chore: getStatusConfig changes

shaheer-deriv · Oct 19, 2023 · 96888aa · 96888aa
1 parent 01c4171
commit 96888aa
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 18 deletions.
diff --git a/packages/account/src/Configs/get-status-badge-config.tsx b/packages/account/src/Configs/get-status-badge-config.tsx
@@ -5,9 +5,10 @@ import { Localize } from '@deriv/translations';
 
 const getStatusBadgeConfig = (
     account_status: string,
-    openFailedVerificationModal: (selected_account_type: string) => void,
-    selected_account_type: string
+    openFailedVerificationModal?: (selected_account_type: string) => void,
+    selected_account_type?: string
 ) => {
+    console.log(account_status);
     switch (account_status) {
         case 'pending':
             return {
@@ -19,7 +20,7 @@ const getStatusBadgeConfig = (
                 ),
                 icon: 'IcAlertWarning',
             };
-        case 'failed':
+        case 'migrated':
             return {
                 text: (
                     <Localize
@@ -51,9 +52,29 @@ const getStatusBadgeConfig = (
                 ),
                 icon: 'IcAlertInfo',
             };
+        // case 'migrated':
+        //     return {
+        //         text: (
+        //             <Localize
+        //                 i18n_default_text='<0>No new positions</0>'
+        //                 components={[<Text key={0} weight='bold' size='xxxs' color='warning' />]}
+        //             />
+        //         ),
+        //         icon: 'IcAlertWarning',
+        //     };
+        case 'migrated_without_position':
+            return {
+                text: (
+                    <Localize
+                        i18n_default_text='<0>Account closed</0>'
+                        components={[<Text key={0} weight='bold' size='xxxs' color='warning' />]}
+                    />
+                ),
+                icon: 'IcAlertWarning',
+            };
         default:
             return {
-                text: '',
+                text: 'aaaa',
                 icon: '',
             };
     }

diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx
@@ -120,6 +120,7 @@ const CFDsListing = observer(() => {
                     } else if (current_acc_status === 'verification_pending') {
                         return 'pending';
                     }
+                    return current_acc_status;
             }
         }
         return null;

diff --git a/packages/appstore/src/components/containers/trading-app-card.tsx b/packages/appstore/src/components/containers/trading-app-card.tsx
@@ -20,7 +20,7 @@ import {
     getStaticUrl,
     getUrlSmartTrader,
     getUrlBinaryBot,
-    MT5LoginlistStatus,
+    MT5LoginListStatus,
 } from '@deriv/shared';
 import OpenPositionsSVGModal from '../modals/open-positions-svg-modal';
 import './trading-app-card.scss';
@@ -80,12 +80,18 @@ const TradingAppCard = ({
             return app_desc;
         }
     };
-
+    console.log(
+        'getStatusBadgeConfig ,mt5_acc_auth_status',
+        getStatusBadgeConfig(mt5_acc_auth_status, openFailedVerificationModal, selected_mt5_jurisdiction),
+        mt5_acc_auth_status
+    );
+    console.log(getStatusBadgeConfig('migrated'));
     const { text: badge_text, icon: badge_icon } = getStatusBadgeConfig(
         mt5_acc_auth_status,
         openFailedVerificationModal,
         selected_mt5_jurisdiction
     );
+    // const { text: badge_text_positions, icon: badge_icon_positions } = getStatusBadgeConfig(banner_status);
 
     const openStaticPage = () => {
         if (is_deriv_platform) {
@@ -118,8 +124,8 @@ const TradingAppCard = ({
     };
 
     const [is_open_position_svg_modal_open, setIsOpenPositionSvgModalOpen] = React.useState(false);
-    const is_open_order_position = banner_status === MT5LoginlistStatus.MIGRATED_WITH_POSITION;
-    const is_account_closed = banner_status === MT5LoginlistStatus.MIGRATED_WITHOUT_POSITION;
+    const is_open_order_position = banner_status === MT5LoginListStatus.MIGRATED_WITH_POSITION;
+    const is_account_closed = banner_status === MT5LoginListStatus.MIGRATED_WITHOUT_POSITION;
 
     return (
         <div className='trading-app-card' key={`trading-app-card__${current_language}`}>
@@ -159,6 +165,8 @@ const TradingAppCard = ({
                     <Text className='description' color={'general'} size='xxs' line_height='m'>
                         {appDescription()}
                     </Text>
+                    {console.log('mt5_acc_auth_status', mt5_acc_auth_status)}
+                    {console.log('badge_icon, badge_text ', badge_icon, badge_text)}
                     {mt5_acc_auth_status && (
                         <StatusBadge
                             className='trading-app-card__acc_status_badge'
@@ -167,7 +175,18 @@ const TradingAppCard = ({
                             text={badge_text}
                         />
                     )}
-                    {is_open_order_position && (
+                    {/* {banner_status && (
+                        <StatusBadge
+                            className='trading-app-card__acc_status_badge'
+                            onClick={() => {
+                                setIsOpenPositionSvgModalOpen(!is_open_position_svg_modal_open);
+                            }}
+                            account_status='open-order-position'
+                            icon={badge_icon_positions}
+                            text={badge_text_positions}
+                        />
+                    )} */}
+                    {/* {is_open_order_position && (
                         <StatusBadge
                             className='trading-app-card__acc_status_badge'
                             onClick={() => {
@@ -198,7 +217,7 @@ const TradingAppCard = ({
                                 />
                             }
                         />
-                    )}
+                    )} */}
                     {is_open_position_svg_modal_open && (
                         <OpenPositionsSVGModal
                             market_type={market_type}

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -10,7 +10,7 @@ import {
     getCurrencyName,
     getPlatformSettings,
     validNumber,
-    MT5LoginlistStatus,
+    MT5LoginListStatus,
     routes,
 } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
@@ -124,8 +124,8 @@ const AccountTransferForm = observer(
 
         const { status } = useGetMt5LoginListStatus(selected_to.value ?? '');
         const is_open_order_position_status_present =
-            status === MT5LoginlistStatus.MIGRATED_WITH_POSITION ||
-            status === MT5LoginlistStatus.MIGRATED_WITHOUT_POSITION;
+            status === MT5LoginListStatus.MIGRATED_WITH_POSITION ||
+            status === MT5LoginListStatus.MIGRATED_WITHOUT_POSITION;
 
         const [from_accounts, setFromAccounts] = React.useState({});
         const [to_accounts, setToAccounts] = React.useState({});

diff --git a/packages/cfd/src/Containers/dmt5-trade-modal.tsx b/packages/cfd/src/Containers/dmt5-trade-modal.tsx
@@ -10,7 +10,7 @@ import {
     getPlatformSettings,
     getUrlBase,
     isMobile,
-    MT5LoginlistStatus,
+    MT5LoginListStatus,
 } from '@deriv/shared';
 import { Localize, localize } from '@deriv/translations';
 import { getPlatformMt5DownloadLink } from '../Helpers/constants';
@@ -76,8 +76,8 @@ const DMT5TradeModal = ({
     };
 
     const { status: banner_status } = useGetMt5LoginListStatus(mt5_trade_account?.login ?? '');
-    const is_open_order_position = banner_status === MT5LoginlistStatus.MIGRATED_WITH_POSITION;
-    const is_account_closed = banner_status === MT5LoginlistStatus.MIGRATED_WITHOUT_POSITION;
+    const is_open_order_position = banner_status === MT5LoginListStatus.MIGRATED_WITH_POSITION;
+    const is_account_closed = banner_status === MT5LoginListStatus.MIGRATED_WITHOUT_POSITION;
 
     return (
         <div className='cfd-trade-modal-container'>

diff --git a/packages/shared/src/utils/constants/mt5-login-list-status.ts b/packages/shared/src/utils/constants/mt5-login-list-status.ts
@@ -1,6 +1,6 @@
-export const MT5LoginlistStatus = Object.freeze({
+export const MT5LoginListStatus = Object.freeze({
     MIGRATED_WITH_POSITION: 'migrated_with_position',
-    MIGRATED_WITHOUT_POSITION: 'migrated',
+    MIGRATED_WITHOUT_POSITION: 'migrated_without_position',
     POA_PENDING: 'poa_pending',
     POA_VERIFIED: 'poa_verified',
 });