@tap-payments/auth-jsconnect 2.0.45 → 2.0.46

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

@@ -45,19 +45,40 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
-import { FlowsTypes } from '../../../@types';
+import { FlowsTypes, IndividualGender, IndividualType, FieldType } from '../../../@types';
 import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
-import { INDIVIDUAl_STEP_NAMES } from '../../../constants';
+import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, getEighteenYearsAgo, getUserNameObject, getUserName, sleep, isValidEmail } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     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, info, hasIndividualCompleted;
-        var _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, board_id, board_info_id, notification, _b, id, type, payload_1, info, hasIndividualCompleted, birthCountry;
+        var _c, _d, _e, _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     payload = {
                         service_name: 'tap_email',
@@ -66,70 +87,83 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                     settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_g.sent()).data;
+                    data = (_l.sent()).data;
                     boardInfoStatus = undefined;
                     countries = settings.data.countries;
-                    if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 11];
+                    if (((_c = data.errors) === null || _c === void 0 ? void 0 : _c.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;
                     if (data === null || data === void 0 ? void 0 : data.country_code) {
                         countryCode = data === null || data === void 0 ? void 0 : data.country_code;
                         thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
-                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 11];
+                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 14];
                     board_id = data === null || data === void 0 ? void 0 : data.id;
                     board_info_id = data === null || data === void 0 ? void 0 : data.board_info_id;
                     if (!(board_id && board_info_id)) return [3, 4];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 2:
-                    boardInfoData = _g.sent();
+                    boardInfoData = _l.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, 4];
-                    return [4, API.individualService.retrieveIndividual(id, type)];
+                    return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode }))];
                 case 3:
-                    individualData = _g.sent();
-                    _g.label = 4;
+                    payload_1 = (_l.sent()).payload;
+                    individualData = payload_1.data || {};
+                    _l.label = 4;
                 case 4:
                     if (!board_id) return [3, 7];
                     return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 5:
-                    boardData = _g.sent();
+                    boardData = _l.sent();
                     return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 6:
