@tap-payments/auth-jsconnect 2.10.0-beta → 2.10.0-development

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

@@ -57,11 +57,11 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
-import { FlowsTypes, AuthForType, BusinessType, LicenseType } from '../../../@types';
+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_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 } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData, isNetworkError, isTimeoutError } 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) {
@@ -186,34 +186,29 @@ export var retrieveEntityListAsync = createAsyncThunk('connectExpress/retrieveEn
 export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/retrieveAuthenticationListAsync', function (_a) {
     var individualId = _a.individualId;
     return __awaiter(void 0, void 0, void 0, function () {
-        var brandList, entityList, brands, err_1, list, err_2;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var brandList, entityList, _b, brandResponse, entityResponse, err_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     brandList = undefined;
                     entityList = undefined;
-                    _b.label = 1;
+                    _c.label = 1;
                 case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4, API.brandService.getBrandList({ individual_id: individualId })];
+                    _c.trys.push([1, 3, , 4]);
+                    return [4, Promise.all([
+                            API.brandService.getBrandList({ individual_id: individualId }),
+                            API.entityService.getEntityListUsingIndividualId(individualId)
+                        ])];
                 case 2:
-                    brands = (_b.sent()).brands;
-                    brandList = brands;
+                    _b = _c.sent(), brandResponse = _b[0], entityResponse = _b[1];
+                    brandList = brandResponse.brands;
+                    entityList = entityResponse.list;
                     return [3, 4];
                 case 3:
-                    err_1 = _b.sent();
+                    err_1 = _c.sent();
+                    console.error('Error fetching data:', err_1);
                     return [3, 4];
-                case 4:
-                    _b.trys.push([4, 6, , 7]);
-                    return [4, API.entityService.getEntityListUsingIndividualId(individualId)];
-                case 5:
-                    list = (_b.sent()).list;
-                    entityList = list;
-                    return [3, 7];
-                case 6:
-                    err_2 = _b.sent();
-                    return [3, 7];
-                case 7: return [2, { brandList: brandList || [], entityList: entityList || [] }];
+                case 4: return [2, { brandList: brandList || [], entityList: entityList || [] }];
             }
         });
     });
@@ -346,7 +341,7 @@ export var createNafathAuth = createAsyncThunk('connectExpress/createNafathAuth'
     });
 }); });
 export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, expiry, interval, maxCalls, count, data, isSuccess, isFailed, authId, leadId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount, askDobInfo;
+    var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, expiry, interval, maxCalls, count, data, error_2, isSuccess, isFailed, authId, leadId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount, askDobInfo;
     var _d, _e, _f, _g, _h, _j, _k, _l;
     return __generator(this, function (_m) {
         switch (_m.label) {
@@ -364,20 +359,32 @@ export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsyn
                 count = 1;
                 _m.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 9];
+                if (!(count <= maxCalls)) return [3, 12];
                 if (thunkApi.signal.aborted) {
-                    return [3, 9];
+                    return [3, 12];
                 }
-                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token)];
+                data = undefined;
+                _m.label = 2;
             case 2:
+                _m.trys.push([2, 4, , 5]);
+                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token, { timeout: NAFATH_PACI_TIMEOUT_DURATION })];
+            case 3:
                 data = _m.sent();
