From 0244cf74a9af5774915216ad9403b5d9500f841a Mon Sep 17 00:00:00 2001 From: shontzu-deriv Date: Fri, 28 Apr 2023 10:44:42 +0800 Subject: [PATCH] fix: move consts to Helpers/constants file --- packages/cfd/src/Containers/trade-modal.tsx | 9 ++---- packages/cfd/src/Helpers/config.tsx | 29 +++---------------- packages/cfd/src/Helpers/constants.ts | 31 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/packages/cfd/src/Containers/trade-modal.tsx b/packages/cfd/src/Containers/trade-modal.tsx index ee40301570ea..5d0f4315ea2e 100644 --- a/packages/cfd/src/Containers/trade-modal.tsx +++ b/packages/cfd/src/Containers/trade-modal.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { Text, Icon, Money } from '@deriv/components'; -import { TTradingPlatformAccounts, TCFDDashboardContainer, TCFDsPlatformType } from '../Components/props.types'; +import { TTradingPlatformAccounts, TCFDDashboardContainer, TCFDsPlatformType } from 'Components/props.types'; import { DetailsOfEachMT5Loginid } from '@deriv/api-types'; import { CFD_PLATFORMS, getCFDAccountKey, isMobile, capitalizeFirstLetter, mobileOSDetect } from '@deriv/shared'; import { localize, Localize } from '@deriv/translations'; import { getPlatformQRCode, mobileDownloadLink, PlatformsDesktopDownload } from '../Helpers/config'; -import { platformsText } from '../Helpers/constants'; +import { getTitle, platformsText } from '../Helpers/constants'; import SpecBox from 'Components/specbox'; import PasswordBox from 'Components/passwordbox'; @@ -25,11 +25,6 @@ type TTradeModalProps = { platform: TCFDsPlatformType; }; -const getTitle = (market_type: string, is_eu_user: boolean) => { - if (is_eu_user) localize('MT5 CFDs'); - return market_type; -}; - const PlatformIconsAndDescriptions = (platform: TCFDsPlatformType, is_demo: string) => { return ( diff --git a/packages/cfd/src/Helpers/config.tsx b/packages/cfd/src/Helpers/config.tsx index 3e15a0f46cee..4fcb737c1406 100644 --- a/packages/cfd/src/Helpers/config.tsx +++ b/packages/cfd/src/Helpers/config.tsx @@ -2,28 +2,17 @@ import React from 'react'; import { QRCode } from 'react-qrcode'; import { TCFDsPlatformType } from 'Components/props.types'; import { - getPlatformDXTradeDownloadLink, - getPlatformDerivEZDownloadLink, getDXTradeWebTerminalLink, platformsText, DERIVEZ_URL, + platforms_icons, + mobileDownloadLink, } from './constants'; import { Text, Icon } from '@deriv/components'; import { Localize } from '@deriv/translations'; import { isMobile, OSDetect, isDesktopOs } from '@deriv/shared'; import { TCFDDashboardContainer } from 'Containers/props.types'; -export const mobileDownloadLink = (platform: TCFDsPlatformType, type: 'ios' | 'android' | 'huawei') => { - switch (platform) { - case 'dxtrade': - return getPlatformDXTradeDownloadLink(type); - case 'derivez': - return getPlatformDerivEZDownloadLink(type); - default: - return getPlatformDXTradeDownloadLink(type); - } -}; - export const getPlatformQRCode = (acc_type: TCFDsPlatformType) => { const qr_code_mobile = isMobile() ? '100%' : '80%'; const os = OSDetect(); @@ -67,17 +56,6 @@ export const PlatformsDesktopDownload = ({ platform, dxtrade_tokens, is_demo }: } }; - const platforms_icons = () => { - switch (platform) { - case 'derivez': - return 'DerivEz'; - case 'dxtrade': - return 'Dxtrade'; - default: - return ''; - } - }; - return (
@@ -100,3 +78,4 @@ export const PlatformsDesktopDownload = ({ platform, dxtrade_tokens, is_demo }: ); }; +export { mobileDownloadLink }; diff --git a/packages/cfd/src/Helpers/constants.ts b/packages/cfd/src/Helpers/constants.ts index 7ada13c95fb8..fd143ed032a0 100644 --- a/packages/cfd/src/Helpers/constants.ts +++ b/packages/cfd/src/Helpers/constants.ts @@ -1,4 +1,5 @@ import { OSDetect } from '@deriv/shared'; +import { localize } from '@deriv/translations'; import { TCFDsPlatformType } from 'Components/props.types'; const platformsText = (platform: TCFDsPlatformType) => { @@ -12,6 +13,33 @@ const platformsText = (platform: TCFDsPlatformType) => { } }; +const platforms_icons = (platform: TCFDsPlatformType) => { + switch (platform) { + case 'derivez': + return 'DerivEz'; + case 'dxtrade': + return 'Dxtrade'; + default: + return ''; + } +}; + +const mobileDownloadLink = (platform: TCFDsPlatformType, type: 'ios' | 'android' | 'huawei') => { + switch (platform) { + case 'dxtrade': + return getPlatformDXTradeDownloadLink(type); + case 'derivez': + return getPlatformDerivEZDownloadLink(type); + default: + return getPlatformDXTradeDownloadLink(type); + } +}; + +const getTitle = (market_type: string, is_eu_user: boolean) => { + if (is_eu_user) localize('MT5 CFDs'); + return market_type; +}; + const REAL_DXTRADE_URL = 'https://dx.deriv.com'; const DEMO_DXTRADE_URL = 'https://dx-demo.deriv.com'; @@ -105,6 +133,9 @@ export { DERIVEZ_URL, getBrokerName, platformsText, + platforms_icons, + getTitle, + mobileDownloadLink, getPlatformDXTradeDownloadLink, getPlatformDerivEZDownloadLink, getPlatformMt5DownloadLink,