diff --git a/packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.tsx b/packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.tsx index c57fa4eeebb2..d4053ae94a8b 100644 --- a/packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.tsx +++ b/packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.tsx @@ -1,23 +1,26 @@ import React from 'react'; import { useHistory } from 'react-router-dom'; import classNames from 'classnames'; -import { Text, Icon, PageOverlay, CFDCompareAccountsCarousel } from '@deriv/components'; + +import { CFDCompareAccountsCarousel, Icon, PageOverlay, Text } from '@deriv/components'; +import { useIsRtl } from '@deriv/hooks'; import { routes } from '@deriv/shared'; -import { Localize, localize } from '@deriv/translations'; import { observer, useStore } from '@deriv/stores'; +import { Localize, localize } from '@deriv/translations'; import { useDevice } from '@deriv-com/ui'; -import { useIsRtl } from '@deriv/hooks'; -import CFDCompareAccountsCard from './cfd-compare-accounts-card'; + import { - getSortedCFDAvailableAccounts, + ctrader_data, + dxtrade_data, + getCtraderDemoData, + getDxtradeDemoData, getEUAvailableAccounts, getMT5DemoData, - getDxtradeDemoData, - getCtraderDemoData, - dxtrade_data, - ctrader_data, + getSortedCFDAvailableAccounts, } from '../../Helpers/compare-accounts-config'; +import CFDCompareAccountsCard from './cfd-compare-accounts-card'; + const CompareCFDs = observer(() => { const { isDesktop } = useDevice(); const is_rtl = useIsRtl(); @@ -147,7 +150,7 @@ const CompareCFDs = observer(() => { {all_cfd_available_accounts.map(item => ( diff --git a/packages/cfd/src/Helpers/compare-accounts-config.ts b/packages/cfd/src/Helpers/compare-accounts-config.ts index a75ecc06a750..8b4e2b5bb0ec 100644 --- a/packages/cfd/src/Helpers/compare-accounts-config.ts +++ b/packages/cfd/src/Helpers/compare-accounts-config.ts @@ -1,6 +1,8 @@ import { localize } from '@deriv/translations'; + import { TInstrumentsIcon, TModifiedTradingPlatformAvailableAccount, TProducts } from '../Components/props.types'; -import { CFD_PLATFORMS, MARKET_TYPE, JURISDICTION, REGION, MARKET_TYPE_SHORTCODE, PRODUCT } from './cfd-config'; + +import { CFD_PLATFORMS, JURISDICTION, MARKET_TYPE, MARKET_TYPE_SHORTCODE, PRODUCT, REGION } from './cfd-config'; // Map the accounts according to the market type const getHighlightedIconLabel = ( @@ -40,8 +42,6 @@ const getHighlightedIconLabel = ( return 'forex'; } else if (item === 'ETFs') { return 'ETFs'; // Preserve the original form for ETFs - } else if (item === 'Derived FX') { - return 'derived_FX'; // Handle FX case } return item.toLowerCase().replace(/\s+/g, '_'); // Replace spaces with underscores }); @@ -69,12 +69,6 @@ const getHighlightedIconLabel = ( text: localize('Basket indices'), is_available: selected_region === REGION.NON_EU, }, - { - id: 'derived_FX', - icon: 'DerivedFX', - text: localize('Derived FX'), - is_available: selected_region === REGION.NON_EU, - }, ]; return instrumentsData.map((item: TInstrumentsIcon) => ({ diff --git a/packages/wallets/src/features/cfd/screens/CompareAccounts/compareAccountsConfig.ts b/packages/wallets/src/features/cfd/screens/CompareAccounts/compareAccountsConfig.ts index 5ce483518a5b..ba62ce53e46a 100644 --- a/packages/wallets/src/features/cfd/screens/CompareAccounts/compareAccountsConfig.ts +++ b/packages/wallets/src/features/cfd/screens/CompareAccounts/compareAccountsConfig.ts @@ -66,11 +66,6 @@ const getHighlightedIconLabel = (values: TValues) => { { highlighted: shouldHighlight('Basket indices'), icon: 'Baskets', text: localize('Basket indices') }, ] as const) : []), - ...(!isEuRegion - ? ([ - { highlighted: shouldHighlight('Derived FX'), icon: 'DerivedFX', text: localize('Derived FX') }, - ] as const) - : []), ] as const; };