-                isSuccess = ((_e = (_d = data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
-                isFailed = ((_g = (_f = data.auth) === null || _f === void 0 ? void 0 : _f.status) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'failed';
+                return [3, 5];
+            case 4:
+                error_2 = _m.sent();
+                if (!isNetworkError(error_2.message) && !isTimeoutError(error_2.message)) {
+                    throw new Error(error_2);
+                }
+                return [3, 5];
+            case 5:
+                isSuccess = ((_e = (_d = data === null || data === void 0 ? void 0 : data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
+                isFailed = ((_g = (_f = data === null || data === void 0 ? void 0 : data.auth) === null || _f === void 0 ? void 0 : _f.status) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'failed';
                 if (isFailed) {
                     (_h = params.onFailure) === null || _h === void 0 ? void 0 : _h.call(params);
                     return [2, { data: data }];
                 }
-                if (!isSuccess) return [3, 6];
+                if (!isSuccess) return [3, 9];
                 authId = (_j = data.auth) === null || _j === void 0 ? void 0 : _j.id;
                 leadId = (_k = data.auth) === null || _k === void 0 ? void 0 : _k.lead_id;
                 thunkApi.dispatch(storeAuthId(authId));
@@ -393,17 +400,18 @@ export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsyn
                         return [2, { data: data }];
                     }
                 }
-                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 4];
+                params.showLoadingScreenAfterNafathSuccess();
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 7];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
-            case 3:
+            case 6:
                 _c = _m.sent(), brandList = _c.brandList, entityList = _c.entityList;
                 if (brandList.length && entityList.length) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
                     return [2, { data: data }];
                 }
-                _m.label = 4;
-            case 4: return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
-            case 5:
+                _m.label = 7;
+            case 7: return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+            case 8:
                 _m.sent();
                 stepName = data.step_name;
                 needToCollectMoreInfo = stepName === 'collect_info';
@@ -420,14 +428,14 @@ export var verifyNafathAsync = createAsyncThunk('connectExpress/verifyNafathAsyn
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
                 }
                 return [2, { data: data, isNextScreenIsDob: askDobInfo }];
-            case 6: return [4, sleep(interval * 1000)];
-            case 7:
+            case 9: return [4, sleep(interval * 1000)];
+            case 10:
                 _m.sent();
-                _m.label = 8;
-            case 8:
+                _m.label = 11;
+            case 11:
                 count++;
                 return [3, 1];
-            case 9: throw new Error(NAFATH_VERIFICATION_FAILED);
+            case 12: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
@@ -536,7 +544,7 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
     });
 }); });
 export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, expiry, interval, maxCalls, count, data, isSuccess, authId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
+    var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, expiry, interval, maxCalls, count, data, error_3, isSuccess, authId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
     var _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -554,15 +562,27 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 count = 1;
                 _g.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 9];
+                if (!(count <= maxCalls)) return [3, 12];
                 if (thunkApi.signal.aborted) {
-                    return [3, 9];
+                    return [3, 12];
                 }
-                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token)];
+                data = undefined;
+                _g.label = 2;
             case 2:
+                _g.trys.push([2, 4, , 5]);
+                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token, { timeout: NAFATH_PACI_TIMEOUT_DURATION })];
+            case 3:
                 data = _g.sent();
-                isSuccess = ((_e = (_d = data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
-                if (!isSuccess) return [3, 6];
+                return [3, 5];
+            case 4:
+                error_3 = _g.sent();
+                if (!isNetworkError(error_3.message) && !isTimeoutError(error_3.message)) {
+                    throw new Error(error_3);
+                }
+                return [3, 5];
+            case 5:
+                isSuccess = ((_e = (_d = data === null || data === void 0 ? void 0 : data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
+                if (!isSuccess) return [3, 9];
                 authId = data.auth.id;
                 thunkApi.dispatch(storeAuthId(authId));
                 if (isScopeAuthentication && !data.new_user && isDataHasIndividualOnly && authId) {
@@ -577,17 +597,17 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                         return [2, data];
                     }
                 }
-                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 4];
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 7];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
-            case 3:
+            case 6:
                 _c = _g.sent(), brandList = _c.brandList, entityList = _c.entityList;
                 if (brandList.length && entityList.length) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
                     return [2, data];
                 }
-                _g.label = 4;
-            case 4: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
-            case 5:
+                _g.label = 7;
+            case 7: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+            case 8:
                 _g.sent();
                 stepName = data.step_name;
                 needToCollectMoreInfo = stepName === 'collect_info';
@@ -600,14 +620,14 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
                 }
                 return [2, data];
-            case 6: return [4, sleep(interval * 1000)];
-            case 7:
+            case 9: return [4, sleep(interval * 1000)];
+            case 10:
                 _g.sent();
-                _g.label = 8;
-            case 8:
+                _g.label = 11;
+            case 11:
                 count++;
                 return [3, 1];
-            case 9: throw new Error('paci_verification_failed');
+            case 12: throw new Error('paci_verification_failed');
         }
     });
 }); });