-                    boardInfoStatus = _g.sent();
-                    _g.label = 7;
+                    boardInfoStatus = _l.sent();
+                    _l.label = 7;
                 case 7:
                     if (!countryCode) {
-                        countryCode = (_c = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _c === void 0 ? void 0 : _c.country;
+                        countryCode = (_d = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _d === void 0 ? void 0 : _d.country;
                         if (countryCode)
                             thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                     }
                     info = (boardInfoStatus || {}).info;
-                    hasIndividualCompleted = ((_d = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _d === void 0 ? void 0 : _d.status) === 'completed';
+                    hasIndividualCompleted = ((_e = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _e === void 0 ? void 0 : _e.status) === 'completed';
                     if (!hasIndividualCompleted) return [3, 8];
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                    return [3, 11];
+                    return [3, 14];
                 case 8:
-                    if (!countryCode) return [3, 10];
-                    return [4, thunkApi.dispatch(retrieveDataList(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, 10];
+                    return [4, thunkApi.dispatch(getIndividualList((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id))];
                 case 9:
-                    _g.sent();
-                    _g.label = 10;
+                    _l.sent();
+                    _l.label = 10;
                 case 10:
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                    _g.label = 11;
-                case 11: return [2, {
+                    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;
+                    if (!birthCountry) return [3, 13];
+                    return [4, thunkApi.dispatch(getCityList(birthCountry))];
+                case 12:
+                    _l.sent();
+                    _l.label = 13;
+                case 13:
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
+                    _l.label = 14;
+                case 14: return [2, {
                         data: data,
                         boardResponse: {
-                            user: individualData === null || individualData === void 0 ? void 0 : individualData.user,
                             brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
                             bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                             merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                            name: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _e === void 0 ? void 0 : _e.names,
-                            contact: (_f = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _f === void 0 ? void 0 : _f.contact,
+                            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,
+                            individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
                             countries: countries,
                             countryCode: countryCode,
                             notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
@@ -158,6 +192,154 @@ 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;
+    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;
+                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();
+                sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
+                return [2, { userList: userList }];
+        }
+    });
+}); });
+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_1, payload, data;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                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;
+                _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;
+                hasContact = !!email || !!mobile;
+                individualData = undefined;
+                if (!(!isPhoneAndEmailAvailable && hasContact)) return [3, 2];
+                hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
+                requestBody = {
+                    id: id,
+                    type: type,
+                    contact: {
+                        email: email,
+                        phone: hasPhone
+                            ? {
+                                country_code: (_c = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _c === void 0 ? void 0 : _c.toString(),
+                                number: mobile
+                            }
+                            : undefined
+                    }
+                };
+                return [4, API.individualService.updateIndividual(requestBody)];
+            case 1:
+                data_1 = _d.sent();
+                individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.user;
+                if (type === IndividualType.SHARE_HOLDER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.shareholder;
+                else if (type === IndividualType.BOARD_MEMBER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.board_member;
+                else if (type === IndividualType.BUYER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.buyer;
+                else if (type === IndividualType.CUSTOMER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.customer;
+                _d.label = 2;
+            case 2:
+                payload = {
+                    id: board_id,
+                    merchant_id: merchant_id,
+                    info: [
+                        {
+                            name: 'individual'
+                        }
+                    ],
+                    notification: {
+                        recipient: {
+                            id: id,
+                            type: type
+                        },
+                        channel: ['email']
+                    }
+                };
+                return [4, API.boardService.requestDetailsByEmail(payload)];
+            case 3:
+                data = _d.sent();
+                return [2, { data: data, userData: __assign(__assign({}, individualData), { type: type }) }];
+        }
+    });
+}); });
+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) {
+            case 0:
+                payload = {
+                    page: 1,
+                    limit: 10,
+                    business_id: businessId
+                };
+                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];
+        }
+    });
+}); });
+export var getCityList = createAsyncThunk('individual/getCityList', function (countryCode) { return __awaiter(void 0, void 0, void 0, function () {
+    var cityBody, list;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                cityBody = {
+                    country: [countryCode]
+                };
+                return [4, API.countryService.getCities(cityBody)];
+            case 1:
+                list = (_a.sent()).list;
+                return [2, list || []];
+        }
+    });
+}); });
+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) {
+            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();
+                individualData = data === null || data === void 0 ? void 0 : data.user;
+                if (type === IndividualType.SHARE_HOLDER)
+                    individualData = data === null || data === void 0 ? void 0 : data.shareholder;
+                else if (type === IndividualType.BOARD_MEMBER)
+                    individualData = data === null || data === void 0 ? void 0 : data.board_member;
+                else if (type === IndividualType.BUYER)
+                    individualData = data === null || data === void 0 ? void 0 : data.buyer;
+                else if (type === IndividualType.CUSTOMER)
+                    individualData = data === null || data === void 0 ? void 0 : data.customer;
+                return [2, { data: __assign(__assign({}, (individualData || {})), { type: 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;
     return __generator(this, function (_b) {
@@ -186,24 +368,24 @@ export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', fun
     });
 }); });
 export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetails', function (boardId) { return __awaiter(void 0, void 0, void 0, function () {
-    var data;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a, user, data;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 1:
-                data = _c.sent();
+                _a = _d.sent(), user = _a.user, data = __rest(_a, ["user"]);
                 return [2, {
-                        data: __assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.names, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.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 })
                     }];
         }
     });
 }); });
 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, countryCode, boardInfoStatus, notification, _c, id, type, info, hasIndividualCompleted;
-    var _d, _e, _f, _g, _h, _j, _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, countryCode, boardInfoStatus, notification, _c, id, type, payload_2, info, hasIndividualCompleted, birthCountry;
+    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
@@ -218,57 +400,69 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_l.sent()).data;
+                data = (_p.sent()).data;
                 boardInfoStatus = undefined;
-                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 11];
-                if (!(board_id && board_info_id)) return [3, 4];
-                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 14];
+                if (!board_id) return [3, 4];
+                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 2:
-                boardInfoData = _l.sent();
-                notification = (boardInfoData || {}).notification;
-                _c = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
-                if (!(id && type)) return [3, 4];
-                return [4, API.individualService.retrieveIndividual(id, type)];
+                boardInfoStatus = _p.sent();
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 3:
-                individualData = _l.sent();
-                _l.label = 4;
+                boardData = _p.sent();
+                _p.label = 4;
             case 4:
-                if (!board_id) return [3, 7];
-                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                countryCode = (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.country;
+                if (!(board_id && board_info_id)) return [3, 7];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 5:
-                boardInfoStatus = _l.sent();
-                return [4, API.boardService.retrieveBoardDetails(board_id)];
+                boardInfoData = _p.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, 7];
+                return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode }))];
             case 6:
-                boardData = _l.sent();
-                _l.label = 7;
+                payload_2 = (_p.sent()).payload;
+                individualData = payload_2.data || {};
+                _p.label = 7;
             case 7:
-                countryCode = (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.country;
                 info = (boardInfoStatus || {}).info;
                 hasIndividualCompleted = ((_f = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _f === void 0 ? void 0 : _f.status) === 'completed';
                 (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
                 if (!hasIndividualCompleted) return [3, 8];
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
-                return [3, 11];
+                return [3, 14];
             case 8:
-                if (!countryCode) return [3, 10];
-                return [4, thunkApi.dispatch(retrieveDataList(countryCode))];
+                if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 11];
+                if (!((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id)) return [3, 10];
+                return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id))];
             case 9:
-                _l.sent();
-                _l.label = 10;
+                _p.sent();
+                _p.label = 10;
             case 10:
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_ADDITIONAL_INDIVIDUAL_INFO_STEP'));
-                _l.label = 11;
-            case 11: return [2, {
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
+                return [3, 14];
+            case 11:
+                birthCountry = ((_l = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _l === void 0 ? void 0 : _l.country) || countryCode;
+                if (!birthCountry) return [3, 13];
+                return [4, thunkApi.dispatch(getCityList(birthCountry))];
+            case 12:
+                _p.sent();
+                _p.label = 13;
+            case 13:
+                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
+                _p.label = 14;
+            case 14: return [2, {
                     data: data,
                     boardResponse: {
-                        user: individualData === null || individualData === void 0 ? void 0 : individualData.user,
                         brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
                         bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
                         entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                         merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                         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: (_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,
                         countries: countries,
                         countryCode: countryCode,
                         notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification,
@@ -279,34 +473,118 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
         }
     });
 }); });
+export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, individual, _b, notification, user, entity, _c, id, type, name, email, mobile, countryCode, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isNameEditable, isEmailEditable, isMobileNumberEditable, isMobileCountryEditable, isNidEditable, isIssuedCountryEditable, isExpiryEditable, isIdTypeEditable, isNationalityEditable, hasContact, hasPhone, hasIdentification, hasBirth, names, contact, requestBody, data;
+    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    return __generator(this, function (_s) {
+        switch (_s.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
+                _b = individual.data.verify.responseBody || {}, notification = _b.notification, user = _b.user, entity = _b.entity;
+                _c = ((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
+                name = params.name, email = params.email, mobile = params.mobile, countryCode = params.countryCode, gender = params.gender, nid = params.nid, issuedCountry = params.issuedCountry, expiryDate = params.expiryDate, dob = params.dob, placeOfBirthCountry = params.placeOfBirthCountry, placeOfBirthCity = params.placeOfBirthCity, nationality = params.nationality;
+                code = entity === null || entity === void 0 ? void 0 : entity.country;
+                data_status = (user || {}).data_status;
+                userName = getUserNameObject(name);
+                identification_id_type = nid && (nid === null || nid === void 0 ? void 0 : nid.startsWith('1')) ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                isNameEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.name) === FieldType.EDITABLE && userName.first;
+                isEmailEditable = ((_d = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _d === void 0 ? void 0 : _d.email) === FieldType.EDITABLE;
+                isMobileNumberEditable = ((_f = (_e = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _e === void 0 ? void 0 : _e.phone) === null || _f === void 0 ? void 0 : _f.number) === FieldType.EDITABLE && mobile;
+                isMobileCountryEditable = ((_h = (_g = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _g === void 0 ? void 0 : _g.phone) === null || _h === void 0 ? void 0 : _h.country_code) === FieldType.EDITABLE;
+                isNidEditable = ((_j = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _j === void 0 ? void 0 : _j.id) === FieldType.EDITABLE && nid;
+                isIssuedCountryEditable = ((_k = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _k === void 0 ? void 0 : _k.issuer_country) === FieldType.EDITABLE;
+                isExpiryEditable = ((_l = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _l === void 0 ? void 0 : _l.expiry) === FieldType.EDITABLE && expiryDate;
+                isIdTypeEditable = ((_m = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _m === void 0 ? void 0 : _m.type) === FieldType.EDITABLE && identification_id_type;
+                isNationalityEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.nationality) === FieldType.EDITABLE;
+                hasContact = email || mobile || countryCode;
+                hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
+                hasIdentification = nid || issuedCountry || identification_id_type || expiryDate;
+                hasBirth = placeOfBirthCity || placeOfBirthCountry;
+                names = isNameEditable
+                    ? {
+                        en: userName,
+                        ar: userName
+                    }
+                    : undefined;
+                contact = hasContact
+                    ? {
+                        email: isEmailEditable ? email : undefined,
+                        phone: hasPhone
+                            ? {
+                                country_code: isMobileCountryEditable ? (_o = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _o === void 0 ? void 0 : _o.toString() : undefined,
+                                number: isMobileNumberEditable ? mobile : undefined
+                            }
+                            : undefined
+                    }
+                    : undefined;
+                requestBody = {
+                    id: id,
+                    type: type,
+                    names: names,
+                    gender: gender || undefined,
+                    contact: contact,
+                    identification: hasIdentification
+                        ? {
+                            id: isNidEditable ? nid : undefined,
+                            issued_country_code: isIssuedCountryEditable ? issuedCountry === null || issuedCountry === void 0 ? void 0 : issuedCountry.iso2 : undefined,
+                            expiry: isExpiryEditable ? new Date(expiryDate).getTime() : undefined,
+                            type: isIdTypeEditable ? identification_id_type : undefined
+                        }
+                        : undefined,
+                    date_of_birth: dob,
+                    birth: hasBirth && {
+                        city: (_p = placeOfBirthCity === null || placeOfBirthCity === void 0 ? void 0 : placeOfBirthCity.name) === null || _p === void 0 ? void 0 : _p.en,
+                        country: placeOfBirthCountry === null || placeOfBirthCountry === void 0 ? void 0 : placeOfBirthCountry.iso2
+                    },
+                    nationality: isNationalityEditable ? nationality === null || nationality === void 0 ? void 0 : nationality.iso2 : undefined,
+                    encryption_contract: [
+                        'gender',
+                        'contact.email',
+                        'contact.phone.country_code',
+                        'contact.phone.number',
+                        'identification.id',
+                        'identification.issued_country_code',
+                        'identification.expiry',
+                        'identification.type',
+                        'birth.city',
+                        'birth.country',
+                        'date_of_birth',
+                        'nationality'
+                    ],
+                    step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_PERSONAL_INFO
+                };
+                return [4, API.individualService.updateIndividual(requestBody)];
+            case 1:
+                data = (_s.sent()).data;
+                if (!(type === IndividualType.USER || type === IndividualType.BUYER)) return [3, 3];
+                return [4, thunkApi.dispatch(retrieveDataList(code))];
+            case 2:
+                _s.sent();
+                _s.label = 3;
+            case 3:
+                thunkApi.dispatch(handleNextScreenStep());
+                (_r = (_q = settings.data.appConfig).onStepCompleted) === null || _r === void 0 ? void 0 : _r.call(_q, settings.data.activeScreen.name, requestBody);
+                return [2, { data: data, formData: params }];
+        }
+    });
+}); });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, id, type, civilID, signatureFileId, businessCountry, documentsList, requestBody, documentBody, data;
-    var _c, _d, _e, _f, _g, _h, _j, _k;
-    return __generator(this, function (_l) {
-        switch (_l.label) {
+    var _a, settings, individual, _b, notification, user, _c, id, type, civilID, signatureFileId, businessCountry, documentsList, isSendSignatureFile, documentBody, occupation, sourceIncome, monthlyIncome, isPEP, isInfluencer, shareCount, shareValue, isOccupationEditable, isSourceIncomeEditable, isPEPEditable, isInfluencerEditable, isSharesAvailable, pepInfo, influencerInfo, occupationInfo, sourceIncomeInfo, monthlyIncomeInfo, userPayload, shareHolderPayload, boardMemberPayload, buyerMemberPayload, payload, requestBody, data;
+    var _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
-                _b = ((_d = (_c = individual.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.notification) === null || _d === void 0 ? void 0 : _d.recipient) || {}, id = _b.id, type = _b.type;
+                _b = individual.data.verify.responseBody || {}, notification = _b.notification, user = _b.user;
+                _c = ((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
                 civilID = params.civilID, signatureFileId = params.signatureFileId;
                 businessCountry = settings.data.businessCountry;
                 documentsList = [];
+                isSendSignatureFile = (user === null || user === void 0 ? void 0 : user.is_authorized) && (type === IndividualType.USER || type === IndividualType.BUYER);
                 if ((civilID || []).length > 0)
                     documentsList.push({ type: 'Civil ID File', images: civilID });
-                if ((signatureFileId || []).length > 0)
+                if (isSendSignatureFile && (signatureFileId || []).length > 0)
                     documentsList.push({ type: 'Signature File', images: signatureFileId });
-                requestBody = {
-                    id: id,
-                    type: type,
-                    occupation: { id: (_e = params.occupation) === null || _e === void 0 ? void 0 : _e.id },
-                    employer_name: params.employerName,
-                    employer_country: (_f = params.employerLocation) === null || _f === void 0 ? void 0 : _f.iso2,
-                    source_income: [{ id: (_g = params.sourceIncome) === null || _g === void 0 ? void 0 : _g.id }],
-                    monthly_income: { id: (_h = params.monthlyIncome) === null || _h === void 0 ? void 0 : _h.id },
-                    is_relative_PEP: params.isPEP,
-                    is_influencer: params.isInfluencer,
-                    encryption_contract: ['employer_name', 'employer_country'],
-                    step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
-                };
                 documentBody = {
                     individual_type_id: id || '',
                     country: businessCountry.iso2,
@@ -315,13 +593,59 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 if (!(documentsList.length > 0)) return [3, 2];
                 return [4, API.entityService.updateDocumentInfo(documentBody)];
             case 1:
-                _l.sent();
-                _l.label = 2;
-            case 2: return [4, API.individualService.updateIndividual(requestBody)];
+                _k.sent();
+                _k.label = 2;
+            case 2:
+                occupation = params.occupation, sourceIncome = params.sourceIncome, monthlyIncome = params.monthlyIncome, isPEP = params.isPEP, isInfluencer = params.isInfluencer, shareCount = params.shareCount, shareValue = params.shareValue;
+                isOccupationEditable = ((_d = user === null || user === void 0 ? void 0 : user.data_status) === null || _d === void 0 ? void 0 : _d.occupation) === FieldType.EDITABLE && (occupation === null || occupation === void 0 ? void 0 : occupation.id);
+                isSourceIncomeEditable = ((_e = user === null || user === void 0 ? void 0 : user.data_status) === null || _e === void 0 ? void 0 : _e.source_of_income) === FieldType.EDITABLE && (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.id);
+                isPEPEditable = ((_f = user === null || user === void 0 ? void 0 : user.data_status) === null || _f === void 0 ? void 0 : _f.is_relative_PEP) === FieldType.EDITABLE;
+                isInfluencerEditable = ((_g = user === null || user === void 0 ? void 0 : user.data_status) === null || _g === void 0 ? void 0 : _g.is_influencer) === FieldType.EDITABLE;
+                isSharesAvailable = shareCount || shareValue;
+                pepInfo = isPEPEditable ? isPEP : undefined;
+                influencerInfo = isInfluencerEditable ? isInfluencer : undefined;
+                occupationInfo = isOccupationEditable ? { id: occupation.id } : undefined;
+                sourceIncomeInfo = isSourceIncomeEditable ? [{ id: sourceIncome.id }] : undefined;
+                monthlyIncomeInfo = (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.id) && { id: monthlyIncome.id };
+                userPayload = {
+                    occupation: occupationInfo,
+                    source_income: sourceIncomeInfo,
+                    monthly_income: monthlyIncomeInfo,
+                    is_relative_PEP: pepInfo,
+                    is_influencer: influencerInfo
+                };
+                shareHolderPayload = {
+                    shares: isSharesAvailable
+                        ? {
+                            count: shareCount && Number(shareCount),
+                            value: shareValue && Number(shareValue)
+                        }
+                        : undefined
+                };
+                boardMemberPayload = {
+                    is_relative_PEP: pepInfo,
+                    is_influencer: influencerInfo
+                };
+                buyerMemberPayload = {
+                    occupation: occupationInfo,
+                    source_income: sourceIncomeInfo,
+                    monthly_income: monthlyIncomeInfo
+                };
+                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)];
             case 3:
-                data = (_l.sent()).data;
+                data = (_k.sent()).data;
                 thunkApi.dispatch(handleNextScreenStep());
-                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
                 return [2, { data: data, formData: params }];
         }
     });
@@ -360,6 +684,7 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
 var initialState = {
     error: null,
     loading: false,
+    cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
         verify: {
@@ -368,6 +693,25 @@ var initialState = {
         otpData: {
             otp: ''
         },
+        individualCollectData: {
+            email: '',
+            mobile: '',
+            countryCode: defaultCountry
+        },
+        individualPersonalData: {
+            name: '',
+            email: '',
+            mobile: '',
+            countryCode: defaultCountry,
+            gender: IndividualGender.MALE,
+            nid: '',
+            issuedCountry: undefined,
+            expiryDate: '',
+            dob: getEighteenYearsAgo(),
+            placeOfBirthCountry: undefined,
+            placeOfBirthCity: undefined,
+            nationality: undefined
+        },
         individualData: {
             occupation: undefined,
             sourceIncome: undefined,
@@ -375,7 +719,9 @@ var initialState = {
             employerName: '',
             employerLocation: undefined,
             isPEP: null,
-            isInfluencer: null
+            isInfluencer: null,
+            shareCount: '',
+            shareValue: ''
         }
     }
 };
@@ -392,6 +738,10 @@ export var individualSlice = createSlice({
         resetOTPScreen: function (state) {
             state.data.otpData.otp = '';
         },
+        resetIndividualData: function (state) {
+            state.data.individualPersonalData = __assign(__assign({}, state.data.individualPersonalData), initialState.data.individualPersonalData);
+            state.data.individualData = __assign(__assign({}, state.data.individualData), initialState.data.individualData);
+        },
         civilIDUploadingStatus: function (state, action) {
             state.data.individualData.civilIDUploading = action.payload;
         },
@@ -406,38 +756,11 @@ export var individualSlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a;
             state.error = null;
             state.customLoading = false;
-            var _b = action.payload, data = _b.data, token = _b.token, boardResponse = _b.boardResponse;
-            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
-            if (description) {
-                state.error = description;
-                return;
-            }
+            var _a = action.payload, data = _a.data, token = _a.token, boardResponse = _a.boardResponse;
             state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id });
             state.data.verify.token = token;
-            var _c = boardResponse || {}, countries = _c.countries, user = _c.user, countryCode = _c.countryCode;
-            var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation, is_relative_PEP = _d.is_relative_PEP, is_influencer = _d.is_influencer;
-            var _e = state.data.individualData.responseBody || {}, sourceIncomeList = _e.sourceIncomeList, monthlyIncomeList = _e.monthlyIncomeList, occupationList = _e.occupationList;
-            var selectedSourceIncome = (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList.find(function (source) { var _a; return (source === null || source === void 0 ? void 0 : source.id) === ((_a = source_income === null || source_income === void 0 ? void 0 : source_income[0]) === null || _a === void 0 ? void 0 : _a.id); })) || (sourceIncomeList === null || sourceIncomeList === void 0 ? void 0 : sourceIncomeList[0]);
-            if (!!selectedSourceIncome)
-                state.data.individualData.sourceIncome = selectedSourceIncome;
-            var code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
-            if (!!code) {
-                var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
-                state.data.individualData.employerLocation = employerLocation;
-            }
-            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);
-            });
-            state.data.individualData.monthlyIncome = selectedMonthlyIncome;
-            state.data.individualData.occupation = selectedOccupation;
-            state.data.individualData.isPEP = is_relative_PEP;
-            state.data.individualData.isInfluencer = is_influencer;
         })
             .addCase(verifyLeadToken.rejected, function (state, action) {
             state.error = action.error.message;
@@ -477,13 +800,106 @@ export var individualSlice = createSlice({
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
-            var _c = boardResponse || {}, countries = _c.countries, user = _c.user, countryCode = _c.countryCode;
-            var _d = user || {}, source_income = _d.source_income, monthly_income = _d.monthly_income, occupation = _d.occupation, is_relative_PEP = _d.is_relative_PEP, is_influencer = _d.is_influencer;
-            var _e = state.data.individualData.responseBody || {}, sourceIncomeList = _e.sourceIncomeList, monthlyIncomeList = _e.monthlyIncomeList, occupationList = _e.occupationList;
+        })
+            .addCase(verifyLeadOTP.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(addDetailsAsync.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(addDetailsAsync.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var userList = action.payload.userList;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: userList });
+        })
+            .addCase(addDetailsAsync.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(requestDetailsByEmail.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(requestDetailsByEmail.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, data = _a.data, userData = _a.userData;
+            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;
+                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 });
+        })
+            .addCase(requestDetailsByEmail.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(retrieveIndividualInfo.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(retrieveIndividualInfo.fulfilled, function (state, action) {
+            var _a, _b, _c, _d;
+            state.loading = false;
+            state.error = null;
+            var _e = action.payload, data = _e.data, countries = _e.countries, countryCode = _e.countryCode;
+            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;
+            var cityList = (state.data.verify.responseBody || {}).cityList;
+            if (data)
+                state.data.individualPersonalData.name = getUserName(data, 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;
+            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);
+            }
+            var expiryDate = (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(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) {
+                    return city.name.en === (birth === null || birth === void 0 ? void 0 : birth.city);
+                });
+                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 = 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 code = (user === null || user === void 0 ? void 0 : user.employer_country) || countryCode;
+            var code = employer_country || countryCode;
             if (!!code) {
                 var employerLocation = (countries || []).find(function (country) { return country.iso2 === code; });
                 state.data.individualData.employerLocation = employerLocation;
@@ -499,7 +915,20 @@ export var individualSlice = createSlice({
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
         })
-            .addCase(verifyLeadOTP.rejected, function (state, action) {
+            .addCase(retrieveIndividualInfo.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(getIndividualList.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(getIndividualList.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: action.payload });
+        })
+            .addCase(getIndividualList.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })
@@ -508,15 +937,70 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(retrieveDataList.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, occupation = _a.occupation;
+            var _b = action.payload, sourceIncome = _b.sourceIncome, monthlyIncome = _b.monthlyIncome, occupationData = _b.occupation;
             var data = state.data.individualData.responseBody;
-            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.list) || [], monthlyIncomeList: (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.list) || [], occupationList: (occupation === null || occupation === void 0 ? void 0 : occupation.list) || [] });
+            var sourceIncomeList = (sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.list) || [];
+            var monthlyIncomeList = (monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.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]);
+            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);
+            });
+            state.data.individualData.monthlyIncome = selectedMonthlyIncome;
+            state.data.individualData.occupation = selectedOccupation;
         })
             .addCase(retrieveDataList.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(getCityList.pending, function (state) {
+            state.cityLoading = true;
+            state.error = null;
+        })
+            .addCase(getCityList.fulfilled, function (state, action) {
+            var _a;
+            state.cityLoading = false;
+            state.error = null;
+            var data = state.data.verify.responseBody;
+            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;
+                });
+                state.data.individualPersonalData.placeOfBirthCity = selectedCity;
+            }
+        })
+            .addCase(getCityList.rejected, function (state, action) {
+            state.cityLoading = false;
+            state.error = action.error.message;
+        })
+            .addCase(updateIndividualPersonalInfo.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(updateIndividualPersonalInfo.fulfilled, function (state, action) {
+            state.loading = false;
+            state.error = null;
+            var _a = action.payload, data = _a.data, formData = _a.formData;
+            state.data.individualPersonalData = formData;
+            state.data.individualPersonalData.responseBody = data;
+        })
+            .addCase(updateIndividualPersonalInfo.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
         })
             .addCase(updateIndividualInfo.pending, function (state) {
             state.loading = true;
@@ -571,6 +1055,6 @@ export var individualSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = individualSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, civilIDUploadingStatus = _a.civilIDUploadingStatus, signatureFileUploadingStatus = _a.signatureFileUploadingStatus;
+export var clearError = (_a = individualSlice.actions, _a.clearError), stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, civilIDUploadingStatus = _a.civilIDUploadingStatus, signatureFileUploadingStatus = _a.signatureFileUploadingStatus, resetIndividualData = _a.resetIndividualData;
 export default individualSlice.reducer;
 export var individualSelector = function (state) { return state.individual; };