npm - @tap-payments/auth-jsconnect - Versions diffs - 2.0.43-test → 2.0.43 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (314) hide show

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

@@ -12,6 +12,7 @@ export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
         contact: any;
         countries: CountryCode[];
         countryCode: any;
+        notification: any;
         flows: {
             name: string;
             status: string;
@@ -33,6 +34,23 @@ export declare const retrieveBoardDetails: import("@reduxjs/toolkit").AsyncThunk
 }, string, {}>;
 export declare const verifyLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
+    boardResponse: {
+        user: any;
+        brand: any;
+        bank_account: any;
+        entity: any;
+        merchant: any;
+        name: any;
+        contact: any;
+        countries: CountryCode[];
+        countryCode: any;
+        notification: any;
+        flows: {
+            name: string;
+            status: string;
+            url: string;
+        }[];
+    };
     formData: {
         otp: string;
     };

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

@@ -49,13 +49,13 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
+import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BUSINESS_FLOW_SUCCESS, 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, countryCode, boardInfoData, countries, board_id, board_info_id, entity, info, hasIndividualCompleted;
-    var _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var payload, settings, data, boardData, individualData, countryCode, boardInfoData, countries, board_id, board_info_id, notification, _a, id, type, info, hasIndividualCompleted;
+    var _b, _c, _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -64,50 +64,68 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                 settings = thunkApi.getState().settings;
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_d.sent()).data;
+                data = (_f.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, 6];
+                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 10];
+                if (data === null || data === void 0 ? void 0 : data.country_code) {
+                    countryCode = data === null || data === void 0 ? void 0 : data.country_code;
+                    thunkApi.dispatch(handleSetCountryByIso2(countryCode));
+                }
+                if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 10];
                 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, 3];
+                if (!(board_id && board_info_id)) return [3, 4];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _d.sent();
-                _d.label = 3;
-            case 3: return [4, API.boardService.retrieveBoardDetails(board_id)];
+                boardInfoData = _f.sent();
+                notification = (boardInfoData || {}).notification;
+                _a = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _a.id, type = _a.type;
+                if (!(id && type)) return [3, 4];
+                return [4, API.individualService.retrieveIndividual(id, type)];
+            case 3:
+                individualData = _f.sent();
+                _f.label = 4;
             case 4:
-                boardData = _d.sent();
-                entity = ((boardData === null || boardData === void 0 ? void 0 : boardData.business) || {}).entity;
-                countryCode = entity === null || entity === void 0 ? void 0 : entity.country;
-                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))];
+                if (!board_id) return [3, 6];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             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'));
+                boardData = _f.sent();
+                _f.label = 6;
+            case 6:
+                if (!countryCode) {
+                    countryCode = (_b = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _b === void 0 ? void 0 : _b.country;
+                    if (countryCode)
+                        thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                 }
-                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, {
+                info = (boardInfoData || {}).info;
+                hasIndividualCompleted = ((_c = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _c === void 0 ? void 0 : _c.status) === 'completed';
+                if (!hasIndividualCompleted) return [3, 7];
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 10];
+            case 7:
+                if (!countryCode) return [3, 9];
+                return [4, thunkApi.dispatch(retrieveDataList(countryCode))];
+            case 8:
+                _f.sent();
+                _f.label = 9;
+            case 9:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                _f.label = 10;
+            case 10: return [2, {
                     data: data,
                     boardResponse: {
-                        user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
+                        user: individualData === null || individualData === void 0 ? void 0 : individualData.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,
+                        name: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.names,
+                        contact: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _e === void 0 ? void 0 : _e.contact,
                         countries: countries,
                         countryCode: countryCode,
-                        flows: BUSINESS_FLOW_SUCCESS.concat(boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info)
+                        notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
+                        flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || [])
                     },
                     token: token
                 }];
@@ -132,16 +150,24 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
     });
 }); });
 export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, sourceIncome, monthlyIncome, occupation;