@@ -685,7 +705,7 @@ export var createNIDNafathAuthIdentityAsync = createAsyncThunk('connectExpress/c
     });
 }); });
 export var verifyNafathIdentityAsync = createAsyncThunk('connectExpress/verifyNafathIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, authData, expiry, interval, maxCalls, count, data, isSuccess, isFailed, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen;
+    var connectExpress, authData, expiry, interval, maxCalls, count, data, error_4, isSuccess, isFailed, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen;
     var _a, _b, _c, _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
@@ -698,22 +718,34 @@ export var verifyNafathIdentityAsync = createAsyncThunk('connectExpress/verifyNa
                 count = 1;
                 _h.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 7];
+                if (!(count <= maxCalls)) return [3, 10];
                 if (thunkApi.signal.aborted) {
-                    return [3, 7];
+                    return [3, 10];
                 }
-                return [4, API.authService.getExpressTokenVerify({ token: authData === null || authData === void 0 ? void 0 : authData.verify_token, leadId: authData === null || authData === void 0 ? void 0 : authData.lead_id })];
+                data = undefined;
+                _h.label = 2;
             case 2:
+                _h.trys.push([2, 4, , 5]);
+                return [4, API.authService.getExpressTokenVerify({ token: authData === null || authData === void 0 ? void 0 : authData.verify_token, leadId: authData === null || authData === void 0 ? void 0 : authData.lead_id }, { timeout: NAFATH_PACI_TIMEOUT_DURATION })];
+            case 3:
                 data = _h.sent();
-                isSuccess = ((_b = (_a = data.auth) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
-                isFailed = ((_d = (_c = data.auth) === null || _c === void 0 ? void 0 : _c.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'failed';
+                return [3, 5];
+            case 4:
+                error_4 = _h.sent();
+                if (!isNetworkError(error_4.message) && !isTimeoutError(error_4.message)) {
+                    throw new Error(error_4);
+                }
+                return [3, 5];
+            case 5:
+                isSuccess = ((_b = (_a = data === null || data === void 0 ? void 0 : data.auth) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
+                isFailed = ((_d = (_c = data === null || data === void 0 ? void 0 : data.auth) === null || _c === void 0 ? void 0 : _c.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'failed';
                 if (isFailed) {
                     (_e = params.onFailure) === null || _e === void 0 ? void 0 : _e.call(params);
                     return [2, { data: data }];
                 }
-                if (!isSuccess) return [3, 4];
+                if (!isSuccess) return [3, 7];
                 return [4, thunkApi.dispatch(getLeadByIdAsync((_f = data.auth) === null || _f === void 0 ? void 0 : _f.lead_id)).unwrap()];
-            case 3:
+            case 6:
                 _h.sent();
                 needToCollectMoreInfo = data.step_name === 'collect_info';
                 creatingAccount = data.step_name === 'create_account';
@@ -733,19 +765,19 @@ export var verifyNafathIdentityAsync = createAsyncThunk('connectExpress/verifyNa
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
                 }
                 return [2, { data: data, isNextScreenIsDob: askDobInfo }];
-            case 4: return [4, sleep(interval * 1000)];
-            case 5:
+            case 7: return [4, sleep(interval * 1000)];
+            case 8:
                 _h.sent();
-                _h.label = 6;
-            case 6:
+                _h.label = 9;
+            case 9:
                 count++;
                 return [3, 1];
-            case 7: throw new Error(NAFATH_VERIFICATION_FAILED);
+            case 10: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
 export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verifyPaciLeadIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, authData, expiry, interval, maxCalls, count, data, isSuccess, needToCollectMoreInfo, creatingAccount;
+    var connectExpress, authData, expiry, interval, maxCalls, count, data, error_5, isSuccess, needToCollectMoreInfo, creatingAccount;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -758,17 +790,29 @@ export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verify
                 count = 1;
                 _d.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 7];
+                if (!(count <= maxCalls)) return [3, 10];
                 if (thunkApi.signal.aborted) {
-                    return [3, 7];
+                    return [3, 10];
                 }
-                return [4, API.authService.getExpressTokenVerify({ token: authData === null || authData === void 0 ? void 0 : authData.verify_token, leadId: authData === null || authData === void 0 ? void 0 : authData.lead_id })];
+                data = undefined;
+                _d.label = 2;
             case 2:
+                _d.trys.push([2, 4, , 5]);
+                return [4, API.authService.getExpressTokenVerify({ token: authData === null || authData === void 0 ? void 0 : authData.verify_token, leadId: authData === null || authData === void 0 ? void 0 : authData.lead_id }, { timeout: NAFATH_PACI_TIMEOUT_DURATION })];
+            case 3:
                 data = _d.sent();
-                isSuccess = ((_b = (_a = data.auth) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
-                if (!isSuccess) return [3, 4];
+                return [3, 5];
+            case 4:
+                error_5 = _d.sent();
+                if (!isNetworkError(error_5.message) && !isTimeoutError(error_5.message)) {
+                    throw new Error(error_5);
+                }
+                return [3, 5];
+            case 5:
+                isSuccess = ((_b = (_a = data === null || data === void 0 ? void 0 : data.auth) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
+                if (!isSuccess) return [3, 7];
                 return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
-            case 3:
+            case 6:
                 _d.sent();
                 needToCollectMoreInfo = data.step_name === 'collect_info';
                 creatingAccount = data.step_name === 'create_account';
@@ -780,14 +824,14 @@ export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verify
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
                 }
                 return [2, data];
-            case 4: return [4, sleep(interval * 1000)];
-            case 5:
+            case 7: return [4, sleep(interval * 1000)];
+            case 8:
                 _d.sent();
-                _d.label = 6;
-            case 6:
+                _d.label = 9;
+            case 9:
                 count++;
                 return [3, 1];
-            case 7: throw new Error('nafath_verification_failed');
+            case 10: throw new Error('paci_verification_failed');
         }
     });
 }); });
@@ -844,10 +888,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;
@@ -861,12 +905,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,
@@ -878,8 +922,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',
@@ -895,22 +939,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');
@@ -981,7 +1044,7 @@ export var createEntity = createAsyncThunk('connectExpress/createEntity', functi
     });
 }); });
 export var updateLeadDOBAsync = createAsyncThunk('connectExpress/updateLeadDOBAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, id, dob, payload, data, needToCollectMoreInfo, creatingAccount;
+    var _a, settings, connectExpress, id, dob, payload, data, needToCollectMoreInfo, creatingAccount, verifyAuthMobile;
     var _b, _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -1001,6 +1064,10 @@ export var updateLeadDOBAsync = createAsyncThunk('connectExpress/updateLeadDOBAs
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 needToCollectMoreInfo = data.step_name === 'collect_info';
                 creatingAccount = data.step_name === 'create_account';
+                verifyAuthMobile = data.step_name === 'connect_express_auth_mobile';
+                if (verifyAuthMobile) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_VERIFY_AUTH_OTP_STEP')); });
+                }
                 if (creatingAccount) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
                 }
