@tap-payments/auth-jsconnect 2.0.20-test → 2.0.22-test

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

@@ -63,10 +63,10 @@ import { BUSINESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LI
 import { convertNumbers2English, getEighteenYearsAgo, hasKey } from '../../../utils';
 import { handleNextScreenStep } from '../../../app/settings';
 export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', function (token, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, data, leadResponse, brandInfo, boardResponse, board_id, board_info_id, steps, entityID, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
-    var _a, _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var payload, data, leadResponse, brandInfo, boardResponse, board_id, board_info_id, steps, brandID, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
+    var _a, _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -74,37 +74,36 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_h.sent()).data;
+                data = (_g.sent()).data;
                 leadResponse = undefined;
                 brandInfo = undefined;
                 boardResponse = undefined;
                 if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 17];
                 return [4, API.leadService.retrieveLead(data === null || data === void 0 ? void 0 : data.id)];
             case 2:
-                leadResponse = _h.sent();
+                leadResponse = _g.sent();
                 board_id = (_a = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _a === void 0 ? void 0 : _a.board_id;
                 board_info_id = (_b = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _b === void 0 ? void 0 : _b.board_info_id;
                 if (!(!!board_id && !!board_info_id)) return [3, 4];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 3:
-                boardResponse = _h.sent();
-                _h.label = 4;
+                boardResponse = _g.sent();
+                _g.label = 4;
             case 4:
                 if (data.step_name === BUSINESS_STEP_NAMES.IDENTITY_AUTH) {
                     thunkApi.dispatch(handleNextScreenStep('BUSINESS_IDBOD_STEP'));
                 }
                 if (!(data.step_name === 'business_info')) return [3, 17];
                 steps = (_c = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _c === void 0 ? void 0 : _c.steps;
-                entityID = (_e = (_d = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _d === void 0 ? void 0 : _d.entity) === null || _e === void 0 ? void 0 : _e.id;
-                brandID = (_g = (_f = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _f === void 0 ? void 0 : _f.brand) === null || _g === void 0 ? void 0 : _g.id;
+                brandID = (_e = (_d = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _d === void 0 ? void 0 : _d.brand) === null || _e === void 0 ? void 0 : _e.id;
                 hasBusinessCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_SUCCESS);
                 hasBusinessCRInfoCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_INFO);
                 hasBusinessCRActivitiesCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CR_ACTIVITIES);
                 hasBusinessCustomersCompleted = hasKey(steps, BUSINESS_STEP_NAMES.BUSINESS_CUSTOMERS);
                 if (!hasBusinessCompleted) return [3, 6];
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entityID))];
+                return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
             case 5:
-                _h.sent();
+                _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
                 return [3, 17];
             case 6:
@@ -119,31 +118,37 @@ export var verifyLeadToken = createAsyncThunk('businessVerifyLeadToken', functio
                 if (!hasBusinessCRActivitiesCompleted) return [3, 12];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 9:
-                _h.sent();
+                _g.sent();
                 return [4, thunkApi.dispatch(retrieveDataList())];
             case 10:
-                _h.sent();
+                _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 11:
-                brandInfo = _h.sent();
+                brandInfo = _g.sent();
                 return [3, 17];
             case 12:
                 if (!hasBusinessCRInfoCompleted) return [3, 15];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 13:
-                _h.sent();
+                _g.sent();
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 14:
-                brandInfo = _h.sent();
+                brandInfo = _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
                 return [3, 17];
             case 15: return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 16:
-                _h.sent();
+                _g.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _h.label = 17;
-            case 17: return [2, { data: data, leadData: __assign(__assign({}, leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data), { flows: boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info }), token: token, brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand }];
+                _g.label = 17;
+            case 17: return [2, {
+                    data: data,
+                    leadData: __assign(__assign({}, leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data), { flows: boardResponse === null || boardResponse === void 0 ? void 0 : boardResponse.info }),
+                    token: token,
+                    brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand,
+                    boardId: (_f = leadResponse === null || leadResponse === void 0 ? void 0 : leadResponse.data) === null || _f === void 0 ? void 0 : _f.board_id
+                }];
         }
     });
 }); });
