Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UPM-1431]/evgeniy/total withdrawal limit fix #16748

Closed
wants to merge 11 commits into from
Closed

[UPM-1431]/evgeniy/total withdrawal limit fix #16748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8707467
chore: [UPM-1431]/evgeniy/total withdrawal limit fix
yauheni-deriv Sep 5, 2024
6013252
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 5, 2024
fef898f
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 6, 2024
b3d6b6b
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 9, 2024
6958d6a
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 12, 2024
d40720d
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 13, 2024
4fd7a65
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 17, 2024
879fb22
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 18, 2024
eb7a6dd
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 18, 2024
6c52ebb
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 19, 2024
664d59b
Merge branch 'master' into account-limits/total-withdrawal-allowed
yauheni-deriv Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/account/src/Components/account-limits/account-limits.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const AccountLimits = observer(
account_balance,
payout,
market_specific,
num_of_days_limit,
lifetime_limit,
remainder,
withdrawal_since_inception_monetary,
} = account_limits;
Expand Down Expand Up @@ -239,7 +239,7 @@ const AccountLimits = observer(

{!is_app_settings && (
<WithdrawalLimitsTable
num_of_days_limit={num_of_days_limit}
lifetime_limit={lifetime_limit}
remainder={remainder}
withdrawal_since_inception_monetary={withdrawal_since_inception_monetary}
/>
Expand Down
6 changes: 3 additions & 3 deletions packages/account/src/Components/account-limits/withdrawal-limits-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import AccountLimitsTableCell from './account-limits-table-cell';
import AccountLimitsTableHeader from './account-limits-table-header';

type TWithdrawalLimitsTable = {
num_of_days_limit?: string | number;
lifetime_limit?: string | number;
withdrawal_since_inception_monetary?: string | number;
remainder?: string | number;
};

const WithdrawalLimitsTable = observer(
({ num_of_days_limit, withdrawal_since_inception_monetary, remainder }: TWithdrawalLimitsTable) => {
({ lifetime_limit, withdrawal_since_inception_monetary, remainder }: TWithdrawalLimitsTable) => {
const { client } = useStore();
const { currency, is_fully_authenticated } = client;
return (
Expand All @@ -39,7 +39,7 @@ const WithdrawalLimitsTable = observer(
<Localize i18n_default_text='Total withdrawal allowed' />
</AccountLimitsTableCell>
<AccountLimitsTableCell align='right'>
{FormatUtils.formatMoney((num_of_days_limit as number) ?? 0, {
{FormatUtils.formatMoney((lifetime_limit as number) ?? 0, {
currency: currency as CurrencyConstants.Currency,
})}
</AccountLimitsTableCell>
Expand Down
Loading