@@ -1014,7 +1081,7 @@ export var updateLeadDOBAsync = createAsyncThunk('connectExpress/updateLeadDOBAs
 export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLeadIndividualAsync', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, connectExpress, id, countryCode, name, email, mobile, phoneCountry, isContactAvailable, payload, data, needToCollectMoreInfo, creatingAccount, collectPhoneOwnershipScreen, isSaudi;
+        var _b, settings, connectExpress, id, countryCode, name, email, mobile, phoneCountry, isContactAvailable, payload, data, needToCollectMoreInfo, creatingAccount, collectPhoneOwnershipScreen, verifyAuthMobile, isSaudi;
         var _c, _d, _e, _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -1034,6 +1101,10 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
                     needToCollectMoreInfo = data.step_name === 'collect_info';
                     creatingAccount = data.step_name === 'create_account';
                     collectPhoneOwnershipScreen = data.step_name === CONNECT_EXPRESS_STEP_NAMES.COLLECT_MOBILE_OWNERSHIP;
+                    verifyAuthMobile = data.step_name === CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP;
+                    if (verifyAuthMobile) {
+                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_VERIFY_AUTH_OTP_STEP')); });
+                    }
                     if (collectPhoneOwnershipScreen) {
                         sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('COLLECT_MOBILE_OWNERSHIP')); });
                     }
@@ -1096,8 +1167,8 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
         });
     });
 });
-export var updateLeadMobile = createAsyncThunk('connect/updateLeadMobile', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, id, startWithNID, payload, leadResponse, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen;
+export var updateLeadMobile = createAsyncThunk('connectExpress/updateLeadMobile', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, id, startWithNID, payload, leadResponse, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen, verifyAuthMobile;
     var _b, _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -1124,9 +1195,13 @@ export var updateLeadMobile = createAsyncThunk('connect/updateLeadMobile', funct
                 creatingAccount = leadResponse.step_name === 'create_account';
                 askDobInfo = leadResponse.step_name === COLLECT_DOB_INFO_NAFATH;
                 collectPhoneOwnershipScreen = leadResponse.step_name === CONNECT_EXPRESS_STEP_NAMES.COLLECT_MOBILE_OWNERSHIP;
+                verifyAuthMobile = leadResponse.step_name === CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP;
                 if (collectPhoneOwnershipScreen) {
                     throw new Error("The new mobile number doesn't match the national ID, please update the mobile to the correct one");
                 }
+                if (verifyAuthMobile) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_VERIFY_AUTH_OTP_STEP')); });
+                }
                 if (askDobInfo) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP')); });
                 }
@@ -1150,8 +1225,8 @@ export var updateLeadMobile = createAsyncThunk('connect/updateLeadMobile', funct
         }
     });
 }); });
