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

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -59,36 +59,76 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
 import { FlowsTypes, AuthForType, BusinessType, LicenseType } from '../../../@types';
 import API from '../../../api';
-import { 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_VERIFICATION_FAILED, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA } from '../../../utils';
+import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, sendCustomDimension, getMetaData } 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) {
+        switch (_a.label) {
+            case 0:
+                connectExpress = thunkApi.getState().connectExpress;
+                payload = {
+                    id: connectExpress.data.leadId || '',
+                    country_code: countryCode,
+                    encryption_contract: []
+                };
+                return [4, API.leadService.updateLeadExpress(payload)];
+            case 1:
+                data = _a.sent();
+                return [2, data];
+        }
+    });
+}); });
 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, _c, boardInfo, boardData, error_1;
-    var _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.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 = _f.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 && !((_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 }];
+                }
                 isRegistered = (status === null || status === void 0 ? void 0 : status.toLowerCase()) === 'registered';
-                if (!isRegistered && !(data === null || data === void 0 ? void 0 : data.identification) && (data === null || data === void 0 ? void 0 : data.phone)) {
+                if (!isRegistered && !(data === null || data === void 0 ? void 0 : data.identification) && phone) {
+                    thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
+                    return [2, { data: data, countryCode: countryCode }];
+                }
+                if (!isRegistered && country_code) {
+                    screen_1 = 'CONNECT_EXPRESS_NID_STEP';
+                    if (!isSA(data.country_code))
+                        screen_1 = 'CONNECT_EXPRESS_MOBILE_STEP';
+                    thunkApi.dispatch(handleCurrentActiveScreen(screen_1));
+                    return [2, { data: data, countryCode: countryCode }];
+                }
+                if (!isRegistered && !isSA(settings.data.businessCountry.iso2)) {
                     thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
                     return [2, { data: data, countryCode: countryCode }];
                 }
+                if (!isRegistered && isSA(settings.data.businessCountry.iso2)) {
+                    thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_NID_STEP'));
+                    return [2, { data: data, countryCode: countryCode }];
+                }
+                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) {
-                    (_e = (_d = settings.data.appConfig).onFlowCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, data);
-                    thunkApi.dispatch(handleOpen(false));
+                    (_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 }];
                 }
                 if (isRegistered && !(board_id && board_info_id)) {
@@ -96,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];
-                _f.label = 2;
+                _h.label = 2;
             case 2:
-                _f.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 = _f.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 = _f.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 }];
@@ -178,42 +218,56 @@ export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/re
         });
     });
 });
-export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (entityId) { return __awaiter(void 0, void 0, void 0, function () {
-    var merchants;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.entityService.getMerchantListUsingEntityId(entityId)];
-            case 1:
-                merchants = (_a.sent()).merchants;
-                return [2, merchants || []];
-        }
-    });
-}); });
-export var getTerminalListAsync = createAsyncThunk('connectExpress/getTerminalListAsync', function (merchantId) { return __awaiter(void 0, void 0, void 0, function () {
-    var list;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.entityService.getTerminalListUsingMerchantId(merchantId)];
-            case 1:
-                list = (_a.sent()).list;
-                return [2, list || []];
-        }
+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, 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;
+                    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 = (_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'));
+                        return [2, { list: list, brandInfo: brandInfo, entityInfo: entityInfo }];
+                    }
+                    sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP')); });
+                    return [2, { list: list, brandInfo: brandInfo, entityInfo: entityInfo }];
+            }
+        });
     });
-}); });
+});
 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,
@@ -223,26 +277,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,
@@ -252,85 +309,125 @@ 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, 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, 9];
+                if (thunkApi.signal.aborted) {
+                    return [3, 9];
+                }
+                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token)];
+            case 2:
+                data = _m.sent();
+                isSuccess = ((_e = (_d = data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
+                isFailed = ((_g = (_f = data.auth) === null || _f === void 0 ? void 0 : _f.status) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'failed';
+                if (isFailed) {
+                    (_h = params.onFailure) === null || _h === void 0 ? void 0 : _h.call(params);
+                    return [2, { data: data }];
+                }
+                if (!isSuccess) return [3, 6];
+                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 }];
+                    }
+                }
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 4];
+                return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
+            case 3:
+                _c = _m.sent(), brandList = _c.brandList, entityList = _c.entityList;
+                if (brandList.length && entityList.length) {
+                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
+                    return [2, { data: data }];
+                }
+                _m.label = 4;
+            case 4: return [4, thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()];
+            case 5:
+                _m.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 6: return [4, sleep(interval * 1000)];
+            case 7:
+                _m.sent();
+                _m.label = 8;
+            case 8:
+                count++;
+                return [3, 1];
+            case 9: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
@@ -357,7 +454,7 @@ export var createCivilIdAuthAsync = createAsyncThunk('connectExpress/createCivil
                     step_name: CONNECT_EXPRESS_STEP_NAMES.CREATE_AUTH_CIVIL_ID,
                     encryption_contract: ['user_credentail.identification_id']
                 };
-                return [4, API.authService.createAuth(requestBody)];
+                return [4, API.authService.createExpressAuth(requestBody)];
             case 1:
                 data = _d.sent();
                 thunkApi.dispatch(handleNextScreenStep());
@@ -367,7 +464,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, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, isSaudi, 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) {
@@ -380,7 +477,8 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
                 _d = settings.data.appConfig, scope = _d.scope, redirectUrl = _d.redirectUrl, authData = _d.data;
                 isScopeAuthentication = scope === SCOPE_AUTH;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                isDataHasOperator = authData === null || authData === void 0 ? void 0 : authData.includes('operator');
+                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,
@@ -396,15 +494,27 @@ 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));
-                if (isScopeAuthentication && redirectUrl && !data.new_user && !isDataHasOperator && authId) {
-                    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 && 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 && redirectUrl && !data.new_user && isDataHasOperator)) 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;
@@ -416,66 +526,73 @@ export var verifyMobileOtpAsync = createAsyncThunk('connectExpress/verifyMobileO
             case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead_id)).unwrap()];
             case 4:
                 _h.sent();
-                isSaudi = isSA(settings.data.businessCountry.iso2);
-                next = isSaudi ? 'CONNECT_EXPRESS_NID_MISSED_STEP' : 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP';
+                isKuwait = isKW(settings.data.businessCountry.iso2);
+                next = 'CONNECT_EXPRESS_NID_MISSED_STEP';
+                if (isKuwait)
+                    next = 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP';
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep(next)); });
                 return [2, data];
         }
     });
 }); });
-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, isDataHasOperator, payload, data, authId, urlQueryStart, _e, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
-    var _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasIndividualOnly, authDataHasValue, expiry, interval, maxCalls, count, data, isSuccess, authId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
+    var _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.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;
+                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;
-                isDataHasOperator = authData === null || authData === void 0 ? void 0 : authData.includes('operator');
-                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)];
+                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:
-                data = _h.sent();
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, params);
+                if (!(count <= maxCalls)) return [3, 9];
+                if (thunkApi.signal.aborted) {
+                    return [3, 9];
+                }
+                return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token)];
+            case 2:
+                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];
                 authId = data.auth.id;
                 thunkApi.dispatch(storeAuthId(authId));
-                if (isScopeAuthentication && redirectUrl && !data.new_user && !isDataHasOperator && authId) {
-                    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 && 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 && redirectUrl && !data.new_user && isDataHasOperator)) return [3, 3];
+                if (!(isScopeAuthentication && !data.new_user && authDataHasValue)) return [3, 4];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
-            case 2:
-                _e = _h.sent(), brandList = _e.brandList, entityList = _e.entityList;
+            case 3:
+                _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];
                 }
-                _h.label = 3;
-            case 3: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
-            case 4:
-                _h.sent();
+                _g.label = 4;
+            case 4: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+            case 5:
+                _g.sent();
                 stepName = data.step_name;
                 needToCollectMoreInfo = stepName === 'collect_info';
                 creatingAccount = stepName === 'create_account';
+                (_f = params.onSuccess) === null || _f === void 0 ? void 0 : _f.call(params);
                 if (creatingAccount) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
                 }
@@ -483,15 +600,17 @@ export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsyn
                     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:
+                _g.sent();
+                _g.label = 8;
+            case 8:
+                count++;
+                return [3, 1];
+            case 9: throw new Error('paci_verification_failed');
         }
     });
 }); });
-export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync', function (_a, thunkApi) {
-    var onSuccess = _a.onSuccess;
-    return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_b) {
-        return [2];
-    }); });
-});
 export var createCivilIDAuthIdentityAsync = createAsyncThunk('connectExpress/createCivilIDAuthIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connectExpress, civilId, countryCode, requestBody, data;
     var _b, _c, _d;
@@ -520,134 +639,136 @@ 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']
                 };
                 return [4, API.leadService.updateLead(requestBody)];
             case 1:
                 data = _e.sent();
-                thunkApi.dispatch(handleNextScreenStep());
-                (_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;
-                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 }];
+                if (!((data === null || data === void 0 ? void 0 : data.verify_token) !== 'null')) return [3, 2];
+                thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_IDENTITY_VERIFY_NAFATH_STEP'));
+                return [3, 4];
+            case 2:
+                if (!isOtherThanKWOrSA(countryCode)) return [3, 4];
+                return [4, thunkApi.dispatch(getLeadByIdAsync(data.id)).unwrap()];
+            case 3:
+                _e.sent();
+                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);
+                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, isSuccess, isFailed, needToCollectMoreInfo, creatingAccount, askDobInfo;
+    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, 7];
+                if (thunkApi.signal.aborted) {
+                    return [3, 7];
+                }
+                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 })];
             case 2:
-                _e.sent();
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                data = _h.sent();
+                isSuccess = ((_b = (_a = data.auth) === null || _a === void 0 ? void 0 : _a.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
+                isFailed = ((_d = (_c = data.auth) === null || _c === void 0 ? void 0 : _c.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'failed';
+                if (isFailed) {
+                    (_e = params.onFailure) === null || _e === void 0 ? void 0 : _e.call(params);
+                    return [2, { data: data }];
+                }
+                if (!isSuccess) return [3, 4];
+                return [4, thunkApi.dispatch(getLeadByIdAsync((_f = data.auth) === null || _f === void 0 ? void 0 : _f.lead_id)).unwrap()];
+            case 3:
+                _h.sent();
                 needToCollectMoreInfo = data.step_name === 'collect_info';
                 creatingAccount = data.step_name === 'create_account';
+                askDobInfo = data.step_name === COLLECT_DOB_INFO_NAFATH;
+                (_g = params.onSuccess) === null || _g === void 0 ? void 0 : _g.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];
+                return [2, { data: data, isNextScreenIsDob: askDobInfo }];
+            case 4: return [4, sleep(interval * 1000)];
+            case 5:
+                _h.sent();
+                _h.label = 6;
+            case 6:
+                count++;
+                return [3, 1];
+            case 7: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });
-export var verifyPaciOtpLeadIdentityAsync = createAsyncThunk('connectExpress/verifyPaciOtpLeadIdentityAsync', 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 verifyPaciLeadIdentityAsync = createAsyncThunk('connectExpress/verifyPaciLeadIdentityAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var connectExpress, authData, expiry, interval, maxCalls, count, data, isSuccess, needToCollectMoreInfo, creatingAccount;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.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',
-                    step_name: '',
-                    sign_in: false,
-                    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;
+                _d.label = 1;
             case 1:
-                data = _e.sent();
-                return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+                if (!(count <= maxCalls)) return [3, 7];
+                if (thunkApi.signal.aborted) {
+                    return [3, 7];
+                }
+                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 })];
             case 2:
-                _e.sent();
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
+                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 [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
+            case 3:
+                _d.sent();
                 needToCollectMoreInfo = data.step_name === 'collect_info';
                 creatingAccount = data.step_name === 'create_account';
+                (_c = params.onSuccess) === null || _c === void 0 ? void 0 : _c.call(params);
                 if (creatingAccount) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP')); });
                 }
@@ -655,23 +776,34 @@ export var verifyPaciOtpLeadIdentityAsync = createAsyncThunk('connectExpress/ver
                     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:
+                _d.sent();
+                _d.label = 6;
+            case 6:
+                count++;
+                return [3, 1];
+            case 7: throw new Error('nafath_verification_failed');
         }
     });
 }); });
-export var checkEmailAvailabilityAsync = createAsyncThunk('connectExpress/CheckEmailAvailabilityAsync', function (_a) {
+export var checkEmailAvailabilityAsync = createAsyncThunk('connectExpress/CheckEmailAvailabilityAsync', function (_a, thunkApi) {
     var email = _a.email, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var requestBody, data;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var connectExpress, requestBody, data;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
+                    connectExpress = thunkApi.getState().connectExpress;
                     requestBody = {
                         email: email,
+                        country: (_c = (_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.leadData) === null || _c === void 0 ? void 0 : _c.country_code,
                         encryption_contract: ['email']
                     };
                     return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_b.sent()).data;
+                    data = (_d.sent()).data;
                     onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                     if (!data.errors)
                         return [2, { response: data, formData: email }];
@@ -692,7 +824,7 @@ export var checkBrandNameAvailabilityAsync = createAsyncThunk('connectExpress/ch
                     requestBody = {
                         profile_name: name,
                         country_code: (_b = settings.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2,
-                        encryption_contract: ['profile_name']
+                        encryption_contract: []
                     };
                     return [4, API.availabilityServices.checkBrand(requestBody, { cancelToken: cancelToken })];
                 case 1:
@@ -705,37 +837,172 @@ 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, body, data, _c, boardInfo, boardData;
-    var _d, _e, _f, _g, _h, _j;
-    return __generator(this, function (_k) {
-        switch (_k.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, 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;
+                    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
+                    };
+                    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;
-                body = {
-                    lead_id: responseData === null || responseData === void 0 ? void 0 : responseData.leadData.id,
-                    post_url: settings.data.appConfig.postURL || ''
-                };
-                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 = _k.sent();
-                (_e = (_d = settings.data.appConfig).onCreated) === null || _e === void 0 ? void 0 : _e.call(_d, data);
-                (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, data);
-                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, data);
-                if (!showBoard) return [3, 3];
+                data = (_e.sent()).data;
+                leadResData = data;
+                _e.label = 2;
+            case 2:
+                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: data.board_id, infoId: data.board_info_id }),
-                        API.boardService.retrieveBoardDetails(data.board_id),
-                        thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()
+                        API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
+                        API.boardService.retrieveBoardDetails(board_id)
                     ])];
-            case 2:
-                _c = _k.sent(), boardInfo = _c[0], boardData = _c[1];
-                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                return [2, { boardInfo: boardInfo, boardData: boardData, account: data }];
             case 3:
-                thunkApi.dispatch(handleOpen(false));
-                return [2];
+                _b = _e.sent(), boardInfo = _b[0], boardData = _b[1];
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
+                return [2, { boardInfo: boardInfo, boardData: boardData }];
+        }
+    });
+}); });
+export var createEntity = createAsyncThunk('connectExpress/createEntity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, brandInfo, legalName, licenseNumber, licenseType, body, data;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                brandInfo = params.brandInfo, legalName = params.legalName, licenseNumber = params.licenseNumber, licenseType = params.licenseType;
+                body = {
+                    business_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) || '',
+                    entity: {
+                        legal_name: {
+                            en: legalName || '',
+                            ar: legalName || ''
+                        },
+                        license: {
+                            number: licenseNumber || '',
+                            type: licenseType || ''
+                        },
+                        country: (_a = settings.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2
+                    }
+                };
+                return [4, API.entityService.createEntity(body)];
+            case 1:
+                data = _b.sent();
+                return [2, { data: data, formData: params }];
+        }
+    });
+}); });
+export var updateLeadDOBAsync = createAsyncThunk('connectExpress/updateLeadDOBAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connectExpress, id, dob, payload, data, needToCollectMoreInfo, creatingAccount;
+    var _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';
+                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 }];
         }
     });
 }); });
@@ -754,7 +1021,7 @@ 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();
@@ -782,14 +1049,14 @@ export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLe
 export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDataAsync ', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, isNonSA, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
+        var _b, settings, connectExpress, selectedLicense, brandName, licenseNumber, termAndConditionChecked, isKWCountry, isFL, _c, responseData, isLeadIdPassed, id, brandNameBody, payload, data;
         var _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, connectExpress = _b.connectExpress;
                     selectedLicense = formData.selectedLicense, brandName = formData.brandName, licenseNumber = formData.licenseNumber, termAndConditionChecked = formData.termAndConditionChecked;
-                    isNonSA = !isSA(settings.data.businessCountry.iso2);
+                    isKWCountry = isKW(settings.data.businessCountry.iso2);
                     isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                     _c = connectExpress.data, responseData = _c.responseData, isLeadIdPassed = _c.isLeadIdPassed;
                     id = ((responseData === null || responseData === void 0 ? void 0 : responseData.leadData) || {}).id;
@@ -802,13 +1069,13 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
                     payload = {
                         id: id || '',
                         brand: brandNameBody,
-                        license_number: isNonSA && isFL ? '' : licenseNumber,
+                        license_number: isKWCountry && isFL ? '' : licenseNumber,
                         license_type: (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) ? (isFL ? LicenseType.FL : LicenseType.CR) : undefined,
                         business_type: selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type,
                         is_acknowledged: true,
                         terms_conditions_accepted: !isLeadIdPassed ? termAndConditionChecked : undefined,
                         step_name: CONNECT_EXPRESS_STEP_NAMES.UPDATE_LEAD_BRAND_BUSINESS,
-                        encryption_contract: ['license_number', 'business_type', 'license_type']
+                        encryption_contract: []
                     };
                     return [4, API.leadService.updateLeadExpress(payload)];
                 case 1:
@@ -820,30 +1087,58 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
         });
     });
 });
-export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOperatorInfoAsync', function (_a, thunkApi) {
-    var terminalInfo = _a.terminalInfo;
+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, body, data, authId, urlQueryStart;
-        var _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.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;
+                    _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 = {
-                        id: ((_d = terminalInfo === null || terminalInfo === void 0 ? void 0 : terminalInfo.operator) === null || _d === void 0 ? void 0 : _d.id) || '',
-                        post_url: postURL || ''
+                        post_url: postURL || '',
+                        authentication_id: authId,
+                        bi: bi,
+                        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: appConfig.data || []
                     };
-                    return [4, API.operatorService.updateOperator(body)];
+                    return [4, API.operatorService.confirm(body)];
                 case 1:
-                    data = _j.sent();
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, data);
-                    authId = (_h = (_g = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _g === void 0 ? void 0 : _g.auth) === null || _h === void 0 ? void 0 : _h.id;
-                    if (authId && redirectUrl) {
-                        urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
-                        window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+                    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 (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];
             }
@@ -851,16 +1146,34 @@ export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOper
     });
 });
 export var onCloseCompleteAsync = createAsyncThunk('connectExpress/onCloseCompleteAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, id;
-    var _a, _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;
-                id = (((_b = (_a = connectExpress.data.responseData) === null || _a === void 0 ? void 0 : _a.boardData) === null || _b === void 0 ? void 0 : _b.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _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];
         }
     });
@@ -869,11 +1182,9 @@ var initialState = {
     error: null,
     loading: false,
     customLoading: false,
-    merchantLoading: false,
-    terminalLoading: false,
     data: {
-        showBoard: true,
         isLeadIdPassed: false,
+        isStartFromBusinessCountry: false,
         flowName: FlowsTypes.CONNECT_EXPRESS,
         mobileData: {
             countryCode: defaultCountry,
@@ -882,7 +1193,6 @@ var initialState = {
         },
         nidData: {
             nid: '',
-            dob: '',
             termAndConditionChecked: false
         },
         civilIdData: {
@@ -892,6 +1202,9 @@ var initialState = {
             otp: '',
             authFor: AuthForType.MOBILE
         },
+        dobData: {
+            dob: ''
+        },
         individualData: {
             name: '',
             email: '',
@@ -905,9 +1218,10 @@ var initialState = {
         },
         authenticationData: {
             brandInfo: undefined,
-            entityInfo: undefined,
-            merchantInfo: undefined,
-            terminalInfo: undefined
+            entityInfo: undefined
+        },
+        authMerchantData: {
+            merchantInfo: undefined
         }
     }
 };
@@ -918,8 +1232,8 @@ 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;
         },
         setIsLeadIdPassed: function (state, action) {
             state.data.isLeadIdPassed = action.payload;
@@ -939,14 +1253,22 @@ export var connectSlice = createSlice({
         resetNIDScreen: function (state) {
             state.data.nidData = __assign(__assign({}, state.data.nidData), initialState.data.nidData);
         },
+        setDefaultCountryCode: function (state, action) {
+            state.data.mobileData.countryCode = action.payload;
+            state.data.individualData.countryCode = action.payload;
+        },
         resetCivilScreen: function (state) {
             state.data.civilIdData = __assign(__assign({}, state.data.civilIdData), initialState.data.civilIdData);
         },
+        resetAuthenticationScreen: function (state) {
+            state.data.authenticationData = __assign(__assign({}, state.data.authenticationData), initialState.data.authenticationData);
+        },
         resetOTPValue: function (state) {
             state.data.otpData.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;
@@ -962,11 +1284,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;
@@ -990,11 +1310,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);
@@ -1041,29 +1359,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) {
@@ -1088,93 +1397,110 @@ export var connectSlice = createSlice({
             var _a;
             state.loading = false;
             state.data.civilIdData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
+            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(createCivilIDAuthIdentityAsync.rejected, function (state, action) {
             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;
+            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) {
+            .addCase(verifyMobileOtpAsync.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
-            .addCase(resendNIDAuthIdentityOTP.fulfilled, function (state, action) {
+            .addCase(verifyMobileOtpAsync.fulfilled, function (state, action) {
             var _a;
-            state.data.nidData = action.payload.formData;
-            state.data.otpData.authFor = AuthForType.NATIONAL_ID;
-            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) });
+            state.loading = false;
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authData: __assign(__assign({}, (_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authData), action.payload) });
         })
-            .addCase(resendNIDAuthIdentityOTP.rejected, function (state, action) {
+            .addCase(verifyMobileOtpAsync.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(verifyMobileOtpAsync.pending, function (state) {
+            .addCase(verifyNafathAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyMobileOtpAsync.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(verifyMobileOtpAsync.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(verifyNIDOtpAsync.pending, function (state) {
+            .addCase(verifyPACIAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyNIDOtpAsync.fulfilled, function (state, action) {
+            .addCase(verifyPACIAsync.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) });
         })
-            .addCase(verifyNIDOtpAsync.rejected, function (state, action) {
+            .addCase(verifyPACIAsync.rejected, function (state, action) {
             state.loading = false;
-            state.error = action.error.message;
+            var error = action.error.message;
+            if (error !== 'Aborted') {
+                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(verifyPaciOtpLeadIdentityAsync.pending, function (state) {
+            .addCase(verifyPaciLeadIdentityAsync.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(verifyPaciOtpLeadIdentityAsync.fulfilled, function (state, action) {
+            .addCase(verifyPaciLeadIdentityAsync.fulfilled, function (state, action) {
             var _a, _b, _c;
             state.loading = false;
             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 }) }) });
         })
-            .addCase(verifyPaciOtpLeadIdentityAsync.rejected, function (state, action) {
+            .addCase(verifyPaciLeadIdentityAsync.rejected, function (state, action) {
             state.loading = false;
-            state.error = action.error.message;
+            var error = action.error.message;
+            if (error !== 'Aborted') {
+                state.error = error;
+            }
         })
             .addCase(retrieveEntityListAsync.pending, function (state) {
             state.loading = true;
@@ -1228,7 +1554,10 @@ export var connectSlice = createSlice({
             state.error = null;
             state.loading = false;
             var _a = action.payload, brandList = _a.brandList, entityList = _a.entityList;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { authenticationData: { brandList: brandList, entityList: entityList } });
+            var eList = __spreadArray(__spreadArray([], entityList, true), [ADD_NEW_ENTITY], false);
+            if (brandList === null || brandList === void 0 ? void 0 : brandList.length)
+                state.data.authenticationData.brandInfo = brandList[0];
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authenticationData: { brandList: brandList, entityList: eList } });
         })
             .addCase(retrieveAuthenticationListAsync.pending, function (state) {
             state.loading = true;
@@ -1265,12 +1594,28 @@ 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 });
+        })
+            .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;
             state.loading = false;
             state.error = null;
+            var licenseList = [OTHER_CR_LICENSE, OTHER_FL_LICENSE];
             state.data.individualData = action.payload.formData;
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { individualData: action.payload.response });
+            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 }));
         })
             .addCase(updateLeadIndividualAsync.pending, function (state) {
             state.loading = true;
@@ -1306,46 +1651,50 @@ export var connectSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(getMerchantListAsync.pending, function (state) {
-            state.merchantLoading = true;
+            .addCase(retrieveDetailsAfterCreateAccountAsync.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
-            .addCase(getMerchantListAsync.fulfilled, function (state, action) {
-            state.merchantLoading = false;
+            .addCase(retrieveDetailsAfterCreateAccountAsync.fulfilled, function (state, action) {
+            state.loading = false;
             state.error = null;
-            var data = state.data.responseData;
-            var merchantList = action.payload;
-            state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { merchantList: merchantList }) });
+            state.data.responseData = __assign(__assign({}, state.data.responseData), action.payload);
         })
-            .addCase(getMerchantListAsync.rejected, function (state, action) {
-            state.merchantLoading = false;
+            .addCase(retrieveDetailsAfterCreateAccountAsync.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(getTerminalListAsync.pending, function (state) {
-            state.terminalLoading = true;
+            .addCase(getMerchantListAsync.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
-            .addCase(getTerminalListAsync.fulfilled, function (state, action) {
-            state.terminalLoading = false;
+            .addCase(getMerchantListAsync.fulfilled, function (state, action) {
+            state.loading = false;
             state.error = null;
             var data = state.data.responseData;
-            var terminalList = action.payload;
-            state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { terminalList: terminalList }) });
+            var _a = action.payload, list = _a.list, brandInfo = _a.brandInfo, entityInfo = _a.entityInfo;
+            state.data.authenticationData.brandInfo = brandInfo;
+            state.data.authenticationData.entityInfo = entityInfo;
+            if (list === null || list === void 0 ? void 0 : list.length) {
+                state.data.authMerchantData.merchantInfo = list[0];
+            }
+            state.data.responseData = __assign(__assign({}, data), { authMerchantData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authMerchantData), { merchantList: list }) });
         })
-            .addCase(getTerminalListAsync.rejected, function (state, action) {
-            state.terminalLoading = false;
+            .addCase(getMerchantListAsync.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateOperatorInfoAsync.pending, function (state) {
+            .addCase(confirmInfo.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(updateOperatorInfoAsync.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(updateOperatorInfoAsync.rejected, function (state, action) {
+            .addCase(confirmInfo.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })
@@ -1361,9 +1710,42 @@ export var connectSlice = createSlice({
             .addCase(onCloseCompleteAsync.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(updateBusinessCountryAsync.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateBusinessCountryAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(updateBusinessCountryAsync.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(createEntity.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(createEntity.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(createEntity.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var data = action.payload.data;
+            var authenticationData = (state.data.responseData || {}).authenticationData;
+            var entityList = (authenticationData || {}).entityList;
+            if (data === null || data === void 0 ? void 0 : data.entity) {
+                var entity = __assign(__assign({}, data.entity), { business_id: data === null || data === void 0 ? void 0 : data.business_id });
+                var list = __spreadArray([entity], entityList, true);
+                state.data.authenticationData.entityInfo = list[0];
+                state.data.responseData = __assign(__assign({}, state.data.responseData), { entityData: data, authenticationData: __assign(__assign({}, authenticationData), { entityList: list }) });
+            }
         });
     }
 });
-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;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode, storeIsStartFromBusinessCountry = _a.storeIsStartFromBusinessCountry, resetAuthenticationScreen = _a.resetAuthenticationScreen;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };