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

package/build/api/entity.d.ts

@@ -1,6 +1,7 @@
 import { AxiosRequestConfig } from 'axios';
 export declare type EntityInfoBody = {
     id: string;
+    lead_id?: string;
     activities?: Array<string>;
     business_operation_start_at?: string;
     channel_services?: Array<string>;
@@ -17,6 +18,7 @@ export declare type EntityInfoBody = {
     actual_income?: string;
     is_relative_PEP?: boolean | null;
     is_influencer?: boolean | null;
+    is_vat_acknowledged?: boolean;
     occupation?: string;
     step_name: string;
     encryption_contract?: Array<string>;
@@ -31,6 +33,7 @@ export declare type EntityBankUpdateBody = {
         swift_code?: string;
         account_number?: string;
     };
+    is_acknowledged: boolean;
     step_name: string;
     encryption_contract?: Array<string>;
 };

package/build/assets/locales/ar.json

@@ -240,5 +240,7 @@
     "tax_success_title": "Your tax details are updated",
     "bank_success_title": "Your bank details are updated",
     "password_success_title": "Your password is set",
-    "bank": "bank"
+    "bank": "bank",
+    "reset_password_success_title": "لقد ارسلنا رسالة بريدية إليك",
+    "reset_password_success_description": "تحقق من بريدك الإلكتروني لإعادة تعيين كلمة المرور الخاصة بك."
 }

package/build/assets/locales/en.json

@@ -260,5 +260,7 @@
     "bank_success_title": "Your bank details are updated",
     "password_success_title": "Your password is set",
     "account_details": "Your account details",
-    "bank": "bank"
+    "bank": "bank",
+    "reset_password_success_title": "We sent you an email",
+    "reset_password_success_description": "Check your email to reset your password."
 }

package/build/constants/app.js

