@tap-payments/auth-jsconnect 2.7.9-test → 2.7.9

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, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, 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 } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA } 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) {
@@ -81,25 +81,25 @@ export var updateBusinessCountryAsync = createAsyncThunk('connectExpress/updateB
     });
 }); });
 export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retrieveLeadIdentityByIdAsync', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, countryCode, showBoard, data, _b, country_code, contact, phone, status, board_id, board_info_id, isRegistered, screen_1, _c, boardInfo, boardData, error_1;
-    var _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var settings, countryCode, showBoard, data, _a, country_code, contact, phone, status, board_id, board_info_id, isRegistered, screen_1, _b, boardInfo, boardData, error_1;
+    var _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
-                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                settings = thunkApi.getState().settings;
                 countryCode = settings.data.businessCountry;
-                showBoard = connectExpress.data.showBoard;
+                showBoard = settings.data.appConfig.showBoard;
                 return [4, API.leadService.retrieveLeadIdentity(leadId)];
             case 1:
-                data = _j.sent();
-                _b = data || {}, country_code = _b.country_code, contact = _b.contact;
+                data = _h.sent();
+                _a = data || {}, country_code = _a.country_code, contact = _a.contact;
                 if (country_code)
                     thunkApi.dispatch(handleSetCountryByIso2(country_code));
                 phone = (contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
                 status = data.status, board_id = data.board_id, board_info_id = data.board_info_id;
-                if (!country_code && !((_d = settings.data.businessCountry) === null || _d === void 0 ? void 0 : _d.iso2)) {
+                if (!country_code && !((_c = settings.data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2)) {
                     thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_BUSINESS_COUNTRY_STEP'));
                     return [2, { data: data, countryCode: countryCode }];
                 }
@@ -123,11 +123,11 @@ export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retr
                     thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_NID_STEP'));
                     return [2, { data: data, countryCode: countryCode }];
                 }
-                if ((_e = data === null || data === void 0 ? void 0 : data.identification) === null || _e === void 0 ? void 0 : _e.authentication_id) {
-                    thunkApi.dispatch(storeAuthId((_f = data === null || data === void 0 ? void 0 : data.identification) === null || _f === void 0 ? void 0 : _f.authentication_id));
+                if ((_d = data === null || data === void 0 ? void 0 : data.identification) === null || _d === void 0 ? void 0 : _d.authentication_id) {
+                    thunkApi.dispatch(storeAuthId((_e = data === null || data === void 0 ? void 0 : data.identification) === null || _e === void 0 ? void 0 : _e.authentication_id));
                 }
                 if (isRegistered && !showBoard) {
-                    (_h = (_g = settings.data.appConfig).onFlowCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, data);
+                    (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, data);
                     thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_ACCOUNT_ALREADY_CREATED_STEP'));
                     return [2, { data: data, countryCode: countryCode }];
                 }
@@ -136,19 +136,19 @@ export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retr
                     return [2, { data: data, countryCode: countryCode }];
                 }
                 if (!(isRegistered && board_id && board_info_id)) return [3, 5];
-                _j.label = 2;
+                _h.label = 2;
             case 2:
-                _j.trys.push([2, 4, , 5]);
+                _h.trys.push([2, 4, , 5]);
                 return [4, Promise.all([
                         API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
                         API.boardService.retrieveBoardDetails(board_id)
                     ])];
             case 3:
-                _c = _j.sent(), boardInfo = _c[0], boardData = _c[1];
+                _b = _h.sent(), boardInfo = _b[0], boardData = _b[1];
                 thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP'));
                 return [2, { data: data, countryCode: countryCode, boardInfo: boardInfo, boardData: boardData }];
             case 4:
-                error_1 = _j.sent();
+                error_1 = _h.sent();
                 thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_ACCOUNT_ALREADY_CREATED_STEP'));
                 return [2, { data: data, countryCode: countryCode }];
             case 5: return [2, { data: data, countryCode: countryCode }];
@@ -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 || [] }];
             }
         });
     });
@@ -221,24 +216,26 @@ export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/re
 export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (_a, thunkApi) {
     var brandInfo = _a.brandInfo, entityInfo = _a.entityInfo;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, connectExpress, platforms, payment_provider, payload, merchants, list;
-        var _c, _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _b, settings, connectExpress, leadId, platforms, payment_provider, payload, merchants, list;
+        var _c, _d, _e, _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, connectExpress = _b.connectExpress;
-                    platforms = (_e = (_d = (_c = connectExpress.data.responseData) === null || _c === void 0 ? void 0 : _c.leadData) === null || _d === void 0 ? void 0 : _d.platforms) !== null && _e !== void 0 ? _e : settings.data.appConfig.platforms;
-                    payment_provider = (_h = (_g = (_f = connectExpress.data.responseData) === null || _f === void 0 ? void 0 : _f.leadResponse) === null || _g === void 0 ? void 0 : _g.payment_provider) !== null && _h !== void 0 ? _h : settings.data.appConfig.paymentProvider;
+                    leadId = (_d = (_c = connectExpress.data.responseData) === null || _c === void 0 ? void 0 : _c.authData) === null || _d === void 0 ? void 0 : _d.lead_id;
+                    platforms = (_g = (_f = (_e = connectExpress.data.responseData) === null || _e === void 0 ? void 0 : _e.leadData) === null || _f === void 0 ? void 0 : _f.platforms) !== null && _g !== void 0 ? _g : settings.data.appConfig.platforms;
+                    payment_provider = (_k = (_j = (_h = connectExpress.data.responseData) === null || _h === void 0 ? void 0 : _h.leadData) === null || _j === void 0 ? void 0 : _j.payment_provider) !== null && _k !== void 0 ? _k : settings.data.appConfig.paymentProvider;
                     payload = {
                         business_entity_id: (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) || '',
                         brand_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id) || '',
+                        lead_id: leadId || '',
                         create_if_not_present: true,
                         platforms: platforms,
                         payment_provider: payment_provider
                     };
                     return [4, API.entityService.getMerchantListUsingEntityId(payload)];
                 case 1:
