Merge branch 'binary-com:master' into shayan/80609/components-shared-…

…ts-migration-parent
niloofar-deriv · Nov 22, 2022 · 52af15f · 52af15f
2 parents 11b9912 + d5a8837
commit 52af15f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/packages/appstore/src/modules/trading-hub/index.tsx b/packages/appstore/src/modules/trading-hub/index.tsx
@@ -154,8 +154,6 @@ const TradingHub: React.FC = () => {
 
     const is_loading = is_populating_mt5_account_list || is_populating_dxtrade_account_list;
 
-    const is_mf = loginid?.startsWith('MF');
-
     if (is_loading) return <Loading className='cfd-accounts-container__loader' is_fullscreen={false} />;
 
     return (
@@ -202,7 +200,7 @@ const TradingHub: React.FC = () => {
                     <CFDAccounts account_type={tab_account_type} />
                     <Divider horizontal className='trading-hub_body--divider' />
                     <OptionsAccounts
-                        platformlauncherprops={is_mf || is_eu || is_eu_country ? mf_platform_config : platform_config}
+                        platformlauncherprops={is_eu ? mf_platform_config : platform_config}
                         accountType={tab_account_type}
                     />
                 </DesktopWrapper>
@@ -219,7 +217,7 @@ const TradingHub: React.FC = () => {
                     {platform_type === 'cfd' && <CFDAccounts account_type={tab_account_type} />}
                     {platform_type === 'options' && (
                         <OptionsAccounts
-                            platformlauncherprops={is_mf ? mf_platform_config : platform_config}
+                            platformlauncherprops={is_eu ? mf_platform_config : platform_config}
                             accountType={tab_account_type}
                         />
                     )}

diff --git a/packages/core/src/App/Constants/routes-config.js b/packages/core/src/App/Constants/routes-config.js
@@ -206,23 +206,16 @@ const getModules = ({ is_pre_appstore }) => {
             ],
         },
         {
-            path: routes.appstore,
+            path: routes.trading_hub,
             component: AppStore,
             is_authenticated: true,
-            getTitle: () => localize('Appstore'),
-            routes: [
-                {
-                    path: routes.trading_hub,
-                    component: AppStore,
-                    getTitle: () => localize('Trading hub'),
-                },
-                {
-                    path: routes.onboarding,
-                    component: AppStore,
-                    is_authenticated: false,
-                    getTitle: () => localize('Onboarding'),
-                },
-            ],
+            getTitle: () => localize('Trading hub'),
+        },
+        {
+            path: routes.onboarding,
+            component: AppStore,
+            is_authenticated: false,
+            getTitle: () => localize('Onboarding'),
         },
         {
             path: routes.cashier,