From acbf585b23691290e5eb6b3e1ebc2a9e1558f24b Mon Sep 17 00:00:00 2001 From: mitra Date: Fri, 26 Apr 2024 21:52:29 +0800 Subject: [PATCH 1/5] feat: :speech_balloon: update description and texts --- .../add-options-account/add-options-account.tsx | 2 +- .../src/components/cfds-listing/index.tsx | 4 +--- .../options-multipliers-listing/index.tsx | 17 ++++++++--------- .../appstore/src/constants/platform-config.ts | 12 ++++++------ packages/core/src/Stores/traders-hub-store.js | 6 ++---- .../src/utils/cfd/available-cfd-accounts.ts | 6 +++--- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/packages/appstore/src/components/add-options-account/add-options-account.tsx b/packages/appstore/src/components/add-options-account/add-options-account.tsx index a6281ff9626d..d1f842bffeb0 100644 --- a/packages/appstore/src/components/add-options-account/add-options-account.tsx +++ b/packages/appstore/src/components/add-options-account/add-options-account.tsx @@ -11,7 +11,7 @@ const AddOptions = observer(() => { const { setShouldShowCooldownModal, openRealAccountSignup } = ui; const { real_account_creation_unlock_date } = client; - const add_deriv_account_text = localize('You need a Deriv account to create a CFD account.'); + const add_deriv_account_text = localize('To trade CFDs, get a Deriv Apps account first.'); const add_deriv_account_btn = localize('Get a Deriv account'); const eu_user = content_flag === ContentFlag.LOW_RISK_CR_EU || content_flag === ContentFlag.EU_REAL; diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx index bc4899eb25ce..059cd379c604 100644 --- a/packages/appstore/src/components/cfds-listing/index.tsx +++ b/packages/appstore/src/components/cfds-listing/index.tsx @@ -168,9 +168,7 @@ const CFDsListing = observer(() => { description={ Learn more' - } + i18n_default_text={'Trade CFDs with high leverage and tight spreads. <0>Learn more'} components={[]} /> diff --git a/packages/appstore/src/components/options-multipliers-listing/index.tsx b/packages/appstore/src/components/options-multipliers-listing/index.tsx index 14ea9ceec09c..3357b809f5f4 100644 --- a/packages/appstore/src/components/options-multipliers-listing/index.tsx +++ b/packages/appstore/src/components/options-multipliers-listing/index.tsx @@ -31,7 +31,7 @@ const OptionsAndMultipliersListing = observer(() => { if (low_risk_cr_non_eu || high_risk_cr || cr_demo) { return ( - + ); } else if (low_risk_cr_eu || is_eu) { @@ -51,24 +51,19 @@ const OptionsAndMultipliersListing = observer(() => { low_risk_cr_non_eu || high_risk_cr || cr_demo ? ( , - , ]} /> ) : ( - ]} - /> + ) } @@ -81,7 +76,11 @@ const OptionsAndMultipliersListing = observer(() => { availability='All' clickable_icon name={localize('Deriv account')} - description={localize('Get a real Deriv account, start trading and manage your funds.')} + description={ + is_eu_user + ? localize('To trade multipliers, get a Deriv Apps account first.') + : localize('To trade options and multipliers, get a Deriv Apps account first.') + } icon='Options' onAction={() => { if (no_MF_account) { diff --git a/packages/appstore/src/constants/platform-config.ts b/packages/appstore/src/constants/platform-config.ts index cba13cf731b9..6b16bae183b7 100644 --- a/packages/appstore/src/constants/platform-config.ts +++ b/packages/appstore/src/constants/platform-config.ts @@ -34,30 +34,30 @@ export interface MfPlatformConfig extends PlatformConfig { export const getAppstorePlatforms = (): PlatformConfig[] => [ { name: getPlatformSettingsAppstore('trader').name, - app_desc: localize('Options and multipliers trading platform.'), + app_desc: localize('The options and multipliers trading platform.'), link_to: routes.trade, }, { name: getPlatformSettingsAppstore('dbot').name, - app_desc: localize('Automate your trading, no coding needed.'), + app_desc: localize('The ultimate bot trading platform.'), link_to: routes.bot, is_external: true, }, { name: getPlatformSettingsAppstore('smarttrader').name, - app_desc: localize('Our legacy options trading platform.'), + app_desc: localize('The legacy options trading platform.'), link_to: getUrlSmartTrader(), is_external: true, }, { name: getPlatformSettingsAppstore('bbot').name, - app_desc: localize('Our legacy automated trading platform.'), + app_desc: localize('The legacy bot trading platform.'), link_to: getUrlBinaryBot(), is_external: true, }, { name: getPlatformSettingsAppstore('go').name, - app_desc: localize('Trade on the go with our mobile app.'), + app_desc: localize('The mobile trading app for multipliers.'), link_to: getStaticUrl('/deriv-go'), is_external: true, new_tab: true, @@ -69,7 +69,7 @@ export const getMFAppstorePlatforms = (): MfPlatformConfig[] => [ app_icon: getPlatformSettingsAppstore('trader').icon, app_title: getPlatformSettingsAppstore('trader').name, name: getPlatformSettingsAppstore('trader').name, - app_desc: localize('Multipliers trading platform.'), + app_desc: localize('The multipliers trading platform .'), link_to: routes.trade, }, ]; diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js index 69c375b40cce..951a839a0a42 100644 --- a/packages/core/src/Stores/traders-hub-store.js +++ b/packages/core/src/Stores/traders-hub-store.js @@ -374,13 +374,11 @@ export default class TradersHubStore extends BaseStore { getAvailableCFDAccounts() { const getAccountDesc = () => { return !this.is_eu_user || this.is_demo_low_risk - ? localize('This account offers CFDs on financial instruments.') + ? localize('CFDs on financial instruments.') : localize('CFDs on derived and financial instruments.'); }; const getSwapFreeAccountDesc = () => { - return localize( - 'Trade swap-free CFDs on MT5 with forex, stocks, stock indices, commodities cryptocurrencies, ETFs and synthetic indices.' - ); + return localize('Swap-free CFDs on selected financial and derived instruments.'); }; const all_available_accounts = [ diff --git a/packages/shared/src/utils/cfd/available-cfd-accounts.ts b/packages/shared/src/utils/cfd/available-cfd-accounts.ts index 1d7549d6a3c9..7e67f014403a 100644 --- a/packages/shared/src/utils/cfd/available-cfd-accounts.ts +++ b/packages/shared/src/utils/cfd/available-cfd-accounts.ts @@ -17,7 +17,7 @@ export interface AvailableAccount { export const getCFDAvailableAccount = () => [ { name: 'Derived', - description: localize('This account offers CFDs on derived instruments.'), + description: localize('CFDs on derived and financial instruments.'), platform: CFD_PLATFORMS.MT5, market_type: 'synthetic', icon: 'Derived', @@ -25,7 +25,7 @@ export const getCFDAvailableAccount = () => [ }, { name: 'Deriv X', - description: localize('This account offers CFDs on a highly customisable CFD trading platform.'), + description: localize('CFDs on financial and derived instruments via a customisable platform.'), platform: CFD_PLATFORMS.DXTRADE, market_type: 'all', icon: 'DerivX', @@ -33,7 +33,7 @@ export const getCFDAvailableAccount = () => [ }, { name: 'Deriv cTrader', - description: localize('This account offers CFDs on a feature-rich trading platform.'), + description: localize('CFDs on financial and derived instruments with copy trading.'), platform: CFD_PLATFORMS.CTRADER, market_type: 'all', icon: 'CTrader', From 9aba24e1a58c64201eb8e8c7483f477509bb8b96 Mon Sep 17 00:00:00 2001 From: mitra Date: Sun, 28 Apr 2024 18:47:32 +0800 Subject: [PATCH 2/5] fix: :test_tube: fix test --- .../add-options-account/__tests__/add-options-account.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/appstore/src/components/add-options-account/__tests__/add-options-account.spec.tsx b/packages/appstore/src/components/add-options-account/__tests__/add-options-account.spec.tsx index 8811210673eb..1f3938e52719 100644 --- a/packages/appstore/src/components/add-options-account/__tests__/add-options-account.spec.tsx +++ b/packages/appstore/src/components/add-options-account/__tests__/add-options-account.spec.tsx @@ -28,7 +28,7 @@ describe('AddOptionsAccount', () => { wrapper, }); expect(container).toBeInTheDocument(); - expect(screen.getByText('You need a Deriv account to create a CFD account.')).toBeInTheDocument(); + expect(screen.getByText('To trade CFDs, get a Deriv Apps account first.')).toBeInTheDocument(); expect(screen.getByText('Get a Deriv account')).toBeInTheDocument(); }); From 5b5fb6bc2565a36d5d8ea6ada75a2ef46eb0b81d Mon Sep 17 00:00:00 2001 From: mitra Date: Tue, 30 Apr 2024 10:22:44 +0800 Subject: [PATCH 3/5] fix: :bug: change cfd description --- packages/wallets/src/features/cfd/CFDPlatformsList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wallets/src/features/cfd/CFDPlatformsList.tsx b/packages/wallets/src/features/cfd/CFDPlatformsList.tsx index 1a299c4f4c4c..7fee9246e5a6 100644 --- a/packages/wallets/src/features/cfd/CFDPlatformsList.tsx +++ b/packages/wallets/src/features/cfd/CFDPlatformsList.tsx @@ -34,7 +34,7 @@ const CFDPlatformsList: React.FC = ({ onMT5PlatformListLoaded }) => { target='_blank' />, ]} - defaults='Trade bigger positions with less capital. <0>Learn more' + defaults='Trade bigger positions with less capital across diverse financial and derived instruments. <0>Learn more' /> Date: Thu, 2 May 2024 13:21:24 +0800 Subject: [PATCH 4/5] fix: :speech_balloon: fix descriptions --- packages/appstore/src/components/cfds-listing/index.tsx | 4 +++- .../src/components/options-multipliers-listing/index.tsx | 5 ++++- packages/shared/src/utils/cfd/available-cfd-accounts.ts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx index 059cd379c604..ad37f51c0428 100644 --- a/packages/appstore/src/components/cfds-listing/index.tsx +++ b/packages/appstore/src/components/cfds-listing/index.tsx @@ -168,7 +168,9 @@ const CFDsListing = observer(() => { description={ Learn more'} + i18n_default_text={ + 'Trade bigger positions with less capital across diverse financial and derived instruments. <0>Learn more' + } components={[]} /> diff --git a/packages/appstore/src/components/options-multipliers-listing/index.tsx b/packages/appstore/src/components/options-multipliers-listing/index.tsx index 3357b809f5f4..1c13b40353b8 100644 --- a/packages/appstore/src/components/options-multipliers-listing/index.tsx +++ b/packages/appstore/src/components/options-multipliers-listing/index.tsx @@ -63,7 +63,10 @@ const OptionsAndMultipliersListing = observer(() => { ) : ( - + ]} + /> ) } diff --git a/packages/shared/src/utils/cfd/available-cfd-accounts.ts b/packages/shared/src/utils/cfd/available-cfd-accounts.ts index 7e67f014403a..7ab4578fd4ca 100644 --- a/packages/shared/src/utils/cfd/available-cfd-accounts.ts +++ b/packages/shared/src/utils/cfd/available-cfd-accounts.ts @@ -17,7 +17,7 @@ export interface AvailableAccount { export const getCFDAvailableAccount = () => [ { name: 'Derived', - description: localize('CFDs on derived and financial instruments.'), + description: localize('CFDs on derived instruments.'), platform: CFD_PLATFORMS.MT5, market_type: 'synthetic', icon: 'Derived', From 8dfd122a98776bbf198e49a4e32f36a90eded3fc Mon Sep 17 00:00:00 2001 From: mitra Date: Thu, 2 May 2024 14:16:30 +0800 Subject: [PATCH 5/5] fix: :bug: address comments --- packages/appstore/src/constants/platform-config.ts | 2 +- packages/wallets/src/features/cfd/CFDPlatformsList.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/appstore/src/constants/platform-config.ts b/packages/appstore/src/constants/platform-config.ts index 6b16bae183b7..461a13e39168 100644 --- a/packages/appstore/src/constants/platform-config.ts +++ b/packages/appstore/src/constants/platform-config.ts @@ -69,7 +69,7 @@ export const getMFAppstorePlatforms = (): MfPlatformConfig[] => [ app_icon: getPlatformSettingsAppstore('trader').icon, app_title: getPlatformSettingsAppstore('trader').name, name: getPlatformSettingsAppstore('trader').name, - app_desc: localize('The multipliers trading platform .'), + app_desc: localize('The multipliers trading platform.'), link_to: routes.trade, }, ]; diff --git a/packages/wallets/src/features/cfd/CFDPlatformsList.tsx b/packages/wallets/src/features/cfd/CFDPlatformsList.tsx index 7fee9246e5a6..1a299c4f4c4c 100644 --- a/packages/wallets/src/features/cfd/CFDPlatformsList.tsx +++ b/packages/wallets/src/features/cfd/CFDPlatformsList.tsx @@ -34,7 +34,7 @@ const CFDPlatformsList: React.FC = ({ onMT5PlatformListLoaded }) => { target='_blank' />, ]} - defaults='Trade bigger positions with less capital across diverse financial and derived instruments. <0>Learn more' + defaults='Trade bigger positions with less capital. <0>Learn more' />