@@ -166,9 +171,9 @@ 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, brandID, payload, data, brandInfo, steps, hasBusinessCompleted, hasBusinessCRInfoCompleted, hasBusinessCRActivitiesCompleted, hasBusinessCustomersCompleted;
-    var _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), business = _a.business, settings = _a.settings;
                 isNID = business.data.otpData.isNID;
@@ -178,21 +183,21 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 brandID = (_c = (_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.id;
                 payload = {
                     data: params.otp,
-                    service_name: (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name,
-                    verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
+                    service_name: ((_e = (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _d === void 0 ? void 0 : _d.verification_by) === null || _e === void 0 ? void 0 : _e.service_name) || ((_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _f === void 0 ? void 0 : _f.service_name),
+                    verify_token: ((_g = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_token) === null || _g === void 0 ? void 0 : _g.verify_token) || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token),
                     step_name: stepName,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_h.sent()).data;
+                data = (_k.sent()).data;
                 brandInfo = undefined;
                 if (!!data.errors) return [3, 13];
                 thunkApi.dispatch(updateStepName(stepName));
                 return [4, thunkApi.dispatch(retrieveEntityList({ leadId: data === null || data === void 0 ? void 0 : data.id }))];
             case 2:
-                _h.sent();
-                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
+                _k.sent();
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, 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);
@@ -203,9 +208,9 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 return [3, 13];
             case 3:
                 if (!hasBusinessCompleted) return [3, 5];
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_g = verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.entity) === null || _g === void 0 ? void 0 : _g.id))];
+                return [4, thunkApi.dispatch(retrieveBoardDetails(verifyResponse === null || verifyResponse === void 0 ? void 0 : verifyResponse.board_id))];
             case 4:
-                _h.sent();
+                _k.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
                 return [3, 13];
             case 5:
@@ -223,21 +228,21 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_CUSTOMERS_STEP'));
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 8:
-                brandInfo = _h.sent();
+                brandInfo = _k.sent();
                 return [3, 13];
             case 9:
                 if (!hasBusinessCRInfoCompleted) return [3, 12];
                 return [4, thunkApi.dispatch(retrieveChannels())];
             case 10:
-                _h.sent();
+                _k.sent();
                 return [4, API.brandService.retrieveBrand(brandID)];
             case 11:
-                brandInfo = _h.sent();
+                brandInfo = _k.sent();
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_ACTIVITIES_STEP'));
                 return [3, 13];
             case 12:
                 thunkApi.dispatch(handleNextScreenStep('BUSINESS_BUSINESS_TYPE_STEP'));
-                _h.label = 13;
+                _k.label = 13;
             case 13: return [2, { data: data, formData: __assign(__assign({}, params), { isNID: isNID }), brandInfo: brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.brand }];
         }
     });
@@ -260,14 +265,12 @@ 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)];
+                return [4, API.leadService.updateLead(requestBody)];
             case 1:
-                data = (_e.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(updateStepName(stepName));
-                    thunkApi.dispatch(handleNextScreenStep());
-                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
-                }
+                data = _e.sent();
+                thunkApi.dispatch(updateStepName(stepName));
+                thunkApi.dispatch(handleNextScreenStep());
+                (_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 }) }];
         }
     });
@@ -290,12 +293,10 @@ export var resendOTPLeadIdentity = createAsyncThunk('resendOTPLeadIdentity', fun
                     step_name: stepName,
                     encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
                 };
-                return [4, API.leadService.updateLeadIdentity(requestBody)];
+                return [4, API.leadService.updateLead(requestBody)];
             case 1:
-                data = (_d.sent()).data;
-                if (!data.errors) {
-                    thunkApi.dispatch(updateStepName(stepName));
-                }
+                data = _d.sent();
+                thunkApi.dispatch(updateStepName(stepName));
                 return [2, data];
         }
     });
@@ -322,14 +323,17 @@ export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function
         }
     });
 }); });
-export var retrieveEntityInfo = createAsyncThunk('retrieveEntityInfo', function (entityID) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveBoardDetails = createAsyncThunk('retrieveBoardDetails', function (boardID) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.entityService.retrieveEntityInfo(entityID)];
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4, API.boardService.retrieveBoardDetails(boardID)];
             case 1:
