diff --git a/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-article.spec.tsx b/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-article.spec.tsx index ad68ca185397..faf26f0039dc 100644 --- a/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-article.spec.tsx +++ b/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-article.spec.tsx @@ -19,7 +19,6 @@ describe('', () => { let mock_self_exclusion_context = { is_app_settings: false, is_eu: false, - is_uk: false, currency: '', overlay_ref: document.createElement('div'), toggleArticle: jest.fn(), @@ -39,7 +38,6 @@ describe('', () => { mock_self_exclusion_context = { is_app_settings: false, is_eu: false, - is_uk: false, currency: '', overlay_ref: document.createElement('div'), toggleArticle: jest.fn(), diff --git a/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-confirm-page.spec.tsx b/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-confirm-page.spec.tsx index bce7ac4898fd..a0a5ebc764d9 100644 --- a/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-confirm-page.spec.tsx +++ b/packages/account/src/Components/self-exclusion/__tests__/self-exclusion-confirm-page.spec.tsx @@ -28,7 +28,6 @@ describe('', () => { is_app_settings: false, is_wrapper_bypassed: false, toggleArticle: jest.fn(), - is_uk: false, handleSubmit: jest.fn(), validateFields: jest.fn(), }; @@ -49,7 +48,6 @@ describe('', () => { is_app_settings: false, is_wrapper_bypassed: false, toggleArticle: jest.fn(), - is_uk: false, handleSubmit: jest.fn(), validateFields: jest.fn(), }; diff --git a/packages/account/src/Components/self-exclusion/self-exclusion-article-content.tsx b/packages/account/src/Components/self-exclusion/self-exclusion-article-content.tsx index 6e0709bf219a..b60b72c012e0 100644 --- a/packages/account/src/Components/self-exclusion/self-exclusion-article-content.tsx +++ b/packages/account/src/Components/self-exclusion/self-exclusion-article-content.tsx @@ -6,10 +6,7 @@ import { Localize, localize } from '@deriv/translations'; import { Button, Icon, OpenLiveChatLink, Popup, Text } from '@deriv/components'; import SelfExclusionContext from './self-exclusion-context'; -type TSelfExclusionArticleItems = Record< - 'is_eu' | 'is_uk' | 'is_deriv_crypto' | 'is_app_settings', - boolean | undefined ->; +type TSelfExclusionArticleItems = Record<'is_eu' | 'is_deriv_crypto' | 'is_app_settings', boolean | undefined>; type TSelfExclusionArticleContent = { is_in_overlay: boolean; @@ -123,10 +120,10 @@ export const selfExclusionArticleItems = ({ is_eu, is_deriv_crypto, is_app_setti }; const SelfExclusionArticleContent = ({ is_in_overlay }: Partial) => { - const { is_app_settings, toggleArticle, overlay_ref, is_eu, is_uk } = React.useContext(SelfExclusionContext); + const { is_app_settings, toggleArticle, overlay_ref, is_eu } = React.useContext(SelfExclusionContext); const { is_deriv_crypto } = React.useContext(PlatformContext); - const keyed_article_items = selfExclusionArticleItems({ is_eu, is_uk, is_deriv_crypto, is_app_settings }); + const keyed_article_items = selfExclusionArticleItems({ is_eu, is_deriv_crypto, is_app_settings }); if (is_in_overlay) { return ( { const { client, ui } = useStore(); - const { currency, is_virtual, is_switching, standpoint, is_eu, is_uk, logout, landing_company_shortcode } = client; + const { currency, is_virtual, is_switching, standpoint, is_eu, logout, landing_company_shortcode } = client; const { is_tablet } = ui; const is_wrapper_bypassed = false; const is_mf = landing_company_shortcode === 'maltainvest'; @@ -440,7 +440,6 @@ const SelfExclusion = observer(({ is_app_settings, overlay_ref, setIsOverlayShow is_eu, is_mf, is_tablet, - is_uk, is_wrapper_bypassed, objectValuesToString, overlay_ref, diff --git a/packages/core/src/App/Components/Layout/Header/__tests__/account-info.spec.tsx b/packages/core/src/App/Components/Layout/Header/__tests__/account-info.spec.tsx index 7cc8d598531c..9d5c1777bda9 100644 --- a/packages/core/src/App/Components/Layout/Header/__tests__/account-info.spec.tsx +++ b/packages/core/src/App/Components/Layout/Header/__tests__/account-info.spec.tsx @@ -82,15 +82,4 @@ describe('AccountInfo component', () => { expect(text).toBeInTheDocument(); expect(screen.queryByText(/no currency assigned/i)).not.toBeInTheDocument(); }); - - it('should render proper "AccountType" base on the passed properties', () => { - const { rerender } = render(); - expect(screen.getByText(/multipliers/i)).toBeInTheDocument(); - - rerender(); - expect(screen.getByText(/gaming/i)).toBeInTheDocument(); - - rerender(); - expect(screen.getByText(/options/i)).toBeInTheDocument(); - }); }); diff --git a/packages/core/src/App/Components/Layout/Header/__tests__/display-account-type.spec.tsx b/packages/core/src/App/Components/Layout/Header/__tests__/display-account-type.spec.tsx index 400ca09be537..e0ecb13b0caf 100644 --- a/packages/core/src/App/Components/Layout/Header/__tests__/display-account-type.spec.tsx +++ b/packages/core/src/App/Components/Layout/Header/__tests__/display-account-type.spec.tsx @@ -4,19 +4,7 @@ import DisplayAccountType from '../display-account-type'; describe('DisplayAccountType component', () => { it('should render "Multipliers"', () => { - render(); + render(); expect(screen.getByText(/multipliers/i)).toBeInTheDocument(); }); - - it('should render "Gaming" if is_united_kingdom = true', () => { - render( - - ); - expect(screen.getByText(/gaming/i)).toBeInTheDocument(); - }); - - it('should render "Options" for Belgium', () => { - render(); - expect(screen.getByText(/options/i)).toBeInTheDocument(); - }); }); diff --git a/packages/core/src/App/Components/Layout/Header/account-actions.jsx b/packages/core/src/App/Components/Layout/Header/account-actions.jsx index e8627d2c32ee..8d6f2b4d35f8 100644 --- a/packages/core/src/App/Components/Layout/Header/account-actions.jsx +++ b/packages/core/src/App/Components/Layout/Header/account-actions.jsx @@ -23,7 +23,6 @@ const AccountActions = React.memo( account_type, balance, currency, - country_standpoint, disableApp, enableApp, is_acc_switcher_on, @@ -63,7 +62,6 @@ const AccountActions = React.memo( is_virtual={is_virtual} is_mobile currency={currency} - country_standpoint={country_standpoint} is_dialog_on={is_acc_switcher_on} toggleDialog={toggleAccountsDialog} /> @@ -99,7 +97,6 @@ const AccountActions = React.memo( is_eu={is_eu} is_virtual={is_virtual} currency={currency} - country_standpoint={country_standpoint} is_dialog_on={is_acc_switcher_on} toggleDialog={toggleAccountsDialog} /> @@ -148,7 +145,6 @@ AccountActions.propTypes = { is_eu: PropTypes.bool, disableApp: PropTypes.any, enableApp: PropTypes.any, - country_standpoint: PropTypes.object, is_acc_switcher_on: PropTypes.any, is_logged_in: PropTypes.any, is_notifications_visible: PropTypes.any, diff --git a/packages/core/src/App/Components/Layout/Header/account-info.jsx b/packages/core/src/App/Components/Layout/Header/account-info.jsx index b86626987319..5917aad57379 100644 --- a/packages/core/src/App/Components/Layout/Header/account-info.jsx +++ b/packages/core/src/App/Components/Layout/Header/account-info.jsx @@ -16,7 +16,6 @@ const AccountInfo = ({ account_type = '', balance, currency, - country_standpoint, disableApp, enableApp, is_dialog_on, @@ -71,11 +70,7 @@ const AccountInfo = ({ )}

- + )} @@ -123,7 +118,6 @@ AccountInfo.propTypes = { account_type: PropTypes.string, balance: PropTypes.string, currency: PropTypes.string, - country_standpoint: PropTypes.object, disableApp: PropTypes.func, enableApp: PropTypes.func, is_dialog_on: PropTypes.bool, diff --git a/packages/core/src/App/Components/Layout/Header/display-account-type.tsx b/packages/core/src/App/Components/Layout/Header/display-account-type.tsx index bfbf5302f114..aa59c953888b 100644 --- a/packages/core/src/App/Components/Layout/Header/display-account-type.tsx +++ b/packages/core/src/App/Components/Layout/Header/display-account-type.tsx @@ -3,21 +3,14 @@ import { Localize } from '@deriv/translations'; type TDisplayAccountType = { account_type: string; - country_standpoint: { - is_united_kingdom?: boolean; - is_belgium?: boolean; - }; is_eu: boolean; }; -const DisplayAccountType = ({ account_type, country_standpoint, is_eu }: TDisplayAccountType) => { +const DisplayAccountType = ({ account_type, is_eu }: TDisplayAccountType) => { if (account_type === 'financial') { return ; } else if (account_type === 'gaming') { - if (country_standpoint.is_united_kingdom) { - return ; - } - if (is_eu || country_standpoint.is_belgium) { + if (is_eu) { return ; } return ; diff --git a/packages/core/src/App/Containers/AccountSwitcher/__tests__/account-switcher.spec.jsx b/packages/core/src/App/Containers/AccountSwitcher/__tests__/account-switcher.spec.jsx index a1a262c1bada..f73af634daf7 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/__tests__/account-switcher.spec.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/__tests__/account-switcher.spec.jsx @@ -104,7 +104,6 @@ let store = mockStore({ }, ], residence: 'id', - country_standpoint: { is_united_kingdom: true }, is_eu: false, is_landing_company_loaded: true, is_low_risk: true, 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 index eacbde35f98e..26db737bd2c9 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher-account-list.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher-account-list.jsx @@ -8,7 +8,6 @@ const AccountList = ({ balance, currency, currency_icon, - country_standpoint, display_type, has_balance, has_error, @@ -49,12 +48,7 @@ const AccountList = ({ /> {display_type === 'currency' ? ( - + ) : ( { - const user_is_from_this_country_list = Object.values(country_standpoint).includes(true); +const CurrencyDisplay = ({ currency, loginid, is_virtual }) => { const account_type = loginid.replace(/\d/g, ''); - if (user_is_from_this_country_list) { - if (account_type === 'MF') { - return ; - } + if (account_type === 'MF') { + return ; } if (is_virtual) { diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx index c8a4d62cab89..6acf2c7dbb7e 100644 --- a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx +++ b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx @@ -33,7 +33,6 @@ const AccountSwitcher = observer(({ history, is_mobile, is_visible }) => { accounts, account_type, account_list, - country_standpoint, currency, is_eu, is_landing_company_loaded, @@ -222,7 +221,6 @@ const AccountSwitcher = observer(({ history, is_mobile, is_visible }) => { balance={accounts[account.loginid].balance} currency={accounts[account.loginid].currency} currency_icon={`IcCurrency-${account.icon}`} - country_standpoint={country_standpoint} display_type={'currency'} has_balance={'balance' in accounts[account.loginid]} has_reset_balance={canResetBalance(accounts[account_loginid])} @@ -269,7 +267,6 @@ const AccountSwitcher = observer(({ history, is_mobile, is_visible }) => { balance={accounts[account.loginid].balance} currency={accounts[account.loginid].currency} currency_icon={`IcCurrency-${account.icon}`} - country_standpoint={country_standpoint} display_type={'currency'} has_balance={'balance' in accounts[account.loginid]} is_disabled={account.is_disabled} @@ -341,7 +338,6 @@ const AccountSwitcher = observer(({ history, is_mobile, is_visible }) => { balance={accounts[account.loginid].balance} currency={accounts[account.loginid].currency} currency_icon={`IcCurrency-${account.icon}`} - country_standpoint={country_standpoint} display_type={'currency'} has_balance={'balance' in accounts[account.loginid]} is_disabled={account.is_disabled} diff --git a/packages/core/src/App/Containers/Layout/header/default-header-wallets.tsx b/packages/core/src/App/Containers/Layout/header/default-header-wallets.tsx index e16b5f05d247..e74e79e01768 100644 --- a/packages/core/src/App/Containers/Layout/header/default-header-wallets.tsx +++ b/packages/core/src/App/Containers/Layout/header/default-header-wallets.tsx @@ -33,7 +33,6 @@ const DefaultHeaderWallets = () => { account_type, balance, currency, - country_standpoint, is_bot_allowed, is_eu, is_logged_in, @@ -144,7 +143,6 @@ const DefaultHeaderWallets = () => { account_type={account_type} balance={balance} currency={currency} - country_standpoint={country_standpoint} disableApp={disableApp} enableApp={enableApp} is_acc_switcher_on={is_acc_switcher_on} diff --git a/packages/core/src/App/Containers/Layout/header/header-account-actions.tsx b/packages/core/src/App/Containers/Layout/header/header-account-actions.tsx index 1cf53166ba7e..54e06534579b 100644 --- a/packages/core/src/App/Containers/Layout/header/header-account-actions.tsx +++ b/packages/core/src/App/Containers/Layout/header/header-account-actions.tsx @@ -8,7 +8,7 @@ type THeaderAccountActions = { const HeaderAccountActions = observer(({ onClickDeposit }: THeaderAccountActions) => { const { client, ui, notifications } = useStore(); - const { account_type, balance, currency, country_standpoint, is_eu, is_logged_in, is_virtual } = client; + const { account_type, balance, currency, is_eu, is_logged_in, is_virtual } = client; const { account_switcher_disabled_message, disableApp, @@ -27,7 +27,6 @@ const HeaderAccountActions = observer(({ onClickDeposit }: THeaderAccountActions account_type={account_type} balance={balance} currency={currency} - country_standpoint={country_standpoint} disableApp={disableApp} enableApp={enableApp} is_acc_switcher_on={is_accounts_switcher_on} diff --git a/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx b/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx index 7faf9a093070..856621f73975 100644 --- a/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx +++ b/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx @@ -25,17 +25,8 @@ type TPlatforms = typeof platforms; const TradersHubHeaderWallets = observer(() => { const { client, common, traders_hub, ui } = useStore(); - const { - account_type, - balance, - country_standpoint, - currency, - has_any_real_account, - is_eu, - is_logged_in, - is_mt5_allowed, - is_virtual, - } = client; + const { account_type, balance, currency, has_any_real_account, is_eu, is_logged_in, is_mt5_allowed, is_virtual } = + client; const { platform } = common; const { modal_data } = traders_hub; const { @@ -139,7 +130,6 @@ const TradersHubHeaderWallets = observer(() => { acc_switcher_disabled_message={account_switcher_disabled_message} account_type={account_type} balance={account_balance} - country_standpoint={country_standpoint} currency={currency} is_dialog_on={is_accounts_switcher_on} is_disabled={false} @@ -166,7 +156,6 @@ const TradersHubHeaderWallets = observer(() => { acc_switcher_disabled_message={account_switcher_disabled_message} account_type={account_type} balance={account_balance} - country_standpoint={country_standpoint} currency={currency} is_dialog_on={is_accounts_switcher_on} is_disabled={false} diff --git a/packages/core/src/App/Containers/Layout/header/traders-hub-header.tsx b/packages/core/src/App/Containers/Layout/header/traders-hub-header.tsx index 2ed84278bedc..c0247cb93e7f 100644 --- a/packages/core/src/App/Containers/Layout/header/traders-hub-header.tsx +++ b/packages/core/src/App/Containers/Layout/header/traders-hub-header.tsx @@ -56,17 +56,8 @@ const CurrencySelectionModal = makeLazyLoader( const TradersHubHeader = observer(() => { const { client, common, traders_hub, ui } = useStore(); - const { - account_type, - balance, - country_standpoint, - currency, - has_any_real_account, - is_eu, - is_logged_in, - is_mt5_allowed, - is_virtual, - } = client; + const { account_type, balance, currency, has_any_real_account, is_eu, is_logged_in, is_mt5_allowed, is_virtual } = + client; const { platform } = common; const { modal_data } = traders_hub; const { @@ -172,7 +163,6 @@ const TradersHubHeader = observer(() => { acc_switcher_disabled_message={account_switcher_disabled_message} account_type={account_type} balance={account_balance} - country_standpoint={country_standpoint} currency={currency} is_dialog_on={is_accounts_switcher_on} is_disabled={false} @@ -201,7 +191,6 @@ const TradersHubHeader = observer(() => { acc_switcher_disabled_message={account_switcher_disabled_message} account_type={account_type} balance={account_balance} - country_standpoint={country_standpoint} currency={currency} is_dialog_on={is_accounts_switcher_on} is_disabled={false} diff --git a/packages/core/src/App/Containers/RealAccountSignup/__tests__/real-account-signup.spec.jsx b/packages/core/src/App/Containers/RealAccountSignup/__tests__/real-account-signup.spec.jsx index b9db4cfe46e8..f978f2a38847 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/__tests__/real-account-signup.spec.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/__tests__/real-account-signup.spec.jsx @@ -39,7 +39,6 @@ describe('', () => { const store = mockStore({ client: { available_crypto_currencies: [], - country_standpoint: '', currency: 'USD', fetchAccountSettings: jest.fn(), residence: 'gb', diff --git a/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js b/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js index 846a4d1747ce..e1eaacc38d23 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js +++ b/packages/core/src/App/Containers/RealAccountSignup/helpers/constants.js @@ -37,14 +37,13 @@ export const getAccountTitle = landing_company_shortcode => { /** * @param {string} landing_company_shortcode - * @param {boolean} is_belgium_residence, * * @return {EXPERIAN.WARN|EXPERIAN.SUCCESS|EXPERIAN.DANGER} */ export const getExperianResult = status => { - const { landing_company_shortcode = '', is_belgium_residence = false } = status; + const { landing_company_shortcode = '' } = status; - if (landing_company_shortcode === 'svg' || is_belgium_residence) return EXPERIAN.SUCCESS; + if (landing_company_shortcode === 'svg') return EXPERIAN.SUCCESS; return EXPERIAN.SUCCESS; }; diff --git a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx index 5d8b8d40de10..2510c575dc2a 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/real-account-signup.jsx @@ -39,7 +39,7 @@ const modal_pages_indices = { }; let active_modal_index_no = 0; -const WizardHeading = ({ country_standpoint, currency, real_account_signup_target }) => { +const WizardHeading = ({ currency, real_account_signup_target }) => { const maltainvest_signup = real_account_signup_target === 'maltainvest'; const deposit_cash_signup = real_account_signup_target === 'deposit_cash'; @@ -53,10 +53,7 @@ const WizardHeading = ({ country_standpoint, currency, real_account_signup_targe switch (real_account_signup_target) { case 'maltainvest': - if (country_standpoint.is_france || country_standpoint.is_other_eu || country_standpoint.is_rest_of_eu) { - return ; - } - return ; + return ; default: return ; } @@ -66,7 +63,6 @@ const RealAccountSignup = observer(({ history, state_index, is_trading_experienc const { ui, client, traders_hub, modules } = useStore(); const { available_crypto_currencies, - country_standpoint, currency, fetchAccountSettings, has_fiat, @@ -95,7 +91,6 @@ const RealAccountSignup = observer(({ history, state_index, is_trading_experienc const deposit_target = modules.cashier.general_store.deposit_target; const setIsDeposit = modules.cashier.general_store.setIsDeposit; const should_show_all_available_currencies = modules.cashier.general_store.should_show_all_available_currencies; - const is_belgium_residence = client.residence === 'be'; // TODO: [deriv-eu] refactor this once more residence checks are required const [current_action, setCurrentAction] = React.useState(null); const [is_loading, setIsLoading] = React.useState(false); const [error, setError] = React.useState(null); @@ -631,10 +626,8 @@ const RealAccountSignup = observer(({ history, state_index, is_trading_experienc return ( diff --git a/packages/core/src/App/Containers/RealAccountSignup/status-dialog-container.jsx b/packages/core/src/App/Containers/RealAccountSignup/status-dialog-container.jsx index 4bd6580de455..ebd9127fefdd 100644 --- a/packages/core/src/App/Containers/RealAccountSignup/status-dialog-container.jsx +++ b/packages/core/src/App/Containers/RealAccountSignup/status-dialog-container.jsx @@ -23,7 +23,6 @@ const CloseIcon = ({ closeModal }) => ( const StatusDialogContainer = observer(({ closeModal, currency, history, icon_size }) => { const { client } = useStore(); const { landing_company_shortcode, is_fully_authenticated } = client; - const is_belgium_residence = client.residence === 'be'; // TODO: [deriv-eu] refactor this once more residence checks are required const closeModalAndOpenCashier = () => { closeModal(); history.push(routes.cashier_deposit); @@ -48,7 +47,6 @@ const StatusDialogContainer = observer(({ closeModal, currency, history, icon_si const getStatus = () => getExperianResult({ landing_company_shortcode, - is_belgium_residence, }); return ( diff --git a/packages/core/src/Modules/ComplaintsPolicy/Components/complaints-policy-content.jsx b/packages/core/src/Modules/ComplaintsPolicy/Components/complaints-policy-content.jsx index 861e5157ac8e..344ba9166a77 100644 --- a/packages/core/src/Modules/ComplaintsPolicy/Components/complaints-policy-content.jsx +++ b/packages/core/src/Modules/ComplaintsPolicy/Components/complaints-policy-content.jsx @@ -100,7 +100,7 @@ const getGeneralQueriesText = landing_company_shortcode => { ); }; -const getYourDecisionText = (is_uk, landing_company_shortcode) => { +const getYourDecisionText = landing_company_shortcode => { const texts = []; texts.push( @@ -137,26 +137,6 @@ const getYourDecisionText = (is_uk, landing_company_shortcode) => { ]} /> ); - - if (is_uk) { - texts.push( - <Localize - key={texts.length} - i18n_default_text='<0/><1/>If you reside in the UK and you are unhappy with our response you may escalate your complaint to the <2>Financial Ombudsman Service</2>.' - components={[ - <br key={0} />, - <br key={1} />, - <a - key={2} - className='link link--orange' - rel='noopener noreferrer' - target='_blank' - href='https://www.financial-ombudsman.org.uk/' - />, - ]} - /> - ); - } } return texts; @@ -179,7 +159,7 @@ const getSubmissionOfAComplaintText = () => ( const Content = observer(({ landing_company_shortcode }) => { const { client } = useStore(); - const { is_uk, mt5_login_list } = client; + const { mt5_login_list } = client; const policy_content = [ { id: 'introduction', @@ -226,7 +206,7 @@ const Content = observer(({ landing_company_shortcode }) => { }, { title: localize('3.4. Your decision'), - text: getYourDecisionText(is_uk, landing_company_shortcode), + text: getYourDecisionText(landing_company_shortcode), }, ], }, diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js index 843927a8a53d..5dc21c2851d2 100644 --- a/packages/core/src/Stores/client-store.js +++ b/packages/core/src/Stores/client-store.js @@ -302,9 +302,7 @@ export default class ClientStore extends BaseStore { should_show_eu_error: computed, is_virtual: computed, is_eu: computed, - is_uk: computed, is_brazil: computed, - country_standpoint: computed, can_upgrade: computed, can_upgrade_to: computed, virtual_account_loginid: computed, @@ -899,30 +897,6 @@ export default class ClientStore extends BaseStore { return this.clients_country === 'br'; } - get is_uk() { - return this.residence === 'gb'; - } - - get country_standpoint() { - const result = { - is_united_kingdom: this.is_uk, - is_france: this.residence === 'fr', - is_belgium: this.residence === 'be', - // Other EU countries: Germany, Spain, Italy, Luxembourg and Greece - is_other_eu: - this.residence === 'de' || - this.residence === 'es' || - this.residence === 'it' || - this.residence === 'lu' || - this.residence === 'gr', - }; - - result.is_rest_of_eu = - this.is_eu && !result.is_uk && !result.is_france && !result.is_belgium && !result.is_other_eu; - - return result; - } - get can_upgrade() { return this.upgrade_info && (this.upgrade_info.can_upgrade || this.upgrade_info.can_open_multi); } diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts index 8b60d3c1a92a..e75adc1e82ac 100644 --- a/packages/stores/src/mockStore.ts +++ b/packages/stores/src/mockStore.ts @@ -112,13 +112,6 @@ const mock = (): TStores & { is_mock: boolean } => { balance: '', can_change_fiat_currency: false, clients_country: '', - country_standpoint: { - is_belgium: false, - is_france: false, - is_other_eu: false, - is_rest_of_eu: false, - is_united_kingdom: false, - }, currency: '', currencies_list: [{ text: '', value: '', has_tool_tip: false }], current_currency_type: '', @@ -227,7 +220,6 @@ const mock = (): TStores & { is_mock: boolean } => { switched: false, switch_broadcast: false, switchEndSignal: jest.fn(), - is_uk: false, isEligibleForMoreRealMt5: jest.fn(), isEligibleForMoreDemoMt5Svg: jest.fn(), updateMT5Status: jest.fn(), diff --git a/packages/stores/types.ts b/packages/stores/types.ts index b69941cffaf8..5cac7725d45c 100644 --- a/packages/stores/types.ts +++ b/packages/stores/types.ts @@ -395,13 +395,6 @@ type RealAccountSignupSettings = { previous_currency: string; success_message: string; }; -type TCountryStandpoint = { - is_belgium: boolean; - is_france: boolean; - is_other_eu: boolean; - is_rest_of_eu: boolean; - is_united_kingdom: boolean; -}; type TClientStore = { fetchStatesList: () => Promise<StatesList>; @@ -426,7 +419,6 @@ type TClientStore = { clients_country: string; cfd_score: number; setCFDScore: (score: number) => void; - country_standpoint: TCountryStandpoint; currency: string; ctrader_total_balance: number; currencies_list: { text: string; value: string; has_tool_tip?: boolean }[]; @@ -457,7 +449,6 @@ type TClientStore = { is_dxtrade_allowed: boolean; is_eu_country: boolean; is_eu: boolean; - is_uk: boolean; is_unwelcome: boolean; is_single_currency: boolean; is_social_signup: boolean;