-                    merchants = (_j.sent()).merchants;
+                    merchants = (_l.sent()).merchants;
                     list = merchants || [];
                     if ((list === null || list === void 0 ? void 0 : list.length) > 1) {
                         thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTH_MERCHANT_LIST_STEP'));
@@ -251,19 +248,21 @@ export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantLi
     });
 });
 export var createMobileAuthAsync = createAsyncThunk('connectExpress/createMobileAuthAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, requestBody, data;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var _a, settings, connectExpress, isStartWithZero, mobileNumber, requestBody, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                isStartWithZero = (_b = params.mobile) === null || _b === void 0 ? void 0 : _b.startsWith('0');
+                mobileNumber = isStartWithZero ? params.mobile.slice(1) : params.mobile;
                 requestBody = {
                     country: settings.data.businessCountry.iso2,
                     scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     lead_id: connectExpress.data.leadId,
                     user_credentail: {
-                        phone: params.mobile,
+                        phone: mobileNumber,
                         code: params.countryCode.idd_prefix.toString()
                     },
                     sign_in: false,
@@ -273,26 +272,29 @@ export var createMobileAuthAsync = createAsyncThunk('connectExpress/createMobile
                 };
                 return [4, API.authService.createExpressAuth(requestBody)];
             case 1:
-                data = _d.sent();
+                data = _e.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody.user_credentail);
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody.user_credentail);
                 return [2, { response: data, formData: params }];
         }
     });
 }); });
 export var resendMobileAuthOTP = createAsyncThunk('connectExpress/resendMobileAuthOTPExpress', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, requestBody, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, settings, connectExpress, isStartWithZero, mobileNumber, requestBody, data;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                isStartWithZero = (_b = params.mobile) === null || _b === void 0 ? void 0 : _b.startsWith('0');
+                mobileNumber = isStartWithZero ? params.mobile.slice(1) : params.mobile;
                 requestBody = {
                     country: settings.data.businessCountry.iso2,
                     scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     lead_id: connectExpress.data.leadId,
                     user_credentail: {
-                        phone: params.mobile,
+                        phone: mobileNumber,
                         code: params.countryCode.idd_prefix.toString()
                     },
                     sign_in: false,
@@ -302,85 +304,138 @@ export var resendMobileAuthOTP = createAsyncThunk('connectExpress/resendMobileAu
                 };
                 return [4, API.authService.createExpressAuth(requestBody)];
             case 1:
-                data = _b.sent();
+                data = _c.sent();
                 return [2, { response: data, formData: params }];
         }
     });
 }); });
-export var createNIDAuthAsync = createAsyncThunk('connectExpress/createNIDAuthAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, dob, nid, nidType, countryCode, requestBody, data;
+export var createNafathAuth = createAsyncThunk('connectExpress/createNafathAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, requestBody, data;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                dob = params.dob, nid = params.nid;
-                nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
-                countryCode = settings.data.businessCountry.iso2;
                 requestBody = {
-                    country: countryCode,
+                    country: settings.data.businessCountry.iso2,
                     scope: settings.data.appConfig.scope,
                     lang: settings.data.language,
                     lead_id: connectExpress.data.leadId,
                     user_credentail: {
-                        identification_id: nid,
-                        identification_id_type: nidType,
-                        date_of_birth: dob,
-                        country_code: countryCode
+                        identification_id: params.nid,
+                        identification_id_type: IDENTIFICATION_TYPE.NAFATH,
+                        country_code: settings.data.businessCountry.iso2
                     },
                     sign_in: false,
                     is_lead: true,
                     step_name: CONNECT_EXPRESS_STEP_NAMES.CREATE_AUTH_NID,
-                    encryption_contract: [
-                        'user_credentail.country_code',
-                        'user_credentail.identification_id',
-                        'user_credentail.identification_id_type',
-                        'user_credentail.date_of_birth'
-                    ]
+                    encryption_contract: ['user_credentail.country_code', 'user_credentail.identification_id', 'user_credentail.identification_id_type']
                 };
-                return [4, API.authService.createExpressAuth(requestBody)];
+                return [4, API.authService.createAuthKitNID(requestBody)];
             case 1:
                 data = _d.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody.user_credentail);
-                return [2, { response: data, formData: params }];
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody);
+                return [2, { response: data, formData: __assign(__assign({}, params), { type: IDENTIFICATION_TYPE.NAFATH }) }];
         }
     });
 }); });
-export var resendNIDAuthOTP = createAsyncThunk('connectExpress/resendNIDAuthOTPExpress', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, dob, nid, nidType, countryCode, requestBody, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+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, 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) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                dob = params.dob, nid = params.nid;
-                nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
-                countryCode = settings.data.businessCountry.iso2;
-                requestBody = {
-                    country: countryCode,
-                    scope: settings.data.appConfig.scope,
-                    lang: settings.data.language,
-                    lead_id: connectExpress.data.leadId,
-                    user_credentail: {
-                        identification_id: nid,
-                        identification_id_type: nidType,
-                        date_of_birth: dob,
-                        country_code: countryCode
-                    },
-                    sign_in: false,
-                    is_lead: true,
-                    step_name: CONNECT_EXPRESS_STEP_NAMES.CREATE_AUTH_NID,
-                    encryption_contract: [
-                        'user_credentail.country_code',
-                        'user_credentail.identification_id',
-                        'user_credentail.identification_id_type',
-                        'user_credentail.date_of_birth'
-                    ]
-                };
-                return [4, API.authService.createExpressAuth(requestBody)];
+                authData = (connectExpress.data.responseData || {}).authData;
+                _b = settings.data.appConfig, scope = _b.scope, redirectUrl = _b.redirectUrl, authConfigData = _b.data;
+                isScopeAuthentication = scope === SCOPE_AUTH;
+                bi = settings.data.deviceInfo.browser.browser_id;
+                isDataHasIndividualOnly = (authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length) === 1 && authConfigData.includes('individual');
+                authDataHasValue = authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length;
+                expiry = (authData === null || authData === void 0 ? void 0 : authData.expiry) || 120;
+                interval = 3;
+                maxCalls = Math.floor(expiry / interval);
+                count = 1;
+                _m.label = 1;
             case 1:
-                data = _b.sent();
-                return [2, { response: data, formData: params }];
+                if (!(count <= maxCalls)) return [3, 12];
+                if (thunkApi.signal.aborted) {
+                    return [3, 12];
+                }
+                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();
+                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, 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));
+                if (isScopeAuthentication && !data.new_user && isDataHasIndividualOnly && authId) {
+                    if (settings.data.appConfig.mode === 'popup') {
+                        settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
+                        thunkApi.dispatch(handleOpen(false));
+                        return [2, { data: data }];
+                    }
+                    if (redirectUrl) {
+                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                        return [2, { data: data }];
+                    }
+                }
+                params.showLoadingScreenAfterNafathSuccess();
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 7];
+                return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
+            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 = 7;
+            case 7: return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+            case 8:
+                _m.sent();
+                stepName = data.step_name;
+                needToCollectMoreInfo = stepName === 'collect_info';
+                creatingAccount = stepName === 'create_account';
+                askDobInfo = stepName === COLLECT_DOB_INFO_NAFATH;
+                (_l = params.onSuccess) === null || _l === void 0 ? void 0 : _l.call(params);
+                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 (needToCollectMoreInfo) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
+                }
+                return [2, { data: data, isNextScreenIsDob: askDobInfo }];
+            case 9: return [4, sleep(interval * 1000)];
+            case 10:
+                _m.sent();
+                _m.label = 11;
+            case 11:
+                count++;
+                return [3, 1];
+            case 12: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
@@ -417,7 +472,7 @@ export var createCivilIdAuthAsync = createAsyncThunk('connectExpress/createCivil
     });
 }); });
 export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasIndividualOnly, payload, data, authId, urlQueryStart, _e, brandList, entityList, isKuwait, next;
+    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, mobileData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, payload, data, authId, urlQueryStart, _e, brandList, entityList, isKuwait, next;
     var _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
@@ -431,6 +486,7 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                 isScopeAuthentication = scope === SCOPE_AUTH;
                 bi = settings.data.deviceInfo.browser.browser_id;
                 isDataHasIndividualOnly = (authData === null || authData === void 0 ? void 0 : authData.length) === 1 && authData.includes('individual');
+                authDataHasValue = authData === null || authData === void 0 ? void 0 : authData.length;
                 payload = {
                     auth_token: auth_token,
                     lead_id: leadId,
@@ -446,6 +502,11 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                 return [4, API.authService.verifyExpressAuth(payload)];
             case 1:
                 data = _h.sent();
+                sendCustomEventToGTM({
+                    event: 'Send Event',
+                    event_category: 'User Registration Flow',
+                    event_action: 'First OTP Success'
+                });
                 (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
                 authId = data.auth.id;
                 thunkApi.dispatch(storeAuthId(authId));
@@ -461,7 +522,7 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                         return [2, data];
                     }
                 }
-                if (!(isScopeAuthentication && !data.new_user && !isDataHasIndividualOnly)) return [3, 3];
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
             case 2:
                 _e = _h.sent(), brandList = _e.brandList, entityList = _e.entityList;
@@ -482,78 +543,8 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
         }
     });
 }); });
-export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, isLeadIdPassed, nidData, _c, auth_token, device_token, service_name, _d, scope, redirectUrl, authData, isScopeAuthentication, bi, isDataHasIndividualOnly, payload, data, authId, urlQueryStart, _e, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
-    var _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId, isLeadIdPassed = _b.isLeadIdPassed, nidData = _b.nidData;
-                if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
-                    throw new Error('Auth data is missing');
-                _c = responseData.authData, auth_token = _c.auth_token, device_token = _c.device_token, service_name = _c.service_name;
-                _d = settings.data.appConfig, scope = _d.scope, redirectUrl = _d.redirectUrl, authData = _d.data;
-                isScopeAuthentication = scope === SCOPE_AUTH;
-                bi = settings.data.deviceInfo.browser.browser_id;
-                isDataHasIndividualOnly = (authData === null || authData === void 0 ? void 0 : authData.length) === 1 && authData.includes('individual');
-                payload = {
-                    auth_token: auth_token,
-                    lead_id: leadId,
-                    data: params.otp,
-                    auth_type: 2,
-                    device_token: device_token,
-                    service_name: service_name || 'ABSHER',
-                    sign_in: false,
-                    terms: isLeadIdPassed && nidData.termAndConditionChecked ? ['general'] : undefined,
-                    step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_AUTH_NID,
-                    encryption_contract: ['data']
-                };
-                return [4, API.authService.verifyExpressAuth(payload)];
-            case 1:
-                data = _h.sent();
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
-                authId = data.auth.id;
-                thunkApi.dispatch(storeAuthId(authId));
-                if (isScopeAuthentication && !data.new_user && isDataHasIndividualOnly && authId) {
-                    if (settings.data.appConfig.mode === 'popup') {
-                        settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
-                        thunkApi.dispatch(handleOpen(false));
-                        return [2, data];
-                    }
-                    if (redirectUrl) {
-                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
-                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
-                        return [2, data];
-                    }
-                }
-                if (!(isScopeAuthentication && !data.new_user && !isDataHasIndividualOnly)) return [3, 3];
-                return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
-            case 2:
-                _e = _h.sent(), brandList = _e.brandList, entityList = _e.entityList;
-                if (brandList.length && entityList.length) {
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
-                    return [2, data];
-                }
-                _h.label = 3;
-            case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
-            case 4:
-                _h.sent();
-                stepName = data.step_name;
-                needToCollectMoreInfo = stepName === 'collect_info';
-                creatingAccount = stepName === 'create_account';
-                if (creatingAccount) {
-                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
-                }
-                if (needToCollectMoreInfo) {
-                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
-                }
-                return [2, data];
-        }
-    });
-}); });
 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, 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) {
@@ -563,22 +554,35 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 _b = settings.data.appConfig, scope = _b.scope, redirectUrl = _b.redirectUrl, authConfigData = _b.data;
                 isScopeAuthentication = scope === SCOPE_AUTH;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                isDataHasIndividualOnly = (authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length) === 1 && authData.includes('individual');
+                isDataHasIndividualOnly = (authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length) === 1 && authConfigData.includes('individual');
+                authDataHasValue = authConfigData === null || authConfigData === void 0 ? void 0 : authConfigData.length;
                 expiry = (authData === null || authData === void 0 ? void 0 : authData.expiry) || 120;
                 interval = 3;
                 maxCalls = Math.floor(expiry / interval);
                 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) {
@@ -593,17 +597,17 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                         return [2, data];
                     }
                 }
-                if (!(isScopeAuthentication && !data.new_user && !isDataHasIndividualOnly)) 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';
@@ -616,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');
         }
     });
 }); });
@@ -655,28 +659,29 @@ export var createCivilIDAuthIdentityAsync = createAsyncThunk('connectExpress/cre
         }
     });
 }); });