+    var monthlyIncomeBody, dataBody, _a, sourceIncome, monthlyIncome, occupation;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0: return [4, Promise.all([
-                    API.dataService.getSourceOfIncome(),
-                    API.dataService.getMonthlyIncome(countryCode),
-                    API.dataService.getOccupation()
-                ])];
+            case 0:
+                monthlyIncomeBody = {
+                    page: 0,
+                    country_code: [countryCode]
+                };
+                dataBody = {
+                    page: 0
+                };
+                return [4, Promise.all([
+                        API.dataService.getSourceOfIncome(dataBody),
+                        API.dataService.getMonthlyIncome(monthlyIncomeBody),
+                        API.dataService.getOccupation(dataBody)
+                    ])];
             case 1:
-                _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data, occupation = _a[2];
+                _a = _b.sent(), sourceIncome = _a[0], monthlyIncome = _a[1], occupation = _a[2];
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
@@ -159,70 +185,114 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
             case 1:
                 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 })
+                        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.names, 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, flows, hasIndividualCompleted;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, countryCode, notification, _c, id, type, info, hasIndividualCompleted;
+    var _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
+                _b = responseBody || {}, board_id = _b.board_id, board_info_id = _b.board_info_id;
+                countries = settings.data.countries;
                 payload = {
                     data: params.otp,
-                    service_name: (_b = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _b === void 0 ? void 0 : _b.service_name,
+                    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,
                     step_name: INDIVIDUAl_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                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) }];
+                data = (_l.sent()).data;
+                countryCode = undefined;
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 10];
+                if (!(board_id && board_info_id)) return [3, 4];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+            case 2:
+                boardInfoData = _l.sent();
+                notification = (boardInfoData || {}).notification;
+                _c = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
+                if (!(id && type)) return [3, 4];
+                return [4, API.individualService.retrieveIndividual(id, type)];
+            case 3:
+                individualData = _l.sent();
+                _l.label = 4;
+            case 4:
+                if (!board_id) return [3, 6];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
+            case 5:
+                boardData = _l.sent();
+                _l.label = 6;
+            case 6:
+                countryCode = (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.country;
+                info = (boardInfoData || {}).info;
+                hasIndividualCompleted = ((_f = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _f === void 0 ? void 0 : _f.status) === 'completed';
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
+                if (!hasIndividualCompleted) return [3, 7];
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
+                return [3, 10];
+            case 7:
+                if (!countryCode) return [3, 9];
+                return [4, thunkApi.dispatch(retrieveDataList(countryCode))];
+            case 8:
+                _l.sent();
+                _l.label = 9;
+            case 9:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
+                _l.label = 10;
+            case 10: return [2, {
+                    data: data,
+                    boardResponse: {
+                        user: individualData === null || individualData === void 0 ? void 0 : individualData.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: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.names,
+                        contact: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.contact,
+                        countries: countries,
+                        countryCode: countryCode,
+                        notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
+                        flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || [])
+                    },
+                    formData: __assign({}, params)
+                }];
         }
     });
 }); });
 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, _j;
-    return __generator(this, function (_k) {
-        switch (_k.label) {
+    var _a, settings, individual, _b, id, type, requestBody, data;
+    var _c, _d, _e, _f, _g, _h, _j, _k;
+    return __generator(this, function (_l) {
+        switch (_l.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
+                _b = ((_d = (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.notification) === null || _d === void 0 ? void 0 : _d.recipient) || {}, id = _b.id, type = _b.type;
                 requestBody = {
-                    id: (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.individual_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,
+                    id: id,
+                    type: type,
+                    occupation: { id: (_e = params.occupation) === null || _e === void 0 ? void 0 : _e.id },
                     employer_name: params.employerName,
-                    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,
+                    employer_country: (_f = params.employerLocation) === null || _f === void 0 ? void 0 : _f.iso2,
+                    source_income: [{ id: (_g = params.sourceIncome) === null || _g === void 0 ? void 0 : _g.id }],
+                    monthly_income: { id: (_h = params.monthlyIncome) === null || _h === void 0 ? void 0 : _h.id },
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
-                    encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
+                    encryption_contract: ['employer_name', 'employer_country'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
-                return [4, API.entityService.updateIndividualInfo(requestBody)];
+                return [4, API.individualService.updateIndividual(requestBody)];
             case 1:
-                data = (_k.sent()).data;
+                data = (_l.sent()).data;
                 if (!(data === null || data === void 0 ? void 0 : data.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
+                    (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }
@@ -252,7 +322,7 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
                 (_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: __assign(__assign({}, data), { flows: BUSINESS_FLOW_SUCCESS.concat(data === null || data === void 0 ? void 0 : data.info) }), formData: params }];
+                return [2, { response: __assign(__assign({}, data), { flows: BUSINESS_FLOW_SUCCESS.concat((data === null || data === void 0 ? void 0 : data.info) || []) }), formData: params }];
         }
     });
 }); });
@@ -308,25 +378,20 @@ export var individualSlice = createSlice({
                 state.error = description;
                 return;
             }
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), boardResponse), state.data.verify.responseBody), { board_id: data.id });
+            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id });
             state.data.verify.token = token;
