@tap-payments/auth-jsconnect 2.10.11-beta → 2.10.11

package/build/features/app/connectExpress/connectExpressStore.js

@@ -59,9 +59,9 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
 import { FlowsTypes, AuthForType, BusinessType, LicenseType, AuthForScreen } from '../../../@types';
 import API from '../../../api';
-import { ADD_NEW_ENTITY, COLLECT_DOB_INFO_NAFATH, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
+import { ADD_NEW_ENTITY, COLLECT_DOB_INFO_NAFATH, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, NAFATH_PACI_TIMEOUT_DURATION, NAFATH_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH, SCOPE_MERCHANT } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError, isInternalServerError, isAuthenticationVerificationFailed } from '../../../utils';
 export var updateBusinessCountryAsync = createAsyncThunk('connectExpress/updateBusinessCountryAsync', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var connectExpress, payload, data;
     return __generator(this, function (_a) {
@@ -499,7 +499,11 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE,
                     encryption_contract: ['data']
                 };
-                return [4, API.authService.verifyExpressAuth(payload)];
+                return [4, API.authService.verifyExpressAuth(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
                 data = _h.sent();
                 sendCustomEventToGTM({
@@ -831,30 +835,43 @@ export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verify
             case 9:
                 count++;
                 return [3, 1];
-            case 10: throw new Error('nafath_verification_failed');
+            case 10: throw new Error('paci_verification_failed');
         }
     });
 }); });
 export var checkEmailAvailabilityAsync = createAsyncThunk('connectExpress/CheckEmailAvailabilityAsync', function (_a, thunkApi) {
     var email = _a.email, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var connectExpress, requestBody, data;
-        var _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var responseData, requestBody, data, retryData;
+        var _b, _c, _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
-                    connectExpress = thunkApi.getState().connectExpress;
+                    responseData = thunkApi.getState().connectExpress.data.responseData;
                     requestBody = {
                         email: email,
-                        country: (_c = (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) === null || _c === void 0 ? void 0 : _c.country_code,
+                        country: (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.country_code,
                         encryption_contract: ['email']
                     };
                     return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_d.sent()).data;
-                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
-                    if (!data.errors)
+                    data = (_g.sent()).data;
+                    if (!data.errors) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                         return [2, { response: data, formData: email }];
+                    }
+                    if (!isInternalServerError((_d = (_c = data.errors) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.error)) {
+                        onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                        return [2];
+                    }
+                    return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
+                case 2:
+                    retryData = (_g.sent()).data;
+                    onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+                    if (!retryData.errors)
+                        return [2, { response: retryData, formData: email }];
+                    if (isInternalServerError((_f = (_e = retryData.errors) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.error))
+                        return [2, { response: { is_available: true }, formData: email }];
                     return [2];
             }
         });
@@ -888,10 +905,10 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
 export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAsync', function (_a, thunkApi) {
     var isRetry = _a.isRetry;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, connectExpress, settings, responseData, _c, postURL, scope, redirectUrl, mode, showBoard, notification, platforms, payment_provider, leadId, authId, bi, leadData, accountData, data, body, data, urlQueryStart;
-        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        return __generator(this, function (_v) {
-            switch (_v.label) {
+        var _b, connectExpress, settings, responseData, _c, postURL, scope, redirectUrl, mode, showBoard, notification, platforms, payment_provider, leadId, authId, bi, leadData, accountData, data, body, data, data, urlQueryStart;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        return __generator(this, function (_y) {
+            switch (_y.label) {
                 case 0:
                     _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
                     responseData = connectExpress.data.responseData;
@@ -905,12 +922,12 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     if (!isRetry) return [3, 2];
                     return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
                 case 1:
-                    data = (_v.sent()).data;
+                    data = (_y.sent()).data;
                     if (data === null || data === void 0 ? void 0 : data.board_id) {
                         leadData = data;
                         accountData = data;
                     }
-                    _v.label = 2;
+                    _y.label = 2;
                 case 2:
                     body = {
                         lead_id: leadId,
@@ -922,8 +939,8 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 4];
                     return [4, API.accountService.expressCreateAccount(body)];
                 case 3:
-                    accountData = _v.sent();
-                    _v.label = 4;
+                    accountData = _y.sent();
+                    _y.label = 4;
                 case 4:
                     sendCustomEventToGTM({
                         event: 'Send Event',
@@ -939,22 +956,41 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
                     (_m = (_l = settings.data.appConfig).onCreated) === null || _m === void 0 ? void 0 : _m.call(_l, accountData);
                     (_p = (_o = settings.data.appConfig).onFlowCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, accountData);
                     (_r = (_q = settings.data.appConfig).onStepCompleted) === null || _r === void 0 ? void 0 : _r.call(_q, settings.data.activeScreen.name, accountData);
-                    if (showBoard) {
-                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                        return [2, { accountData: accountData }];
-                    }
-                    if (!(scope === SCOPE_AUTH)) return [3, 8];
+                    if (!(scope === SCOPE_MERCHANT)) return [3, 8];
                     if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 6];
                     return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
                 case 5:
-                    data = (_v.sent()).data;
+                    data = (_y.sent()).data;
                     leadData = data;
-                    _v.label = 6;
-                case 6: return [4, thunkApi.dispatch(onCloseComplete({ merchantId: (_s = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _s === void 0 ? void 0 : _s.id, brandId: (_t = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _t === void 0 ? void 0 : _t.id, entityId: (_u = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _u === void 0 ? void 0 : _u.id }))];
+                    _y.label = 6;
+                case 6:
+                    if (!postURL) return [3, 8];
+                    return [4, thunkApi.dispatch(onCloseComplete({
+                            merchantId: (_s = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _s === void 0 ? void 0 : _s.id,
+                            brandId: (_t = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _t === void 0 ? void 0 : _t.id,
+                            entityId: (_u = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _u === void 0 ? void 0 : _u.id,
+                            nextScreen: showBoard ? 'CONNECT_EXPRESS_PREPARING_DATA_STEP' : ''
+                        }))];
                 case 7:
-                    _v.sent();
+                    _y.sent();
                     return [2, { accountData: accountData }];
                 case 8:
+                    if (showBoard) {
+                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                        return [2, { accountData: accountData }];
+                    }
+                    if (!(scope === SCOPE_AUTH)) return [3, 12];
+                    if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 10];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+                case 9:
+                    data = (_y.sent()).data;
+                    leadData = data;
+                    _y.label = 10;
+                case 10: return [4, thunkApi.dispatch(onCloseComplete({ merchantId: (_v = leadData === null || leadData === void 0 ? void 0 : leadData.merchant) === null || _v === void 0 ? void 0 : _v.id, brandId: (_w = leadData === null || leadData === void 0 ? void 0 : leadData.brand) === null || _w === void 0 ? void 0 : _w.id, entityId: (_x = leadData === null || leadData === void 0 ? void 0 : leadData.entity) === null || _x === void 0 ? void 0 : _x.id }))];
+                case 11:
+                    _y.sent();
+                    return [2, { accountData: accountData }];
+                case 12:
                     if (redirectUrl && mode === 'page') {
                         urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
                         window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
@@ -1110,13 +1146,13 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
 export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDataAsync ', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, isKWCountry, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
+        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, unifiedNumber, isKWCountry, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
         var _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, connectExpress = _b.connectExpress;
-                    selectedLicense = formData.selectedLicense, brandName = formData.brandName, licenseNumber = formData.licenseNumber, termAndConditionChecked = formData.termAndConditionChecked;
+                    selectedLicense = formData.selectedLicense, brandName = formData.brandName, licenseNumber = formData.licenseNumber, termAndConditionChecked = formData.termAndConditionChecked, unifiedNumber = formData.unifiedNumber;
                     isKWCountry = isKW(settings.data.businessCountry.iso2);
                     isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                     _c = connectExpress.data, responseData = _c.responseData, isLeadIdPassed = _c.isLeadIdPassed;
@@ -1134,6 +1170,7 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
                         license_type: (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) ? (isFL ? LicenseType.FL : LicenseType.CR) : undefined,
                         business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type,
                         is_acknowledged: true,
+                        unified_number: unifiedNumber,
                         terms_conditions_accepted: !isLeadIdPassed ? termAndConditionChecked : undefined,
                         step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_BRAND_BUSINESS,
                         encryption_contract: []
@@ -1274,7 +1311,11 @@ export var verifyAuthMobileOtpAsync = createAsyncThunk('connectExpress/verifyAut
                     step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP,
                     encryption_contract: ['data']
                 };
-                return [4, API.authService.verifyExpressLeadIdentity(payload)];
+                return [4, API.authService.verifyExpressLeadIdentity(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
                 data = _e.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
@@ -1461,6 +1502,7 @@ var initialState = {
         businessData: {
             brandName: '',
             licenseNumber: '',
+            unifiedNumber: '',
             termAndConditionChecked: false
         },
         authenticationData: {
@@ -1678,9 +1720,11 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload) });
         })
-            .addCase(verifyMobileOtpAsync.rejected, function (state, action) {
+            .addCase(verifyMobileOtpAsync.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(verifyNafathAsync.pending, function (state) {
             state.loading = true;
@@ -1757,7 +1801,7 @@ export var connectSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveEntityListAsync.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             state.loading = false;
             var data = action.payload;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -1777,7 +1821,8 @@ export var connectSlice = createSlice({
                 }
             }
             licenseList = __spreadArray(__spreadArray([], licenseList, true), [OTHER_CR_LICENSE, OTHER_FL_LICENSE], false);
-            var _c = ((_b = state.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) || {}, license_number = _c.license_number, license_type = _c.license_type;
+            var _e = ((_b = state.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) || {}, license_number = _e.license_number, license_type = _e.license_type, entity = _e.entity;
+            var unified_number = (_d = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.additional_info) === null || _d === void 0 ? void 0 : _d.unified_number;
             var selectedLicense = undefined;
             if (license_number) {
                 var findLicense = licenseList.find(function (_a) {
@@ -1793,6 +1838,18 @@ export var connectSlice = createSlice({
                     selectedLicense = __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: license_number } });
                 state.data.businessData.licenseNumber = license_number;
             }
+            if (unified_number) {
+                var findLicense = licenseList.find(function (_a) {
+                    var _b;
+                    var license = _a.license;
+                    return ((_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number) === unified_number;
+                });
+                if (findLicense)
+                    selectedLicense = findLicense;
+                else
+                    selectedLicense = __assign(__assign({}, OTHER_CR_LICENSE), { license: { number: '', additional_info: { unified_number: unified_number } } });
+                state.data.businessData.unifiedNumber = unified_number;
+            }
             state.data.businessData.selectedLicense = selectedLicense;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { licenseList: licenseList });
         })
@@ -1895,6 +1952,7 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             state.data.individualData.mobile = action.payload.formData.mobile;
+            state.data.individualData.countryCode = action.payload.formData.countryCode;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse, verifyAuthMobile: action.payload.leadResponse });
             state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
         })
@@ -1930,9 +1988,11 @@ export var connectSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyAuthMobileOtpAsync.rejected, function (state, action) {
+            .addCase(verifyAuthMobileOtpAsync.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(resendLeadMobileAuthOTP.pending, function (state) {
             state.loading = true;

package/build/features/app/entity/entityStore.js

@@ -63,7 +63,7 @@ import { BusinessType, DocumentPurpose, FlowsTypes, LicenseType } from '../../..
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { ENTITY_STEP_NAMES } from '../../../constants';
 import moment from 'moment';
-import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData, sendCustomEventToGTM } from '../../../utils';
+import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData, sendCustomEventToGTM, isAuthenticationVerificationFailed } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('entityVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -145,9 +145,9 @@ export var resendOTP = createAsyncThunk('entityResendOTP', function (params, thu
 }); });
 export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, entity, settings, responseBody, payload, data, _b, entity_id, config, boardId, country_code, entityData, publicKey, countryIso2, data_2, entityTypes;
-    var _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), entity = _a.entity, settings = _a.settings;
                 responseBody = entity.data.verify.responseBody;
@@ -158,11 +158,13 @@ export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', functio
                     step_name: ENTITY_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('ENTITY_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_j.sent()).data;
-                if ((_d = data === null || data === void 0 ? void 0 : data.errors) === null || _d === void 0 ? void 0 : _d.length)
-                    throw new Error(data.errors[0].description);
+                data = _h.sent();
                 _b = data || {}, entity_id = _b.entity_id, config = _b.config, boardId = _b.id, country_code = _b.country_code;
                 entityData = undefined;
                 publicKey = config === null || config === void 0 ? void 0 : config.public_key;
@@ -174,22 +176,22 @@ export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', functio
                 if (!!entity_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                data_2 = _j.sent();
-                if (!((_e = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _e === void 0 ? void 0 : _e.id))
+                data_2 = _h.sent();
+                if (!((_d = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _d === void 0 ? void 0 : _d.id))
                     throw new Error('entity_id_missing');
                 entityData = data_2;
                 return [3, 5];
             case 3: return [4, API.entityService.retrieveEntity(entity_id)];
             case 4:
-                entityData = _j.sent();
-                _j.label = 5;
+                entityData = _h.sent();
+                _h.label = 5;
             case 5:
-                if (!countryIso2 && ((_f = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _f === void 0 ? void 0 : _f.country))
+                if (!countryIso2 && ((_e = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _e === void 0 ? void 0 : _e.country))
                     thunkApi.dispatch(handleSetCountryByIso2(entityData.entity.country));
-                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, { otp: params.otp });
                 return [4, API.entityService.retrieveEntityType()];
             case 6:
-                entityTypes = _j.sent();
+                entityTypes = _h.sent();
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('ENTITY_NAME_STEP')); });
                 return [2, {
                         data: data,
@@ -649,9 +651,11 @@ export var entitySlice = createSlice({
                 state.data.entityCapitalData.capitalShareValue = formatNumberAsCurrency(shares === null || shares === void 0 ? void 0 : shares.value);
             state.data.entityNameData = __assign(__assign({}, state.data.entityNameData), { responseBody: __assign(__assign({}, state.data.entityNameData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id }) });
         })
-            .addCase(verifyEntityLeadOTP.rejected, function (state, action) {
+            .addCase(verifyEntityLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(updateEntityName.pending, function (state) {
             state.loading = true;

package/build/features/app/individual/individualStore.js

@@ -71,7 +71,7 @@ import API from '../../../api';
 import { FlowsTypes, IndividualGender, DocumentPurpose } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES, MONTHLY_INCOME_LIST } from '../../../constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType, isOtherThanKWOrSA, isKWOrSA, sendCustomEventToGTM } from '../../../utils';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType, isOtherThanKWOrSA, isKWOrSA, sendCustomEventToGTM, isAuthenticationVerificationFailed } from '../../../utils';
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -445,9 +445,9 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
 });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, individual, settings, responseBody, countries, payload, data, userList, recipientData, publicKey, countryCode, _b, business_id, recipient, board_id, board_info_id, notification, _c, id, type, individualData, birthCountry;
-    var _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
@@ -459,40 +459,42 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                     step_name: INDIVIDUAl_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
-                return [4, API.leadService.verifyLeadOTP(payload)];
+                return [4, API.leadService.verifyTokenOTP(payload).catch(function (err) {
+                        if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                            thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_OTP_VERIFY_SECURITY_ERROR_STEP'));
+                        throw new Error(err === null || err === void 0 ? void 0 : err.message);
+                    })];
             case 1:
-                data = (_m.sent()).data;
+                data = _l.sent();
                 recipientData = undefined;
-                if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
-                    throw new Error(data.errors[0].description);
-                publicKey = (_f = data === null || data === void 0 ? void 0 : data.config) === null || _f === void 0 ? void 0 : _f.public_key;
+                publicKey = (_e = data === null || data === void 0 ? void 0 : data.config) === null || _e === void 0 ? void 0 : _e.public_key;
                 countryCode = data === null || data === void 0 ? void 0 : data.country_code;
                 if (publicKey)
                     thunkApi.dispatch(handlePublicKey(publicKey));
-                if (!((_g = settings.data.businessCountry) === null || _g === void 0 ? void 0 : _g.iso2) && countryCode)
+                if (!((_f = settings.data.businessCountry) === null || _f === void 0 ? void 0 : _f.iso2) && countryCode)
                     thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                 _b = data || {}, business_id = _b.business_id, recipient = _b.recipient, board_id = _b.id, board_info_id = _b.board_info_id;
                 recipientData = recipient;
-                if (!!((_h = data === null || data === void 0 ? void 0 : data.recipient) === null || _h === void 0 ? void 0 : _h.id)) return [3, 3];
+                if (!!((_g = data === null || data === void 0 ? void 0 : data.recipient) === null || _g === void 0 ? void 0 : _g.id)) return [3, 3];
                 if (!(board_id && board_info_id)) return [3, 3];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                notification = (_m.sent()).notification;
+                notification = (_l.sent()).notification;
                 recipientData = notification === null || notification === void 0 ? void 0 : notification.recipient;
                 if (!(recipientData === null || recipientData === void 0 ? void 0 : recipientData.id))
                     throw new Error('individual_id_missing');
-                _m.label = 3;
+                _l.label = 3;
             case 3:
                 _c = recipientData || {}, id = _c.id, type = _c.type;
                 return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
             case 4:
-                individualData = (_m.sent()).data;
+                individualData = (_l.sent()).data;
                 if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && !isKWOrSA(countryCode))) return [3, 7];
                 if (!business_id) return [3, 6];
                 return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
             case 5:
-                userList = _m.sent();
-                _m.label = 6;
+                userList = _l.sent();
+                _l.label = 6;
             case 6:
                 userList = userList === null || userList === void 0 ? void 0 : userList.filter(function (user) { return user.id === id; });
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
@@ -502,23 +504,23 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 if (!business_id) return [3, 9];
                 return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
             case 8:
-                userList = _m.sent();
-                _m.label = 9;
+                userList = _l.sent();
+                _l.label = 9;
             case 9:
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                 return [3, 13];
             case 10:
-                birthCountry = ((_j = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _j === void 0 ? void 0 : _j.country) || countryCode;
+                birthCountry = ((_h = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _h === void 0 ? void 0 : _h.country) || countryCode;
                 if (!birthCountry) return [3, 12];
                 return [4, thunkApi.dispatch(getCityList(birthCountry))];
             case 11:
-                _m.sent();
-                _m.label = 12;
+                _l.sent();
+                _l.label = 12;
             case 12:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                _m.label = 13;
+                _l.label = 13;
             case 13:
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, { otp: params.otp });
+                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, { otp: params.otp });
                 return [2, {
                         data: data,
                         countries: countries,
@@ -621,7 +623,8 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                             expiry: isExpiryNonEditable || !expiryDate ? undefined : new Date(expiryDate).getTime(),
                             type: isIdTypeNonEditable || !identification_id_type ? undefined : identification_id_type
                         }
-                    })), (!isDOBNonEditable && {
+                    })), (!isDOBNonEditable &&
+                        dob && {
                         date_of_birth: dob
                     })), (hasBirth &&
                         !(isBirthCityNonEditable && isBirthCountryNonEditable) && {
@@ -911,8 +914,8 @@ var initialState = {
             gender: IndividualGender.MALE,
             nid: '',
             issuedCountry: undefined,
-            expiryDate: '',
-            dob: '',
+            expiryDate: undefined,
+            dob: undefined,
             placeOfBirthCountry: undefined,
             placeOfBirthCity: undefined,
             nationality: undefined
@@ -1009,9 +1012,11 @@ export var individualSlice = createSlice({
             state.data.otpData.responseBody = data;
             state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { countries: countries, countryCode: countryCode, userList: userList });
         })
-            .addCase(verifyLeadOTP.rejected, function (state, action) {
+            .addCase(verifyLeadOTP.rejected, function (state, _a) {
+            var message = _a.error.message;
             state.loading = false;
-            state.error = action.error.message;
+            if (!isAuthenticationVerificationFailed(message))
+                state.error = message;
         })
             .addCase(addDetailsAsync.pending, function (state) {
             state.addOrRequestDetailLoading = true;