Thisyahlen/87700/no option to change currency for mf (binary-com#7520)

* fix: exit traders hub * fix: remove is_currency_switcher_disabled_for_mf from the currency switcher dropdown
sanjam-deriv · Mar 13, 2023 · 2ac4796 · 2ac4796
1 parent ec0ce14
commit 2ac4796
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 48 deletions.
diff --git a/packages/appstore/src/components/containers/currency-switcher-container.tsx b/packages/appstore/src/components/containers/currency-switcher-container.tsx
@@ -27,7 +27,7 @@ const CurrentSwitcherContainer = ({
     const { client, modules, traders_hub }: TRootStore = store;
 
     const { document_status } = client.authentication_status;
-    const { is_eu_user, is_demo, is_currency_switcher_disabled_for_mf } = traders_hub;
+    const { is_eu_user, is_demo } = traders_hub;
     const { current_list } = modules.cfd;
 
     const has_mf_mt5_account = Object.keys(current_list)
@@ -41,9 +41,7 @@ const CurrentSwitcherContainer = ({
             </div>
         );
 
-        if ((is_eu_user && has_mf_mt5_account) || is_currency_switcher_disabled_for_mf) {
-            return null;
-        } else if (is_demo) {
+        if ((is_eu_user && has_mf_mt5_account) || is_demo) {
             return null;
         }
         return icon_dropdown;

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
@@ -18,7 +18,7 @@ const RealAccountCard = () => {
 
     const { accounts, loginid } = client;
     const { current_list } = modules.cfd;
-    const { openModal, is_eu_user, is_currency_switcher_disabled_for_mf } = traders_hub;
+    const { openModal, is_eu_user } = traders_hub;
     const { balance, currency } = accounts[loginid] || default_balance;
 
     const has_mf_mt5_account = Object.keys(current_list)
@@ -35,9 +35,7 @@ const RealAccountCard = () => {
             }
             icon={currency}
             onClick={() => {
-                if (is_currency_switcher_disabled_for_mf) {
-                    return null;
-                } else if (!is_eu_user && !has_mf_mt5_account) {
+                if (!is_eu_user && !has_mf_mt5_account) {
                     openModal('currency_selection');
                 }
                 return 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
@@ -9,50 +9,44 @@ import './real-account-switcher.scss';
 
 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 AccountNeedsVerification = observer(({ multipliers_account_status }: 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 (
-            <CurrencySwitcherContainer
-                className='real-account-switcher__container'
-                title={
-                    <Text size='xs' line_height='s'>
-                        {title}
-                    </Text>
-                }
-                icon={icon}
-                onClick={() => {
-                    if (is_currency_switcher_disabled_for_mf) {
-                        return null;
-                    }
-                    return openModal('currency_selection');
-                }}
-            >
-                <StatusBadge
-                    account_status={multipliers_account_status}
-                    openFailedVerificationModal={openFailedVerificationModal}
-                    selected_account_type='multipliers'
-                />
-            </CurrencySwitcherContainer>
-        );
-    }
-);
+    return (
+        <CurrencySwitcherContainer
+            className='real-account-switcher__container'
+            title={
+                <Text size='xs' line_height='s'>
+                    {title}
+                </Text>
+            }
+            icon={icon}
+            onClick={() => {
+                return openModal('currency_selection');
+            }}
+        >
+            <StatusBadge
+                account_status={multipliers_account_status}
+                openFailedVerificationModal={openFailedVerificationModal}
+                selected_account_type='multipliers'
+            />
+        </CurrencySwitcherContainer>
+    );
+});
 
 const RealAccountSwitcher = () => {
     const { client, traders_hub } = useStores();
     const { is_logging_in, is_switching, has_maltainvest_account } = client;
     const {
         multipliers_account_status,
-        is_currency_switcher_disabled_for_mf,
+
         is_eu_user,
         no_CR_account,
         no_MF_account,
@@ -71,12 +65,7 @@ const RealAccountSwitcher = () => {
     }
 
     if (multipliers_account_status && is_eu_user) {
-        return (
-            <AccountNeedsVerification
-                multipliers_account_status={multipliers_account_status}
-                is_currency_switcher_disabled_for_mf={is_currency_switcher_disabled_for_mf}
-            />
-        );
+        return <AccountNeedsVerification multipliers_account_status={multipliers_account_status} />;
     }
 
     if (has_maltainvest_account && is_eu_user) {