-            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 _c = boardResponse || {}, countries = _c.countries, user = _c.user, countryCode = _c.countryCode;
+            var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_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]);
+            var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) ||
+                (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
-            var selectedMonthlyIncome = (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) { var _a; return ((_a = income === null || income === void 0 ? void 0 : income.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === (actual_income === null || actual_income === void 0 ? void 0 : actual_income.toLocaleLowerCase()); })) || (monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList[2]);
-            if (!!selectedMonthlyIncome)
-                state.data.individualData.monthlyIncome = selectedMonthlyIncome;
-            var code = (data === null || data === void 0 ? void 0 : data.employer_country) || countryCode;
+            var code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
             if (!!code) {
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
             }
-            var selectedOccupation = (occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (o) { var _a; return ((_a = o === null || o === void 0 ? void 0 : o.name_en) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === (occupation === null || occupation === void 0 ? void 0 : occupation.toLocaleLowerCase()); })) || (occupationList === null || occupationList === void 0 ? void 0 : occupationList[0]);
-            if (!!selectedOccupation)
-                state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })
@@ -359,7 +424,7 @@ export var individualSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, data = _b.data, formData = _b.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, boardResponse = _b.boardResponse;
             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;
@@ -367,7 +432,21 @@ export var individualSlice = createSlice({
             }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.individualData = __assign({}, state.data.individualData);
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
+            var _c = boardResponse || {}, countries = _c.countries, user = _c.user, countryCode = _c.countryCode;
+            var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_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; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) ||
+                (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
+            if (!!selectedSourceIncome)
+                state.data.individualData.sourceIncome = selectedSourceIncome;
+            var code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
+            if (!!code) {
+                var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
+                state.data.individualData.employerLocation = employerLocation;
+            }
+            state.data.individualData.isPEP = is_relative_PEP;
+            state.data.individualData.isInfluencer = is_influencer;
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
@@ -382,7 +461,7 @@ export var individualSlice = createSlice({
             state.error = null;
             var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, occupation = _a.occupation;
             var data = state.data.individualData.responseBody;
-            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [], occupationList: occupation || [] });
+            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.list) || [], monthlyIncomeList: (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) || [], occupationList: (occupation === null || occupation === void 0 ? void 0 : occupation.list) || [] });
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;
@@ -417,8 +496,8 @@ export var individualSlice = createSlice({
             state.error = null;
             state.loading = false;
             var data = (action.payload || {}).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 });
