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

@tap-payments/auth-jsconnect 2.4.28-test → 2.4.29

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 (835) hide show

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -67,27 +67,28 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import API from '@api';
-import { FlowsTypes, IndividualGender, IndividualType, DocumentPurpose } from '@types';
-import { handleNextScreenStep, handlePrevScreenStep, handleSetCountryByIso2 } from '@app/settings';
-import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '@constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType } from '@utils';
+import API from '../../../api';
+import { FlowsTypes, IndividualGender, DocumentPurpose } from '../../../@types';
+import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
+import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES, MONTHLY_INCOME_LIST } from '../../../constants';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType, isOtherThanKWOrSA } from '../../../utils';
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, board_id, board_info_id, notification, _b, id, type, data_1, birthCountry, individuals, _c, is_authorized, data_state;
-        var _d, _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
+        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, publicKey, board_id, board_info_id, notification, _b, id, type, data_1, birthCountry, individuals, _c, is_authorized, data_state;
+        var _d, _e, _f, _g, _h, _j, _k, _l;
+        return __generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
-                    payload = {
-                        service_name: 'tap_email',
-                        verify_token: token
-                    };
+                    payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
+                        notification: {
+                            sms: false
+                        }
+                    }));
                     settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_l.sent()).data;
+                    data = (_m.sent()).data;
                     boardInfoStatus = undefined;
                     countries = settings.data.countries;
                     if (((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
@@ -98,6 +99,10 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                         countryCode = data === null || data === void 0 ? void 0 : data.country_code;
                         thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
+                    publicKey = (_e = data === null || data === void 0 ? void 0 : data.config) === null || _e === void 0 ? void 0 : _e.public_key;
+                    if (publicKey) {
+                        thunkApi.dispatch(handlePublicKey(publicKey));
+                    }
                     if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_INFO)) return [3, 2];
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PHONE_INFO_STEP'));
                     return [3, 16];
@@ -108,54 +113,56 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                     if (!(board_id && board_info_id)) return [3, 5];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 3:
-                    boardInfoData = _l.sent();
+                    boardInfoData = _m.sent();
                     notification = (boardInfoData || {}).notification;
                     _b = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _b.id, type = _b.type;
                     if (!(id && type)) return [3, 5];
                     return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
                 case 4:
-                    data_1 = (_l.sent()).data;
+                    data_1 = (_m.sent()).data;
                     individualData = data_1 || {};
-                    _l.label = 5;
+                    _m.label = 5;
                 case 5:
                     if (!board_id) return [3, 7];
                     return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 6:
-                    boardData = _l.sent();
-                    _l.label = 7;
+                    boardData = _m.sent();
+                    _m.label = 7;
                 case 7:
-                    if (!countryCode) {
-                        countryCode = (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.country;
-                        if (countryCode)
-                            thunkApi.dispatch(handleSetCountryByIso2(countryCode));
+                    if (!countryCode && ((_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country)) {
+                        countryCode = boardData.entity.country;
+                        thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
                     if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 11];
-                    if (!((_f = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _f === void 0 ? void 0 : _f.id)) return [3, 9];
-                    return [4, thunkApi.dispatch(getIndividualList((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id))];
+                    if (!((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id)) return [3, 9];
+                    return [4, thunkApi.dispatch(getIndividualList((_h = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _h === void 0 ? void 0 : _h.id))];
                 case 8:
-                    _l.sent();
-                    _l.label = 9;
+                    _m.sent();
+                    _m.label = 9;
                 case 9: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 10:
-                    boardInfoStatus = _l.sent();
+                    boardInfoStatus = _m.sent();
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                     return [3, 14];
                 case 11:
-                    birthCountry = ((_h = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _h === void 0 ? void 0 : _h.country) || countryCode;
+                    birthCountry = ((_j = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _j === void 0 ? void 0 : _j.country) || countryCode;
                     if (!birthCountry) return [3, 13];
                     return [4, thunkApi.dispatch(getCityList(birthCountry))];
                 case 12:
-                    _l.sent();
-                    _l.label = 13;
+                    _m.sent();
+                    _m.label = 13;
                 case 13:
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                    _l.label = 14;
+                    if (isInternally)
+                        sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
+                    else
+                        thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
+                    _m.label = 14;
                 case 14: return [3, 16];
                 case 15:
                     if (isUpdatePhoneInfo) {
                         thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_VERIFY_STEP'));
                     }
-                    _l.label = 16;
+                    _m.label = 16;
                 case 16:
                     individuals = (boardData || {}).individuals;
                     _c = individualData || {}, is_authorized = _c.is_authorized, data_state = _c.data_state;
@@ -167,8 +174,8 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                                 entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                                 merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                                 merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                                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,
+                                name: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.names,
+                                contact: (_l = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _l === void 0 ? void 0 : _l.contact,
                                 individuals: is_authorized ? individuals : __assign(__assign({}, individuals), (!!data_state && { data_state: data_state })),
                                 countries: countries,
                                 countryCode: countryCode,
@@ -238,7 +245,7 @@ export var addDetailsAsync = createAsyncThunk('individual/addDetailsAsync', func
     });
 }); });
 export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsByEmail', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var individual, _a, merchant_id, board_id, user, collectInfo, id, objects, ids, _b, resEmail, resPhone, isPhoneAndEmailAvailable, email, mobile, countryCode, hasContact, individualData, hasPhone, requestBody, data_2, list, payload, data;
+    var individual, _a, merchant_id, board_id, user, collectInfo, id, objects, ids, _b, resEmail, resPhone, isPhoneAndEmailAvailable, email, mobile, countryCode, hasContact, individualData, hasPhone, requestBody, data_2, user_1, payload, data;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -269,8 +276,8 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                 return [4, API.individualService.updateMultipleIndividual(requestBody)];
             case 1:
                 data_2 = _d.sent();
-                list = sortUserList(mapUserList(data_2 === null || data_2 === void 0 ? void 0 : data_2.individuals)) || [];
-                individualData = (list === null || list === void 0 ? void 0 : list[0]) && __assign({}, list[0]);
+                user_1 = (sortUserList(mapUserList(data_2 === null || data_2 === void 0 ? void 0 : data_2.individuals)) || [])[0];
+                individualData = user_1;
                 _d.label = 2;
             case 2:
                 payload = {
@@ -292,7 +299,7 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                 return [4, API.boardService.requestDetailsByEmail(payload)];
             case 3:
                 data = _d.sent();
-                return [2, { data: data, userData: __assign({}, individualData) }];
+                return [2, { data: data, individualData: individualData }];
         }
     });
 }); });
@@ -330,23 +337,24 @@ export var getCityList = createAsyncThunk('individual/getCityList', function (co
     });
 }); });
 export var retrieveIndividualInfo = createAsyncThunk('individual/retrieveIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, type, countryCode, settings, data, individualData;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var id, type, countryCode, settings, data, _a, isShareholder, isBoardMember, isBuyer, isCustomer, individualData;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 id = params.id, type = params.type, countryCode = params.countryCode;
                 settings = thunkApi.getState().settings;
                 return [4, API.individualService.retrieveIndividual(id, type)];
             case 1:
-                data = _a.sent();
+                data = _b.sent();
+                _a = getIndividualType([type]), isShareholder = _a.isShareholder, isBoardMember = _a.isBoardMember, isBuyer = _a.isBuyer, isCustomer = _a.isCustomer;
                 individualData = data === null || data === void 0 ? void 0 : data.user;
-                if (type === IndividualType.SHARE_HOLDER)
+                if (isShareholder)
                     individualData = data === null || data === void 0 ? void 0 : data.shareholder;
-                else if (type === IndividualType.BOARD_MEMBER)
+                else if (isBoardMember)
                     individualData = data === null || data === void 0 ? void 0 : data.board_member;
-                else if (type === IndividualType.BUYER)
+                else if (isBuyer)
                     individualData = data === null || data === void 0 ? void 0 : data.buyer;
-                else if (type === IndividualType.CUSTOMER)
+                else if (isCustomer)
                     individualData = data === null || data === void 0 ? void 0 : data.customer;
                 return [2, {
                         data: __assign(__assign({}, (individualData || {})), { objects: [type], individual_data_state: individualData === null || individualData === void 0 ? void 0 : individualData.data_state, object: type }),
@@ -357,7 +365,7 @@ export var retrieveIndividualInfo = createAsyncThunk('individual/retrieveIndivid
     });
 }); });
 export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode) { return __awaiter(void 0, void 0, void 0, function () {
-    var monthlyIncomeBody, dataBody, _a, sourceIncome, monthlyIncome, occupation;
+    var monthlyIncomeBody, dataBody, _a, sourceIncome, monthlyIncome, occupationData, occupation, mappedOccupation;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -374,11 +382,16 @@ export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', fun
                         API.dataService.getOccupation(dataBody)
                     ])];
             case 1:
-                _a = _b.sent(), sourceIncome = _a[0], monthlyIncome = _a[1], occupation = _a[2];
+                _a = _b.sent(), sourceIncome = _a[0], monthlyIncome = _a[1], occupationData = _a[2];
+                occupation = (occupationData === null || occupationData === void 0 ? void 0 : occupationData.occupation) || {};
+                mappedOccupation = (occupation.section || []).map(function (section) {
+                    var sub = (occupation.chapter || []).filter(function (chapter) { return chapter.section_code === section.code; });
+                    return __assign(__assign({}, section), { sub: sub });
+                });
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
-                        occupation: occupation
+                        occupation: { list: mappedOccupation || [] }
                     }];
         }
     });
@@ -407,16 +420,16 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
             case 1:
                 _a = _d.sent(), user = _a.user, data = __rest(_a, ["user"]);
                 return [2, {
-                        data: __assign(__assign({}, data), { 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: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.names, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.contact })
+                        data: __assign(__assign({}, data), { 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: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.names, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.contact, board_status: data === null || data === void 0 ? void 0 : data.status })
                     }];
         }
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, boardInfoStatus, countryCode, notification, _c, id, type, data_3, birthCountry, individuals, _d, is_authorized, data_state;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    return __generator(this, function (_q) {
-        switch (_q.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, boardInfoStatus, countryCode, publicKey, notification, _c, id, type, data_3, birthCountry, individuals, _d, is_authorized, data_state;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    return __generator(this, function (_r) {
+        switch (_r.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
@@ -431,55 +444,66 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_q.sent()).data;
-                boardInfoStatus = undefined;
+                data = (_r.sent()).data;
+                countryCode = undefined;
                 if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
+                publicKey = (_g = data === null || data === void 0 ? void 0 : data.config) === null || _g === void 0 ? void 0 : _g.public_key;
+                if (publicKey) {
+                    thunkApi.dispatch(handlePublicKey(publicKey));
+                }
+                if (data === null || data === void 0 ? void 0 : data.country_code) {
+                    countryCode = data.country_code;
+                    thunkApi.dispatch(handleSetCountryByIso2(data.country_code));
+                }
                 if (!board_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 2:
-                boardData = _q.sent();
-                _q.label = 3;
+                boardData = _r.sent();
+                _r.label = 3;
             case 3:
-                countryCode = (_g = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _g === void 0 ? void 0 : _g.country;
+                if (!countryCode && ((_h = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _h === void 0 ? void 0 : _h.country)) {
+                    countryCode = boardData.entity.country;
+                    thunkApi.dispatch(handleSetCountryByIso2(countryCode));
+                }
                 if (!(board_id && board_info_id)) return [3, 6];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 4:
-                boardInfoData = _q.sent();
+                boardInfoData = _r.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, 6];
                 return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
             case 5:
-                data_3 = (_q.sent()).data;
+                data_3 = (_r.sent()).data;
                 individualData = data_3 || {};
-                _q.label = 6;
+                _r.label = 6;
             case 6:
                 if (countryCode)
                     thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                 if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 10];
-                if (!((_h = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _h === void 0 ? void 0 : _h.id)) return [3, 8];
-                return [4, thunkApi.dispatch(getIndividualList((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id))];
+                if (!((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id)) return [3, 8];
+                return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id))];
             case 7:
-                _q.sent();
-                _q.label = 8;
+                _r.sent();
+                _r.label = 8;
             case 8: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 9:
-                boardInfoStatus = _q.sent();
+                boardInfoStatus = _r.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                 return [3, 13];
             case 10:
-                birthCountry = ((_k = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _k === void 0 ? void 0 : _k.country) || countryCode;
+                birthCountry = ((_l = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _l === void 0 ? void 0 : _l.country) || countryCode;
                 if (!birthCountry) return [3, 12];
                 return [4, thunkApi.dispatch(getCityList(birthCountry))];
             case 11:
-                _q.sent();
-                _q.label = 12;
+                _r.sent();
+                _r.label = 12;
             case 12:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                _q.label = 13;
+                _r.label = 13;
             case 13:
-                (_m = (_l = settings.data.appConfig).onStepCompleted) === null || _m === void 0 ? void 0 : _m.call(_l, settings.data.activeScreen.name, { otp: params.otp });
+                (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, { otp: params.otp });
                 individuals = (boardData || {}).individuals;
                 _d = individualData || {}, is_authorized = _d.is_authorized, data_state = _d.data_state;
                 return [2, {
@@ -490,8 +514,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                             merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                            name: (_o = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _o === void 0 ? void 0 : _o.names,
-                            contact: (_p = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _p === void 0 ? void 0 : _p.contact,
+                            name: (_p = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _p === void 0 ? void 0 : _p.names,
+                            contact: (_q = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _q === void 0 ? void 0 : _q.contact,
                             individuals: is_authorized ? individuals : __assign(__assign({}, individuals), (!!data_state && { data_state: data_state })),
                             countries: countries,
                             countryCode: countryCode,
@@ -539,7 +563,7 @@ export var updatePhoneInfo = createAsyncThunk('individual/updatePhoneInfo', func
 export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, individual, _c, notification, user, entity, id, _d, objects, ids, name, email, mobile, countryCode, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isGenderNonEditable, isNameENNonEditable, isNameARNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, nameIsEditable, contact, requestBody, data, _e, isUser, isBuyer, isUserORBuyerType;
+        var _b, settings, individual, _c, notification, user, entity, id, _d, objects, ids, countryCode, name, email, mobile, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isGenderNonEditable, isNameENNonEditable, isNameARNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, nameIsEditable, contact, requestBody, data, currencyData, _e, isUser, isBuyer, isUserORBuyerType;
         var _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
@@ -548,11 +572,15 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     _c = individual.data.verify.responseBody || {}, notification = _c.notification, user = _c.user, entity = _c.entity;
                     id = (((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}).id;
                     _d = user || {}, objects = _d.objects, ids = _d.ids;
-                    name = formData.name, email = formData.email, mobile = formData.mobile, countryCode = formData.countryCode, gender = formData.gender, nid = formData.nid, issuedCountry = formData.issuedCountry, expiryDate = formData.expiryDate, dob = formData.dob, placeOfBirthCountry = formData.placeOfBirthCountry, placeOfBirthCity = formData.placeOfBirthCity, nationality = formData.nationality;
+                    countryCode = (originalFormData || {}).countryCode;
+                    name = formData.name, email = formData.email, mobile = formData.mobile, gender = formData.gender, nid = formData.nid, issuedCountry = formData.issuedCountry, expiryDate = formData.expiryDate, dob = formData.dob, placeOfBirthCountry = formData.placeOfBirthCountry, placeOfBirthCity = formData.placeOfBirthCity, nationality = formData.nationality;
                     code = entity === null || entity === void 0 ? void 0 : entity.country;
                     data_status = (user || {}).data_status;
                     userName = getUserNameObject(name);
                     identification_id_type = nid ? (nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA) : undefined;
+                    if (isOtherThanKWOrSA(settings.data.businessCountry.iso2)) {
+                        identification_id_type = IDENTIFICATION_TYPE.NID;
+                    }
                     isGenderNonEditable = hasNoneEditableValue(data_status, 'gender');
                     isNameENNonEditable = hasNoneEditableValue(data_status, 'name.en');
                     isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');
@@ -567,13 +595,14 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     isDOBNonEditable = hasNoneEditableValue(data_status, 'birth.date');
                     isBirthCityNonEditable = hasNoneEditableValue(data_status, 'birth.city');
                     isBirthCountryNonEditable = hasNoneEditableValue(data_status, 'birth.country');
-                    hasContact = email || mobile || countryCode;
+                    hasContact = email || mobile;
                     hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
                     hasIdentification = nid && (issuedCountry || identification_id_type || expiryDate);
                     hasBirth = placeOfBirthCity || placeOfBirthCountry;
                     nameIsEditable = userName.first && !(isNameENNonEditable && isNameARNonEditable);
                     contact = hasContact && !(isEmailNonEditable && isMobileCountryNonEditable && isMobileNumberNonEditable)
-                        ? __assign({ email: isEmailNonEditable ? undefined : email }, (!((isMobileCountryNonEditable && isMobileNumberNonEditable) || !hasPhone) && {
+                        ? __assign({ email: isEmailNonEditable ? undefined : email }, (!(isMobileCountryNonEditable && isMobileNumberNonEditable) &&
+                            hasPhone && {
                             phone: {
                                 country_code: isMobileCountryNonEditable ? undefined : (_h = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _h === void 0 ? void 0 : _h.toString(),
                                 number: isMobileNumberNonEditable || !mobile ? undefined : mobile
@@ -618,17 +647,20 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
                     data = _l.sent();
+                    return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
+                case 2:
+                    currencyData = _l.sent();
                     _e = getIndividualType(objects), isUser = _e.isUser, isBuyer = _e.isBuyer;
                     isUserORBuyerType = isUser || isBuyer;
-                    if (!isUserORBuyerType) return [3, 3];
+                    if (!isUserORBuyerType) return [3, 4];
                     return [4, thunkApi.dispatch(retrieveDataList(code))];
-                case 2:
-                    _l.sent();
-                    _l.label = 3;
                 case 3:
+                    _l.sent();
+                    _l.label = 4;
+                case 4:
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
                     (_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: originalFormData }];
+                    return [2, { data: data, formData: originalFormData, currencyData: currencyData }];
             }
         });
     });
@@ -636,7 +668,7 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, individual, _c, notification, user, id, _d, objects, ids, occupation, sourceIncome, monthlyIncome, isPEP, isInfluencer, shareCount, shareValue, civilID, signatureFileId, isOccupationNonEditable, isSourceIncomeNonEditable, isPEPNonEditable, isInfluencerNonEditable, isMonthlyIncomeNonEditable, isSharesAvailable, pepInfo, influencerInfo, occupationInfo, sourceIncomeInfo, monthlyIncomeInfo, userPayload, shareHolderPayload, boardMemberPayload, buyerMemberPayload, _e, isUser, isShareholder, isBoardMember, isBuyer, isCustomer, isUserORBuyerType, payload, requestBody, data, businessCountry, hasCivilIdDocument, hasSignatureDocument, isSendSignatureFile, civilIdDocument, signatureDocument, documentBody, documentBody, documentsList, documentBody, list, individualData;
+        var _b, settings, individual, _c, notification, user, id, _d, objects, ids, occupation, sourceIncome, monthlyIncome, isPEP, isInfluencer, shareCount, shareValue, civilID, signatureFileId, isOccupationNonEditable, isSourceIncomeNonEditable, isPEPNonEditable, isInfluencerNonEditable, isMonthlyIncomeNonEditable, isSharesAvailable, pepInfo, influencerInfo, occupationInfo, sourceIncomeInfo, monthlyIncomeInfo, userPayload, shareHolderPayload, boardMemberPayload, buyerMemberPayload, _e, isUser, isShareholder, isBoardMember, isBuyer, isCustomer, isUserORBuyerType, payload, requestBody, data, businessCountry, hasCivilIdDocument, hasSignatureDocument, isSendSignatureFile, civilIdDocument, signatureDocument, documentBody, documentBody, documentsList, documentBody, individualData;
         var _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -652,9 +684,9 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     isInfluencerNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'is_influencer');
                     isMonthlyIncomeNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'monthly_income');
                     isSharesAvailable = shareCount || shareValue;
-                    pepInfo = isPEPNonEditable ? undefined : isPEP;
-                    influencerInfo = isInfluencerNonEditable ? undefined : isInfluencer;
-                    occupationInfo = isOccupationNonEditable || !(occupation === null || occupation === void 0 ? void 0 : occupation.id) ? undefined : { id: occupation.id };
+                    pepInfo = isPEPNonEditable || isPEP === null ? undefined : isPEP;
+                    influencerInfo = isInfluencerNonEditable || isInfluencer === null ? undefined : isInfluencer;
+                    occupationInfo = isOccupationNonEditable || !(occupation === null || occupation === void 0 ? void 0 : occupation.id) ? undefined : { chapter: { id: occupation.id } };
                     sourceIncomeInfo = isSourceIncomeNonEditable || !(sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.id) ? undefined : [{ id: sourceIncome.id }];
                     monthlyIncomeInfo = isMonthlyIncomeNonEditable || !(monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.id) ? undefined : { id: monthlyIncome.id };
                     userPayload = {
@@ -733,8 +765,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     _h.sent();
                     _h.label = 7;
                 case 7:
-                    list = sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [];
-                    individualData = (list === null || list === void 0 ? void 0 : list[0]) && __assign({}, list[0]);
+                    individualData = (sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [])[0];
                     thunkApi.dispatch(handleNextScreenStep());
                     (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, requestBody);
                     return [2, { data: data, formData: originalFormData, individualData: individualData }];
@@ -742,20 +773,23 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
         });
     });
 });
-export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', function (_a) {
+export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', function (_a, thunkApi) {
     var email = _a.email, cancelToken = _a.cancelToken, onSuccess = _a.onSuccess;
     return __awaiter(void 0, void 0, void 0, function () {
-        var requestBody, data;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var settings, requestBody, data;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
+                    settings = thunkApi.getState().settings;
                     requestBody = {
                         email: email,
+                        country: (_b = settings.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2,
                         encryption_contract: ['email']
                     };
                     return [4, API.availabilityServices.checkEmail(requestBody, { cancelToken: cancelToken })];
                 case 1:
-                    data = (_b.sent()).data;
+                    data = (_c.sent()).data;
                     onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
                     if (!data.errors)
                         return [2, { response: data, formData: email }];
@@ -805,12 +839,27 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
         }
     });
 }); });
+export var onCloseCompleteIndividual = createAsyncThunk('individual/onCloseCompleteIndividual', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var individual, _a, merchant, brand, entity;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                individual = thunkApi.getState().individual;
+                _a = individual.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
+            case 1:
+                _b.sent();
+                return [2];
+        }
+    });
+}); });
 var initialState = {
     error: null,
     loading: false,
     cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
+        currency: '',
         verify: {
             token: ''
         },
@@ -955,7 +1004,7 @@ export var individualSlice = createSlice({
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: userList });
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: userList, user: __assign(__assign({}, user), { is_authorized: (user === null || user === void 0 ? void 0 : user.is_authorized) !== undefined ? user === null || user === void 0 ? void 0 : user.is_authorized : primaryUser === null || primaryUser === void 0 ? void 0 : primaryUser.is_authorized }) });
             var _f = user || {}, source_income = _f.source_income, monthly_income = _f.monthly_income, occupation = _f.occupation, is_relative_PEP = _f.is_relative_PEP, is_influencer = _f.is_influencer, birth = _f.birth, contact = _f.contact, identification = _f.identification, nationality = _f.nationality, gender = _f.gender, shares = _f.shares;
-            var _g = state.data.individualData.responseBody || {}, sourceIncomeList = _g.sourceIncomeList, monthlyIncomeList = _g.monthlyIncomeList, occupationList = _g.occupationList;
+            var _g = state.data.individualData.responseBody || {}, sourceIncomeList = _g.sourceIncomeList, monthlyIncomeList = _g.monthlyIncomeList;
             var cityList = (state.data.verify.responseBody || {}).cityList;
             if (user)
                 state.data.individualPersonalData.name = getUserName(user, false);
@@ -1005,9 +1054,7 @@ export var individualSlice = createSlice({
             var selectedMonthlyIncome = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) {
                 return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id);
             });
-            var selectedOccupation = occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occup) {
-                return occup.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id);
-            });
+            var selectedOccupation = (occupation === null || occupation === void 0 ? void 0 : occupation.chapter) || (occupation === null || occupation === void 0 ? void 0 : occupation.section);
             state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             state.data.individualData.occupation = selectedOccupation;
             if (is_relative_PEP !== undefined)
@@ -1026,12 +1073,12 @@ export var individualSlice = createSlice({
             .addCase(requestDetailsByEmail.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, userData = _a.userData;
+            var _a = action.payload, data = _a.data, individualData = _a.individualData;
             var userList = (state.data.verify.responseBody || {}).userList;
             var list = userList || [];
             list = list.map(function (user) {
                 var _a, _b;
-                var userInfo = user.id === (userData === null || userData === void 0 ? void 0 : userData.id) ? userData : user;
+                var userInfo = user.id === (individualData === null || individualData === void 0 ? void 0 : individualData.id) ? individualData : user;
                 return user.id === ((_b = (_a = data === null || data === void 0 ? void 0 : data.notification) === null || _a === void 0 ? void 0 : _a.recipient) === null || _b === void 0 ? void 0 : _b.id) ? __assign(__assign({}, userInfo), { isRequestedEmail: true }) : userInfo;
             });
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { requestEmailData: data, userList: list });
@@ -1050,7 +1097,7 @@ export var individualSlice = createSlice({
             var user = (state.data.verify.responseBody || {}).user;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { primaryUser: data, user: __assign(__assign({}, data), { is_authorized: data.is_authorized !== undefined ? data.is_authorized : user === null || user === void 0 ? void 0 : user.is_authorized }) });
             var _f = data || {}, source_income = _f.source_income, monthly_income = _f.monthly_income, occupation = _f.occupation, is_relative_PEP = _f.is_relative_PEP, is_influencer = _f.is_influencer, birth = _f.birth, contact = _f.contact, identification = _f.identification, nationality = _f.nationality, gender = _f.gender, shares = _f.shares;
-            var _g = state.data.individualData.responseBody || {}, sourceIncomeList = _g.sourceIncomeList, monthlyIncomeList = _g.monthlyIncomeList, occupationList = _g.occupationList;
+            var _g = state.data.individualData.responseBody || {}, sourceIncomeList = _g.sourceIncomeList, monthlyIncomeList = _g.monthlyIncomeList;
             var cityList = (state.data.verify.responseBody || {}).cityList;
             if (data)
                 state.data.individualPersonalData.name = getUserName(data, false);
@@ -1100,9 +1147,7 @@ export var individualSlice = createSlice({
             var selectedMonthlyIncome = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) {
                 return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id);
             });
-            var selectedOccupation = occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occup) {
-                return occup.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id);
-            });
+            var selectedOccupation = (occupation === null || occupation === void 0 ? void 0 : occupation.chapter) || (occupation === null || occupation === void 0 ? void 0 : occupation.section);
             state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