@@ -53,7 +53,12 @@ export var CONNECT_SCREENS_NAVIGATION = [
 export var BUSINESS_SCREENS_NAVIGATION = [
     {
         name: 'BUSINESS_VERIFY_STEP',
-        next: ['BUSINESS_IDBOD_STEP', 'BUSINESS_BUSINESS_TYPE_STEP', 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'],
+        next: [
+            'BUSINESS_IDBOD_STEP',
+            'BUSINESS_BUSINESS_TYPE_STEP',
+            'BUSINESS_ACTIVITIES_STEP',
+            'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'
+        ],
         prev: '',
         order: 1
     },
@@ -101,9 +106,15 @@ export var BUSINESS_SCREENS_NAVIGATION = [
     },
     {
         name: 'BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
+        next: 'BUSINESS_RESET_PASSWORD_SUCCESS',
+        prev: '',
+        order: 7
+    },
+    {
+        name: 'BUSINESS_RESET_PASSWORD_SUCCESS',
         next: '',
         prev: '',
-        order: 6
+        order: 8
     }
 ];
 export var INDIVIDUAL_SCREENS_NAVIGATION = [
@@ -127,9 +138,15 @@ export var INDIVIDUAL_SCREENS_NAVIGATION = [
     },
     {
         name: 'INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 4
+    },
+    {
+        name: 'INDIVIDUAL_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var PASSWORD_SCREENS_NAVIGATION = [
@@ -159,9 +176,15 @@ export var PASSWORD_SCREENS_NAVIGATION = [
     },
     {
         name: 'PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'PASSWORD_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 5
+    },
+    {
+        name: 'PASSWORD_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 6
     }
 ];
 export var BANK_SCREENS_NAVIGATION = [
@@ -185,9 +208,15 @@ export var BANK_SCREENS_NAVIGATION = [
     },
     {
         name: 'BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'BANK_RESET_PASSWORD_SUCCESS',
         prev: '',
         order: 4
+    },
+    {
+        name: 'BANK_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var TAX_SCREENS_NAVIGATION = [
@@ -211,9 +240,15 @@ export var TAX_SCREENS_NAVIGATION = [
     },
     {
         name: 'TAX_SUCCESS_FOUR_FLOWS_BUTTONS_STEP',
-        next: '',
+        next: 'TAX_RESET_PASSWORD_SUCCESS',
         prev: 'TAX_DETAILS_SUCCESS_STEP',
         order: 4
+    },
+    {
+        name: 'TAX_RESET_PASSWORD_SUCCESS',
+        next: '',
+        prev: '',
+        order: 5
     }
 ];
 export var DefaultDeviceInfo = {

package/build/constants/validation.d.ts

@@ -8,3 +8,4 @@ export declare const SAUDI_NUMBER_LENGTH = 9;
 export declare const REGEX_FULL_NAME: RegExp;
 export declare const REGEX_WEBSITE: RegExp;
 export declare const REGEX_BENEFICIARY_NAME: RegExp;
+export declare const REGEX_BRAND_NAME: RegExp;

package/build/constants/validation.js

@@ -8,3 +8,4 @@ export var SAUDI_NUMBER_LENGTH = 9;
 export var REGEX_FULL_NAME = /^([a-zA-Z]{2,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,}|[a-zA-Z]+\s{1}[a-zA-Z.-]{1,}\s{1}[a-zA-Z]{1,})$/g;
 export var REGEX_WEBSITE = /^[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,63}(:[0-9]{1,5})?(\/.*)?$/;
 export var REGEX_BENEFICIARY_NAME = /^([\u0600-\u065F\u066A-\u06EF\u06FA-\u06FFa-zA-Z\s])*$/g;
+export var REGEX_BRAND_NAME = /(.*[a-zA-Z0-9]){3}/g;

package/build/features/app/bank/bankStore.js

@@ -50,7 +50,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { hasKey } from '../../../utils';
-import { handleNextScreenStep } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { BANK_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse, _a, steps, entity, hasCompleted;
@@ -65,24 +65,28 @@ export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (t
             case 1:
                 data = (_b.sent()).data;
                 leadResponse = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 5];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
                 leadResponse = _b.sent();
                 _a = leadResponse.data, steps = _a.steps, entity = _a.entity;
                 hasCompleted = hasKey(steps, BANK_STEP_NAMES.BANK_SUCCESS);
-                if (!hasCompleted) return [3, 4];
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+                if (!(data.step_name === BANK_STEP_NAMES.PHONE_AUTH)) return [3, 3];
+                thunkApi.dispatch(handleCurrentActiveScreen('BANK_VERIFY_STEP'));
+                return [3, 6];
             case 3:
+                if (!hasCompleted) return [3, 5];
+                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+            case 4:
                 _b.sent();
                 thunkApi.dispatch(handleNextScreenStep('BANK_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 5];
-            case 4:
+                return [3, 6];
+            case 5:
                 if (data.step_name === BANK_STEP_NAMES.BANK_INFO) {
                     thunkApi.dispatch(handleNextScreenStep('BANK_BANK_DETAILS_STEP'));
                 }
-                _b.label = 5;
-            case 5: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _b.label = 6;
+            case 6: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });
@@ -151,16 +155,17 @@ export var retrieveEntityInfo = createAsyncThunk('retrieveBankEntityInfo', funct
 }); });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, bank, iban, beneficiaryName, bank_name, requestBody, data;
-    var _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
                 iban = params.iban;
                 beneficiaryName = params.beneficiaryName;
                 bank_name = params.bankName;
                 requestBody = {
-                    wallet_id: (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.merchant_wallet_id,
+                    wallet_id: (_c = (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.merchant) === null || _c === void 0 ? void 0 : _c.wallet_id,
+                    is_acknowledged: params.confirmPolicy,
                     bank_account: {
                         iban: iban,
                         beneficiary_name: beneficiaryName,
@@ -171,10 +176,10 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (p
                 };
                 return [4, API.entityService.createBankAccount(requestBody)];
             case 1:
-                data = (_e.sent()).data;
+                data = (_f.sent()).data;
                 if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
+                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }

package/build/features/app/business/businessStore.d.ts

@@ -24,6 +24,7 @@ export declare const updateLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<{
     };
 }, NIDFormValues, {}>;
 export declare const resendOTPLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
+export declare const retrieveChannels: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<any, {
     leadId: string;
 }, {}>;
@@ -36,7 +37,6 @@ export declare const updateLeadBusinessType: import("@reduxjs/toolkit").AsyncThu
 }, BusinessTypeFormValues, {}>;
 export declare const createAccount: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    channelsData: any;
 }, void, {}>;
 export declare const updateActivitiesInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;

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

@@ -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,25 +136,32 @@ 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 }) }];
         }
     });
 }); });
@@ -216,6 +223,17 @@ export var resendOTPLeadIdentity = createAsyncThunk('resendOTPLeadIdentity', fun
         }
     });
 }); });
+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) {
@@ -267,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) {
@@ -286,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 }];
         }
     });
 }); });
@@ -554,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;
@@ -565,6 +582,24 @@ 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;
@@ -638,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;
@@ -672,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;
@@ -710,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/individual/individualStore.js

@@ -50,7 +50,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { hasKey } from '../../../utils';
-import { handleNextScreenStep } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
 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;
@@ -66,26 +66,30 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
             case 1:
                 data = (_d.sent()).data;
                 leadResponse = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 7];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
                 leadResponse = _d.sent();
                 _a = leadResponse.data, steps = _a.steps, entity = _a.entity;
                 hasTaxCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
-                if (!hasTaxCompleted) return [3, 4];
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 3];
+                thunkApi.dispatch(handleCurrentActiveScreen('INDIVIDUAL_VERIFY_STEP'));
+                return [3, 7];
             case 3:
+                if (!hasTaxCompleted) return [3, 5];
+                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+            case 4:
                 _d.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 6];
-            case 4:
-                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO)) return [3, 6];
-                return [4, thunkApi.dispatch(retrieveDataList((_c = (_b = leadResponse.data) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.country))];
+                return [3, 7];
             case 5:
+                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO)) return [3, 7];
+                return [4, thunkApi.dispatch(retrieveDataList((_c = (_b = leadResponse.data) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.country))];
+            case 6:
                 _d.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _d.label = 6;
-            case 6: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _d.label = 7;
+            case 7: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });
@@ -179,18 +183,19 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
 }); });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, individual, requestBody, data;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
                 requestBody = {
                     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,
+                    lead_id: (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.id,
+                    occupation: (_d = params.occupation) === null || _d === void 0 ? void 0 : _d.id,
                     employer_name: params.employerName,
-                    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,
+                    employer_country: (_e = params.employerLocation) === null || _e === void 0 ? void 0 : _e.iso2,
+                    source_income: [(_f = params.sourceIncome) === null || _f === void 0 ? void 0 : _f.id],
+                    actual_income: (_g = params.monthlyIncome) === null || _g === void 0 ? void 0 : _g.id,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
                     encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
@@ -198,10 +203,10 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 };
                 return [4, API.entityService.updateIndividualInfo(requestBody)];
             case 1:
-                data = (_j.sent()).data;
+                data = (_k.sent()).data;
                 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);
+                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }
@@ -355,6 +360,9 @@ export var individualSlice = createSlice({
                 var employerLocation = countries.find(function (country) { return country.iso2 === countryCode; });
                 state.data.individualData.employerLocation = employerLocation;
             }
+            var selectedOccupation = occupation === null || occupation === void 0 ? void 0 : occupation[0];
+            if (!!selectedOccupation)
+                state.data.individualData.occupation = selectedOccupation;
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;

package/build/features/app/password/passwordStore.js

@@ -50,7 +50,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
 import { hasKey } from '../../../utils';
-import { handleNextScreenStep } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
 import { PASSWORD_OPERATION_TYPE, PASSWORD_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var payload, data, leadResponse, _a, steps, entity, hasCompleted;
@@ -65,24 +65,28 @@ export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', functio
             case 1:
                 data = (_b.sent()).data;
                 leadResponse = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 5];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
                 leadResponse = _b.sent();
                 _a = leadResponse.data, steps = _a.steps, entity = _a.entity;
                 hasCompleted = hasKey(steps, PASSWORD_STEP_NAMES.PASSWORD_SUCCESS);
-                if (!hasCompleted) return [3, 4];
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+                if (!(data.step_name === PASSWORD_STEP_NAMES.PHONE_AUTH)) return [3, 3];
+                thunkApi.dispatch(handleCurrentActiveScreen('PASSWORD_VERIFY_STEP'));
+                return [3, 6];
             case 3:
+                if (!hasCompleted) return [3, 5];
+                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+            case 4:
                 _b.sent();
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 5];
-            case 4:
+                return [3, 6];
+            case 5:
                 if (data.step_name === PASSWORD_STEP_NAMES.PASSWORD_INFO) {
                     thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
                 }
-                _b.label = 5;
-            case 5: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
+                _b.label = 6;
+            case 6: return [2, { data: data, leadData: leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data, token: token }];
         }
     });
 }); });