feat: derivx cfd account is displayed in dashboard along with syn & f…

packages/cfd/src/Components/cfd-real-account-display.tsx

@@ -38,6 +38,7 @@ type TCFDRealAccountDisplayProps = {
     is_loading?: boolean;
     is_logged_in: boolean;
     isSyntheticCardVisible: (account_category: string) => boolean;
+    isDxtradeAllCardVisible: (account_category: string) => boolean;
     is_virtual: boolean;
     isFinancialCardVisible: () => boolean;
     onSelectAccount: (objCFDAccount: TObjectCFDAccount) => void;
@@ -75,6 +76,7 @@ const CFDRealAccountDisplay = ({
     is_virtual,
     isSyntheticCardVisible,
     isFinancialCardVisible,
+    isDxtradeAllCardVisible,
     onSelectAccount,
     realSyntheticAccountsExistingData,
     realFinancialAccountsExistingData,
@@ -245,7 +247,7 @@ const CFDRealAccountDisplay = ({
         />
     );
 
-    const derivx_all_account = platform === 'dxtrade' && (
+    const derivx_all_account = platform === 'dxtrade' && isDxtradeAllCardVisible('real') && (
         <CFDAccountCard
             commission_message={localize('No commission')}
             descriptor={general_messages.getFinancialAccountDescriptor(platform)}

packages/cfd/src/Containers/cfd-dashboard.tsx

@@ -219,7 +219,9 @@ const CFDDashboard = (props: TCFDDashboardProps) => {
         if (props.is_logged_in) {
             ['demo', 'real'].forEach(account_type => {
                 const should_enable_tab =
-                    isDxtradeAllCardVisible() || isSyntheticCardVisible(account_type) || isFinancialCardVisible();
+                    isDxtradeAllCardVisible(account_type) ||
+                    isSyntheticCardVisible(account_type) ||
+                    isFinancialCardVisible();
 
                 if (account_type === 'real' && is_real_enabled !== should_enable_tab) {
                     setIsRealEnabled(should_enable_tab);
@@ -324,9 +326,18 @@ const CFDDashboard = (props: TCFDDashboardProps) => {
         props.openPasswordModal();
     };
 
-    const isDxtradeAllCardVisible = () => {
+    const hasAccount = (category: string, type: string) => {
+        return Object.keys(current_list).some(key => key.startsWith(`${platform}.${category}.${type}`));
+    };
+
+    const isDxtradeAllCardVisible = (account_category: string) => {
         const { platform, landing_companies } = props;
 
+        const has_synthetic_account = hasAccount(account_category, 'synthetic');
+        const has_financial_account = hasAccount(account_category, 'financial');
+
+        if (has_synthetic_account || has_financial_account) return false;
+
         return isLandingCompanyEnabled({
             landing_companies,
             platform,
@@ -335,22 +346,28 @@ const CFDDashboard = (props: TCFDDashboardProps) => {
     };
 
     const isSyntheticCardVisible = (account_category: string) => {
-        const { current_list, platform, is_eu, is_eu_country, landing_companies, is_logged_in } = props;
-        const has_synthetic_account = Object.keys(current_list).some(key =>
-            key.startsWith(`${platform}.${account_category}.synthetic`)
-        );
+        const { platform, is_eu, is_eu_country, landing_companies, is_logged_in } = props;
+        const has_synthetic_account = hasAccount(account_category, 'synthetic');
+        const has_financial_account = hasAccount(account_category, 'financial');
 
         // Hiding card for logged out EU users
         if (!is_logged_in && is_eu_country) return false;
 
         if (is_eu && !has_synthetic_account) return false;
 
+        if (!has_synthetic_account && !has_financial_account) return false;
+
         return isLandingCompanyEnabled({ landing_companies, platform, type: 'gaming' }) || !is_logged_in;
     };
 
     const isFinancialCardVisible = () => {
         const { platform, landing_companies, is_logged_in } = props;
 
+        const has_synthetic_account = hasAccount('real', 'synthetic');
+        const has_financial_account = hasAccount('real', 'financial');
+
+        if (!has_synthetic_account && !has_financial_account) return false;
+
         return (
             !is_logged_in ||
             isLandingCompanyEnabled({
@@ -537,6 +554,7 @@ const CFDDashboard = (props: TCFDDashboardProps) => {
                                                 is_virtual={is_virtual}
                                                 isSyntheticCardVisible={isSyntheticCardVisible}
                                                 isFinancialCardVisible={isFinancialCardVisible}
+                                                isDxtradeAllCardVisible={isDxtradeAllCardVisible}
                                                 openAccountTransfer={openAccountTransfer}
                                                 openPasswordManager={togglePasswordManagerModal}
                                                 platform={platform}

packages/components/stories/icon/icons.js

@@ -885,4 +885,4 @@ export const icons =
         'IcWalletZingpayDark',
         'IcWalletZingpayLight',
     ],
-};
+}

packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx

@@ -291,7 +291,14 @@ const AccountSwitcher = props => {
         }
 
         if (!is_demo && platform === CFD_PLATFORMS.DXTRADE) {
-            return [...gaming_config, ...financial_config, ...all_config];
+            const has_account = Object.keys(existing_cfd_accounts).some(
+                key =>
+                    existing_cfd_accounts[key].market_type === 'synthetic' ||
+                    existing_cfd_accounts[key].market_type === 'financial'
+            );
+
+            if (has_account) return [...gaming_config, ...financial_config];
+            return [...all_config];
         }
 
         return [...gaming_config, ...financial_config];