-                data = (_a.sent()).data;
-                return [2, { data: data }];
+                data = _c.sent();
+                return [2, {
+                        data: __assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.name, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.contact })
+                    }];
         }
     });
 }); });
@@ -596,13 +600,13 @@ export var businessSlice = createSlice({
             var _a, _b, _c, _d;
             state.error = null;
             state.customLoading = false;
-            var _e = action.payload, data = _e.data, token = _e.token, leadData = _e.leadData, brandInfo = _e.brandInfo;
+            var _e = action.payload, data = _e.data, token = _e.token, leadData = _e.leadData, brandInfo = _e.brandInfo, boardId = _e.boardId;
             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.verify.responseBody = __assign(__assign(__assign({}, data), leadData), state.data.verify.responseBody);
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), leadData), state.data.verify.responseBody), { board_id: boardId });
             state.data.verify.token = token;
             state.data.otpData.isNID = false;
             var _f = state.data.verify.responseBody || {}, entity = _f.entity, entity_activities = _f.entity_activities, business_type = _f.business_type;
@@ -787,23 +791,17 @@ export var businessSlice = createSlice({
             state.error = action.error.message;
             state.loading = false;
         })
-            .addCase(retrieveEntityInfo.pending, function (state) {
+            .addCase(retrieveBoardDetails.pending, function (state) {
             state.error = null;
             state.loading = true;
         })
-            .addCase(retrieveEntityInfo.fulfilled, function (state, action) {
-            var _a;
+            .addCase(retrieveBoardDetails.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
             var data = (action.payload || {}).data;
-            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.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
-            .addCase(retrieveEntityInfo.rejected, function (state, action) {
+            .addCase(retrieveBoardDetails.rejected, function (state, action) {
             state.error = action.error.message;
             state.loading = false;
         })

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

@@ -1,8 +1,19 @@
 import { RootState } from '../../../app/store';
-import { FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
+import { CountryCode, FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    boardResponse: any;
+    boardResponse: {
+        user: any;
+        brand: any;
+        bank_account: any;
+        entity: any;
+        merchant: any;
+        name: any;
+        contact: any;
+        countries: CountryCode[];
+        countryCode: any;
+        flows: any;
+    };
     token: string;
 }, string, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
@@ -13,7 +24,7 @@ export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     monthlyIncome: any;
     occupation: any;
 }, string, {}>;
-export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{
+export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, string, {}>;
 export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{

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

@@ -49,13 +49,13 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { hasKey } from '../../../utils';
 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, settings, data, boardData, userData, countryCode, boardInfoData, countries, board_id, board_info_id, _a, steps, entity, user, hasTaxCompleted;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var payload, settings, data, boardData, countryCode, boardInfoData, countries, board_id, board_info_id, entity, info, hasIndividualCompleted;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -64,47 +64,51 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                 settings = thunkApi.getState().settings;
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_b.sent()).data;
+                data = (_d.sent()).data;
                 boardInfoData = undefined;
                 countries = settings.data.countries;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 10];
-                return [4, API.boardService.retrieveBoard(data === null || data === void 0 ? void 0 : data.id)];
-            case 2:
-                boardData = _b.sent();
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 6];
                 board_id = data === null || data === void 0 ? void 0 : data.id;
                 board_info_id = data === null || data === void 0 ? void 0 : data.board_info_id;
-                if (!(!!board_id && !!board_info_id)) return [3, 4];
+                if (!(!!board_id && !!board_info_id)) return [3, 3];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
-            case 3:
-                boardInfoData = _b.sent();
-                _b.label = 4;
+            case 2:
+                boardInfoData = _d.sent();
+                _d.label = 3;
+            case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                _a = (boardData === null || boardData === void 0 ? void 0 : boardData.business) || {}, steps = _a.steps, entity = _a.entity, user = _a.user;
+                boardData = _d.sent();
+                entity = ((boardData === null || boardData === void 0 ? void 0 : boardData.business) || {}).entity;
                 countryCode = entity === null || entity === void 0 ? void 0 : entity.country;
-                return [4, API.userService.retrieveUserInfo(user === null || user === void 0 ? void 0 : user.id)];
-            case 5:
-                userData = _b.sent();
-                hasTaxCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
-                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 6];
-                thunkApi.dispatch(handleCurrentActiveScreen('INDIVIDUAL_VERIFY_STEP'));
-                return [3, 10];
-            case 6:
-                if (!hasTaxCompleted) return [3, 8];
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
-            case 7:
-                _b.sent();
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 10];
-            case 8:
-                if (!(data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO)) return [3, 10];
+                info = boardInfoData.info;
+                hasIndividualCompleted = ((_a = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _a === void 0 ? void 0 : _a.status) === 'completed';
                 return [4, thunkApi.dispatch(retrieveDataList(entity === null || entity === void 0 ? void 0 : entity.country))];
-            case 9:
-                _b.sent();
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _b.label = 10;
-            case 10: return [2, {
+            case 5:
+                _d.sent();
+                if (data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_AUTH) {
+                    thunkApi.dispatch(handleCurrentActiveScreen('INDIVIDUAL_VERIFY_STEP'));
+                }
+                else if (hasIndividualCompleted) {
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                }
+                else if (data.step_name === INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO) {
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                }
+                _d.label = 6;
+            case 6: return [2, {
                     data: data,
-                    boardResponse: __assign(__assign(__assign({}, userData === null || userData === void 0 ? void 0 : userData.user), boardData === null || boardData === void 0 ? void 0 : boardData.business), { countries: countries, countryCode: countryCode, flows: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info }),
+                    boardResponse: {
+                        user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
+                        brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
+                        bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
+                        entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
+                        merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
+                        name: (_b = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _b === void 0 ? void 0 : _b.name,
+                        contact: (_c = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _c === void 0 ? void 0 : _c.contact,
+                        countries: countries,
+                        countryCode: countryCode,
+                        flows: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info
+                    },
                     token: token
                 }];
         }
@@ -146,51 +150,50 @@ export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', fun
         }
     });
 }); });
-export var retrieveEntityInfo = createAsyncThunk('retrieveIndividualEntityInfo', function (entityID) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetails', function (boardId) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.entityService.retrieveEntityInfo(entityID)];
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 1:
-                data = (_a.sent()).data;
-                return [2, { data: data }];
+                data = _c.sent();
+                return [2, {
+                        data: __assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.name, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.contact })
+                    }];
         }
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, payload, data, _b, steps, entity, hasIndividualCompleted;
-    var _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, individual, settings, responseBody, payload, data, flows, hasIndividualCompleted;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
                 payload = {
                     data: params.otp,
-                    service_name: (_c = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _c === void 0 ? void 0 : _c.service_name,
+                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.service_name,
                     verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
                     step_name: INDIVIDUAl_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_g.sent()).data;
-                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 5];
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, { otp: params.otp });
-                _b = responseBody || {}, steps = _b.steps, entity = _b.entity;
-                hasIndividualCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
-                if (!hasIndividualCompleted) return [3, 3];
-                return [4, thunkApi.dispatch(retrieveEntityInfo((_f = responseBody === null || responseBody === void 0 ? void 0 : responseBody.entity) === null || _f === void 0 ? void 0 : _f.id))];
-            case 2:
-                _g.sent();
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 5];
-            case 3: return [4, thunkApi.dispatch(retrieveDataList(entity === null || entity === void 0 ? void 0 : entity.country))];
-            case 4:
-                _g.sent();
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _g.label = 5;
-            case 5: return [2, { data: data, formData: __assign({}, params) }];
+                data = (_f.sent()).data;
+                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
+                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
+                    flows = (responseBody || {}).flows;
+                    hasIndividualCompleted = ((_e = flows === null || flows === void 0 ? void 0 : flows.find(function (flow) { return flow.name === 'individual'; })) === null || _e === void 0 ? void 0 : _e.status) === 'completed';
+                    if (hasIndividualCompleted) {
+                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                    }
+                    else {
+                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                    }
+                }
+                return [2, { data: data, formData: __assign({}, params) }];
         }
     });
 }); });
