Hirad/UPM-1681/Account closure and transfer modal issue (deriv-com#17207

) * chore: fixed the transfer and account closure pop up issues * chore: updated the types
likhith-deriv · Nov 6, 2024 · ac5323a · ac5323a
1 parent ebd3000
commit ac5323a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/...ity/ClosingAccount/closing-account-pending-conditions/closing-account-pending-balance.tsx b/...ity/ClosingAccount/closing-account-pending-conditions/closing-account-pending-balance.tsx
@@ -62,6 +62,7 @@ const ClosingAccountPendingBalance = observer(({ platform, account_balance }: TC
                                 platform,
                                 shortcode: is_mt5_platform ? (account.landing_company_short as TShortcode) : undefined,
                                 is_eu: is_eu_user,
+                                product: account.product,
                             }) ?? ''
                         }
                         value={

diff --git a/...y/ClosingAccount/closing-account-pending-conditions/closing-account-pending-positions.tsx b/...y/ClosingAccount/closing-account-pending-conditions/closing-account-pending-positions.tsx
@@ -63,6 +63,7 @@ const ClosingAccountPendingPositions = observer(
                                         ? (account.landing_company_short as TShortcode)
                                         : undefined,
                                     is_eu: is_eu_user,
+                                    product: account.product,
                                 }) ?? ''
                             }
                             value={

diff --git a/packages/account/src/Types/common.type.ts b/packages/account/src/Types/common.type.ts
@@ -217,17 +217,20 @@ export type TAccounts = {
     title?: string;
 };
 
+type TProduct = 'financial' | 'synthetic' | 'swap_free' | 'zero_spread' | 'cTrader' | 'derivx';
+
 type TPendingAccountDetails = {
     balance?: number;
     currency?: string;
     display_login?: string;
     positions?: number;
     withdrawals?: number;
+    product?: TProduct;
 };
 
 export type TDetailsOfDerivAccount = TAccounts & TPendingAccountDetails;
 export type TDetailsOfMT5Account = DetailsOfEachMT5Loginid & TPendingAccountDetails;
-export type TDetailsOfDerivXAccount = TDetailsOfMT5Account & { account_id?: string };
+export type TDetailsOfDerivXAccount = TDetailsOfMT5Account & { account_id?: string; product?: TProduct };
 export type TDetailsOfCtraderAccount = DetailsOfEachMT5Loginid & {
     display_balance?: string;
     platform?: string;

diff --git a/packages/cashier/src/stores/account-transfer-store.ts b/packages/cashier/src/stores/account-transfer-store.ts
@@ -402,6 +402,7 @@ export default class AccountTransferStore {
                               platform: account.account_type,
                               is_eu: this.root_store.client.is_eu,
                               is_transfer_form: true,
+                              product: account.product,
                           }) || ''
                       }`;
             const account_text_display = is_cfd

diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher-account-list.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher-account-list.jsx
@@ -16,6 +16,7 @@ const AccountList = ({
     is_disabled,
     is_virtual,
     is_eu,
+    product,
     loginid,
     market_type,
     redirectAccount,
@@ -57,6 +58,7 @@ const AccountList = ({
                                 sub_account_type={sub_account_type}
                                 has_error={has_error}
                                 platform={platform}
+                                product={product}
                                 is_dark_mode_on={is_dark_mode_on}
                                 shortcode={shortcode}
                                 should_show_server_name={should_show_server_name}
@@ -132,12 +134,13 @@ const AccountDisplay = ({
     sub_account_type,
     platform,
     server,
+    product,
     is_dark_mode_on,
     is_eu,
     shortcode,
     should_show_server_name,
 }) => {
-    const account_title = getCFDAccountDisplay({ market_type, sub_account_type, platform, is_eu, shortcode });
+    const account_title = getCFDAccountDisplay({ market_type, sub_account_type, platform, is_eu, shortcode, product });
     // TODO: Remove once account with error has market_type and sub_account_type in details response
     const getServerName = React.useCallback(account => {
         if (account) {

diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
@@ -240,6 +240,7 @@ const AccountSwitcher = observer(({ history, is_mobile, is_visible }) => {
                                     is_disabled={account.is_disabled}
                                     is_virtual={account.is_virtual}
                                     loginid={account.loginid}
+                                    product={account.product}
                                     redirectAccount={account.is_disabled ? undefined : () => doSwitch(account.loginid)}
                                     onClickResetVirtualBalance={resetBalance}
                                     selected_loginid={account_loginid}

diff --git a/packages/shared/src/utils/cfd/cfd.ts b/packages/shared/src/utils/cfd/cfd.ts
@@ -99,7 +99,7 @@ export const getCFDAccountKey = ({
                 return 'all_demo';
         }
     }
-    if (market_type === 'all') {
+    if (market_type === 'all' && platform !== CFD_PLATFORMS.MT5) {
         switch (platform) {
             case CFD_PLATFORMS.CTRADER:
                 return 'ctrader';