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

bahar/region-should-not-show-in-account-selection-dropdown #6828

Merged
merged 1 commit into from
Nov 2, 2022
Merged

bahar/region-should-not-show-in-account-selection-dropdown #6828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 11 additions & 54 deletions packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,7 @@ import {
} from '@deriv/shared';
import { localize, Localize } from '@deriv/translations';
import { connect } from 'Stores/connect';
import {
TRootStore,
TClientStore,
TUiStore,
TReactChangeEvent,
TAccount,
TAccountsList,
TCryptoTransactionDetails,
} from 'Types';
import { TRootStore, TClientStore, TReactChangeEvent, TAccount, TAccountsList, TCryptoTransactionDetails } from 'Types';
import CryptoFiatConverter from 'Components/crypto-fiat-converter';
import ErrorDialog from 'Components/error-dialog';
import PercentageSelector from 'Components/percentage-selector';
Expand Down Expand Up @@ -53,10 +45,8 @@ type TAccountTransferFormProps = {
crypto_transactions: Array<TCryptoTransactionDetails>;
error: object;
is_crypto: boolean;
is_dark_mode_on: TUiStore['is_dark_mode_on'];
is_dxtrade_allowed: TClientStore['is_dxtrade_allowed'];
minimum_fee: string;
mt5_login_list: TClientStore['mt5_login_list'];
onChangeConverterFromAmount: () => void;
onChangeConverterToAmount: () => void;
onChangeTransferFrom: (event: TReactChangeEvent) => void;
Expand All @@ -82,13 +72,7 @@ type TAccountTransferFormProps = {
validateTransferToAmount: () => void;
};

const AccountOption = ({ mt5_login_list, account, idx, is_dark_mode_on }: TAccountsList) => {
let server;

if (account.is_mt) {
server = mt5_login_list.find(mt5_account => mt5_account.login === account.value);
}

const AccountOption = ({ account, idx }: TAccountsList) => {
return (
<React.Fragment key={idx}>
{(account.currency || account.platform_icon) && (
Expand All @@ -109,18 +93,11 @@ const AccountOption = ({ mt5_login_list, account, idx, is_dark_mode_on }: TAccou
</Text>
</div>

{server?.market_type === 'synthetic' && (
<Text color={is_dark_mode_on ? 'general' : 'colored-background'} size='xxs' className='badge-server'>
{server.server_info?.geolocation?.region}&nbsp;
{server.server_info?.geolocation?.sequence !== 1 ? server.server_info?.geolocation?.sequence : ''}
</Text>
)}

<span className='account-transfer-form__balance'>
<Money
amount={account.balance}
currency={account.currency}
has_sign={account.balance && account.balance < 0}
has_sign={!!account.balance && account.balance < 0}
show_currency
/>
</span>
Expand Down Expand Up @@ -149,9 +126,7 @@ const AccountTransferForm = ({
error,
is_crypto,
is_dxtrade_allowed,
is_dark_mode_on,
minimum_fee,
mt5_login_list,
onChangeConverterFromAmount,
onChangeConverterToAmount,
onChangeTransferFrom,
Expand Down Expand Up @@ -237,35 +212,19 @@ const AccountTransferForm = ({
dxtrade_accounts_to = [];

accounts_list.forEach((account, idx) => {
const text = (
<AccountOption
mt5_login_list={mt5_login_list}
idx={idx}
account={account}
is_dark_mode_on={is_dark_mode_on}
/>
);
const text = <AccountOption idx={idx} account={account} />;
const value = account.value;
const account_server = mt5_login_list.find(server => server.login === account.value);

const is_cfd_account = account.is_mt || account.is_dxtrade;
let server_region = '';
if (account_server?.market_type === 'synthetic') {
server_region = `[${account_server.server_info?.geolocation?.region}${
account_server.server_info?.geolocation?.sequence !== 1
? account_server.server_info?.geolocation?.sequence
: ''
}]`;
}

getAccounts('from', account).push({
text,
value,
is_mt: account.is_mt,
is_dxtrade: account.is_dxtrade,
nativepicker_text: `${
is_cfd_account ? account.market_type : getCurrencyName(account.currency)
} ${server_region} (${account.balance} ${is_cfd_account ? account.currency : account.text})`,
nativepicker_text: `${is_cfd_account ? account.market_type : getCurrencyName(account.currency)} (${
account.balance
} ${is_cfd_account ? account.currency : account.text})`,
});
const is_selected_from = account.value === selected_from.value;

Expand All @@ -287,9 +246,9 @@ const AccountTransferForm = ({
is_mt: account.is_mt,
is_dxtrade: account.is_dxtrade,
disabled: is_disabled,
nativepicker_text: `${
is_cfd_account ? account.market_type : getCurrencyName(account.currency)
} ${server_region} (${account.balance} ${is_cfd_account ? account.currency : account.text})`,
nativepicker_text: `${is_cfd_account ? account.market_type : getCurrencyName(account.currency)} (${
account.balance
} ${is_cfd_account ? account.currency : account.text})`,
});
}
});
Expand Down Expand Up @@ -626,7 +585,7 @@ const AccountTransferForm = ({
);
};

export default connect(({ client, modules, ui }: TRootStore) => ({
export default connect(({ client, modules }: TRootStore) => ({
account_limits: client.account_limits,
account_transfer_amount: modules.cashier.account_transfer.account_transfer_amount,
accounts_list: modules.cashier.account_transfer.accounts_list,
Expand All @@ -637,10 +596,8 @@ export default connect(({ client, modules, ui }: TRootStore) => ({
converter_to_error: modules.cashier.crypto_fiat_converter.converter_to_error,
crypto_transactions: modules.cashier.transaction_history.crypto_transactions,
is_crypto: modules.cashier.general_store.is_crypto,
is_dark_mode_on: ui.is_dark_mode_on,
is_dxtrade_allowed: client.is_dxtrade_allowed,
minimum_fee: modules.cashier.account_transfer.minimum_fee,
mt5_login_list: client.mt5_login_list,
onChangeConverterFromAmount: modules.cashier.crypto_fiat_converter.onChangeConverterFromAmount,
onChangeConverterToAmount: modules.cashier.crypto_fiat_converter.onChangeConverterToAmount,
onChangeTransferFrom: modules.cashier.account_transfer.onChangeTransferFrom,
Expand Down
2 changes: 1 addition & 1 deletion packages/cashier/src/pages/account-transfer/account-transfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default connect(({ client, modules }: TRootStore) => ({
is_loading: modules.cashier.general_store.is_loading,
is_switching: client.is_switching,
is_transfer_confirm: modules.cashier.account_transfer.is_transfer_confirm,
is_transfer_locked: modules.cashier.general_store.is_transfer_locked,
is_transfer_locked: modules.cashier.account_transfer.is_transfer_locked,
is_virtual: client.is_virtual,
onMount: modules.cashier.account_transfer.onMountAccountTransfer,
recentTransactionOnMount: modules.cashier.transaction_history.onMount,
Expand Down
2 changes: 0 additions & 2 deletions packages/cashier/src/types/shared/account.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ export type TAccount = {
export type TMt5LoginList = Array<DetailsOfEachMT5Loginid>;

export type TAccountsList = {
mt5_login_list: TMt5LoginList;
account: TAccount;
idx: string | number;
is_dark_mode_on: boolean;
};