-export var createNIDAuthIdentityAsync = createAsyncThunk('connectExpress/createNIDAuthIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, dob, nid, nidType, countryCode, requestBody, data;
+export var createNIDNafathAuthIdentityAsync = createAsyncThunk('connectExpress/createNIDNafathAuthIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, nid, dob, nidType, countryCode, authData, requestBody, data;
     var _b, _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                dob = params.dob, nid = params.nid;
-                nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                nid = params.nid, dob = params.dob;
+                nidType = IDENTIFICATION_TYPE.NAFATH;
                 countryCode = settings.data.businessCountry.iso2;
                 if (isOtherThanKWOrSA(countryCode)) {
                     nidType = IDENTIFICATION_TYPE.NID;
                 }
+                authData = (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.authData;
                 requestBody = {
-                    id: (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.authData.lead_id,
+                    id: authData === null || authData === void 0 ? void 0 : authData.lead_id,
                     identification: {
                         id: nid,
                         issued_country_code: countryCode,
                         type: nidType
                     },
+                    date_of_birth: nidType === IDENTIFICATION_TYPE.NAFATH ? undefined : dob,
                     country_code: countryCode,
-                    date_of_birth: dob,
                     step_name: CONNECT_EXPRESS_STEP_NAMES.IDENTITY_AUTH,
                     encryption_contract: ['identification.issued_country_code', 'identification.id', 'identification.type', 'date_of_birth']
                 };
@@ -684,7 +689,7 @@ export var createNIDAuthIdentityAsync = createAsyncThunk('connectExpress/createN
             case 1:
                 data = _e.sent();
                 if (!((data === null || data === void 0 ? void 0 : data.verify_token) !== 'null')) return [3, 2];
-                thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_OTP_IDENTITY_STEP'));
+                thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_IDENTITY_VERIFY_NAFATH_STEP'));
                 return [3, 4];
             case 2:
                 if (!isOtherThanKWOrSA(countryCode)) return [3, 4];
@@ -694,84 +699,85 @@ export var createNIDAuthIdentityAsync = createAsyncThunk('connectExpress/createN
                 thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP'));
                 _e.label = 4;
             case 4:
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody.identification);
-                return [2, { response: { verify_token: data.verify_token }, formData: params }];
-        }
-    });
-}); });
-export var resendNIDAuthIdentityOTP = createAsyncThunk('connectExpress/resendNIDAuthIdentityOTPExpress', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, dob, nid, nidType, countryCode, requestBody, data;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                dob = params.dob, nid = params.nid;
-                nidType = nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
-                countryCode = settings.data.businessCountry.iso2;
-                if (isOtherThanKWOrSA(countryCode)) {
-                    nidType = IDENTIFICATION_TYPE.NID;
-                }
-                requestBody = {
-                    id: (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.authData.lead_id,
-                    identification: {
-                        id: nid,
-                        issued_country_code: countryCode,
-                        type: nidType
-                    },
-                    country_code: countryCode,
-                    date_of_birth: dob,
-                    step_name: CONNECT_EXPRESS_STEP_NAMES.IDENTITY_AUTH,
-                    encryption_contract: ['identification.issued_country_code', 'identification.id', 'identification.type', 'date_of_birth']
-                };
-                return [4, API.leadService.updateLead(requestBody)];
-            case 1:
-                data = _c.sent();
-                return [2, { response: { verify_token: data.verify_token }, formData: params }];
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
+                return [2, { response: { random: data.random, expiry: data.expiry, verify_token: data.verify_token }, formData: params }];
         }
     });
 }); });
-export var verifyNIDOtpLeadIdentityAsync = createAsyncThunk('connectExpress/verifyNIDOtpLeadIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, _b, responseData, leadId, verify_token, payload, data, needToCollectMoreInfo, creatingAccount;
-    var _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+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, error_4, isSuccess, isFailed, needToCollectMoreInfo, creatingAccount, askDobInfo, collectPhoneOwnershipScreen;
+    var _a, _b, _c, _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
-                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
-                _b = connectExpress.data || {}, responseData = _b.responseData, leadId = _b.leadId;
-                if (!(responseData === null || responseData === void 0 ? void 0 : responseData.authData))
-                    throw new Error('Auth data is missing');
-                verify_token = responseData.authData.verify_token;
-                payload = {
-                    verify_token: verify_token,
-                    lead_id: leadId,
-                    data: params.otp,
-                    service_name: 'absher',
-                    sign_in: false,
-                    step_name: CONNECT_EXPRESS_STEP_NAMES.VERIFY_IDENTITY_AUTH,
-                    encryption_contract: ['data']
-                };
-                return [4, API.authService.verifyExpressLeadIdentity(payload)];
+                connectExpress = thunkApi.getState().connectExpress;
+                authData = (connectExpress.data.responseData || {}).authData;
+                expiry = (authData === null || authData === void 0 ? void 0 : authData.expiry) || 120;
+                interval = 3;
+                maxCalls = Math.floor(expiry / interval);
+                count = 1;
+                _h.label = 1;
             case 1:
-                data = _e.sent();
-                return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+                if (!(count <= maxCalls)) return [3, 10];
+                if (thunkApi.signal.aborted) {
+                    return [3, 10];
+                }
+                data = undefined;
+                _h.label = 2;
             case 2:
-                _e.sent();
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                _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();
+                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, 7];
+                return [4, thunkApi.dispatch(getLeadByIdAsync((_f = data.auth) === null || _f === void 0 ? void 0 : _f.lead_id)).unwrap()];
+            case 6:
+                _h.sent();
                 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;
+                (_g = params.onSuccess) === null || _g === void 0 ? void 0 : _g.call(params);
+                if (collectPhoneOwnershipScreen) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('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 (needToCollectMoreInfo) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
                 }
-                return [2, data];
+                return [2, { data: data, isNextScreenIsDob: askDobInfo }];
+            case 7: return [4, sleep(interval * 1000)];
+            case 8:
+                _h.sent();
+                _h.label = 9;
+            case 9:
+                count++;
+                return [3, 1];
+            case 10: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
-export var verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verifyPaciOtpLeadIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, authData, expiry, interval, maxCalls, count, data, isSuccess, needToCollectMoreInfo, creatingAccount;
+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, error_5, isSuccess, needToCollectMoreInfo, creatingAccount;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -784,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';
@@ -806,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('paci_verification_failed');
+            case 10: throw new Error('nafath_verification_failed');
         }
     });
 }); });
@@ -867,53 +885,113 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
         });
     });
 });
