Skip to content

Commit

Permalink
Sergei / 88771 / Australian VRTC accounts are not able to create real…
Browse files Browse the repository at this point in the history 
… account (binary-com#7633)

* fix: add button for adding account

* fix: convert total assets for demo in account currency

* fix: add check for restricted_countries for is_high function in client-store

* Update packages/core/src/Stores/client-store.js

Co-authored-by: Matin shafiei <matin@binary.com>

* Update packages/core/src/Stores/client-store.js

Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>

* chore: empty

* fix: delete unnecessary '`'

* refactor: change restricted_countries

* chore: empty

* fix: demo account total assets is always USD

* fix: delete 'add or manage account' by checking 'filtered_remaining_real_accounts' length

---------

Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: Matin shafiei <matin@binary.com>
Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
  • Loading branch information
@sergei-deriv @matin-deriv
@mahdiyeh-deriv @jim-deriv
5 people committed Mar 2, 2023
1 parent 13cfd0f commit 612dfa4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 22 deletions.
32 changes: 11 additions & 21 deletions packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ const AccountSwitcher = props => {
const [is_dxtrade_demo_visible, setDxtradeDemoVisible] = React.useState(true);
const [is_dxtrade_real_visible, setDxtradeRealVisible] = React.useState(true);
const [exchanged_rate_cfd_real, setExchangedRateCfdReal] = React.useState(1);
const [exchanged_rate_demo, setExchangedRateDemo] = React.useState(1);
const [exchanged_rate_cfd_demo, setExchangedRateCfdDemo] = React.useState(1);
const [is_non_eu_regulator_visible, setNonEuRegulatorVisible] = React.useState(true);
const [is_eu_regulator_visible, setEuRegulatorVisible] = React.useState(true);
const [filtered_real_accounts, setFilteredRealAccounts] = React.useState([]);
Expand All @@ -62,9 +60,6 @@ const AccountSwitcher = props => {

const vrtc_loginid = props.account_list.find(account => account.is_virtual)?.loginid;
const vrtc_currency = props.accounts[vrtc_loginid] ? props.accounts[vrtc_loginid].currency : 'USD';
const cfd_demo_currency =
props.mt5_login_list.find(account => isDemo(account))?.currency ||
props.dxtrade_accounts_list.find(account => isDemo(account))?.currency;

React.useEffect(() => {
if (getMaxAccountsDisplayed()) {
Expand All @@ -83,12 +78,6 @@ const AccountSwitcher = props => {
if (cfd_real_currency !== account_total_balance_currency) {
getCurrentExchangeRate(cfd_real_currency, setExchangedRateCfdReal);
}
if (vrtc_currency !== account_total_balance_currency) {
getCurrentExchangeRate(vrtc_currency, setExchangedRateDemo);
}
if (cfd_demo_currency !== account_total_balance_currency) {
getCurrentExchangeRate(cfd_demo_currency, setExchangedRateCfdDemo);
}
if (props.is_low_risk || props.is_high_risk) {
const real_accounts = getSortedAccountList(props.account_list, props.accounts).filter(
account => !account.is_virtual && account.loginid.startsWith('CR')
Expand Down Expand Up @@ -454,13 +443,10 @@ const AccountSwitcher = props => {

const getTotalDemoAssets = () => {
const vrtc_balance = props.accounts[vrtc_loginid] ? props.accounts[vrtc_loginid].balance : 0;
const mt5_demo_total = getTotalBalanceCfd(props.mt5_login_list, true, exchanged_rate_cfd_demo);
const dxtrade_demo_total = getTotalBalanceCfd(props.dxtrade_accounts_list, true, exchanged_rate_cfd_demo);
const mt5_demo_total = getTotalBalanceCfd(props.mt5_login_list, true, 1);
const dxtrade_demo_total = getTotalBalanceCfd(props.dxtrade_accounts_list, true, 1);

const total =
(vrtc_currency !== account_total_balance_currency ? vrtc_balance * exchanged_rate_demo : vrtc_balance) +
mt5_demo_total.balance +
dxtrade_demo_total.balance;
const total = vrtc_balance + mt5_demo_total.balance + dxtrade_demo_total.balance;

return props.is_pre_appstore ? vrtc_balance : total;
};
Expand Down Expand Up @@ -863,14 +849,18 @@ const AccountSwitcher = props => {
</Button>
</div>
))}
{can_manage_account_multi && (
{(can_manage_account_multi ||
(!props.has_active_real_account && filtered_remaining_real_accounts?.length === 0)) && (
<Button
className='acc-switcher__btn'
secondary
onClick={
props.has_any_real_account && !hasSetCurrency()
? setAccountCurrency
: () => props.openRealAccountSignup('manage')
: () =>
props.has_active_real_account
? props.openRealAccountSignup('manage')
: props.openRealAccountSignup()
}
>
{props.has_fiat && props.available_crypto_currencies?.length === 0
Expand Down Expand Up @@ -1253,9 +1243,9 @@ const AccountSwitcher = props => {
</Text>
<Text size='xs' color='prominent' className='acc-switcher__balance'>
<Money
currency={account_total_balance_currency}
currency={isRealAccountTab ? account_total_balance_currency : vrtc_currency}
amount={formatMoney(
account_total_balance_currency,
isRealAccountTab ? account_total_balance_currency : vrtc_currency,
isRealAccountTab ? getTotalRealAssets() : getTotalDemoAssets(),
true
)}
Expand Down
8 changes: 7 additions & 1 deletion packages/core/src/Stores/client-store.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2504,8 +2504,14 @@ export default class ClientStore extends BaseStore {
get is_high_risk() {
if (isEmptyObject(this.account_status)) return false;
const { gaming_company, financial_company } = this.landing_companies;

// This is a conditional check for countries like Australia/Norway which fulfil one of these following conditions.
const restricted_countries =
financial_company?.shortcode === 'svg' ||
(gaming_company?.shortcode === 'svg' && financial_company?.shortcode !== 'maltainvest');

const high_risk_landing_company = financial_company?.shortcode === 'svg' && gaming_company?.shortcode === 'svg';
return high_risk_landing_company || this.account_status.risk_classification === 'high';
return high_risk_landing_company || this.account_status.risk_classification === 'high' || restricted_countries;
}

get is_low_risk() {
Expand Down

0 comments on commit 612dfa4

Please sign in to comment.