Amina/ COJ-674/fix: verified_status for MT5 jurisdictions for POA sub…

…mission (deriv-com#14675) * fix: verified_status * fix: test cases * fix: update master
vinu-deriv · May 28, 2024 · 19f55ba · 19f55ba
1 parent 53dfd2d
commit 19f55ba
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/packages/cfd/src/Containers/__tests__/cfd-financial-stp-real-account-signup.spec.js b/packages/cfd/src/Containers/__tests__/cfd-financial-stp-real-account-signup.spec.js
@@ -84,7 +84,7 @@ describe('<CFDFinancialStpRealAccountSignup />', () => {
         jest.clearAllMocks();
     });
 
-    const authenticated_with_idv = {
+    const verified_jurisdiction = {
         bvi: 1,
         labuan: 1,
         maltainvest: 0,
@@ -138,7 +138,7 @@ describe('<CFDFinancialStpRealAccountSignup />', () => {
             account_status: {
                 authentication: {
                     document: {
-                        authenticated_with_idv,
+                        verified_jurisdiction,
                         status: 'none',
                     },
                     attempts: {
@@ -256,7 +256,7 @@ describe('<CFDFinancialStpRealAccountSignup />', () => {
     });
 
     it('should check for POA status when Jurisdiction is Labuan and resubmit status is set to true', () => {
-        const authenticated_with_idv = {
+        const verified_jurisdiction = {
             bvi: 1,
             labuan: 0,
             maltainvest: 0,
@@ -271,7 +271,7 @@ describe('<CFDFinancialStpRealAccountSignup />', () => {
                 account_status: {
                     authentication: {
                         document: {
-                            authenticated_with_idv,
+                            verified_jurisdiction,
                             status: 'none',
                         },
                         attempts: {

diff --git a/packages/cfd/src/features/Containers/__tests__/real-account-signup-verifications.spec.js b/packages/cfd/src/features/Containers/__tests__/real-account-signup-verifications.spec.js
@@ -84,7 +84,7 @@ describe('<RealAccountSignupVerifications />', () => {
         jest.clearAllMocks();
     });
 
-    const authenticated_with_idv = {
+    const verified_jurisdiction = {
         bvi: 1,
         labuan: 1,
         maltainvest: 0,
@@ -138,7 +138,7 @@ describe('<RealAccountSignupVerifications />', () => {
             account_status: {
                 authentication: {
                     document: {
-                        authenticated_with_idv,
+                        verified_jurisdiction,
                         status: 'none',
                     },
                     attempts: {
@@ -256,7 +256,7 @@ describe('<RealAccountSignupVerifications />', () => {
     });
 
     it('should check for POA status when Jurisdiction is Labuan and resubmit status is set to true', () => {
-        const authenticated_with_idv = {
+        const verified_jurisdiction = {
             bvi: 1,
             labuan: 0,
             maltainvest: 0,
@@ -271,7 +271,7 @@ describe('<RealAccountSignupVerifications />', () => {
                 account_status: {
                     authentication: {
                         document: {
-                            authenticated_with_idv,
+                            verified_jurisdiction,
                             status: 'none',
                         },
                         attempts: {

diff --git a/packages/shared/src/utils/cfd/cfd.ts b/packages/shared/src/utils/cfd/cfd.ts
@@ -1,8 +1,7 @@
 import { DetailsOfEachMT5Loginid, GetAccountStatus, LandingCompany } from '@deriv/api-types';
 import { localize } from '@deriv/translations';
-
 import { CFD_PLATFORMS } from '../platform';
-import { Jurisdiction, JURISDICTION_MARKET_TYPES } from '../constants/jurisdictions-config';
+import { AUTH_STATUS_CODES, Jurisdiction, JURISDICTION_MARKET_TYPES } from '../constants';
 
 let CFD_text_translated: { [key: string]: () => void };
 
@@ -513,15 +512,10 @@ export const getMT5AccountTitle = ({ account_type, jurisdiction }: TGetMT5Accoun
 };
 
 export const isPOARequiredForMT5 = (account_status: GetAccountStatus, jurisdiction_shortcode: string) => {
-    const { authentication } = account_status || {};
-
-    if (authentication?.attempts?.latest?.service === 'idv') {
-        if (authentication?.document?.status === 'pending') {
-            return false;
-        }
-        // @ts-expect-error as the prop authenticated_with_idv is not yet present in GetAccountStatus
-        return !authentication?.document?.authenticated_with_idv[jurisdiction_shortcode];
+    const { document } = account_status?.authentication || {};
+    if (document?.status === AUTH_STATUS_CODES.PENDING) {
+        return false;
     }
-
-    return !['pending', 'verified'].includes(authentication?.document?.status ?? '');
+    // @ts-expect-error as the prop verified_jurisdiction is not yet present in GetAccountStatu
+    return !document?.verified_jurisdiction[jurisdiction_shortcode];
 };
diff --git a/packages/wallets/src/features/cfd/flows/Verification/Verification.tsx b/packages/wallets/src/features/cfd/flows/Verification/Verification.tsx
@@ -87,10 +87,12 @@ const Verification: FC<TVerificationProps> = ({ selectedJurisdiction }) => {
     const selectedMarketType = getModalState('marketType') ?? 'all';
     const platform = getModalState('platform') ?? PlatformDetails.mt5.platform;
 
-    const shouldSubmitPOA = useMemo(
-        () => !poaStatus?.has_attempted_poa || (!poaStatus?.is_pending && !poaStatus.is_verified),
-        [poaStatus]
-    );
+    const shouldSubmitPOA = useMemo(() => {
+        if (poaStatus?.is_pending) return false;
+        // @ts-expect-error as the prop verified_jurisdiction is not yet present in GetAccountStatusResponse type
+        return selectedJurisdiction ? !poaStatus?.verified_jurisdiction?.[selectedJurisdiction] : false;
+    }, [selectedJurisdiction, poaStatus]);
+
     const shouldFillPersonalDetails = useMemo(
         () => !settings?.has_submitted_personal_details,
         [settings?.has_submitted_personal_details]