@@ -226,13 +229,13 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
     });
 }); });
 export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, id, infoId, entity, payload, data;
+    var _a, settings, individual, _b, id, infoId, payload, data;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
-                _b = individual.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id, entity = _b.entity;
+                _b = individual.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id;
                 if (!id)
                     return [2];
                 payload = {
@@ -243,7 +246,7 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
                 return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
             case 1:
                 data = _g.sent();
-                return [4, thunkApi.dispatch(retrieveEntityInfo(entity === null || entity === void 0 ? void 0 : entity.id))];
+                return [4, thunkApi.dispatch(retrieveBoardDetails(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);
@@ -307,8 +310,9 @@ export var individualSlice = createSlice({
             }
             state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), boardResponse), state.data.verify.responseBody), { board_id: data.id });
             state.data.verify.token = token;
-            var _c = boardResponse || {}, source_income = _c.source_income, actual_income = _c.actual_income, occupation = _c.occupation, is_relative_PEP = _c.is_relative_PEP, is_influencer = _c.is_influencer, countries = _c.countries, countryCode = _c.countryCode;
-            var _d = state.data.individualData.responseBody || {}, sourceIncomeList = _d.sourceIncomeList, monthlyIncomeList = _d.monthlyIncomeList, occupationList = _d.occupationList;
+            var _c = boardResponse || {}, countries = _c.countries, countryCode = _c.countryCode, brand = _c.brand;
+            var _d = brand || {}, source_income = _d.source_income, actual_income = _d.actual_income, occupation = _d.occupation, is_relative_PEP = _d.is_relative_PEP, is_influencer = _d.is_influencer;
+            var _e = state.data.individualData.responseBody || {}, sourceIncomeList = _e.sourceIncomeList, monthlyIncomeList = _e.monthlyIncomeList, occupationList = _e.occupationList;
             var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a, _b; return ((_a = source === null || source === void 0 ? void 0 : source.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === ((_b = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()); })) || (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
@@ -363,6 +367,7 @@ export var individualSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
+            state.data.individualData = __assign({}, state.data.individualData);
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -404,23 +409,18 @@ export var individualSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(retrieveEntityInfo.pending, function (state) {
+            .addCase(retrieveBoardDetails.pending, function (state) {
             state.error = null;
             state.loading = true;
         })
-            .addCase(retrieveEntityInfo.fulfilled, function (state, action) {
-            var _a;
+            .addCase(retrieveBoardDetails.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
             var data = (action.payload || {}).data;
-            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.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
+            var _a = data || {}, entity = _a.entity, user = _a.user;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), data), { entity: entity, name: user === null || user === void 0 ? void 0 : user.name });
         })
-            .addCase(retrieveEntityInfo.rejected, function (state, action) {
+            .addCase(retrieveBoardDetails.rejected, function (state, action) {
             state.error = action.error.message;
             state.loading = false;
         })
@@ -434,8 +434,8 @@ export var individualSlice = createSlice({
                 state.error = description;
                 return;
             }
-            var flows = response.flows, steps = response.steps, bank_account = response.bank_account;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows, steps: steps, bank_account: bank_account });
+            var flows = response.flows;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
         })
             .addCase(updateBoardSuccess.pending, function (state) {
             state.loading = true;

package/build/features/app/password/passwordStore.d.ts

@@ -2,13 +2,15 @@ import { RootState } from '../../../app/store';
 import { FlowsTypes, OTPFormValues, PasswordCreateFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    boardResponse: any;
+    boardResponse: {
+        flows: any;
+    };
     token: string;
 }, string, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, void, {}>;
-export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{
+export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, string, {}>;
 export declare const verifyPasswordLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
@@ -33,6 +35,7 @@ export declare const verifyOperationToken: import("@reduxjs/toolkit").AsyncThunk
 }, {
     token: string;
     boardId: string;
+    boardInfoId: string;
 }, {}>;
 export declare const resendOperationOTP: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
@@ -48,9 +51,8 @@ export declare const resetPassword: import("@reduxjs/toolkit").AsyncThunk<{
         otp: string;
     };
 }, OTPFormValues, {}>;
-export declare const retrieveLeadPassword: import("@reduxjs/toolkit").AsyncThunk<{
-    boardResponse: any;
-    entity: any;
+export declare const retrieveBoardResetPasswordSuccess: import("@reduxjs/toolkit").AsyncThunk<{
+    id: any;
 }, void, {}>;
 declare type VerifyData = {
     token: string;