diff --git a/packages/core/src/App/Containers/RealAccountSignup/add-or-manage-accounts.jsx b/packages/core/src/App/Containers/RealAccountSignup/add-or-manage-accounts.jsx index 2dd6bdaa9381..153d67d7da98 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/add-or-manage-accounts.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/add-or-manage-accounts.jsx @@ -35,6 +35,8 @@ const AddOrManageAccounts = props => { setShouldShowCancel, onClose, show_eu_related_content, + is_low_risk, + is_pre_appstore, } = props; const initial_active_index = @@ -138,7 +140,7 @@ const AddOrManageAccounts = props => { return ( - {show_eu_related_content && has_fiat ? ( + {show_eu_related_content && !(is_low_risk && is_pre_appstore) && has_fiat ? ( fiat_section ) : ( ({ @@ -231,4 +235,6 @@ export default connect(({ client, modules, ui, traders_hub }) => ({ resetRealAccountSignupTarget: ui.resetRealAccountSignupTarget, setIsDeposit: modules.cashier.general_store.setIsDeposit, show_eu_related_content: traders_hub.show_eu_related_content, + is_low_risk: client.is_low_risk, + is_pre_appstore: client.is_pre_appstore, }))(AddOrManageAccounts); diff --git a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx index 828a9dc44cb3..8a2534c80fa6 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx @@ -124,6 +124,7 @@ const RealAccountSignup = ({ should_show_risk_warning_modal, state_index, state_value, + is_low_risk, }) => { const [current_action, setCurrentAction] = React.useState(null); const [is_loading, setIsLoading] = React.useState(false); @@ -260,7 +261,11 @@ const RealAccountSignup = ({ if (getActiveModalIndex() === modal_pages_indices.status_dialog) return 'auto'; if (!currency) return '688px'; // Set currency modal if (has_real_account && currency) { - if (show_eu_related_content && getActiveModalIndex() === modal_pages_indices.add_or_manage_account) { + if ( + show_eu_related_content && + !(is_pre_appstore && is_low_risk) && + getActiveModalIndex() === modal_pages_indices.add_or_manage_account + ) { // Manage account return '420px'; // Since crypto is disabled for EU clients, lower the height of modal } @@ -656,4 +661,5 @@ export default connect(({ ui, client, common, traders_hub, modules }) => ({ should_show_risk_warning_modal: ui.should_show_risk_warning_modal, state_value: ui.real_account_signup, show_eu_related_content: traders_hub.show_eu_related_content, + is_low_risk: client.is_low_risk, }))(withRouter(RealAccountSignup)); diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js index 0a933a8cd734..93767c0ad320 100644 --- a/packages/core/src/Stores/client-store.js +++ b/packages/core/src/Stores/client-store.js @@ -531,7 +531,9 @@ export default class ClientStore extends BaseStore { return []; }; - if (!this.landing_companies || !this.root_store.ui) return []; + if (!this.landing_companies || !this.root_store.ui) { + return []; + } if (!this.root_store.ui.real_account_signup_target) { return getDefaultAllowedCurrencies(); } @@ -539,7 +541,9 @@ export default class ClientStore extends BaseStore { ['set_currency', 'manage'].includes(this.root_store.ui.real_account_signup_target) && this.current_landing_company ) { - return this.current_landing_company.legal_allowed_currencies; + return this.is_pre_appstore + ? getDefaultAllowedCurrencies() + : this.current_landing_company.legal_allowed_currencies; } const target = this.root_store.ui.real_account_signup_target === 'maltainvest' ? 'financial' : 'gaming';