-export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connectExpress, settings, _b, responseData, showBoard, _c, postURL, scope, redirectUrl, mode, platforms, payment_provider, authId, bi, body, data, leadData, board_id, board_info_id, _d, boardInfo, boardData, urlQueryStart;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-    return __generator(this, function (_u) {
-        switch (_u.label) {
+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) {
+                case 0:
+                    _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
+                    responseData = connectExpress.data.responseData;
+                    _c = settings.data.appConfig, postURL = _c.postURL, scope = _c.scope, redirectUrl = _c.redirectUrl, mode = _c.mode, showBoard = _c.showBoard, notification = _c.notification;
+                    platforms = (_e = (_d = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _d === void 0 ? void 0 : _d.platforms) !== null && _e !== void 0 ? _e : settings.data.appConfig.platforms;
+                    payment_provider = (_g = (_f = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _f === void 0 ? void 0 : _f.payment_provider) !== null && _g !== void 0 ? _g : settings.data.appConfig.paymentProvider;
+                    leadId = (_h = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _h === void 0 ? void 0 : _h.id;
+                    authId = (_k = (_j = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _j === void 0 ? void 0 : _j.auth) === null || _k === void 0 ? void 0 : _k.id;
+                    bi = settings.data.deviceInfo.browser.browser_id;
+                    accountData = undefined;
+                    if (!isRetry) return [3, 2];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+                case 1:
+                    data = (_v.sent()).data;
+                    if (data === null || data === void 0 ? void 0 : data.board_id) {
+                        leadData = data;
+                        accountData = data;
+                    }
+                    _v.label = 2;
+                case 2:
+                    body = {
+                        lead_id: leadId,
+                        post_url: scope === SCOPE_AUTH ? '' : postURL || '',
+                        platforms: platforms,
+                        payment_provider: payment_provider,
+                        notification: notification
+                    };
+                    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;
+                case 4:
+                    sendCustomEventToGTM({
+                        event: 'Send Event',
+                        event_category: 'User Registration Flow',
+                        event_action: 'Registration Completed',
+                        event_label: 'Product Type',
+                        event_value: leadId
+                    });
+                    sendCustomDimension({
+                        event: 'PageView',
+                        lead_ID: leadId
+                    });
+                    (_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 (!!(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;
+                    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 }))];
+                case 7:
+                    _v.sent();
+                    return [2, { accountData: accountData }];
+                case 8:
+                    if (redirectUrl && mode === 'page') {
+                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                        return [2, { accountData: accountData }];
+                    }
+                    thunkApi.dispatch(handleOpen(false));
+                    return [2];
+            }
+        });
+    });
+});
+export var retrieveDetailsAfterCreateAccountAsync = createAsyncThunk('connectExpress/retrieveDetailsAfterCreateAccountAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var connectExpress, _a, accountData, leadData, leadResData, data, board_id, board_info_id, _b, boardInfo, boardData;
+    var _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
-                _a = thunkApi.getState(), connectExpress = _a.connectExpress, settings = _a.settings;
-                _b = connectExpress.data, responseData = _b.responseData, showBoard = _b.showBoard;
-                _c = settings.data.appConfig, postURL = _c.postURL, scope = _c.scope, redirectUrl = _c.redirectUrl, mode = _c.mode;
-                platforms = (_f = (_e = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _e === void 0 ? void 0 : _e.platforms) !== null && _f !== void 0 ? _f : settings.data.appConfig.platforms;
-                payment_provider = (_h = (_g = responseData === null || responseData === void 0 ? void 0 : responseData.leadResponse) === null || _g === void 0 ? void 0 : _g.payment_provider) !== null && _h !== void 0 ? _h : settings.data.appConfig.paymentProvider;
-                authId = (_k = (_j = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _j === void 0 ? void 0 : _j.auth) === null || _k === void 0 ? void 0 : _k.id;
-                bi = settings.data.deviceInfo.browser.browser_id;
-                body = {
-                    lead_id: responseData === null || responseData === void 0 ? void 0 : responseData.leadData.id,
-                    post_url: scope === SCOPE_AUTH ? '' : postURL || '',
-                    platforms: platforms,
-                    payment_provider: payment_provider
-                };
-                return [4, API.accountService.expressCreateAccount(body)];
+                connectExpress = thunkApi.getState().connectExpress;
+                _a = connectExpress.data.responseData || {}, accountData = _a.accountData, leadData = _a.leadData;
+                leadResData = undefined;
+                if (!!(leadData === null || leadData === void 0 ? void 0 : leadData.board_id)) return [3, 2];
+                return [4, thunkApi.dispatch(getLeadByIdAsync(leadData === null || leadData === void 0 ? void 0 : leadData.id)).unwrap()];
             case 1:
-                data = _u.sent();
-                (_m = (_l = settings.data.appConfig).onCreated) === null || _m === void 0 ? void 0 : _m.call(_l, data);
-                (_p = (_o = settings.data.appConfig).onFlowCompleted) === null || _p === void 0 ? void 0 : _p.call(_o, data);
-                (_r = (_q = settings.data.appConfig).onStepCompleted) === null || _r === void 0 ? void 0 : _r.call(_q, settings.data.activeScreen.name, data);
-                if (!showBoard) return [3, 4];
-                return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+                data = (_e.sent()).data;
+                leadResData = data;
+                _e.label = 2;
             case 2:
-                leadData = (_u.sent()).data;
-                board_id = (_s = data.board_id) !== null && _s !== void 0 ? _s : leadData.board_id;
-                board_info_id = (_t = data.board_info_id) !== null && _t !== void 0 ? _t : leadData.board_info_id;
+                board_id = (_c = accountData === null || accountData === void 0 ? void 0 : accountData.board_id) !== null && _c !== void 0 ? _c : leadResData === null || leadResData === void 0 ? void 0 : leadResData.board_id;
+                board_info_id = (_d = accountData === null || accountData === void 0 ? void 0 : accountData.board_info_id) !== null && _d !== void 0 ? _d : leadResData === null || leadResData === void 0 ? void 0 : leadResData.board_info_id;
                 return [4, Promise.all([
                         API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
                         API.boardService.retrieveBoardDetails(board_id)
                     ])];
             case 3:
-                _d = _u.sent(), boardInfo = _d[0], boardData = _d[1];
+                _b = _e.sent(), boardInfo = _b[0], boardData = _b[1];
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                return [2, { boardInfo: boardInfo, boardData: boardData, account: data }];
-            case 4:
-                if (redirectUrl && mode === 'page') {
-                    urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
-                    window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
-                    return [2, { account: data }];
-                }
-                thunkApi.dispatch(handleOpen(false));
-                return [2];
+                return [2, { boardInfo: boardInfo, boardData: boardData }];
         }
     });
 }); });
