@tap-payments/auth-jsconnect 2.0.2 → 2.0.5

package/build/features/app/business/businessStore.js

@@ -62,7 +62,7 @@ import { BusinessType, FlowsTypes } from '../../../@types';
 import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
 import { convertNumbers2English, getFlowUrl, hasKey } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
-export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -108,7 +108,7 @@ export var resendOTP = createAsyncThunk('resendOTPBusiness', function (params, t
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, business, settings, isNID, responseBody, verifyResponse, stepName, payload, data, steps, hasBusinessCompleted;
+    var _a, business, settings, isNID, responseBody, verifyResponse, stepName, payload, data, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted;
     var _b, _c, _d, _e;
     return __generator(this, function (_f) {
         switch (_f.label) {
@@ -128,7 +128,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_f.sent()).data;
-                if (!!data.errors) return [3, 6];
+                if (!!data.errors) return [3, 9];
                 thunkApi.dispatch(updateStepName(stepName));
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 2:
@@ -136,42 +136,46 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
                 steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
+                hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
                 if (!isNID) return [3, 3];
                 thunkApi.dispatch(handleNextScreenStep());
-                return [3, 6];
+                return [3, 9];
             case 3:
                 if (!hasBusinessCompleted) return [3, 5];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_e = verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.entity) === null || _e === void 0 ? void 0 : _e.id))];
             case 4:
                 _f.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 6];
+                return [3, 9];
             case 5:
-                if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
-                    thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
-                }
-                else {
-                    thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                }
-                _f.label = 6;
-            case 6: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }) }];
+                if (!(data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH)) return [3, 6];
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
+                return [3, 9];
+            case 6:
+                if (!hasBusinessCRInfoCompleted) return [3, 8];
+                return [4, thunkApi.dispatch(retrieveChannels())];
+            case 7:
+                _f.sent();
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
+                return [3, 9];
+            case 8:
+                thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
+                _f.label = 9;
+            case 9: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }) }];
         }
     });
 }); });
 export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, identification_id_type, stepName, headers, requestBody, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, business, identification_id_type, stepName, requestBody, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
-                headers = {
-                    lead_id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
-                    device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
-                };
                 requestBody = {
+                    id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
                     identification_id: params.nid,
                     identification_id_type: identification_id_type,
                     date_of_birth: params.dob,
@@ -179,18 +183,57 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                     step_name: stepName,
                     encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
                 };
-                return [4, API.leadService.updateLeadIdentity(requestBody, { headers: headers })];
+                return [4, API.leadService.updateLeadIdentity(requestBody)];
             case 1:
-                data = (_g.sent()).data;
-                if (!data.errors && !params.isResend) {
+                data = (_e.sent()).data;
+                if (!data.errors) {
                     thunkApi.dispatch(updateStepName(stepName));
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
+                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
     });
 }); });
+export var resendOTPLeadIdentity = createAsyncThunk('resendOTPLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, business, _b, nid, dob, type, stepName, requestBody, data;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
+                _b = business.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
+                requestBody = {
+                    id: ((_c = business.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
+                    identification_id: nid,
+                    identification_id_type: type,
+                    date_of_birth: dob,
+                    country_code: settings.data.businessCountry.iso2,
+                    step_name: stepName,
+                    encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
+                };
+                return [4, API.leadService.updateLeadIdentity(requestBody)];
+            case 1:
+                data = (_d.sent()).data;
+                if (!data.errors) {
+                    thunkApi.dispatch(updateStepName(stepName));
+                }
+                return [2, data];
+        }
+    });
+}); });
+export var retrieveChannels = createAsyncThunk('retrieveChannels', function () { return __awaiter(void 0, void 0, void 0, function () {
+    var data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4, API.dataService.getChannelsOfServices()];
+            case 1:
+                data = (_a.sent()).data;
+                return [2, data];
+        }
+    });
+}); });
 export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -242,7 +285,7 @@ export var updateLeadBusinessType = createAsyncThunk('updateLeadBusinessType', f
     });
 }); });
 export var createAccount = createAsyncThunk('createAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, requestBody, data, channels;
+    var _a, settings, business, requestBody, data;
     var _b, _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -261,15 +304,14 @@ export var createAccount = createAsyncThunk('createAccount', function (params, t
                 return [4, API.accountService.createAccount(requestBody)];
             case 1:
                 data = (_e.sent()).data;
-                channels = undefined;
                 if (!!data.errors) return [3, 3];
-                return [4, API.dataService.getChannelsOfServices()];
+                return [4, thunkApi.dispatch(retrieveChannels())];
             case 2:
-                channels = _e.sent();
+                _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);
                 _e.label = 3;
-            case 3: return [2, { data: data, channelsData: channels === null || channels === void 0 ? void 0 : channels.data }];
+            case 3: return [2, { data: data }];
         }
     });
 }); });
@@ -311,7 +353,7 @@ export var updateActivitiesInfo = createAsyncThunk('updateActivitiesInfo', funct
         }
     });
 }); });
-export var retrieveDataList = createAsyncThunk('retrieveDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveDataList = createAsyncThunk('bankRetrieveDataList', function () { return __awaiter(void 0, void 0, void 0, function () {
     var _a, customerBases, expectedSales, expectedCustomerSales;
     return __generator(this, function (_b) {
         switch (_b.label) {
@@ -365,7 +407,7 @@ export var updateCustomersInfo = createAsyncThunk('updateCustomersInfo', functio
         }
     });
 }); });
-export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var updateLeadSuccess = createAsyncThunk('businessUpdateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, business, _b, steps, id, flowCompleted, payload, data;
     var _c, _d, _e, _f, _g;
     return __generator(this, function (_h) {
@@ -403,13 +445,15 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_h.sent()).data;
+                if (!!data.errors) return [3, 3];
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_g = data.entity) === null || _g === void 0 ? void 0 : _g.id))];
             case 2:
                 _h.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _h.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -527,10 +571,10 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData;
+            var _d = action.payload, data = _d.data, formData = _d.formData;
             var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
@@ -538,15 +582,31 @@ export var businessSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
+            var _e = state.data.verify.responseBody || {}, entity = _e.entity, entity_activities = _e.entity_activities, business_type = _e.business_type;
+            var issuingDate = (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+            if (!!issuingDate) {
+                var formattedDate = moment(issuingDate).format('YYYY-MM-DD');
+                state.data.activitiesData.operationStartDate = convertNumbers2English(formattedDate);
+            }
+            var activities = entity_activities || [];
+            var selectedActivity = activities === null || activities === void 0 ? void 0 : activities[0];
+            if (!!selectedActivity)
+                state.data.activitiesData.activities = [selectedActivity];
+            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { entity_id: entity === null || entity === void 0 ? void 0 : entity.id, activities: activities });
+            if (!!(entity === null || entity === void 0 ? void 0 : entity.license)) {
+                state.data.businessTypeData.selectedLicense = {
+                    legal_name: entity === null || entity === void 0 ? void 0 : entity.legal_name,
+                    license: { number: (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.number },
+                    type: business_type
+                };
+            }
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateLeadIdentity.pending, function (state, action) {
-            var _a;
-            if (!((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend))
-                state.loading = true;
+            .addCase(updateLeadIdentity.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
@@ -567,6 +627,25 @@ export var businessSlice = createSlice({
             .addCase(updateLeadIdentity.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(resendOTPLeadIdentity.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPLeadIdentity.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var data = action.payload;
+            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.nidData.responseBody = data;
+            state.data.otpData.otp = '';
+            state.data.otpData.isNID = true;
+        })
+            .addCase(resendOTPLeadIdentity.rejected, function (state, action) {
+            state.error = action.error.message;
         })
             .addCase(retrieveEntityList.pending, function (state) {
             state.error = null;
@@ -594,7 +673,7 @@ export var businessSlice = createSlice({
                 }
             }
             licenseList = __spreadArray(__spreadArray([], licenseList, true), [OTHER_CR_LICENSE, OTHER_FL_LICENSE], false);
-            state.data.businessTypeData.responseBody = { licenseList: licenseList };
+            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { licenseList: licenseList });
             var licenseNumber = (((_c = (_b = state.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.license) || {}).number;
             var selectedLicense = ((_d = licenseList === null || licenseList === void 0 ? void 0 : licenseList.find) === null || _d === void 0 ? void 0 : _d.call(licenseList, function (_a) {
                 var license = _a.license;
@@ -628,6 +707,30 @@ export var businessSlice = createSlice({
             .addCase(retrieveEntityInfo.rejected, function (state, action) {
             state.error = action.error.message;
             state.loading = false;
+        })
+            .addCase(retrieveChannels.pending, function (state) {
+            state.error = null;
+            state.loading = true;
+        })
+            .addCase(retrieveChannels.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            state.loading = false;
+            var data = action.payload || {};
+            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            var channels = data || [];
+            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), { channelList: channels });
+            var selectedChannel = channels === null || channels === void 0 ? void 0 : channels[0];
+            if (!!selectedChannel)
+                state.data.activitiesData.salesChannels = [selectedChannel];
+        })
+            .addCase(retrieveChannels.rejected, function (state, action) {
+            state.error = action.error.message;
+            state.loading = false;
         })
             .addCase(updateLeadBusinessType.pending, function (state) {
             state.loading = true;
@@ -666,24 +769,20 @@ export var businessSlice = createSlice({
             state.error = null;
         })
             .addCase(createAccount.fulfilled, function (state, action) {
-            var _a, _b;
+            var _a;
             state.loading = false;
             state.error = null;
-            var _c = action.payload, data = _c.data, channelsData = _c.channelsData;
-            var message = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = channelsData === null || channelsData === void 0 ? void 0 : channelsData.errors) === null || _b === void 0 ? void 0 : _b[0]) || {}).message;
-            if (message) {
-                state.error = message;
+            var data = action.payload.data;
+            var _b = ((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}, message = _b.message, description = _b.description;
+            if (message || description) {
+                state.error = message || description;
                 return;
             }
             if ((data === null || data === void 0 ? void 0 : data.status) === 'ALREADY_TAKEN') {
                 state.error = 'signup_user_exists_error';
                 return;
             }
-            var channels = channelsData || [];
-            state.data.businessTypeData.responseBody = __assign(__assign(__assign({}, data), state.data.businessTypeData.responseBody), { channelList: channels });
-            var selectedChannel = channels === null || channels === void 0 ? void 0 : channels[0];
-            if (!!selectedChannel)
-                state.data.activitiesData.salesChannels = [selectedChannel];
+            state.data.businessTypeData.responseBody = __assign(__assign({}, state.data.businessTypeData.responseBody), data);
         })
             .addCase(createAccount.rejected, function (state, action) {
             state.loading = false;

package/build/features/app/connect/connectStore.d.ts

@@ -3,23 +3,18 @@ import { ResponseData, MobileFormValues, NIDFormValues, OTPFormValues, Individua
 import { CancelToken } from 'axios';
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
-    formData: MobileFormValues & {
-        isResend: boolean;
-    };
-}, MobileFormValues & {
-    isResend: boolean;
-}, {}>;
+    formData: MobileFormValues;
+}, MobileFormValues, {}>;
+export declare const resendOTPMobile: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const createNIDAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: {
         type: string;
         nid: string;
         dob: string;
-        isResend: boolean;
     };
-}, NIDFormValues & {
-    isResend: boolean;
-}, {}>;
+}, NIDFormValues, {}>;
+export declare const resendOTPNID: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const verifyAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: OTPFormValues;

package/build/features/app/connect/connectStore.js

@@ -82,7 +82,7 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
                 data = (_c.sent()).data;
-                if (!data.errors && !params.isResend) {
+                if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 }
@@ -90,13 +90,37 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
         }
     });
 }); });
-export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, identification_id_type, requestBody, data;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, _b, mobile, countryCode, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                _b = connect.data.mobileData, mobile = _b.mobile, countryCode = _b.countryCode;
+                requestBody = {
+                    lang: settings.data.language,
+                    user_credentail: {
+                        phone: mobile || '',
+                        code: countryCode.idd_prefix.toString()
+                    },
+                    sign_in: false,
+                    step_name: CONNECT_STEP_NAMES.CREATE_AUTH_MOBILE,
+                    encryption_contract: ['user_credentail.phone', 'user_credentail.code']
+                };
+                return [4, API.authService.createAuth(requestBody)];
+            case 1:
+                data = (_c.sent()).data;
+                return [2, data];
+        }
+    });
+}); });
+export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, identification_id_type, requestBody, data;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
                     lang: settings.data.language,
@@ -117,15 +141,46 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_d.sent()).data;
-                if (!data.errors && !params.isResend) {
+                data = (_c.sent()).data;
+                if (!data.errors) {
                     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);
+                    (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 }
                 return [2, { response: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
     });
 }); });
+export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, _b, nid, dob, type, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                requestBody = {
+                    lang: settings.data.language,
+                    user_credentail: {
+                        identification_id: nid,
+                        identification_id_type: type,
+                        date_of_birth: dob,
+                        country_code: settings.data.businessCountry.iso2
+                    },
+                    sign_in: false,
+                    step_name: CONNECT_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.createAuth(requestBody)];
+            case 1:
+                data = (_c.sent()).data;
+                return [2, data];
+        }
+    });
+}); });
 export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, connect, settings, isAbsher, _b, mobileData, nidData, responseBody, payload, data, params_1, params_2;
     var _c, _d;
@@ -186,11 +241,11 @@ export var retrieveLead = createAsyncThunk('retrieveLead', function (params, thu
     });
 }); });
 export var createLead = createAsyncThunk('createLead', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, connect, settings, businessCountry, payload, brandPayload, _b, brandResponse, data;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var settings, businessCountry, payload, brandPayload, _a, brandResponse, data;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                _a = thunkApi.getState(), connect = _a.connect, settings = _a.settings;
+                settings = thunkApi.getState().settings;
                 businessCountry = settings.data.businessCountry;
                 payload = {
                     individual_id: params.individualId,
@@ -204,7 +259,7 @@ export var createLead = createAsyncThunk('createLead', function (params, thunkAp
                         API.leadService.createLead(payload)
                     ])];
             case 1:
-                _b = _c.sent(), brandResponse = _b[0].data, data = _b[1].data;
+                _a = _b.sent(), brandResponse = _a[0].data, data = _a[1].data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep(params.stepName));
                 }
@@ -254,10 +309,10 @@ export var updateLeadIndividual = createAsyncThunk('updateLeadIndividual', funct
     });
 }); });
 export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, payload, data;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, settings, connect, instagram, twitter, _b, mobileData, nidData, otpData, brandData, isAbsher, responseBody, isExistingUser, isOther, brand, payload, data;
+    var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
                 instagram = !!((_c = params.links) === null || _c === void 0 ? void 0 : _c.instagram) ? "".concat(INSTAGRAM_URL, "/").concat((_d = params.links) === null || _d === void 0 ? void 0 : _d.instagram) : '';
@@ -266,27 +321,36 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 isAbsher = otpData.isAbsher;
                 responseBody = (isAbsher ? nidData : mobileData).responseBody;
                 isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
+                isOther = ((_g = params.selectedBrandItem) === null || _g === void 0 ? void 0 : _g.id) === 'other';
+                brand = __assign({ name: {
+                        en: params.brandName,
+                        ar: params.brandName,
+                        zh: params.brandName
+                    }, website: (_h = params.links) === null || _h === void 0 ? void 0 : _h.website, social: [twitter, instagram] }, (isExistingUser &&
+                    !isOther && {
+                    id: (_j = params.selectedBrandItem) === null || _j === void 0 ? void 0 : _j.id,
+                    name: undefined
+                }));
                 payload = {
-                    brand: {
-                        name: {
-                            en: params.brandName,
-                            ar: params.brandName,
-                            zh: params.brandName
-                        },
-                        website: (_g = params.links) === null || _g === void 0 ? void 0 : _g.website,
-                        social: [twitter, instagram]
-                    },
-                    id: (isExistingUser ? (_h = brandData.responseBody) === null || _h === void 0 ? void 0 : _h.lead_id : (_j = otpData.responseBody) === null || _j === void 0 ? void 0 : _j.lead_id) || '',
+                    brand: brand,
+                    id: (isExistingUser ? (_k = brandData.responseBody) === null || _k === void 0 ? void 0 : _k.lead_id : (_l = otpData.responseBody) === null || _l === void 0 ? void 0 : _l.lead_id) || '',
                     terms_conditions_accepted: params.termAndConditionChecked,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
-                    encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh', 'brand.website']
+                    encryption_contract: [
+                        'brand.name.en',
+                        'brand.name.ar',
+                        'brand.name.zh',
+                        'brand.website',
+                        'brand.social[0]',
+                        'brand.social[1]'
+                    ]
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
-                data = (_m.sent()).data;
+                data = (_p.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, params);
+                    (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, params);
                 }
                 return [2, { response: data, formData: params }];
         }
@@ -437,7 +501,6 @@ export var connectSlice = createSlice({
             .addCase(createMobileAuth.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
-            state.customLoading = false;
             state.error = null;
             var _b = action.payload, formData = _b.formData, response = _b.response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -449,16 +512,30 @@ export var connectSlice = createSlice({
             state.data.mobileData.responseBody = response;
             state.data.otpData.isAbsher = false;
         })
-            .addCase(createMobileAuth.pending, function (state, action) {
-            if (action.meta.arg.isResend)
-                state.customLoading = true;
-            if (!action.meta.arg.isResend)
-                state.loading = true;
+            .addCase(createMobileAuth.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(createMobileAuth.rejected, function (state, action) {
             state.loading = false;
-            state.customLoading = false;
+            state.error = action.error.message;
+        })
+            .addCase(resendOTPMobile.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var response = action.payload;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.mobileData.responseBody = response;
+            state.data.otpData.isAbsher = false;
+        })
+            .addCase(resendOTPMobile.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPMobile.rejected, function (state, action) {
             state.error = action.error.message;
         })
             .addCase(createNIDAuth.fulfilled, function (state, action) {
@@ -475,14 +552,31 @@ export var connectSlice = createSlice({
             state.data.nidData.responseBody = response;
             state.data.otpData.isAbsher = true;
         })
-            .addCase(createNIDAuth.pending, function (state, action) {
-            var _a;
-            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
+            .addCase(createNIDAuth.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(createNIDAuth.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(resendOTPNID.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var response = action.payload;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.nidData.responseBody = response;
+            state.data.otpData.isAbsher = true;
+        })
+            .addCase(resendOTPNID.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPNID.rejected, function (state, action) {
+            state.error = action.error.message;
         })
             .addCase(verifyAuth.fulfilled, function (state, action) {
             var _a;