@tap-payments/auth-jsconnect 1.0.94-test → 1.0.97-test

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

@@ -60,9 +60,9 @@ import moment from 'moment';
 import API from '../../../api';
 import { BusinessType, FlowsTypes } from '../../../@types';
 import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../constants';
-import { convertNumbers2English, getFlowUrl, hasKey, removeRequestHeaders } from '../../../utils';
+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) {
@@ -159,19 +159,16 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
     });
 }); });
 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 +176,46 @@ 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 retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -311,7 +336,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 +390,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) {
@@ -377,6 +402,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 if (flowCompleted || !id)
                     return [2];
                 payload = {
+                    lang: settings.data.language,
                     step_name: BUSINESS_STEP_NAMES.BUSINESS_SUCCESS,
                     id: id,
                     flows: [
@@ -402,13 +428,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 }];
         }
     });
 }); });
@@ -542,10 +570,8 @@ export var businessSlice = createSlice({
             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) {
@@ -566,6 +592,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;
@@ -771,7 +816,6 @@ export var businessSlice = createSlice({
                 return;
             }
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), response);
-            removeRequestHeaders();
         })
             .addCase(updateLeadSuccess.pending, function (state) {
             state.loading = true;

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

@@ -61,7 +61,7 @@ import { FlowsTypes } from '../../../@types';
 import API from '../../../api';
 import { CONNECT_STEP_NAMES, IDENTIFICATION_TYPE, INSTAGRAM_URL, OTHER_BRAND, TWITTER_URL } from '../../../constants';
 import { defaultCountry } from '../../../constants';
-import { getIndividualName, getFlowUrl, capitalizeTheFirstLetterOfEachWord, removeRequestHeaders } from '../../../utils';
+import { getIndividualName, getFlowUrl, capitalizeTheFirstLetterOfEachWord } from '../../../utils';
 export var createMobileAuth = createAsyncThunk('createMobileAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var settings, requestBody, data;
     var _a, _b;
@@ -70,6 +70,7 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
             case 0:
                 settings = thunkApi.getState().settings;
                 requestBody = {
+                    lang: settings.data.language,
                     user_credentail: {
                         phone: params.mobile || '',
                         code: params.countryCode.idd_prefix.toString()
@@ -81,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);
                 }
@@ -89,15 +90,40 @@ 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,
                     user_credentail: {
                         identification_id: params.nid,
                         identification_id_type: identification_id_type,
@@ -115,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;
@@ -184,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,
@@ -202,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));
                 }
@@ -277,7 +334,14 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     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) || '',
                     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:
@@ -347,6 +411,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 isExistingUser = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.new_user) === false;
                 leadId = isExistingUser ? (_c = brandData.responseBody) === null || _c === void 0 ? void 0 : _c.lead_id : (_d = otpData.responseBody) === null || _d === void 0 ? void 0 : _d.lead_id;
                 payload = {
+                    lang: settings.data.language,
                     step_name: CONNECT_STEP_NAMES.CONNECT_SUCCESS,
                     flows: [
                         {
@@ -434,7 +499,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;
@@ -446,16 +510,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) {
@@ -472,14 +550,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;
@@ -637,7 +732,6 @@ export var connectSlice = createSlice({
                 state.error = description;
                 return;
             }
-            removeRequestHeaders();
         })
             .addCase(updateLeadSuccess.pending, function (state) {
             state.loading = true;

package/build/features/app/individual/individualStore.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { CountryCode, FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     leadData: any;
@@ -12,7 +12,8 @@ export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     sourceIncome: any;
     monthlyIncome: any;
     countryCode: string;
-    countries: CountryCode[];
+    occupation: any;
+    countries: import("../../../@types").CountryCode[];
 }, string, {}>;
 export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;

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

@@ -49,10 +49,10 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { hasKey, removeRequestHeaders } from '../../../utils';
+import { hasKey } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
 import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
-export var verifyLeadToken = createAsyncThunk('verifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse, _a, steps, entity, hasTaxCompleted;
     var _b, _c;
     return __generator(this, function (_d) {
@@ -106,23 +106,24 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
         }
     });
 }); });
-export var retrieveDataList = createAsyncThunk('retrieveDataList', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, sourceIncome, monthlyIncome, countries;
+export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, sourceIncome, monthlyIncome, occupation, settings, countries;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                return [4, Promise.all([
-                        API.dataService.getSourceOfIncome(),
-                        API.dataService.getMonthlyIncome(countryCode)
-                    ])];
+            case 0: return [4, Promise.all([
+                    API.dataService.getSourceOfIncome(),
+                    API.dataService.getMonthlyIncome(countryCode),
+                    API.dataService.getOccupation()
+                ])];
             case 1:
-                _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data;
+                _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data, occupation = _a[2];
+                settings = thunkApi.getState().settings;
                 countries = settings.data.countries;
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
                         countryCode: countryCode,
+                        occupation: occupation,
                         countries: countries
                     }];
         }
@@ -157,7 +158,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_g.sent()).data;
-                if (!!data.errors) return [3, 5];
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 5];
                 (_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;
                 hasIndividualCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
@@ -184,20 +185,21 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
                 requestBody = {
-                    id: (_c = (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id,
+                    id: (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.individual_id,
+                    occupation: (_c = params.occupation) === null || _c === void 0 ? void 0 : _c.id,
                     employer_name: params.employerName,
-                    employer_city: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
+                    employer_country: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
                     source_income: [(_e = params.sourceIncome) === null || _e === void 0 ? void 0 : _e.id],
                     actual_income: (_f = params.monthlyIncome) === null || _f === void 0 ? void 0 : _f.id,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
-                    encryption_contract: ['employer_name', 'employer_city', 'actual_income'],
+                    encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
-                return [4, API.entityService.updateEntityInfo(requestBody)];
+                return [4, API.entityService.updateIndividualInfo(requestBody)];
             case 1:
                 data = (_j.sent()).data;
-                if (!data.errors) {
+                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
                 }
@@ -205,7 +207,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
         }
     });
 }); });
-export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var updateLeadSuccess = createAsyncThunk('individualUpdateLeadSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, individual, id, payload, data;
     var _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
@@ -216,6 +218,7 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 if (!id)
                     return [2];
                 payload = {
+                    lang: settings.data.language,
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS,
                     id: id,
                     encryption_contract: []
@@ -223,13 +226,15 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadSuccess', function (p
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
+                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
                 _g.sent();
                 (_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 });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _g.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -245,6 +250,7 @@ var initialState = {
             otp: ''
         },
         individualData: {
+            occupation: undefined,
             sourceIncome: undefined,
             monthlyIncome: undefined,
             employerName: '',
@@ -336,9 +342,9 @@ export var individualSlice = createSlice({
             .addCase(retrieveDataList.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries;
+            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries, occupation = _a.occupation;
             var data = state.data.individualData.responseBody;
-            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [] });
+            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [], occupationList: occupation || [] });
             var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
@@ -407,7 +413,6 @@ export var individualSlice = createSlice({
             }
             var flows = response.flows, steps = response.steps;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows, steps: steps });
-            removeRequestHeaders();
         })
             .addCase(updateLeadSuccess.pending, function (state) {
             state.loading = true;