+            var entity = (data || {}).entity;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), data), { entity: entity });
         })
             .addCase(retrieveBoardDetails.rejected, function (state, action) {
             state.error = action.error.message;

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

@@ -2,13 +2,7 @@ import { RootState } from '../../../app/store';
 import { FlowsTypes, OTPFormValues, PasswordCreateFormValues, ResponseData, SharedState } from '../../../@types';
 export declare const verifyLeadToken: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
-    boardResponse: {
-        flows: {
-            name: string;
-            status: string;
-            url: string;
-        }[];
-    };
+    boardResponse: any;
     token: string;
 }, string, {}>;
 export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{

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

@@ -49,13 +49,13 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes } from '../../../@types';
-import { handleCurrentActiveScreen, handleNextScreenStep } from '../../../app/settings';
+import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BUSINESS_FLOW_SUCCESS, 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, boardInfoData, board_id, board_info_id, info, hasPasswordCompleted;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var payload, data, boardInfoData, boardData, board_id, board_info_id, countryIso2, info, hasPasswordCompleted;
+    var _a, _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 payload = {
                     service_name: 'tap_email',
@@ -63,21 +63,28 @@ export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', functio
                 };
                 return [4, API.leadService.verifyLeadToken(payload)];
             case 1:
-                data = (_b.sent()).data;
-                boardInfoData = undefined;
-                if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 5];
+                data = (_e.sent()).data;
+                boardData = undefined;
+                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, 3];
+                if (!(board_id && board_info_id)) return [3, 3];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 2:
-                boardInfoData = _b.sent();
-                _b.label = 3;
-            case 3: return [4, thunkApi.dispatch(retrieveBoardDetails(board_id))];
+                boardInfoData = _e.sent();
+                _e.label = 3;
+            case 3:
+                if (!board_id) return [3, 5];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 4:
-                _b.sent();
-                info = boardInfoData.info;
-                hasPasswordCompleted = ((_a = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'password'; })) === null || _a === void 0 ? void 0 : _a.status) === 'completed';
+                boardData = _e.sent();
+                _e.label = 5;
+            case 5:
+                countryIso2 = (_a = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _a === void 0 ? void 0 : _a.country;
+                if (countryIso2)
+                    thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
+                info = (boardInfoData || {}).info;
+                hasPasswordCompleted = ((_b = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'password'; })) === null || _b === void 0 ? void 0 : _b.status) === 'completed';
                 if (data.step_name === PASSWORD_STEP_NAMES.PHONE_AUTH) {
                     thunkApi.dispatch(handleCurrentActiveScreen('PASSWORD_VERIFY_STEP'));
                 }
@@ -87,8 +94,12 @@ export var verifyLeadToken = createAsyncThunk('passwordVerifyLeadToken', functio
                 else 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, boardResponse: { flows: BUSINESS_FLOW_SUCCESS.concat(boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) }, token: token }];
+                _e.label = 6;
+            case 6: return [2, {
+                    data: data,
+                    boardResponse: __assign(__assign({}, boardData === null || boardData === void 0 ? void 0 : boardData.business), { flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []), 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: (_c = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _c === void 0 ? void 0 : _c.names, contact: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.contact }),
+                    token: token
+                }];
         }
     });
 }); });
@@ -118,7 +129,7 @@ export var retrieveBoardDetails = createAsyncThunk('retrievePasswordBoardDetails
             case 1:
                 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 })
+                        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.names, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.contact })
                     }];
         }
     });
@@ -202,7 +213,7 @@ export var updateBoardSuccess = createAsyncThunk('passwordUpdateBoardSuccess', f
                 (_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: __assign(__assign({}, data), { flows: BUSINESS_FLOW_SUCCESS.concat(data === null || data === void 0 ? void 0 : data.info) }), formData: params }];
+                return [2, { response: __assign(__assign({}, data), { flows: BUSINESS_FLOW_SUCCESS.concat((data === null || data === void 0 ? void 0 : data.info) || []) }), formData: params }];
         }
     });
 }); });
@@ -227,7 +238,7 @@ export var verifyOperationToken = createAsyncThunk('verifyOperationToken', funct
                 _a.label = 3;
             case 3:
                 thunkApi.dispatch(handleNextScreenStep('PASSWORD_CREATE_PASSWORD_STEP'));
-                return [2, { data: data, token: token, boardId: boardId, flows: BUSINESS_FLOW_SUCCESS.concat(boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) }];
+                return [2, { data: data, token: token, boardId: boardId, flows: BUSINESS_FLOW_SUCCESS.concat((boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || []) }];
         }
     });
 }); });