-export var skipUpdateLeadMobile = createAsyncThunk('connect/skipUpdateLeadMobile', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, id, startWithNID, payload, leadResponse, needToCollectMoreInfo, creatingAccount, askDobInfo;
+export var skipUpdateLeadMobile = createAsyncThunk('connectExpress/skipUpdateLeadMobile', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, id, startWithNID, payload, leadResponse, needToCollectMoreInfo, creatingAccount, askDobInfo, verifyAuthMobile;
     var _b, _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -1171,6 +1246,10 @@ export var skipUpdateLeadMobile = createAsyncThunk('connect/skipUpdateLeadMobile
                 needToCollectMoreInfo = leadResponse.step_name === 'collect_info';
                 creatingAccount = leadResponse.step_name === 'create_account';
                 askDobInfo = leadResponse.step_name === COLLECT_DOB_INFO_NAFATH;
+                verifyAuthMobile = leadResponse.step_name === CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP;
+                if (verifyAuthMobile) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_VERIFY_AUTH_OTP_STEP')); });
+                }
                 if (askDobInfo) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP')); });
                 }
@@ -1194,6 +1273,82 @@ export var skipUpdateLeadMobile = createAsyncThunk('connect/skipUpdateLeadMobile
         }
     });
 }); });
+export var verifyAuthMobileOtpAsync = createAsyncThunk('connectExpress/verifyAuthMobileOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, responseData, _b, verify_token, verification_by, payload, data, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen, isSaudi;
+    var _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                responseData = (connectExpress.data || {}).responseData;
+                if (!(responseData === null || responseData === void 0 ? void 0 : responseData.verifyAuthMobile))
+                    throw new Error('Auth data is missing');
+                _b = responseData.verifyAuthMobile, verify_token = _b.verify_token, verification_by = _b.verification_by;
+                payload = {
+                    verify_token: verify_token,
+                    data: params.otp,
+                    auth_type: 2,
+                    service_name: verification_by === null || verification_by === void 0 ? void 0 : verification_by.service_name,
+                    sign_in: false,
+                    step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_MOBILE_OTP,
+                    encryption_contract: ['data']
+                };
+                return [4, API.authService.verifyExpressLeadIdentity(payload)];
+            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);
+                needToCollectMoreInfo = data.step_name === 'collect_info';
+                creatingAccount = data.step_name === 'create_account';
+                askDobInfo = data.step_name === COLLECT_DOB_INFO_NAFATH;
+                collectPhoneOwnershipScreen = data.step_name === CONNECT_EXPRESS_STEP_NAMES.COLLECT_MOBILE_OWNERSHIP;
+                if (askDobInfo) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP')); });
+                }
+                if (creatingAccount) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
+                }
+                if (collectPhoneOwnershipScreen) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('COLLECT_MOBILE_OWNERSHIP')); });
+                }
+                if (!needToCollectMoreInfo) return [3, 4];
+                isSaudi = isSA(settings.data.businessCountry.iso2);
+                if (!isSaudi) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveEntityListAsync(data.lead.id)).unwrap()];
+            case 2:
+                _e.sent();
+                _e.label = 3;
+            case 3:
+                sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_BUSINESS_INFO_STEP')); });
+                _e.label = 4;
+            case 4: return [2, { data: data }];
+        }
+    });
+}); });
+export var resendLeadMobileAuthOTP = createAsyncThunk('connectExpress/resendLeadMobileAuthOTPExpress', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var connectExpress, payload, data;
+    var _a, _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
+            case 0:
+                connectExpress = thunkApi.getState().connectExpress;
+                payload = {
+                    id: ((_b = (_a = connectExpress.data.responseData) === null || _a === void 0 ? void 0 : _a.leadData) === null || _b === void 0 ? void 0 : _b.id) || '',
+                    contact: {
+                        phone: {
+                            country_code: (_e = (_d = (_c = connectExpress.data.individualData) === null || _c === void 0 ? void 0 : _c.countryCode) === null || _d === void 0 ? void 0 : _d.idd_prefix) === null || _e === void 0 ? void 0 : _e.toString(),
+                            number: ((_f = connectExpress.data.individualData) === null || _f === void 0 ? void 0 : _f.mobile) || ''
+                        }
+                    },
+                    step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_INDIVIDUAL,
+                    encryption_contract: ['contact.phone.country_code', 'contact.phone.number']
+                };
+                return [4, API.leadService.updateLeadExpress(payload)];
+            case 1:
+                data = _g.sent();
+                return [2, data];
+        }
+    });
+}); });
 export var confirmInfo = createAsyncThunk('connectExpress/confirmInfo', function (_a, thunkApi) {
     var brandInfo = _a.brandInfo, entityInfo = _a.entityInfo, merchantInfo = _a.merchantInfo;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -1318,6 +1473,10 @@ var initialState = {
             mobile: '',
             countryCode: defaultCountry
         },
+        verifyAuthOtpData: {
+            otp: '',
+            authFor: AuthForScreen.INDIVIDUAL
+        },
         businessData: {
             brandName: '',
             licenseNumber: '',
@@ -1373,6 +1532,9 @@ export var connectSlice = createSlice({
         resetOTPValue: function (state) {
             state.data.otpData.otp = '';
         },
+        resetVerifyAuthOTPValue: function (state) {
+            state.data.verifyAuthOtpData.otp = '';
+        },
         resetStore: function (state) {
             var _a;
             state.data = __assign(__assign({}, state.data), { responseData: { leadData: (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.leadData } });
@@ -1706,7 +1868,8 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             state.data.dobData = action.payload.formData;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { dobData: action.payload.response });
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { dobData: action.payload.response, verifyAuthMobile: action.payload.response });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.DOB;
         })
             .addCase(updateLeadDOBAsync.pending, function (state) {
             state.loading = true;
@@ -1722,7 +1885,8 @@ export var connectSlice = createSlice({
             state.error = null;
             var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
             state.data.individualData = action.payload.formData;
-            state.data.responseData = __assign(__assign(__assign({}, state.data.responseData), { individualData: action.payload.response }), (!((_b = (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.licenseList) === null || _b === void 0 ? void 0 : _b.length) && { licenseList: licenseList }));
+            state.data.responseData = __assign(__assign(__assign(__assign({}, state.data.responseData), { individualData: action.payload.response }), (!((_b = (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.licenseList) === null || _b === void 0 ? void 0 : _b.length) && { licenseList: licenseList })), { verifyAuthMobile: action.payload.response });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.INDIVIDUAL;
         })
             .addCase(updateLeadIndividualAsync.pending, function (state) {
             state.loading = true;
@@ -1750,7 +1914,8 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = null;
             state.data.individualData.mobile = action.payload.formData.mobile;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse });
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse, verifyAuthMobile: action.payload.leadResponse });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
         })
             .addCase(updateLeadMobile.pending, function (state) {
             state.loading = true;
@@ -1763,7 +1928,8 @@ export var connectSlice = createSlice({
             .addCase(skipUpdateLeadMobile.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse });
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.leadResponse, verifyAuthMobile: action.payload.leadResponse });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
         })
             .addCase(skipUpdateLeadMobile.pending, function (state) {
             state.loading = true;
@@ -1772,6 +1938,32 @@ export var connectSlice = createSlice({
             .addCase(skipUpdateLeadMobile.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(verifyAuthMobileOtpAsync.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { verifyAuthMobileOtp: action.payload.data });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
+        })
+            .addCase(verifyAuthMobileOtpAsync.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(verifyAuthMobileOtpAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(resendLeadMobileAuthOTP.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(resendLeadMobileAuthOTP.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(resendLeadMobileAuthOTP.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(createAccountAsync.pending, function (state) {
             state.loading = true;
@@ -1880,6 +2072,6 @@ export var connectSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode, storeIsStartFromBusinessCountry = _a.storeIsStartFromBusinessCountry, resetAuthenticationScreen = _a.resetAuthenticationScreen;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetVerifyAuthOTPValue = _a.resetVerifyAuthOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode, storeIsStartFromBusinessCountry = _a.storeIsStartFromBusinessCountry, resetAuthenticationScreen = _a.resetAuthenticationScreen;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };