@tap-payments/auth-jsconnect 2.4.5-test → 2.4.6

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

@@ -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]) {
@@ -68,17 +68,17 @@ 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 } from '../../../utils';
+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;
-        var _c, _d, _e, _f, _g, _h, _j;
-        return __generator(this, function (_k) {
-            switch (_k.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',
@@ -87,10 +87,10 @@ export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a
                     settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_k.sent()).data;
+                    data = (_m.sent()).data;
                     boardInfoStatus = undefined;
                     countries = settings.data.countries;
-                    if (((_c = data.errors) === null || _c === void 0 ? void 0 : _c.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
+                    if (((_d = data.errors) === null || _d === void 0 ? void 0 : _d.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
                         throw new Error(data.errors[0].description || (data === null || data === void 0 ? void 0 : data.mw_error));
                     if (isInternally)
                         data.step_name = INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO;
@@ -98,6 +98,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,73 +112,76 @@ 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 = _k.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 = (_k.sent()).data;
+                    data_1 = (_m.sent()).data;
                     individualData = data_1 || {};
-                    _k.label = 5;
+                    _m.label = 5;
                 case 5:
                     if (!board_id) return [3, 7];
                     return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 6:
-                    boardData = _k.sent();
-                    _k.label = 7;
+                    boardData = _m.sent();
+                    _m.label = 7;
                 case 7:
                     if (!countryCode) {
-                        countryCode = (_d = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _d === void 0 ? void 0 : _d.country;
+                        countryCode = (_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country;
                         if (countryCode)
                             thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
                     if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 11];
-                    if (!((_e = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _e === void 0 ? void 0 : _e.id)) return [3, 9];
-                    return [4, thunkApi.dispatch(getIndividualList((_f = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _f === void 0 ? void 0 : _f.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:
-                    _k.sent();
-                    _k.label = 9;
+                    _m.sent();
+                    _m.label = 9;
                 case 9: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 10:
-                    boardInfoStatus = _k.sent();
+                    boardInfoStatus = _m.sent();
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                     return [3, 14];
                 case 11:
-                    birthCountry = ((_g = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _g === void 0 ? void 0 : _g.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:
-                    _k.sent();
-                    _k.label = 13;
+                    _m.sent();
+                    _m.label = 13;
                 case 13:
-                    sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                    _k.label = 14;
+                    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'));
                     }
-                    _k.label = 16;
-                case 16: return [2, {
-                        data: data,
-                        boardResponse: {
-                            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,
-                            merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                            name: (_h = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _h === void 0 ? void 0 : _h.names,
-                            contact: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.contact,
-                            individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
-                            countries: countries,
-                            countryCode: countryCode,
-                            notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
-                            business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
-                            flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || []
-                        },
-                        token: token
-                    }];
+                    _m.label = 16;
+                case 16:
+                    individuals = (boardData || {}).individuals;
+                    _c = individualData || {}, is_authorized = _c.is_authorized, data_state = _c.data_state;
+                    return [2, {
+                            data: data,
+                            boardResponse: {
+                                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,
+                                merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
+                                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,
+                                notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
+                                business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
+                                flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || []
+                            },
+                            token: token
+                        }];
             }
         });
     });
@@ -215,29 +222,27 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
     });
 }); });
 export var addDetailsAsync = createAsyncThunk('individual/addDetailsAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, user, userList, id, type, birth, countryCode;
+    var settings, user, userList, birth, individual_id, countryCode;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 user = params.user, userList = params.userList;
-                id = user.id, type = user.type, birth = user.birth;
+                birth = user.birth, individual_id = user.individual_id;
                 countryCode = (birth === null || birth === void 0 ? void 0 : birth.country) || settings.data.businessCountry.iso2;
                 if (!countryCode) return [3, 2];
                 return [4, thunkApi.dispatch(getCityList(countryCode))];
             case 1:
                 _a.sent();
                 _a.label = 2;
-            case 2: return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type }))];
-            case 3:
-                _a.sent();
+            case 2:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                return [2, { userList: userList }];
+                return [2, { userList: userList, individualId: individual_id, countryCode: settings.data.businessCountry.iso2, countries: settings.data.countries }];
         }
     });
 }); });
 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, type, _b, resEmail, resPhone, isPhoneAndEmailAvailable, email, mobile, countryCode, hasContact, individualData, hasPhone, requestBody, data_2, 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) {
@@ -245,7 +250,7 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                 individual = thunkApi.getState().individual;
                 _a = individual.data.verify.responseBody || {}, merchant_id = _a.merchant_id, board_id = _a.board_id;
                 user = params.user, collectInfo = params.collectInfo;
-                id = user.id, type = user.type;
+                id = user.id, objects = user.objects, ids = user.ids;
                 _b = (user === null || user === void 0 ? void 0 : user.contact) || {}, resEmail = _b.email, resPhone = _b.phone;
                 isPhoneAndEmailAvailable = isValidEmail(resEmail) && (resPhone === null || resPhone === void 0 ? void 0 : resPhone.country_code) && (resPhone === null || resPhone === void 0 ? void 0 : resPhone.number);
                 email = collectInfo.email, mobile = collectInfo.mobile, countryCode = collectInfo.countryCode;
@@ -254,8 +259,7 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                 if (!(!isPhoneAndEmailAvailable && hasContact)) return [3, 2];
                 hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
                 requestBody = {
-                    id: id,
-                    type: type,
+                    ids: (ids === null || ids === void 0 ? void 0 : ids.length) ? ids : [id],
                     contact: {
                         email: email,
                         phone: hasPhone
@@ -266,18 +270,11 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                             : undefined
                     }
                 };
-                return [4, API.individualService.updateIndividual(requestBody)];
+                return [4, API.individualService.updateMultipleIndividual(requestBody)];
             case 1:
                 data_2 = _d.sent();
-                individualData = data_2 === null || data_2 === void 0 ? void 0 : data_2.user;
-                if (type === IndividualType.SHARE_HOLDER)
-                    individualData = data_2 === null || data_2 === void 0 ? void 0 : data_2.shareholder;
-                else if (type === IndividualType.BOARD_MEMBER)
-                    individualData = data_2 === null || data_2 === void 0 ? void 0 : data_2.board_member;
-                else if (type === IndividualType.BUYER)
-                    individualData = data_2 === null || data_2 === void 0 ? void 0 : data_2.buyer;
-                else if (type === IndividualType.CUSTOMER)
-                    individualData = data_2 === null || data_2 === void 0 ? void 0 : data_2.customer;
+                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 = {
@@ -291,7 +288,7 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                     notification: {
                         recipient: {
                             id: id,
-                            type: type
+                            type: (objects === null || objects === void 0 ? void 0 : objects[0]) || ''
                         },
                         channel: ['email']
                     }
@@ -299,14 +296,14 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                 return [4, API.boardService.requestDetailsByEmail(payload)];
             case 3:
                 data = _d.sent();
-                return [2, { data: data, userData: __assign(__assign({}, individualData), { type: type }) }];
+                return [2, { data: data, individualData: individualData }];
         }
     });
 }); });
 export var getIndividualList = createAsyncThunk('individual/getIndividualList', function (businessId) { return __awaiter(void 0, void 0, void 0, function () {
-    var payload, _a, users, shareholders, board_members, userList, shareHolderList, boardMemberList, individualList;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var payload, individuals, list;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 payload = {
                     page: 1,
@@ -315,12 +312,9 @@ export var getIndividualList = createAsyncThunk('individual/getIndividualList',
                 };
                 return [4, API.individualService.getIndividualList(payload)];
             case 1:
-                _a = _b.sent(), users = _a.users, shareholders = _a.shareholders, board_members = _a.board_members;
-                userList = (users || []).map(function (user) { return (__assign(__assign({}, user), { type: IndividualType.USER })); });
-                shareHolderList = (shareholders || []).map(function (shareholder) { return (__assign(__assign({}, shareholder), { type: IndividualType.SHARE_HOLDER })); });
-                boardMemberList = (board_members || []).map(function (board_member) { return (__assign(__assign({}, board_member), { type: IndividualType.BOARD_MEMBER })); });
-                individualList = __spreadArray(__spreadArray(__spreadArray([], userList, true), shareHolderList, true), boardMemberList, true);
-                return [2, individualList];
+                individuals = (_a.sent()).individuals;
+                list = sortUserList(mapUserList(individuals)) || [];
+                return [2, __spreadArray([], list, true)];
         }
     });
 }); });
@@ -340,30 +334,35 @@ 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 || {})), { type: type }), countryCode: countryCode, countries: settings.data.countries }];
+                return [2, {
+                        data: __assign(__assign({}, (individualData || {})), { objects: [type], individual_data_state: individualData === null || individualData === void 0 ? void 0 : individualData.data_state, object: type }),
+                        countryCode: countryCode,
+                        countries: settings.data.countries
+                    }];
         }
     });
 }); });
 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:
@@ -380,11 +379,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 || [] }
                     }];
         }
     });
@@ -419,10 +423,10 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
     });
 }); });
 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;
-    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, boardInfoStatus, publicKey, 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, _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;
@@ -430,62 +434,68 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 countries = settings.data.countries;
                 payload = {
                     data: params.otp,
-                    service_name: (_d = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _d === void 0 ? void 0 : _d.service_name,
+                    service_name: (_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _e === void 0 ? void 0 : _e.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 = (_p.sent()).data;
+                data = (_r.sent()).data;
                 boardInfoStatus = undefined;
-                if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
+                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 (!board_id) return [3, 3];
                 return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 2:
-                boardData = _p.sent();
-                _p.label = 3;
+                boardData = _r.sent();
+                _r.label = 3;
             case 3:
-                countryCode = (_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country;
+                countryCode = (_h = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _h === void 0 ? void 0 : _h.country;
                 if (!(board_id && board_info_id)) return [3, 6];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 4:
-                boardInfoData = _p.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 = (_p.sent()).data;
+                data_3 = (_r.sent()).data;
                 individualData = data_3 || {};
-                _p.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 (!((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id)) return [3, 8];
-                return [4, thunkApi.dispatch(getIndividualList((_h = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _h === void 0 ? void 0 : _h.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:
-                _p.sent();
-                _p.label = 8;
+                _r.sent();
+                _r.label = 8;
             case 8: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 9:
-                boardInfoStatus = _p.sent();
+                boardInfoStatus = _r.sent();
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                 return [3, 13];
             case 10:
-                birthCountry = ((_j = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _j === void 0 ? void 0 : _j.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:
-                _p.sent();
-                _p.label = 12;
+                _r.sent();
+                _r.label = 12;
             case 12:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                _p.label = 13;
+                _r.label = 13;
             case 13:
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, 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, {
                         data: data,
                         boardResponse: {
@@ -494,9 +504,9 @@ 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: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.names,
-                            contact: (_o = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _o === void 0 ? void 0 : _o.contact,
-                            individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
+                            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,
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
@@ -511,31 +521,30 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
 export var updatePhoneInfo = createAsyncThunk('individual/updatePhoneInfo', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var individual, _b, token, responseBody, _c, id, type, mobile, countryCode, requestBody, data;
-        var _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var individual, _b, token, responseBody, id, mobile, countryCode, requestBody, data;
+        var _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     individual = thunkApi.getState().individual;
                     _b = individual.data.verify, token = _b.token, responseBody = _b.responseBody;
-                    _c = (responseBody === null || responseBody === void 0 ? void 0 : responseBody.source) || {}, id = _c.id, type = _c.type;
+                    id = ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.source) || {}).id;
                     mobile = formData.mobile, countryCode = formData.countryCode;
                     requestBody = {
-                        id: id,
-                        type: type,
+                        ids: [id],
                         contact: {
                             phone: {
-                                country_code: (_d = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _d === void 0 ? void 0 : _d.toString(),
+                                country_code: (_c = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _c === void 0 ? void 0 : _c.toString(),
                                 number: mobile || ''
                             }
                         }
                     };
-                    return [4, API.individualService.updateIndividual(requestBody)];
+                    return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
-                    data = _e.sent();
+                    data = _d.sent();
                     return [4, thunkApi.dispatch(verifyToken({ token: token, isUpdatePhoneInfo: true }))];
                 case 2:
-                    _e.sent();
+                    _d.sent();
                     return [2, { data: data, formData: originalFormData }];
             }
         });
@@ -544,23 +553,30 @@ 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, _d, id, type, name, email, mobile, countryCode, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isNameNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, contact, requestBody, data;
-        var _e, _f, _g, _h, _j;
-        return __generator(this, function (_k) {
-            switch (_k.label) {
+        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) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, individual = _b.individual;
                     _c = individual.data.verify.responseBody || {}, notification = _c.notification, user = _c.user, entity = _c.entity;
-                    _d = ((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _d.id, type = _d.type;
-                    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;
+                    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;
+                    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;
-                    isNameNonEditable = hasNoneEditableValue(data_status, 'name');
+                    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');
                     isEmailNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.contact, 'email');
-                    isMobileNumberNonEditable = hasNoneEditableValue((_e = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _e === void 0 ? void 0 : _e.phone, 'number');
-                    isMobileCountryNonEditable = hasNoneEditableValue((_f = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _f === void 0 ? void 0 : _f.phone, 'country_code');
+                    isMobileNumberNonEditable = hasNoneEditableValue((_f = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _f === void 0 ? void 0 : _f.phone, 'number');
+                    isMobileCountryNonEditable = hasNoneEditableValue((_g = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _g === void 0 ? void 0 : _g.phone, 'country_code');
                     isNidNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.identification, 'id');
                     isIssuedCountryNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.identification, 'issuer_country');
                     isExpiryNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.identification, 'expiry');
@@ -569,21 +585,23 @@ 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;
+                    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 : (_g = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _g === void 0 ? void 0 : _g.toString(),
+                                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
                             }
                         })) : undefined;
-                    requestBody = __assign(__assign(__assign(__assign(__assign(__assign(__assign({ id: id, type: type, gender: gender || undefined }, (!(isNameNonEditable || !userName.first) && {
+                    requestBody = __assign(__assign(__assign(__assign(__assign(__assign(__assign({ ids: (ids === null || ids === void 0 ? void 0 : ids.length) ? ids : [id], gender: isGenderNonEditable || !gender ? undefined : gender }, (nameIsEditable && {
                         names: {
-                            en: userName,
-                            ar: userName
+                            en: isNameENNonEditable ? undefined : userName,
+                            ar: isNameARNonEditable ? undefined : userName
                         }
                     })), { contact: contact }), (hasIdentification &&
                         !(isNidNonEditable && isIssuedCountryNonEditable && isExpiryNonEditable && isIdTypeNonEditable) && {
@@ -616,18 +634,23 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                             'date_of_birth',
                             'nationality'
                         ], step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_PERSONAL_INFO });
-                    return [4, API.individualService.updateIndividual(requestBody)];
+                    return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
-                    data = _k.sent();
-                    if (!(type === IndividualType.USER || type === IndividualType.BUYER)) return [3, 3];
-                    return [4, thunkApi.dispatch(retrieveDataList(code))];
+                    data = _l.sent();
+                    return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
                 case 2:
-                    _k.sent();
-                    _k.label = 3;
+                    currencyData = _l.sent();
+                    _e = getIndividualType(objects), isUser = _e.isUser, isBuyer = _e.isBuyer;
+                    isUserORBuyerType = isUser || isBuyer;
+                    if (!isUserORBuyerType) return [3, 4];
+                    return [4, thunkApi.dispatch(retrieveDataList(code))];
                 case 3:
+                    _l.sent();
+                    _l.label = 4;
+                case 4:
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                    (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: data, formData: originalFormData }];
+                    (_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, currencyData: currencyData }];
             }
         });
     });
@@ -635,14 +658,15 @@ 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, _d, id, type, occupation, sourceIncome, monthlyIncome, isPEP, isInfluencer, shareCount, shareValue, civilID, signatureFileId, isOccupationNonEditable, isSourceIncomeNonEditable, isPEPNonEditable, isInfluencerNonEditable, isMonthlyIncomeNonEditable, isSharesAvailable, pepInfo, influencerInfo, occupationInfo, sourceIncomeInfo, monthlyIncomeInfo, userPayload, shareHolderPayload, boardMemberPayload, buyerMemberPayload, payload, requestBody, data, businessCountry, hasCivilIdDocument, hasSignatureDocument, isSendSignatureFile, civilIdDocument, signatureDocument, documentBody, documentBody, documentsList, documentBody;
-        var _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        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) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, individual = _b.individual;
                     _c = individual.data.verify.responseBody || {}, notification = _c.notification, user = _c.user;
-                    _d = ((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _d.id, type = _d.type;
+                    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;
                     occupation = formData.occupation, sourceIncome = formData.sourceIncome, monthlyIncome = formData.monthlyIncome, isPEP = formData.isPEP, isInfluencer = formData.isInfluencer, shareCount = formData.shareCount, shareValue = formData.shareValue, civilID = formData.civilID, signatureFileId = formData.signatureFileId;
                     isOccupationNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'occupation');
                     isSourceIncomeNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'source_of_income');
@@ -652,7 +676,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     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 };
+                    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 = {
@@ -679,23 +703,20 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                         source_income: sourceIncomeInfo,
                         monthly_income: monthlyIncomeInfo
                     };
+                    _e = getIndividualType(objects), isUser = _e.isUser, isShareholder = _e.isShareholder, isBoardMember = _e.isBoardMember, isBuyer = _e.isBuyer, isCustomer = _e.isCustomer;
+                    isUserORBuyerType = isUser || isBuyer;
                     payload = userPayload;
-                    if (type === IndividualType.SHARE_HOLDER)
-                        payload = shareHolderPayload;
-                    if (type === IndividualType.BOARD_MEMBER)
-                        payload = boardMemberPayload;
-                    if (type === IndividualType.BUYER)
-                        payload = buyerMemberPayload;
-                    if (type === IndividualType.CUSTOMER)
-                        payload = {};
-                    requestBody = __assign(__assign({ id: id, type: type }, payload), { encryption_contract: [], step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO });
-                    return [4, API.individualService.updateIndividual(requestBody)];
+                    if (objects === null || objects === void 0 ? void 0 : objects.length) {
+                        payload = __assign(__assign(__assign(__assign(__assign({}, (isUser && payload)), (isShareholder && shareHolderPayload)), (isBoardMember && boardMemberPayload)), (isBuyer && buyerMemberPayload)), (isCustomer && {}));
+                    }
+                    requestBody = __assign(__assign({ ids: (ids === null || ids === void 0 ? void 0 : ids.length) ? ids : [id] }, payload), { encryption_contract: [], step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO });
+                    return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
-                    data = _g.sent();
+                    data = _h.sent();
                     businessCountry = settings.data.businessCountry;
                     hasCivilIdDocument = (civilID || []).length > 0;
                     hasSignatureDocument = (signatureFileId || []).length > 0;
-                    isSendSignatureFile = (user === null || user === void 0 ? void 0 : user.is_authorized) && (type === IndividualType.USER || type === IndividualType.BUYER);
+                    isSendSignatureFile = (user === null || user === void 0 ? void 0 : user.is_authorized) && isUserORBuyerType;
                     civilIdDocument = getRecentDocumentBasedOnPurpose(user === null || user === void 0 ? void 0 : user.documents, DocumentPurpose.IDENTITY_DOCUMENT);
                     signatureDocument = getRecentDocumentBasedOnPurpose(user === null || user === void 0 ? void 0 : user.documents, DocumentPurpose.CUSTOMER_SIGNATURE);
                     if (!((civilIdDocument === null || civilIdDocument === void 0 ? void 0 : civilIdDocument.id) && hasCivilIdDocument)) return [3, 3];
@@ -705,8 +726,8 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
                 case 2:
-                    _g.sent();
-                    _g.label = 3;
+                    _h.sent();
+                    _h.label = 3;
                 case 3:
                     if (!((signatureDocument === null || signatureDocument === void 0 ? void 0 : signatureDocument.id) && hasSignatureDocument && isSendSignatureFile)) return [3, 5];
                     documentBody = {
@@ -715,8 +736,8 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
                 case 4:
-                    _g.sent();
-                    _g.label = 5;
+                    _h.sent();
+                    _h.label = 5;
                 case 5:
                     documentsList = [];
                     if (hasCivilIdDocument && !(civilIdDocument === null || civilIdDocument === void 0 ? void 0 : civilIdDocument.id))
@@ -725,36 +746,40 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                         documentsList.push({ type: DocumentPurpose.CUSTOMER_SIGNATURE, images: signatureFileId });
                     if (!(documentsList.length > 0)) return [3, 7];
                     documentBody = {
-                        individual_type_id: id || '',
+                        individual_type_id: ((ids === null || ids === void 0 ? void 0 : ids.length) ? ids.find(function (i) { return i.includes('usr_'); }) : id) || '',
                         country: businessCountry.iso2,
                         documents: documentsList
                     };
                     return [4, API.documentService.updateDocumentInfo(documentBody)];
                 case 6:
-                    _g.sent();
-                    _g.label = 7;
+                    _h.sent();
+                    _h.label = 7;
                 case 7:
+                    individualData = (sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [])[0];
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: data, formData: originalFormData }];
+                    (_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 }];
             }
         });
     });
 });
-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 }];
@@ -764,13 +789,13 @@ export var checkEmailAvailability = createAsyncThunk('checkEmailAvailability', f
     });
 });
 export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, id, infoId, payload, data, boardInfoStatus;
-    var _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, individual, _b, id, infoId, primaryUser, payload, data, boardInfoStatus, individualDataRes, _c, is_authorized, userId, type;
+    var _d, _e, _f, _g;
+    return __generator(this, function (_h) {
+        switch (_h.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
-                _b = individual.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id;
+                _b = individual.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id, primaryUser = _b.primaryUser;
                 if (!id)
                     return [2];
                 payload = {
@@ -780,17 +805,41 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
                 };
                 return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
             case 1:
-                data = _g.sent();
+                data = _h.sent();
                 return [4, API.boardService.retrieveBoardInfoStatus(id)];
             case 2:
-                boardInfoStatus = _g.sent();
+                boardInfoStatus = _h.sent();
                 return [4, thunkApi.dispatch(retrieveBoardDetails(id))];
             case 3:
-                _g.sent();
-                (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, {});
-                (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
+                _h.sent();
+                individualDataRes = undefined;
+                _c = primaryUser || {}, is_authorized = _c.is_authorized, userId = _c.id, type = _c.object;
+                if (!!is_authorized) return [3, 5];
+                return [4, thunkApi
+                        .dispatch(retrieveIndividualInfo({ id: userId, type: type, countryCode: settings.data.businessCountry.iso2 }))
+                        .unwrap()];
+            case 4:
+                individualDataRes = _h.sent();
+                _h.label = 5;
+            case 5:
+                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, {});
+                (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: __assign(__assign({}, data), { flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || [] }), formData: params }];
+                return [2, { response: __assign(__assign({}, data), { flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || [] }), formData: params, individualData: individualDataRes === null || individualDataRes === void 0 ? void 0 : individualDataRes.data }];
+        }
+    });
+}); });
+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];
         }
     });
 }); });
@@ -800,6 +849,7 @@ var initialState = {
     cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
+        currency: '',
         verify: {
             token: ''
         },
@@ -834,7 +884,6 @@ var initialState = {
             sourceIncome: undefined,
             monthlyIncome: undefined,
             employerName: '',
-            employerLocation: undefined,
             isPEP: null,
             isInfluencer: null,
             shareCount: '',
@@ -936,10 +985,72 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(addDetailsAsync.fulfilled, function (state, action) {
+            var _a, _b, _c, _d;
             state.loading = false;
             state.error = null;
-            var userList = action.payload.userList;
+            var _e = action.payload, userList = _e.userList, individualId = _e.individualId, countries = _e.countries;
+            var primaryUser = (state.data.verify.responseBody || {}).user;
+            var user = (userList || []).find(function (user) { return user.individual_id === individualId; });
             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;
+            var cityList = (state.data.verify.responseBody || {}).cityList;
+            if (user)
+                state.data.individualPersonalData.name = getUserName(user, false);
+            if (contact === null || contact === void 0 ? void 0 : contact.email)
+                state.data.individualPersonalData.email = contact === null || contact === void 0 ? void 0 : contact.email;
+            if ((_a = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _a === void 0 ? void 0 : _a.number)
+                state.data.individualPersonalData.mobile = (_b = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _b === void 0 ? void 0 : _b.number;
+            if ((_c = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _c === void 0 ? void 0 : _c.country_code) {
+                state.data.individualPersonalData.countryCode = findCountryByIddPrefix(countries, (_d = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _d === void 0 ? void 0 : _d.country_code) || defaultCountry;
+            }
+            if (gender)
+                state.data.individualPersonalData.gender = gender.toLowerCase();
+            if (identification === null || identification === void 0 ? void 0 : identification.id)
+                state.data.individualPersonalData.nid = identification === null || identification === void 0 ? void 0 : identification.id;
+            if (identification === null || identification === void 0 ? void 0 : identification.issued_country_code) {
+                state.data.individualPersonalData.issuedCountry = findCountryByIso2(countries, identification === null || identification === void 0 ? void 0 : identification.issued_country_code);
+            }
+            var expiryDate = new Date((identification === null || identification === void 0 ? void 0 : identification.expiry) || new Date().getTime());
+            state.data.individualPersonalData.expiryDate = convertNumbers2English(dateFormat(expiryDate));
+            if (birth === null || birth === void 0 ? void 0 : birth.date)
+                state.data.individualPersonalData.dob = convertNumbers2English(dateFormat(new Date(birth === null || birth === void 0 ? void 0 : birth.date)));
+            if (birth === null || birth === void 0 ? void 0 : birth.country) {
+                state.data.individualPersonalData.placeOfBirthCountry = findCountryByIso2(countries, birth === null || birth === void 0 ? void 0 : birth.country);
+            }
+            if (birth === null || birth === void 0 ? void 0 : birth.city) {
+                var selectedCity = cityList === null || cityList === void 0 ? void 0 : cityList.find(function (city) {
+                    var _a;
+                    return city.id === ((_a = birth === null || birth === void 0 ? void 0 : birth.city) === null || _a === void 0 ? void 0 : _a.cityId);
+                });
+                state.data.individualPersonalData.placeOfBirthCity = selectedCity;
+            }
+            if (nationality) {
+                state.data.individualPersonalData.nationality = findCountryByIso2(countries, nationality);
+            }
+            var _h = shares || {}, count = _h.count, value = _h.value;
+            var shareCount = count === null || count === void 0 ? void 0 : count.toString();
+            var shareValue = value === null || value === void 0 ? void 0 : value.toString();
+            if (shareCount) {
+                state.data.individualData.shareCount = shareCount;
+            }
+            if (shareValue) {
+                state.data.individualData.shareValue = formatNumberAsCurrency(shareValue);
+            }
+            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) {
+                return income.id === (monthly_income === null || monthly_income === void 0 ? void 0 : monthly_income.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)
+                state.data.individualData.isPEP = is_relative_PEP;
+            if (is_influencer !== undefined)
+                state.data.individualData.isInfluencer = is_influencer;
         })
             .addCase(addDetailsAsync.rejected, function (state, action) {
             state.loading = false;
@@ -952,12 +1063,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 });
@@ -972,11 +1083,11 @@ export var individualSlice = createSlice({
             .addCase(retrieveIndividualInfo.fulfilled, function (state, action) {
             var _a, _b, _c, _d;
             state.error = null;
-            var _e = action.payload, data = _e.data, countries = _e.countries, countryCode = _e.countryCode;
+            var _e = action.payload, data = _e.data, countries = _e.countries;
             var user = (state.data.verify.responseBody || {}).user;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { 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, employer_country = _f.employer_country, shares = _f.shares;
-            var _g = state.data.individualData.responseBody || {}, sourceIncomeList = _g.sourceIncomeList, monthlyIncomeList = _g.monthlyIncomeList, occupationList = _g.occupationList;
+            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;
             var cityList = (state.data.verify.responseBody || {}).cityList;
             if (data)
                 state.data.individualPersonalData.name = getUserName(data, false);
@@ -991,7 +1102,6 @@ export var individualSlice = createSlice({
                 state.data.individualPersonalData.gender = gender.toLowerCase();
             if (identification === null || identification === void 0 ? void 0 : identification.id)
                 state.data.individualPersonalData.nid = identification === null || identification === void 0 ? void 0 : identification.id;
-            state.data.individualPersonalData.issuedCountry = identification === null || identification === void 0 ? void 0 : identification.issued_country_code;
             if (identification === null || identification === void 0 ? void 0 : identification.issued_country_code) {
                 state.data.individualPersonalData.issuedCountry = findCountryByIso2(countries, identification === null || identification === void 0 ? void 0 : identification.issued_country_code);
             }
@@ -1024,17 +1134,10 @@ export var individualSlice = createSlice({
             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 = employer_country || countryCode;
-            if (!!code) {
-                var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
-                state.data.individualData.employerLocation = employerLocation;
-            }
             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;
@@ -1061,25 +1164,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;
         })
@@ -1099,10 +1200,10 @@ export var individualSlice = createSlice({
             var cityList = action.payload;
             state.data.verify.responseBody = __assign(__assign({}, data), { cityList: cityList });
             var birth = (((_a = state.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.user) || {}).birth;
-            var city = (birth || {}).city;
-            if (city) {
-                var selectedCity = cityList === null || cityList === void 0 ? void 0 : cityList.find(function (c) {
-                    return c.name.en === city;
+            if (birth === null || birth === void 0 ? void 0 : birth.city) {
+                var selectedCity = cityList === null || cityList === void 0 ? void 0 : cityList.find(function (city) {
+                    var _a;
+                    return city.id === ((_a = birth === null || birth === void 0 ? void 0 : birth.city) === null || _a === void 0 ? void 0 : _a.cityId);
                 });
                 state.data.individualPersonalData.placeOfBirthCity = selectedCity;
             }
@@ -1131,11 +1232,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;
@@ -1148,9 +1252,16 @@ export var individualSlice = createSlice({
             .addCase(updateIndividualInfo.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, formData = _a.formData;
+            var _a = action.payload, data = _a.data, formData = _a.formData, individualData = _a.individualData;
             state.data.individualData = formData;
             state.data.individualData.responseBody = data;
+            var userList = (state.data.verify.responseBody || {}).userList;
+            var list = userList || [];
+            list = list.map(function (user) {
+                var userInfo = user.id === (individualData === null || individualData === void 0 ? void 0 : individualData.id) ? individualData : user;
+                return userInfo;
+            });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: list });
         })
             .addCase(updateIndividualInfo.rejected, function (state, action) {
             state.loading = false;
@@ -1202,14 +1313,18 @@ export var individualSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = (action.payload || {}).response;
+            var _b = action.payload || {}, response = _b.response, individualData = _b.individualData;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
             if (description) {
                 state.error = description;
                 return;
             }
             var flows = response.flows;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
+            var individuals = (state.data.verify.responseBody || {}).individuals;
+            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;
@@ -1218,6 +1333,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;
         });
     }
 });