);
- if (is_eu_user && has_mf_mt5_account) {
+
+ if ((is_eu_user && has_mf_mt5_account) || is_currency_switcher_disabled_for_mf) {
return null;
} else if (is_demo) {
return null;
@@ -53,7 +54,6 @@ const CurrentSwitcherContainer = ({
className={classNames(className, 'currency-switcher-container', {
'currency-switcher-container--has-interaction': has_interaction,
})}
- {...props}
>
diff --git a/packages/appstore/src/components/currency-switcher-card/real/real-account-card.tsx b/packages/appstore/src/components/currency-switcher-card/real/real-account-card.tsx
index 4f098c81af1b..13c43b42a4a6 100644
--- a/packages/appstore/src/components/currency-switcher-card/real/real-account-card.tsx
+++ b/packages/appstore/src/components/currency-switcher-card/real/real-account-card.tsx
@@ -18,7 +18,7 @@ const RealAccountCard = () => {
const { accounts, loginid } = client;
const { current_list } = modules.cfd;
- const { openModal, is_eu_user, multipliers_account_status } = traders_hub;
+ const { openModal, is_eu_user, is_currency_switcher_disabled_for_mf } = traders_hub;
const { balance, currency } = accounts[loginid] || default_balance;
const has_mf_mt5_account = Object.keys(current_list)
@@ -35,7 +35,7 @@ const RealAccountCard = () => {
}
icon={currency}
onClick={() => {
- if (multipliers_account_status) {
+ if (is_currency_switcher_disabled_for_mf) {
return null;
} else if (!is_eu_user && !has_mf_mt5_account) {
openModal('currency_selection');
diff --git a/packages/appstore/src/components/currency-switcher-card/real/real-account-switcher.tsx b/packages/appstore/src/components/currency-switcher-card/real/real-account-switcher.tsx
index 717e9159a393..94935ce8df42 100644
--- a/packages/appstore/src/components/currency-switcher-card/real/real-account-switcher.tsx
+++ b/packages/appstore/src/components/currency-switcher-card/real/real-account-switcher.tsx
@@ -7,40 +7,46 @@ import { useStores } from 'Stores/index';
import RealAccountCard from './real-account-card';
import './real-account-switcher.scss';
-const AccountNeedsVerification = observer(({ multipliers_account_status }: { multipliers_account_status: string }) => {
- const { client, traders_hub } = useStores();
- const { account_list, loginid } = client;
+type AccountNeedsVerificationProps = {
+ multipliers_account_status: string;
+ is_currency_switcher_disabled_for_mf: boolean;
+};
+const AccountNeedsVerification = observer(
+ ({ multipliers_account_status, is_currency_switcher_disabled_for_mf }: AccountNeedsVerificationProps) => {
+ const { client, traders_hub } = useStores();
+ const { account_list, loginid } = client;
- const { openModal, openFailedVerificationModal } = traders_hub;
+ const { openModal, openFailedVerificationModal } = traders_hub;
- const title = account_list.find((acc: { loginid: string }) => loginid === acc.loginid).title;
- const icon = account_list.find((acc: { loginid: string }) => loginid === acc.loginid).icon;
+ const title = account_list.find((acc: { loginid: string }) => loginid === acc.loginid).title;
+ const icon = account_list.find((acc: { loginid: string }) => loginid === acc.loginid).icon;
- return (
-
{
- if (multipliers_account_status) {
- return null;
- }
- return openModal('currency_selection');
- }}
- >
-
-
- );
-});
+ return (
+
{
+ if (is_currency_switcher_disabled_for_mf) {
+ return null;
+ }
+ return openModal('currency_selection');
+ }}
+ >
+
+
+ );
+ }
+);
const RealAccountSwitcher = () => {
const { client, traders_hub } = useStores();
const { is_logging_in, is_switching, has_any_real_account } = client;
- const { multipliers_account_status } = traders_hub;
+ const { multipliers_account_status, is_currency_switcher_disabled_for_mf } = traders_hub;
if (is_switching || is_logging_in) {
return (
@@ -51,7 +57,12 @@ const RealAccountSwitcher = () => {
}
if (multipliers_account_status) {
- return
;
+ return (
+
+ );
}
if (has_any_real_account) {
diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js
index d40475304f93..56614df10a43 100644
--- a/packages/core/src/Stores/traders-hub-store.js
+++ b/packages/core/src/Stores/traders-hub-store.js
@@ -80,6 +80,7 @@ export default class TradersHubStore extends BaseStore {
is_demo: computed,
is_eu_selected: computed,
is_real: computed,
+ is_currency_switcher_disabled_for_mf: computed,
no_CR_account: computed,
no_MF_account: computed,
multipliers_account_status: computed,
@@ -337,6 +338,14 @@ export default class TradersHubStore extends BaseStore {
return this.selected_account_type === 'real' && this.root_store.client.has_active_real_account;
}
+ get is_currency_switcher_disabled_for_mf() {
+ return !!(
+ this.is_eu_user &&
+ this.multipliers_account_status &&
+ this.multipliers_account_status !== 'need_verification'
+ );
+ }
+
setTogglePlatformType(platform_type) {
this.selected_platform_type = platform_type;
}