@@ -946,10 +1024,45 @@ 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, verifyAuthMobile;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                id = (((_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) || {}).id;
+                dob = params.dob;
+                payload = {
+                    id: id || '',
+                    date_of_birth: dob,
+                    step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_DOB,
+                    encryption_contract: ['date_of_birth']
+                };
+                return [4, API.leadService.updateLeadExpress(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';
+                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')); });
+                }
+                if (needToCollectMoreInfo) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
+                }
+                return [2, { response: data, formData: params }];
+        }
+    });
+}); });
 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, 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) {
@@ -961,13 +1074,21 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
                     isContactAvailable = email || mobile;
                     payload = __assign(__assign({ id: id || '', country_code: (_e = settings.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2, name: getIndividualName(name) }, (isContactAvailable && {
                         contact: __assign({ email: email }, (mobile && { phone: { country_code: phoneCountry, number: mobile } }))
-                    })), { step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_INDIVIDUAL, encryption_contract: ['name.first', 'name.middle', 'name.last', 'contact.email', 'contact.phone.country_code', 'contact.phone.number'] });
+                    })), { metadata: getMetaData(), step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_INDIVIDUAL, encryption_contract: ['name.first', 'name.middle', 'name.last', 'contact.email', 'contact.phone.country_code', 'contact.phone.number'] });
                     return [4, API.leadService.updateLeadExpress(payload)];
                 case 1:
                     data = _h.sent();
                     (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, formData);
                     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')); });
+                    }
                     if (creatingAccount) {
                         sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
                     }
@@ -1027,19 +1148,203 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
         });
     });
 });
+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) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                id = (((_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) || {}).id;
+                startWithNID = connectExpress.data.otpData.authFor === AuthForType.NATIONAL_ID;
+                payload = {
+                    id: id || '',
+                    contact: {
+                        phone: {
+                            country_code: params.countryCode.idd_prefix.toString(),
+                            number: params.mobile
+                        }
+                    },
+                    step_name: CONNECT_EXPRESS_STEP_NAMES.COLLECT_MOBILE_OWNERSHIP,
+                    encryption_contract: ['contact.phone.country_code', 'contact.phone.number']
+                };
+                return [4, API.leadService.updateLeadExpress(payload)];
+            case 1:
+                leadResponse = _e.sent();
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                needToCollectMoreInfo = leadResponse.step_name === 'collect_info';
+                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')); });
+                }
+                if (creatingAccount) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
+                }
+                if (!needToCollectMoreInfo) return [3, 5];
+                if (!startWithNID) return [3, 4];
+                if (!isSA(settings.data.businessCountry.iso2)) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveEntityListAsync(leadResponse.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')); });
+                return [3, 5];
+            case 4:
+                sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
+                _e.label = 5;
+            case 5: return [2, { leadResponse: leadResponse, formData: params }];
+        }
+    });
+}); });
+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) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
+                id = (((_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) || {}).id;
+                startWithNID = connectExpress.data.otpData.authFor === AuthForType.NATIONAL_ID;
+                payload = {
+                    id: id || '',
+                    step_name: CONNECT_EXPRESS_STEP_NAMES.COLLECT_MOBILE_OWNERSHIP_SKIPPED,
+                    encryption_contract: []
+                };
+                return [4, API.leadService.updateLeadExpress(payload)];
+            case 1:
+                leadResponse = _e.sent();
+                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, {});
+                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')); });
+                }
+                if (creatingAccount) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
+                }
+                if (!needToCollectMoreInfo) return [3, 5];
+                if (!startWithNID) return [3, 4];
+                if (!isSA(settings.data.businessCountry.iso2)) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveEntityListAsync(leadResponse.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')); });
+                return [3, 5];
+            case 4:
+                sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP')); });
+                _e.label = 5;
+            case 5: return [2, { leadResponse: leadResponse }];
+        }
+    });
+}); });
+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 () {
-        var _b, connectExpress, settings, responseData, _c, postURL, redirectUrl, bi, authId, body, data, urlQueryStart;
-        var _d, _e, _f, _g;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var _b, connectExpress, settings, responseData, _c, appConfig, deviceInfo, activeScreen, postURL, redirectUrl, showBoard, bi, authId, leadId, body, data, _d, board_id, board_info_id, _e, boardInfo, boardData, urlQueryStart;
+        var _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
                     responseData = connectExpress.data.responseData;
-                    _c = settings.data.appConfig, postURL = _c.postURL, redirectUrl = _c.redirectUrl;
-                    bi = settings.data.deviceInfo.browser.browser_id;
-                    authId = (_e = (_d = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _d === void 0 ? void 0 : _d.auth) === null || _e === void 0 ? void 0 : _e.id;
+                    _c = settings.data, appConfig = _c.appConfig, deviceInfo = _c.deviceInfo, activeScreen = _c.activeScreen;
+                    postURL = appConfig.postURL, redirectUrl = appConfig.redirectUrl, showBoard = appConfig.showBoard;
+                    bi = deviceInfo.browser.browser_id;
+                    authId = (_g = (_f = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _f === void 0 ? void 0 : _f.auth) === null || _g === void 0 ? void 0 : _g.id;
+                    leadId = (_j = (_h = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _h === void 0 ? void 0 : _h.lead) === null || _j === void 0 ? void 0 : _j.id;
                     body = {
                         post_url: postURL || '',
                         authentication_id: authId,
@@ -1047,14 +1352,28 @@ export var confirmInfo = createAsyncThunk('connectExpress/confirmInfo', function
                         brand_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id) || '',
                         merchant_id: (merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.id) || '',
                         entity_id: (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) || '',
-                        data: settings.data.appConfig.data || []
+                        data: appConfig.data || []
                     };
                     return [4, API.operatorService.confirm(body)];
                 case 1:
-                    data = _h.sent();
-                    (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, data);
+                    data = _l.sent();
+                    (_k = appConfig.onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(appConfig, activeScreen.name, data);
+                    _d = merchantInfo || {}, board_id = _d.board_id, board_info_id = _d.board_info_id;
+                    if (!(showBoard && board_id && board_info_id)) return [3, 4];
+                    return [4, Promise.all([
+                            API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
+                            API.boardService.retrieveBoardDetails(board_id)
+                        ])];
+                case 2:
+                    _e = _l.sent(), boardInfo = _e[0], boardData = _e[1];
+                    return [4, thunkApi.dispatch(getLeadByIdAsync(leadId))];
+                case 3:
+                    _l.sent();
+                    thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP'));
+                    return [2, { boardInfo: boardInfo, boardData: boardData, confirmData: data }];
+                case 4:
                     if (authId) {
-                        if (settings.data.appConfig.mode === 'popup') {
+                        if (appConfig.mode === 'popup') {
                             settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
                             thunkApi.dispatch(handleOpen(false));
                             return [2];
@@ -1070,16 +1389,34 @@ export var confirmInfo = createAsyncThunk('connectExpress/confirmInfo', function
     });
 });
 export var onCloseCompleteAsync = createAsyncThunk('connectExpress/onCloseCompleteAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, _a, merchant, brand, entity;
-    var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a, connectExpress, settings, _b, boardData, authData, confirmData, _c, appConfig, deviceInfo, activeScreen, _d, merchant, brand, entity, authId, redirectUrl, bi, urlQueryStart;
+    var _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
-                connectExpress = thunkApi.getState().connectExpress;
-                _a = ((_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.boardData) || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                _a = thunkApi.getState(), connectExpress = _a.connectExpress, settings = _a.settings;
+                _b = connectExpress.data.responseData || {}, boardData = _b.boardData, authData = _b.authData, confirmData = _b.confirmData;
+                _c = settings.data, appConfig = _c.appConfig, deviceInfo = _c.deviceInfo, activeScreen = _c.activeScreen;
+                _d = boardData || {}, merchant = _d.merchant, brand = _d.brand, entity = _d.entity;
+                authId = (_e = authData === null || authData === void 0 ? void 0 : authData.auth) === null || _e === void 0 ? void 0 : _e.id;
+                redirectUrl = appConfig.redirectUrl;
+                bi = deviceInfo.browser.browser_id;
+                if (confirmData && authId) {
+                    (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, activeScreen.name, confirmData);
+                    if (settings.data.appConfig.mode === 'popup') {
+                        settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
+                        thunkApi.dispatch(handleOpen(false));
+                        return [2];
+                    }
+                    if (redirectUrl) {
+                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                    }
+                    return [2];
+                }
                 return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
-                _c.sent();
+                _h.sent();
                 return [2];
         }
     });
@@ -1089,7 +1426,6 @@ var initialState = {
     loading: false,
     customLoading: false,
     data: {
-        showBoard: true,
         isLeadIdPassed: false,
         isStartFromBusinessCountry: false,
         flowName: FlowsTypes.CONNECT_EXPRESS,
@@ -1100,7 +1436,6 @@ var initialState = {
         },
         nidData: {
             nid: '',
-            dob: '',
             termAndConditionChecked: false
         },
         civilIdData: {
@@ -1110,12 +1445,19 @@ var initialState = {
             otp: '',
             authFor: AuthForType.MOBILE
         },
+        dobData: {
+            dob: ''
+        },
         individualData: {
             name: '',
             email: '',
             mobile: '',
             countryCode: defaultCountry
         },
+        verifyAuthOtpData: {
+            otp: '',
+            authFor: AuthForScreen.INDIVIDUAL
+        },
         businessData: {
             brandName: '',
             licenseNumber: '',
@@ -1137,9 +1479,6 @@ export var connectSlice = createSlice({
         setLeadId: function (state, action) {
             state.data.leadId = action.payload;
         },
-        setShowBoard: function (state, action) {
-            state.data.showBoard = action.payload;
-        },
         storeIsStartFromBusinessCountry: function (state, action) {
             state.data.isStartFromBusinessCountry = action.payload;
         },
@@ -1174,8 +1513,12 @@ export var connectSlice = createSlice({
         resetOTPValue: function (state) {
             state.data.otpData.otp = '';
         },
+        resetVerifyAuthOTPValue: function (state) {
+            state.data.verifyAuthOtpData.otp = '';
+        },
         resetStore: function (state) {
-            state.data = __assign(__assign({}, state.data), { responseData: undefined });
+            var _a;
+            state.data = __assign(__assign({}, state.data), { responseData: { leadData: (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.leadData } });
         },
         resetIndividualScreen: function (state) {
             state.data.individualData = initialState.data.individualData;
@@ -1191,11 +1534,9 @@ export var connectSlice = createSlice({
             state.customLoading = false;
             var _a = action.payload, data = _a.data, countryCode = _a.countryCode, boardInfo = _a.boardInfo, boardData = _a.boardData;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { leadData: data, boardInfo: boardInfo, boardData: boardData });
-            var _b = data || {}, identification = _b.identification, date_of_birth = _b.date_of_birth, contact = _b.contact, terms_conditions_accepted = _b.terms_conditions_accepted;
+            var _b = data || {}, identification = _b.identification, contact = _b.contact, terms_conditions_accepted = _b.terms_conditions_accepted;
             if (identification === null || identification === void 0 ? void 0 : identification.id)
                 state.data.nidData.nid = identification === null || identification === void 0 ? void 0 : identification.id;
-            if (date_of_birth)
-                state.data.nidData.dob = date_of_birth;
             var phone = (contact || {}).phone;
             if (phone) {
                 state.data.mobileData.mobile = phone === null || phone === void 0 ? void 0 : phone.number;
@@ -1219,11 +1560,9 @@ export var connectSlice = createSlice({
             state.loading = false;
             var _c = action.payload, data = _c.data, countryCode = _c.countryCode;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { leadData: data });
-            var _d = data || {}, name = _d.name, contact = _d.contact, brand = _d.brand, identification = _d.identification, date_of_birth = _d.date_of_birth, terms_conditions_accepted = _d.terms_conditions_accepted;
+            var _d = data || {}, name = _d.name, contact = _d.contact, brand = _d.brand, identification = _d.identification, terms_conditions_accepted = _d.terms_conditions_accepted;
             if (identification === null || identification === void 0 ? void 0 : identification.id)
                 state.data.nidData.nid = identification === null || identification === void 0 ? void 0 : identification.id;
-            if (date_of_birth)
-                state.data.nidData.dob = date_of_birth;
             var fullName = concatenateObjectValues(name, ['first', 'middle', 'last']);
             if (!!fullName) {
                 var capitalizedName = capitalizeTheFirstLetterOfEachWord(fullName);
@@ -1270,29 +1609,20 @@ export var connectSlice = createSlice({
             .addCase(resendMobileAuthOTP.rejected, function (state, action) {
             state.error = action.error.message;
         })
-            .addCase(createNIDAuthAsync.pending, function (state) {
-            state.loading = true;
-            state.error = null;
-        })
-            .addCase(createNIDAuthAsync.fulfilled, function (state, action) {
+            .addCase(createNafathAuth.fulfilled, function (state, action) {
             state.loading = false;
-            state.data.nidData = action.payload.formData;
+            state.error = null;
+            var _a = action.payload, formData = _a.formData, response = _a.response;
+            state.data.nidData = formData;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: response });
             state.data.otpData.authFor = AuthForType.NATIONAL_ID;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: action.payload.response });
         })
-            .addCase(createNIDAuthAsync.rejected, function (state, action) {
-            state.loading = false;
-            state.error = action.error.message;
-        })
-            .addCase(resendNIDAuthOTP.pending, function (state) {
+            .addCase(createNafathAuth.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
-            .addCase(resendNIDAuthOTP.fulfilled, function (state, action) {
-            state.data.nidData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: action.payload.response });
-        })
-            .addCase(resendNIDAuthOTP.rejected, function (state, action) {
+            .addCase(createNafathAuth.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
             .addCase(createCivilIdAuthAsync.pending, function (state) {
@@ -1324,32 +1654,20 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(createNIDAuthIdentityAsync.pending, function (state) {
+            .addCase(createNIDNafathAuthIdentityAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(createNIDAuthIdentityAsync.fulfilled, function (state, action) {
+            .addCase(createNIDNafathAuthIdentityAsync.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
             state.data.nidData = action.payload.formData;
             state.data.otpData.authFor = AuthForType.NATIONAL_ID_MISSED;
             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.response) });
         })
-            .addCase(createNIDAuthIdentityAsync.rejected, function (state, action) {
+            .addCase(createNIDNafathAuthIdentityAsync.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
-        })
-            .addCase(resendNIDAuthIdentityOTP.pending, function (state) {
-            state.error = null;
-        })
-            .addCase(resendNIDAuthIdentityOTP.fulfilled, function (state, action) {
-            var _a;
-            state.data.nidData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID_MISSED;
-            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.response) });
-        })
-            .addCase(resendNIDAuthIdentityOTP.rejected, function (state, action) {
-            state.error = action.error.message;
         })
             .addCase(verifyMobileOtpAsync.pending, function (state) {
             state.loading = true;
@@ -1364,18 +1682,23 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(verifyNIDOtpAsync.pending, function (state) {
+            .addCase(verifyNafathAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyNIDOtpAsync.fulfilled, function (state, action) {
+            .addCase(verifyNafathAsync.fulfilled, function (state, action) {
             var _a;
             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) });
+            var _b = action.payload, data = _b.data, isNextScreenIsDob = _b.isNextScreenIsDob;
+            state.data.individualData.isPrevDob = isNextScreenIsDob || false;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), data) });
         })
-            .addCase(verifyNIDOtpAsync.rejected, function (state, action) {
+            .addCase(verifyNafathAsync.rejected, function (state, action) {
             state.loading = false;
-            state.error = action.error.message;
+            var error = action.error.message;
+            if (error !== 'Aborted') {
+                state.error = error;
+            }
         })
             .addCase(verifyPACIAsync.pending, function (state) {
             state.loading = true;
@@ -1393,19 +1716,24 @@ export var connectSlice = createSlice({
                 state.error = error;
             }
         })
-            .addCase(verifyNIDOtpLeadIdentityAsync.pending, function (state) {
+            .addCase(verifyNafathIdentityAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyNIDOtpLeadIdentityAsync.fulfilled, function (state, action) {
-            var _a, _b, _c;
+            .addCase(verifyNafathIdentityAsync.fulfilled, function (state, action) {
+            var _a, _b;
             state.loading = false;
+            var _c = action.payload, data = _c.data, isNextScreenIsDob = _c.isNextScreenIsDob;
             var auth = (((_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData) || {}).auth;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign(__assign({}, (_b = state.data.responseData) === null || _b === void 0 ? void 0 : _b.authData), action.payload), { auth: __assign(__assign({}, (_c = action.payload) === null || _c === void 0 ? void 0 : _c.auth), { id: auth === null || auth === void 0 ? void 0 : auth.id }) }) });
+            state.data.individualData.isPrevDob = isNextScreenIsDob || false;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign(__assign({}, (_b = state.data.responseData) === null || _b === void 0 ? void 0 : _b.authData), data), { auth: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.auth), { id: auth === null || auth === void 0 ? void 0 : auth.id }) }) });
         })
-            .addCase(verifyNIDOtpLeadIdentityAsync.rejected, function (state, action) {
+            .addCase(verifyNafathIdentityAsync.rejected, function (state, action) {
             state.loading = false;
-            state.error = action.error.message;
+            var error = action.error.message;
+            if (error !== 'Aborted') {
+                state.error = error;
+            }
         })
             .addCase(verifyPaciLeadIdentityAsync.pending, function (state) {
             state.loading = true;
@@ -1516,6 +1844,21 @@ export var connectSlice = createSlice({
             if (action.error.message === 'Aborted')
                 return;
             state.error = action.error.message;
+        })
+            .addCase(updateLeadDOBAsync.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            state.data.dobData = action.payload.formData;
+            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;
+            state.error = null;
+        })
+            .addCase(updateLeadDOBAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateLeadIndividualAsync.fulfilled, function (state, action) {
             var _a, _b;
@@ -1523,7 +1866,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;
@@ -1546,6 +1890,61 @@ export var connectSlice = createSlice({
             .addCase(updateLeadBusinessDataAsync.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(updateLeadMobile.fulfilled, function (state, action) {
+            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, verifyAuthMobile: action.payload.leadResponse });
+            state.data.verifyAuthOtpData.authFor = AuthForScreen.MOBILE_OWNERSHIP;
+        })
+            .addCase(updateLeadMobile.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateLeadMobile.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(skipUpdateLeadMobile.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            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;
+            state.error = null;
+        })
+            .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;
@@ -1558,6 +1957,19 @@ export var connectSlice = createSlice({
             .addCase(createAccountAsync.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), action.payload);
+        })
+            .addCase(retrieveDetailsAfterCreateAccountAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(getMerchantListAsync.pending, function (state) {
             state.loading = true;
@@ -1583,10 +1995,11 @@ export var connectSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(confirmInfo.fulfilled, function (state) {
+            .addCase(confirmInfo.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            state.data.responseData = __assign({}, state.data.responseData);
+            var _a = action.payload || {}, boardInfo = _a.boardInfo, boardData = _a.boardData, confirmData = _a.confirmData;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { boardInfo: boardInfo, boardData: boardData, confirmData: confirmData });
         })
             .addCase(confirmInfo.rejected, function (state, action) {
             state.loading = false;
@@ -1640,6 +2053,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, setShowBoard = _a.setShowBoard, 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; };