From 1b6bb624254de98224d621901fd9907f854daa3d Mon Sep 17 00:00:00 2001
From: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com>
Date: Tue, 21 Mar 2023 13:23:25 +0800
Subject: [PATCH 01/21] thisyahlen/chore: new account verification modal for
purchase authentication (#7936)
* chore: new account verification modal for purchase authentication
* fix: height and width
* fix: modal footer css
* fix: css mobile title
---
packages/core/src/Stores/common-store.js | 2 +-
.../account-verification-required-modal.tsx | 42 +++++++++++++++++++
.../services-error-modal.jsx | 5 +++
.../trader/src/sass/app/modules/trading.scss | 12 ++++++
4 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/account-verification-required-modal.tsx
diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
index bcef314f5f46..412161e3c4cc 100644
--- a/packages/core/src/Stores/common-store.js
+++ b/packages/core/src/Stores/common-store.js
@@ -257,7 +257,7 @@ export default class CommonStore extends BaseStore {
setServicesError(error) {
this.services_error = error;
if (isMobile()) {
- if (error.code === 'CompanyWideLimitExceeded') {
+ if (error.code === 'CompanyWideLimitExceeded' || error.code === 'PleaseAuthenticate') {
this.root_store.ui.toggleServicesErrorModal(true);
} else {
this.root_store.ui.addToast({
diff --git a/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/account-verification-required-modal.tsx b/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/account-verification-required-modal.tsx
new file mode 100644
index 000000000000..58a5ed336f42
--- /dev/null
+++ b/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/account-verification-required-modal.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { Button, Modal } from '@deriv/components';
+import { localize, Localize } from '@deriv/translations';
+import { isMobile, routes } from '@deriv/shared';
+import { useHistory } from 'react-router-dom';
+
+type TAccountVerificationRequiredModalProps = {
+ is_visible: boolean;
+ onConfirm: () => void;
+};
+
+const AccountVerificationRequiredModal = ({ is_visible, onConfirm }: TAccountVerificationRequiredModalProps) => {
+ const history = useHistory();
+ return (
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default AccountVerificationRequiredModal;
diff --git a/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/services-error-modal.jsx b/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/services-error-modal.jsx
index 6801777aee7f..898f82407355 100644
--- a/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/services-error-modal.jsx
+++ b/packages/trader/src/App/Components/Elements/Modals/ServicesErrorModal/services-error-modal.jsx
@@ -6,6 +6,7 @@ import { getTitle } from './constants';
import AuthorizationRequiredModal from './authorization-required-modal.jsx';
import InsufficientBalanceModal from './insufficient-balance-modal.jsx';
import CompanyWideLimitExceededModal from './company-wide-limit-exceeded-modal.jsx';
+import AccountVerificationRequiredModal from './account-verification-required-modal.tsx';
const ServicesErrorModal = ({ is_virtual, is_visible, is_logged_in, onConfirm, services_error }) => {
const { code, message } = services_error;
@@ -32,6 +33,10 @@ const ServicesErrorModal = ({ is_virtual, is_visible, is_logged_in, onConfirm, s
return ;
}
+ if (code === 'PleaseAuthenticate') {
+ return ;
+ }
+
return (
{message}
diff --git a/packages/trader/src/sass/app/modules/trading.scss b/packages/trader/src/sass/app/modules/trading.scss
index 651c94a17834..1b7a7e2dbbfb 100644
--- a/packages/trader/src/sass/app/modules/trading.scss
+++ b/packages/trader/src/sass/app/modules/trading.scss
@@ -778,3 +778,15 @@
.payout-hint {
padding: 0 1.6rem 1.6rem;
}
+
+.account-verification-required-modal {
+ @include mobile {
+ &-text {
+ padding: 1.5rem;
+ }
+ }
+
+ &-button {
+ margin: 0;
+ }
+}
From 19b3dc869140ec8069cb5b1713231008c204a65c Mon Sep 17 00:00:00 2001
From: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com>
Date: Tue, 21 Mar 2023 13:48:09 +0800
Subject: [PATCH 02/21] thisyahlen/fix: remove financial mt5 for norway and
japan (#7846)
* fix: remove financial mt5 for norway and japan
* fix: resolved comments
* fix: rename restricetd countries
* fix: compare accounts table
* fix: fix compare accounts table for norway/japan
* fix: remove synthetic bvi for norway and japan
---
.../components/cfds-listing/cfds-listing.scss | 17 +++++++++++++
.../src/Containers/compare-accounts-modal.tsx | 7 ++++++
.../Containers/mt5-compare-table-content.tsx | 24 +++++++++++++++++--
packages/cfd/src/Containers/props.types.ts | 4 ++++
packages/core/src/Stores/traders-hub-store.js | 15 ++++++++++++
5 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/packages/appstore/src/components/cfds-listing/cfds-listing.scss b/packages/appstore/src/components/cfds-listing/cfds-listing.scss
index 1e5c630a5344..ee84ecccefdb 100644
--- a/packages/appstore/src/components/cfds-listing/cfds-listing.scss
+++ b/packages/appstore/src/components/cfds-listing/cfds-listing.scss
@@ -1145,6 +1145,10 @@
&-row-demo {
grid-template-columns: 1.5fr 1fr 1fr 1fr;
+
+ &--restricted {
+ grid-template-columns: 1fr 2fr 1fr;
+ }
@include mobile {
width: 116vw;
height: unset;
@@ -1177,6 +1181,10 @@
&__pre-appstore {
grid-template-columns: 1fr 1fr;
}
+ } @else if $synthetic_accounts_count > 0 and $financial_accounts_count == 0 {
+ &__pre-appstore {
+ grid-template-columns: 2fr 1fr;
+ }
} @else if $synthetic_accounts_count == 0 {
grid-template-columns: 1fr ($financial_accounts_count + fr);
&__pre-appstore {
@@ -1189,6 +1197,11 @@
}
}
}
+ .cfd-accounts-compare-modal__table-header-for-synthetic-#{$synthetic_accounts_count} {
+ &__pre-appstore {
+ grid-template-columns: 1fr 2fr 1fr;
+ }
+ }
}
}
&__table-header-item {
@@ -1209,6 +1222,10 @@
&--platform {
&__pre-appstore {
+ grid-template-columns: 1fr 4.25fr 0.9fr;
+ &--restricted {
+ grid-template-columns: 1fr 2fr 1fr;
+ }
grid-template-columns: 11rem 82rem 13.5rem;
}
}
diff --git a/packages/cfd/src/Containers/compare-accounts-modal.tsx b/packages/cfd/src/Containers/compare-accounts-modal.tsx
index 332398232c82..2d0b3243046a 100644
--- a/packages/cfd/src/Containers/compare-accounts-modal.tsx
+++ b/packages/cfd/src/Containers/compare-accounts-modal.tsx
@@ -44,6 +44,7 @@ type TCompareAccountsModalProps = TCompareAccountsReusedProps & {
upgradeable_landing_companies: unknown[];
landing_company_shortcode: string;
content_flag: string;
+ financial_restricted_countries: string[];
};
type TDxtradeCompareAccountContent = TCompareAccountsReusedProps & {
@@ -115,6 +116,7 @@ const CompareAccountsModal = ({
toggleCompareAccounts,
content_flag,
show_eu_related_content,
+ financial_restricted_countries,
}: TCompareAccountsModalProps) => {
const location = window.location.pathname;
const is_pre_appstore_setting = location.startsWith('/appstore/traders-hub');
@@ -142,6 +144,9 @@ const CompareAccountsModal = ({
const show_preappstore_eu_demo = is_pre_appstore_setting && show_eu_related_content && is_demo_tab;
const is_preappstore_cr_demo_account = is_pre_appstore_setting && content_flag === ContentFlag.CR_DEMO;
+ const is_preappstore_restricted_cr_demo_account =
+ is_pre_appstore_setting && financial_restricted_countries && content_flag === ContentFlag.CR_DEMO;
+
const is_dxtrade = platform && platform === CFD_PLATFORMS.DXTRADE;
const mt5_accounts = [
landing_companies?.mt_gaming_company?.financial,
@@ -225,6 +230,7 @@ const CompareAccountsModal = ({
is_logged_in={is_logged_in}
is_pre_appstore_setting={is_pre_appstore_setting}
is_preappstore_cr_demo_account={is_preappstore_cr_demo_account}
+ is_preappstore_restricted_cr_demo_account={is_preappstore_restricted_cr_demo_account}
is_real_enabled={is_real_enabled}
openDerivRealAccountNeededModal={openDerivRealAccountNeededModal}
openPasswordModal={openPasswordModal}
@@ -305,4 +311,5 @@ export default connect(({ modules, ui, client, traders_hub }: RootStore) => ({
is_eu_user: traders_hub.is_eu_user,
content_flag: traders_hub.content_flag,
show_eu_related_content: traders_hub.show_eu_related_content,
+ financial_restricted_countries: traders_hub.financial_restricted_countries,
}))(CompareAccountsModal);
diff --git a/packages/cfd/src/Containers/mt5-compare-table-content.tsx b/packages/cfd/src/Containers/mt5-compare-table-content.tsx
index cb16044e9135..4521e7889b41 100644
--- a/packages/cfd/src/Containers/mt5-compare-table-content.tsx
+++ b/packages/cfd/src/Containers/mt5-compare-table-content.tsx
@@ -35,6 +35,8 @@ const Row = ({
is_pre_appstore_setting,
content_flag,
is_high_risk_for_mt5,
+ financial_restricted_countries,
+ is_preappstore_restricted_cr_demo_account,
}: TCompareAccountRowProps) => {
const is_leverage_row = id === 'leverage';
const is_platform_row = id === 'platform';
@@ -48,6 +50,15 @@ const Row = ({
if (is_platform_row && !is_pre_appstore_setting) {
return null;
}
+
+ if (is_platform_row && is_pre_appstore_setting && financial_restricted_countries) {
+ values.synthetic_bvi = { text: 'MT5' };
+ }
+
+ if (is_pre_appstore_setting && is_preappstore_restricted_cr_demo_account) {
+ delete values.synthetic_bvi;
+ }
+
if (is_platform_row && content_flag === ContentFlag.HIGH_RISK_CR && is_high_risk_for_mt5) {
// needed to adjust the design for high risk
values.financial_svg = { text: 'MT5' };
@@ -144,6 +155,7 @@ const DMT5CompareModalContent = ({
is_logged_in,
is_pre_appstore_setting,
is_preappstore_cr_demo_account,
+ is_preappstore_restricted_cr_demo_account,
is_real_enabled,
is_virtual,
openDerivRealAccountNeededModal,
@@ -167,6 +179,7 @@ const DMT5CompareModalContent = ({
no_CR_account,
is_eu_user,
no_MF_account,
+ financial_restricted_countries,
}: TDMT5CompareModalContentProps) => {
const [has_submitted_personal_details, setHasSubmittedPersonalDetails] = React.useState(false);
@@ -450,7 +463,9 @@ const DMT5CompareModalContent = ({
classname_for_demo_and_eu ??
classNames(`cfd-accounts-compare-modal__table-header${pre_appstore_class}`, {
[`cfd-accounts-compare-modal__table-header-for-synthetic-${synthetic_accounts_count}-financial-${financial_accounts_count}${pre_appstore_class}`]:
- available_accounts_count < 6,
+ available_accounts_count < 6 && !financial_restricted_countries,
+ [`cfd-accounts-compare-modal__table-header-for-synthetic-${synthetic_accounts_count}${pre_appstore_class}`]:
+ financial_restricted_countries,
})
}
>
@@ -460,7 +475,7 @@ const DMT5CompareModalContent = ({
{localize('Derived')}
)}
- {financial_accounts_count > 0 && (
+ {!financial_restricted_countries && financial_accounts_count > 0 && (
{show_eu_related_content ? localize('CFDs') : localize('Financial')}
@@ -485,6 +500,10 @@ const DMT5CompareModalContent = ({
is_pre_appstore_setting={is_pre_appstore_setting}
content_flag={content_flag}
is_high_risk_for_mt5={is_high_risk_for_mt5}
+ financial_restricted_countries={financial_restricted_countries}
+ is_preappstore_restricted_cr_demo_account={
+ is_preappstore_restricted_cr_demo_account
+ }
/>
))}
@@ -569,4 +588,5 @@ export default connect(({ modules, client, common, ui, traders_hub }: RootStore)
no_CR_account: traders_hub.no_CR_account,
is_eu_user: traders_hub.is_eu_user,
no_MF_account: traders_hub.no_MF_account,
+ financial_restricted_countries: traders_hub.financial_restricted_countries,
}))(DMT5CompareModalContent);
diff --git a/packages/cfd/src/Containers/props.types.ts b/packages/cfd/src/Containers/props.types.ts
index b7590669aaf6..28e35cfaed14 100644
--- a/packages/cfd/src/Containers/props.types.ts
+++ b/packages/cfd/src/Containers/props.types.ts
@@ -269,6 +269,8 @@ export type TCompareAccountRowProps = TCompareAccountContentProps & {
is_pre_appstore_setting: boolean;
pre_appstore_class: string;
is_high_risk_for_mt5: boolean;
+ financial_restricted_countries: string[];
+ is_preappstore_restricted_cr_demo_account: boolean;
};
export type TCompareAccountContentProps = {
@@ -292,6 +294,7 @@ export type TDMT5CompareModalContentProps = {
is_logged_in: boolean;
is_pre_appstore_setting: boolean;
is_preappstore_cr_demo_account: boolean;
+ is_preappstore_restricted_cr_demo_account: boolean;
is_real_enabled: boolean;
is_virtual: boolean;
openDerivRealAccountNeededModal: () => void;
@@ -316,6 +319,7 @@ export type TDMT5CompareModalContentProps = {
no_CR_account: boolean;
is_eu_user: boolean;
no_MF_account: boolean;
+ financial_restricted_countries: string[];
};
export type TCFDDbviOnboardingProps = {
diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js
index a8abb4769139..f8c0891fbc3c 100644
--- a/packages/core/src/Stores/traders-hub-store.js
+++ b/packages/core/src/Stores/traders-hub-store.js
@@ -78,6 +78,7 @@ export default class TradersHubStore extends BaseStore {
no_CR_account: computed,
no_MF_account: computed,
multipliers_account_status: computed,
+ financial_restricted_countries: computed,
openDemoCFDAccount: action.bound,
openModal: action.bound,
openRealAccount: action.bound,
@@ -111,6 +112,7 @@ export default class TradersHubStore extends BaseStore {
this.root_store.client.dxtrade_accounts_list,
this.is_demo_low_risk,
this.root_store.modules?.cfd?.current_list,
+ this.root_store.client.landing_companies,
this.root_store.common.current_language,
],
() => {
@@ -381,6 +383,12 @@ export default class TradersHubStore extends BaseStore {
this.setCombinedCFDMT5Accounts();
}
+ get financial_restricted_countries() {
+ const { financial_company, gaming_company } = this.root_store.client.landing_companies;
+
+ return gaming_company?.shortcode === 'svg' && !financial_company;
+ }
+
getAvailableMt5Accounts() {
if (this.is_eu_user && !this.is_demo_low_risk) {
this.available_mt5_accounts = this.available_cfd_accounts.filter(account =>
@@ -389,6 +397,13 @@ export default class TradersHubStore extends BaseStore {
return;
}
+ if (this.financial_restricted_countries) {
+ this.available_mt5_accounts = this.available_cfd_accounts.filter(
+ account => account.market_type !== 'financial' && account.platform === CFD_PLATFORMS.MT5
+ );
+ return;
+ }
+
this.available_mt5_accounts = this.available_cfd_accounts.filter(
account => account.platform === CFD_PLATFORMS.MT5
);
From 8bb13518f4cebd42bc3d2a602807d7c1b6aa5b6a Mon Sep 17 00:00:00 2001
From: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Date: Tue, 21 Mar 2023 13:49:36 +0800
Subject: [PATCH 03/21] Jim/88166/delay in real account creation flow after
clicking add account button in the account creation popup (#7926)
* chore: remove duplicate get_settings api request
* chore: set account_settings in client-store if undefined
* chore: remove unnecessary else block
* refactor: convert if expression to ternary
* chore: set account_settings in client store instead of creating a local variable
---
packages/core/src/Stores/client-store.js | 12 +++++++-----
packages/core/src/_common/base/socket_cache.js | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index 512ff593b38c..73d325152247 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -1317,7 +1317,7 @@ export default class ClientStore extends BaseStore {
new_data.landing_company_shortcode = authorize_response.authorize.landing_company_name;
runInAction(() => (client_accounts[client_id] = new_data));
this.setLoginInformation(client_accounts, client_id);
- WS.authorized.storage.getSettings().then(get_settings_response => {
+ WS.authorized.getSettings().then(get_settings_response => {
this.setAccountSettings(get_settings_response.get_settings);
resolve();
});
@@ -1659,14 +1659,16 @@ export default class ClientStore extends BaseStore {
statement: 1,
})
);
- const account_settings = (await WS.authorized.cache.getSettings()).get_settings;
- if (account_settings) this.setPreferredLanguage(account_settings.preferred_language);
+
+ if (Object.keys(this.account_settings).length === 0) {
+ this.setAccountSettings((await WS.authorized.getSettings()).get_settings);
+ }
+ if (this.account_settings) this.setPreferredLanguage(this.account_settings.preferred_language);
await this.fetchResidenceList();
await this.getTwoFAStatus();
- if (account_settings && !account_settings.residence) {
+ if (this.account_settings && !this.account_settings.residence) {
this.root_store.ui.toggleSetResidenceModal(true);
}
-
await WS.authorized.cache.landingCompany(this.residence).then(this.responseLandingCompany);
if (!this.is_virtual) await this.getLimits();
diff --git a/packages/core/src/_common/base/socket_cache.js b/packages/core/src/_common/base/socket_cache.js
index 71a5f2f8f90d..625a5e3ccfd7 100644
--- a/packages/core/src/_common/base/socket_cache.js
+++ b/packages/core/src/_common/base/socket_cache.js
@@ -30,6 +30,7 @@ const SocketCache = (() => {
contracts_for: { expire: 10 },
exchange_rates: { expire: 60 },
trading_times: { expire: 120 },
+ get_settings: { expire: 10 },
// TODO: Enable statement and trade table caching once we have UI design for handling
// transitions between cached table and newly added data to table
// statement : { expire: 10 },
From 3ff9daaa96a0b87bc46797527ffa0d1adccca3ae Mon Sep 17 00:00:00 2001
From: Shaheer <122449658+shaheer-deriv@users.noreply.github.com>
Date: Tue, 21 Mar 2023 09:55:44 +0400
Subject: [PATCH 04/21] fix: :sparkles: allows users to enter accented name
characters (#7832)
* fix: :sparkles: allows users to enter accented name characters
* chore: :wastebasket: removes unused 'letter_symbol' variable
* fix: :bug: allows accented characters in name for existing users
* docs: :pencil2: comment on the regex used for name validation
* resused regex function
Co-authored-by: Yashim Wong
* fix: :memo: imported reused regex function
* fix: :memo: comment on regex function used
---------
Co-authored-by: Yashim Wong
---
.../src/Configs/personal-details-config.js | 4 ++--
.../PersonalDetails/personal-details.jsx | 22 ++++++++++++-------
.../core/src/Constants/form-error-messages.js | 2 +-
.../declarative-validation-rules.ts | 7 +++---
.../validation/form-error-messages-types.ts | 2 +-
5 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/packages/account/src/Configs/personal-details-config.js b/packages/account/src/Configs/personal-details-config.js
index 0e47264846bf..a994b15edf82 100644
--- a/packages/account/src/Configs/personal-details-config.js
+++ b/packages/account/src/Configs/personal-details-config.js
@@ -29,7 +29,7 @@ const personal_details_config = ({ residence_list, account_settings, is_appstore
rules: [
['req', localize('First name is required.')],
['length', localize('First name should be between 2 and 50 characters.'), { min: 2, max: 50 }],
- ['letter_symbol', getErrorMessages().letter_symbol()],
+ ['name', getErrorMessages().name()],
],
},
last_name: {
@@ -38,7 +38,7 @@ const personal_details_config = ({ residence_list, account_settings, is_appstore
rules: [
['req', localize('Last name is required.')],
['length', localize('Last name should be between 2 and 50 characters.'), { min: 2, max: 50 }],
- ['letter_symbol', getErrorMessages().letter_symbol()],
+ ['name', getErrorMessages().name()],
],
},
date_of_birth: {
diff --git a/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx b/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx
index 41fcbcae844a..b4da912be5b0 100644
--- a/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx
+++ b/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx
@@ -35,6 +35,7 @@ import {
routes,
WS,
useIsMounted,
+ validName,
} from '@deriv/shared';
import { Localize, localize } from '@deriv/translations';
import { withRouter } from 'react-router';
@@ -314,8 +315,6 @@ export const PersonalDetailsForm = ({
}
validateValues(val => val, required_fields, localize('This field is required'));
- const only_alphabet_fields = ['first_name', 'last_name'];
- validateValues(validLetterSymbol, only_alphabet_fields, localize('Only alphabet is allowed'));
const residence_fields = ['citizen'];
const validateResidence = val => getLocation(residence_list, val, 'value');
@@ -351,12 +350,19 @@ export const PersonalDetailsForm = ({
const min_name = 2;
const max_name = 50;
- if (values.first_name && !validLength(values.first_name.trim(), { min: min_name, max: max_name })) {
- errors.first_name = localize('You should enter 2-50 characters.');
- }
- if (values.last_name && !validLength(values.last_name.trim(), { min: min_name, max: max_name })) {
- errors.last_name = localize('You should enter 2-50 characters.');
- }
+ const validateName = (name, field) => {
+ if (name) {
+ if (!validLength(name.trim(), { min: min_name, max: max_name })) {
+ errors[field] = localize('You should enter 2-50 characters.');
+ } else if (!validName(name)) {
+ // validName() has the exact regex used at the backend for allowing non digit characters including accented unicode characters.
+ // two or more space between name not allowed.
+ errors[field] = localize('Letters, spaces, periods, hyphens, apostrophes only.');
+ }
+ }
+ };
+ validateName(values.first_name, 'first_name');
+ validateName(values.last_name, 'last_name');
if (values.phone) {
// minimum characters required is 9 numbers (excluding +- signs or space)
diff --git a/packages/core/src/Constants/form-error-messages.js b/packages/core/src/Constants/form-error-messages.js
index a0ca7bbbf6da..b69d902b55ad 100644
--- a/packages/core/src/Constants/form-error-messages.js
+++ b/packages/core/src/Constants/form-error-messages.js
@@ -11,7 +11,7 @@ export const FORM_ERROR_MESSAGES = {
}),
email: () => localize('Invalid email address.'),
general: () => localize('Only letters, numbers, space, hyphen, period, and apostrophe are allowed.'),
- letter_symbol: () => localize('Letters, spaces, periods, hyphens, apostrophes only'),
+ name: () => localize('Letters, spaces, periods, hyphens, apostrophes only.'),
password: () => localize('Password should have lower and uppercase English letters with numbers.'),
po_box: () => localize('P.O. Box is not accepted in address'),
phone: () => localize('Please enter a valid phone number (e.g. +15417541234).'),
diff --git a/packages/shared/src/utils/validation/declarative-validation-rules.ts b/packages/shared/src/utils/validation/declarative-validation-rules.ts
index d4ef06025b63..313d72c320fa 100644
--- a/packages/shared/src/utils/validation/declarative-validation-rules.ts
+++ b/packages/shared/src/utils/validation/declarative-validation-rules.ts
@@ -24,6 +24,7 @@ export const validPostCode = (value: string) => value === '' || /^[A-Za-z0-9][A-
export const validTaxID = (value: string) => /(?!^$|\s+)[A-Za-z0-9./\s-]$/.test(value);
export const validPhone = (value: string) => /^\+?([0-9-]+\s)*[0-9-]+$/.test(value);
export const validLetterSymbol = (value: string) => /^[A-Za-z]+([a-zA-Z.' -])*[a-zA-Z.' -]+$/.test(value);
+export const validName = (value: string) => /^(?!.*\s{2,})[\p{L}\s'.-]{2,50}$/u.test(value);
export const validLength = (value = '', options: TOptions) =>
(options.min ? value.length >= options.min : true) && (options.max ? value.length <= options.max : true);
export const validPassword = (value: string) => /(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]+/.test(value);
@@ -108,9 +109,9 @@ const initPreBuildDVRs = () => ({
message: form_error_messages.general,
},
length: { func: validLength, message: '' }, // Message will be set in validLength function on initiation
- letter_symbol: {
- func: validLetterSymbol,
- message: form_error_messages.letter_symbol,
+ name: {
+ func: validName,
+ message: form_error_messages.name,
},
number: {
func: (...args: [string, TOptions, Record]) => {
diff --git a/packages/shared/src/utils/validation/form-error-messages-types.ts b/packages/shared/src/utils/validation/form-error-messages-types.ts
index bc2099a1738a..4496c0ae7225 100644
--- a/packages/shared/src/utils/validation/form-error-messages-types.ts
+++ b/packages/shared/src/utils/validation/form-error-messages-types.ts
@@ -6,7 +6,7 @@ export type TFormErrorMessagesTypes = Record<
| 'barrier'
| 'email'
| 'general'
- | 'letter_symbol'
+ | 'name'
| 'password'
| 'po_box'
| 'phone'
From 466cc3e954890f2a1172010d1a4b84b2b203b091 Mon Sep 17 00:00:00 2001
From: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>
Date: Tue, 21 Mar 2023 08:57:33 +0300
Subject: [PATCH 05/21] Evgeniy / 89431 / no error message for idv duplicated
document numbers (#7743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: no error message for idv duplicated document numbers
* feat: idv testing document whitelist
* refactor: function rename, code and test fix
* refactor: code style change, review fixes
---------
Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
---
.../Components/hooks/useToggleValidation.tsx | 19 ---------
.../__tests__/idv-document-submit.spec.js | 4 +-
.../idv-document-submit.jsx | 18 +++++----
.../poi/idv-document-submit/utils.js | 18 ++++++++-
.../idv-doc-submit-on-signup.jsx | 39 +++++++++++++------
.../proof-of-identity-submission-for-mt5.jsx | 10 ++++-
6 files changed, 63 insertions(+), 45 deletions(-)
delete mode 100644 packages/account/src/Components/hooks/useToggleValidation.tsx
diff --git a/packages/account/src/Components/hooks/useToggleValidation.tsx b/packages/account/src/Components/hooks/useToggleValidation.tsx
deleted file mode 100644
index 338f152543c2..000000000000
--- a/packages/account/src/Components/hooks/useToggleValidation.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { getPlatformFromUrl } from '@deriv/shared';
-import React from 'react';
-
-export const useToggleValidation = (hash: string) => {
- const [is_validation_enabled, setIsValidationEnabled] = React.useState(false);
- const { is_staging_deriv_app } = getPlatformFromUrl();
-
- React.useEffect(() => {
- // This effect allows to toggle IDV validation
- // for repetitive and sequential numbers
- if (!is_staging_deriv_app || (hash && hash === '#toggle_id_validation')) {
- setIsValidationEnabled(true);
- } else {
- setIsValidationEnabled(false);
- }
- }, [hash]);
-
- return is_validation_enabled;
-};
diff --git a/packages/account/src/Components/poi/idv-document-submit/__tests__/idv-document-submit.spec.js b/packages/account/src/Components/poi/idv-document-submit/__tests__/idv-document-submit.spec.js
index 760be0ae6890..40b62b8829a0 100644
--- a/packages/account/src/Components/poi/idv-document-submit/__tests__/idv-document-submit.spec.js
+++ b/packages/account/src/Components/poi/idv-document-submit/__tests__/idv-document-submit.spec.js
@@ -6,9 +6,6 @@ import { isSequentialNumber, isRecurringNumberRegex } from '../utils';
jest.mock('react-router');
jest.mock('Assets/ic-document-submit-icon.svg', () => jest.fn(() => 'DocumentSubmitLogo'));
-jest.mock('../../../hooks/useToggleValidation', () => ({
- useToggleValidation: jest.fn(() => '#toggle_id_validation'),
-}));
jest.mock('../utils.js', () => ({
getDocumentData: function (country_code, key) {
const data = {
@@ -30,6 +27,7 @@ jest.mock('../utils.js', () => ({
getRegex: jest.fn(() => /5436454364243/i),
isSequentialNumber: jest.fn(() => false),
isRecurringNumberRegex: jest.fn(() => false),
+ isIDVWhitelistDocumentNumber: jest.fn(() => false),
}));
jest.mock('@deriv/shared', () => ({
diff --git a/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx b/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
index 2b1ed17d7462..ae42fd1d24c9 100644
--- a/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
+++ b/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
@@ -1,5 +1,4 @@
import React from 'react';
-import { useLocation } from 'react-router';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { Autocomplete, Button, DesktopWrapper, Input, MobileWrapper, Text, SelectNative } from '@deriv/components';
@@ -13,15 +12,13 @@ import {
isRecurringNumberRegex,
isSequentialNumber,
preventEmptyClipboardPaste,
+ isIDVWhitelistDocumentNumber,
} from './utils';
-import { useToggleValidation } from '../../hooks/useToggleValidation';
import FormFooter from 'Components/form-footer';
import BackButtonIcon from 'Assets/ic-poi-back-btn.svg';
import DocumentSubmitLogo from 'Assets/ic-document-submit-icon.svg';
const IdvDocumentSubmit = ({ handleBack, handleViewComplete, selected_country, is_from_external }) => {
- const location = useLocation();
- const validation_is_enabled = useToggleValidation(location?.hash);
const [document_list, setDocumentList] = React.useState([]);
const [document_image, setDocumentImage] = React.useState(null);
const [is_input_disable, setInputDisable] = React.useState(true);
@@ -118,6 +115,14 @@ const IdvDocumentSubmit = ({ handleBack, handleViewComplete, selected_country, i
const is_sequential_number = isSequentialNumber(document_number);
const is_recurring_number = isRecurringNumberRegex(document_number);
const needs_additional_document = !!document_type.additional;
+ const is_idv_whitelist_document_number = isIDVWhitelistDocumentNumber(
+ country_code,
+ document_type.id,
+ document_number
+ );
+ const is_document_number_invalid =
+ (!is_idv_whitelist_document_number && (is_recurring_number || is_sequential_number)) ||
+ document_number === document_type.example_format;
if (!document_type || !document_type.text || !document_type.value) {
errors.document_type = localize('Please select a document type.');
@@ -135,10 +140,7 @@ const IdvDocumentSubmit = ({ handleBack, handleViewComplete, selected_country, i
if (!document_number) {
errors.document_number =
localize('Please enter your document number. ') + getExampleFormat(document_type.example_format);
- } else if (
- (validation_is_enabled && (is_recurring_number || is_sequential_number)) ||
- document_number === document_type.example_format
- ) {
+ } else if (is_document_number_invalid) {
errors.document_number = localize('Please enter a valid ID number.');
} else {
const format_regex = getRegex(document_type.value);
diff --git a/packages/account/src/Components/poi/idv-document-submit/utils.js b/packages/account/src/Components/poi/idv-document-submit/utils.js
index 44abda08b293..719f7a729ace 100644
--- a/packages/account/src/Components/poi/idv-document-submit/utils.js
+++ b/packages/account/src/Components/poi/idv-document-submit/utils.js
@@ -1,4 +1,4 @@
-import { getUrlBase } from '@deriv/shared';
+import { getPlatformFromUrl, getUrlBase } from '@deriv/shared';
const PATTERN_SIZE = 5;
@@ -48,6 +48,15 @@ export const isSequentialNumber = document_number => {
return pattern_results.includes(true);
};
+// function for skipping validation of exact document numbers for QA smileidentity sandbox testing
+export const isIDVWhitelistDocumentNumber = (country, document_type, document_number) => {
+ const is_whitelisted_number =
+ idv_test_document_whitelist.has(country) &&
+ idv_test_document_whitelist.get(country)[document_type] === document_number;
+
+ return is_whitelisted_number && (getPlatformFromUrl().is_test_link || getPlatformFromUrl().is_staging);
+};
+
export const getRegex = target_regex => {
const output_regex = regex.find(r => r.regex_string === target_regex);
if (output_regex) {
@@ -206,3 +215,10 @@ const idv_document_data = {
},
},
};
+
+export const idv_test_document_whitelist = new Map([
+ ['gh', { drivers_license: 'B0000000', passport: 'G0000000', ssnit: 'C000000000000', voter_id: '0000000000' }],
+ ['ke', { alien_card: '000000', passport: 'A00000000', national_id: '00000000' }],
+ ['ng', { drivers_license: 'ABC000000000', nin_slip: '00000000000', voter_id: '0000000000000000000' }],
+ ['za', { national_id: '0000000000000', national_id_no_photo: '0000000000000' }],
+]);
diff --git a/packages/account/src/Components/poi/poi-form-on-signup/idv-doc-submit-on-signup/idv-doc-submit-on-signup.jsx b/packages/account/src/Components/poi/poi-form-on-signup/idv-doc-submit-on-signup/idv-doc-submit-on-signup.jsx
index a30eb074437a..627224a57346 100644
--- a/packages/account/src/Components/poi/poi-form-on-signup/idv-doc-submit-on-signup/idv-doc-submit-on-signup.jsx
+++ b/packages/account/src/Components/poi/poi-form-on-signup/idv-doc-submit-on-signup/idv-doc-submit-on-signup.jsx
@@ -1,5 +1,4 @@
import React from 'react';
-import { useLocation } from 'react-router';
import { Formik, Field } from 'formik';
import { localize, Localize } from '@deriv/translations';
import {
@@ -22,13 +21,11 @@ import {
isRecurringNumberRegex,
isSequentialNumber,
preventEmptyClipboardPaste,
+ isIDVWhitelistDocumentNumber,
} from '../../idv-document-submit/utils';
-import { useToggleValidation } from '../../../hooks/useToggleValidation';
import DocumentSubmitLogo from 'Assets/ic-document-submit-icon.svg';
export const IdvDocSubmitOnSignup = ({ citizen_data, has_previous, onPrevious, onNext, value, has_idv_error }) => {
- const location = useLocation();
- const validation_is_enabled = useToggleValidation(location?.hash);
const [document_list, setDocumentList] = React.useState([]);
const [document_image, setDocumentImage] = React.useState(null);
const [is_input_disable, setInputDisable] = React.useState(true);
@@ -100,6 +97,14 @@ export const IdvDocSubmitOnSignup = ({ citizen_data, has_previous, onPrevious, o
const is_sequential_number = isSequentialNumber(document_number);
const is_recurring_number = isRecurringNumberRegex(document_number);
const needs_additional_document = !!document_type.additional;
+ const is_idv_whitelist_document_number = isIDVWhitelistDocumentNumber(
+ country_code,
+ document_type.id,
+ document_number
+ );
+ const is_document_number_invalid =
+ (!is_idv_whitelist_document_number && (is_recurring_number || is_sequential_number)) ||
+ document_number === document_type.example_format;
if (!document_type || !document_type.text || !document_type.value) {
errors.document_type = localize('Please select a document type.');
@@ -117,10 +122,7 @@ export const IdvDocSubmitOnSignup = ({ citizen_data, has_previous, onPrevious, o
if (!document_number) {
errors.document_number =
localize('Please enter your document number. ') + getExampleFormat(document_type.example_format);
- } else if (
- (validation_is_enabled && (is_recurring_number || is_sequential_number)) ||
- document_number === document_type.example_format
- ) {
+ } else if (is_document_number_invalid) {
errors.document_number = localize('Please enter a valid ID number.');
} else {
const format_regex = getRegex(document_type.value);
@@ -177,7 +179,17 @@ export const IdvDocSubmitOnSignup = ({ citizen_data, has_previous, onPrevious, o
validateOnChange
validateOnBlur
>
- {({ errors, handleBlur, handleChange, handleSubmit, isValid, setFieldValue, touched, values }) => (
+ {({
+ errors,
+ handleBlur,
+ handleChange,
+ handleSubmit,
+ isSubmitting,
+ isValid,
+ setFieldValue,
+ touched,
+ values,
+ }) => (
{({ setRef }) => (