@@ -1129,25 +1174,23 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
-            var _a;
+            var _a, _b;
             state.loading = false;
             state.error = null;
-            var _b = action.payload, sourceIncome = _b.sourceIncome, monthlyIncome = _b.monthlyIncome, occupationData = _b.occupation;
+            var _c = action.payload, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, occupationData = _c.occupation;
             var data = state.data.individualData.responseBody;
             var sourceIncomeList = (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.list) || [];
-            var monthlyIncomeList = (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) || [];
+            var monthlyIncomeList = ((_a = monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) === null || _a === void 0 ? void 0 : _a.length) ? monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list : MONTHLY_INCOME_LIST;
             var occupationList = (occupationData === null || occupationData === void 0 ? void 0 : occupationData.list) || [];
             state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncomeList, monthlyIncomeList: monthlyIncomeList, occupationList: occupationList });
-            var _c = ((_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.user) || {}, source_income = _c.source_income, monthly_income = _c.monthly_income, occupation = _c.occupation;
-            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]);
+            var _d = ((_b = state.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.user) || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation;
+            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); });
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;
             var selectedMonthlyIncome = monthlyIncomeList === null || monthlyIncomeList === void 0 ? void 0 : monthlyIncomeList.find(function (income) {
                 return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.id);
             });
-            var selectedOccupation = occupationList === null || occupationList === void 0 ? void 0 : occupationList.find(function (occup) {
-                return occup.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id);
-            });
+            var selectedOccupation = (occupation === null || occupation === void 0 ? void 0 : occupation.chapter) || (occupation === null || occupation === void 0 ? void 0 : occupation.section);
             state.data.individualData.monthlyIncome = selectedMonthlyIncome;
             state.data.individualData.occupation = selectedOccupation;
         })
@@ -1199,11 +1242,14 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(updateIndividualPersonalInfo.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, currencyData = _b.currencyData;
             state.data.individualPersonalData = formData;
             state.data.individualPersonalData.responseBody = data;
+            if ((_a = currencyData === null || currencyData === void 0 ? void 0 : currencyData.code) === null || _a === void 0 ? void 0 : _a.english)
+                state.data.currency = currencyData.code.english;
         })
             .addCase(updateIndividualPersonalInfo.rejected, function (state, action) {
             state.loading = false;
@@ -1285,7 +1331,10 @@ export var individualSlice = createSlice({
             }
             var flows = response.flows;
             var individuals = (state.data.verify.responseBody || {}).individuals;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { flows: flows }), (individualData && { individuals: __assign(__assign({}, individuals), { data_state: individualData === null || individualData === void 0 ? void 0 : individualData.data_state }) }));
+            var data_state = (((individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) ? individuals : individualData) || {}).data_state;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), { flows: flows }), (data_state && {
+                individuals: __assign(__assign({}, individuals), { data_state: data_state })
+            }));
         })
             .addCase(updateBoardSuccess.pending, function (state) {
             state.loading = true;
@@ -1294,6 +1343,18 @@ export var individualSlice = createSlice({
             .addCase(updateBoardSuccess.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(onCloseCompleteIndividual.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteIndividual.fulfilled, function (state) {
+            state.loading = false;
+            state.error = null;
+        })
+            .addCase(onCloseCompleteIndividual.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         });
     }
 });