Merge pull request #29 from amina-deriv/shaheer/code-duplication-fix

Shaheer/code duplication fix
shaheer-deriv · May 22, 2023 · dc915c7 · dc915c7
2 parents 2c4996f + c7eb7c4
commit dc915c7
Show file tree

Hide file tree

Showing 70 changed files with 3,157 additions and 889 deletions.
diff --git a/packages/account/src/Components/currency-selector/__tests__/currency-selector.spec.tsx b/packages/account/src/Components/currency-selector/__tests__/currency-selector.spec.tsx
@@ -26,8 +26,8 @@ describe('<CurrencySelector/>', () => {
                 is_virtual: 1,
                 landing_company_shortcode: 'virtual',
                 trading: {},
-                token: 'a1-sLGGrhfYPkeEprxEop2T591cLKbuN',
-                email: 'test+qw@deriv.com',
+                token: '',
+                email: '',
                 session_start: 1651059038,
                 excluded_until: '',
                 landing_company_name: 'virtual',
@@ -273,8 +273,8 @@ describe('<CurrencySelector/>', () => {
                     is_virtual: 1,
                     landing_company_shortcode: 'svg',
                     trading: {},
-                    token: 'a1-sLGGrhfYPkeEprxEop2T591cLKbuN',
-                    email: 'test+qw@deriv.com',
+                    token: '',
+                    email: '',
                     session_start: 1651059038,
                     excluded_until: '',
                     landing_company_name: 'svg',

diff --git a/packages/account/src/Components/poi-poa-docs-submitted/poi-poa-docs-submitted.tsx b/packages/account/src/Components/poi-poa-docs-submitted/poi-poa-docs-submitted.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button, Icon, Loading } from '@deriv/components';
 import { localize } from '@deriv/translations';
-import { getAuthenticationStatusInfo } from '@deriv/shared';
+import { getAuthenticationStatusInfo, Jurisdiction } from '@deriv/shared';
 import IconMessageContent from 'Components/icon-message-content';
 import { GetAccountStatus } from '@deriv/api-types';
 
@@ -43,8 +43,9 @@ const PoiPoaDocsSubmitted = ({
     const getDescription = () => {
         const { manual_status, poi_verified_for_vanuatu_maltainvest, poi_verified_for_bvi_labuan, poa_pending } =
             getAuthenticationStatusInfo(account_status);
-        const is_vanuatu_or_maltainvest_selected =
-            jurisdiction_selected_shortcode === 'vanuatu' || jurisdiction_selected_shortcode === 'maltainvest';
+        const is_vanuatu_or_maltainvest_selected = [Jurisdiction.VANUATU, Jurisdiction.MALTA_INVEST].includes(
+            jurisdiction_selected_shortcode
+        );
         if (
             (is_vanuatu_or_maltainvest_selected && poi_verified_for_vanuatu_maltainvest && poa_pending) ||
             (!is_vanuatu_or_maltainvest_selected && poi_verified_for_bvi_labuan && poa_pending) ||

diff --git a/...ccount/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission-for-mt5.jsx b/...ccount/src/Sections/Verification/ProofOfIdentity/proof-of-identity-submission-for-mt5.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React from 'react';
-import { WS } from '@deriv/shared';
+import { WS, Jurisdiction } from '@deriv/shared';
 import Unsupported from 'Components/poi/status/unsupported';
 import OnfidoUpload from './onfido-sdk-view.jsx';
 import { identity_status_codes, submission_status_code, service_code } from './proof-of-identity-utils';
@@ -30,7 +30,7 @@ const POISubmissionForMT5 = ({
                 is_idv_supported &&
                 Number(idv_submissions_left) > 0 &&
                 !is_idv_disallowed &&
-                jurisdiction_selected_shortcode !== 'vanuatu'
+                jurisdiction_selected_shortcode !== Jurisdiction.VANUATU
             ) {
                 setSubmissionService(service_code.idv);
             } else if (onfido_submissions_left && is_onfido_supported) {