@tap-payments/auth-jsconnect 2.8.58-development → 2.8.59-beta

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

@@ -71,113 +71,120 @@ import API from '../../../api';
 import { FlowsTypes, IndividualGender, DocumentPurpose } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES, MONTHLY_INCOME_LIST } from '../../../constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType, isOtherThanKWOrSA, isKWOrSA } from '../../../utils';
+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 settings, payload, data, userList, recipientData, countries, _b, country_code, config, boardId, countryCode, publicKey, data_1, _c, business_id, recipient, board_id, board_info_id, notification, _d, id_1, type, individualData, birthCountry;
-        var _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.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:
-                    settings = thunkApi.getState().settings;
                     payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
                         notification: {
                             sms: false
                         }
                     }));
+                    settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_j.sent()).data;
-                    recipientData = undefined;
+                    data = (_m.sent()).data;
+                    boardInfoStatus = undefined;
                     countries = settings.data.countries;
-                    if (((_e = data.errors) === null || _e === void 0 ? void 0 : _e.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;
-                    _b = data || {}, country_code = _b.country_code, config = _b.config, boardId = _b.id;
-                    countryCode = country_code;
-                    publicKey = config === null || config === void 0 ? void 0 : config.public_key;
-                    if (country_code)
-                        thunkApi.dispatch(handleSetCountryByIso2(country_code));
-                    if (publicKey)
+                    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));
+                    }
+                    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 (!!country_code) return [3, 3];
-                    return [4, API.boardService.retrieveBoardDetails(boardId)];
+                    }
+                    if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_INFO)) return [3, 2];
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PHONE_INFO_STEP'));
+                    return [3, 16];
                 case 2:
-                    data_1 = _j.sent();
-                    countryCode = (_f = data_1 === null || data_1 === void 0 ? void 0 : data_1.entity) === null || _f === void 0 ? void 0 : _f.country;
-                    if (countryCode)
-                        thunkApi.dispatch(handleSetCountryByIso2(countryCode));
-                    _j.label = 3;
+                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 15];
+                    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, 5];
+                    return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 3:
-                    if (!(data.step_name === INDIVIDUAl_STEP_NAMES.PHONE_INFO)) return [3, 4];
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PHONE_INFO_STEP'));
-                    return [3, 18];
+                    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:
-                    if (!(data.step_name !== INDIVIDUAl_STEP_NAMES.PHONE_AUTH)) return [3, 17];
-                    _c = data || {}, business_id = _c.business_id, recipient = _c.recipient, board_id = _c.id, board_info_id = _c.board_info_id;
-                    recipientData = recipient;
-                    if (!!((_g = data === null || data === void 0 ? void 0 : data.recipient) === null || _g === void 0 ? void 0 : _g.id)) return [3, 6];
-                    if (!(board_id && board_info_id)) return [3, 6];
-                    return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+                    data_1 = (_m.sent()).data;
+                    individualData = data_1 || {};
+                    _m.label = 5;
                 case 5:
-                    notification = (_j.sent()).notification;
-                    recipientData = notification === null || notification === void 0 ? void 0 : notification.recipient;
-                    if (!(recipientData === null || recipientData === void 0 ? void 0 : recipientData.id))
-                        throw new Error('individual_id_missing');
-                    _j.label = 6;
+                    if (!board_id) return [3, 7];
+                    return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 6:
-                    _d = recipientData || {}, id_1 = _d.id, type = _d.type;
-                    return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id_1, type: type, countryCode: countryCode })).unwrap()];
+                    boardData = _m.sent();
+                    _m.label = 7;
                 case 7:
-                    individualData = (_j.sent()).data;
-                    if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && !isKWOrSA(countryCode))) return [3, 10];
-                    if (!business_id) return [3, 9];
-                    return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
+                    if (!countryCode && ((_f = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _f === void 0 ? void 0 : _f.country)) {
+                        countryCode = boardData.entity.country;
+                        thunkApi.dispatch(handleSetCountryByIso2(countryCode));
+                    }
+                    if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 11];
+                    if (!((_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:
-                    userList = _j.sent();
-                    _j.label = 9;
-                case 9:
-                    userList = userList === null || userList === void 0 ? void 0 : userList.filter(function (user) { return user.id === id_1; });
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
-                    return [3, 16];
+                    _m.sent();
+                    _m.label = 9;
+                case 9: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 10:
-                    if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 13];
-                    if (!business_id) return [3, 12];
-                    return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
+                    boardInfoStatus = _m.sent();
+                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
+                    return [3, 14];
                 case 11:
-                    userList = _j.sent();
-                    _j.label = 12;
+                    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:
-                    thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
-                    return [3, 16];
+                    _m.sent();
+                    _m.label = 13;
                 case 13:
-                    birthCountry = ((_h = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _h === void 0 ? void 0 : _h.country) || countryCode;
-                    if (!birthCountry) return [3, 15];
-                    return [4, thunkApi.dispatch(getCityList(birthCountry))];
-                case 14:
-                    _j.sent();
-                    _j.label = 15;
-                case 15:
                     if (isInternally)
                         sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
                     else
                         thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
-                    _j.label = 16;
-                case 16: return [3, 18];
-                case 17:
+                    _m.label = 14;
+                case 14: return [3, 16];
+                case 15:
                     if (isUpdatePhoneInfo) {
                         thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_VERIFY_STEP'));
                     }
-                    _j.label = 18;
-                case 18: return [2, {
-                        data: data,
-                        countries: countries,
-                        countryCode: countryCode,
-                        token: token,
-                        userList: userList || []
-                    }];
+                    _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
+                        }];
             }
         });
     });
@@ -390,141 +397,133 @@ export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', fun
     });
 }); });
 export var retrieveBoardStatus = createAsyncThunk('individual/retrieveBoardStatus', function (parmas, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var individual, _a, board_id, board_info_id, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var individual, board_id, data;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 individual = thunkApi.getState().individual;
-                _a = individual.data.verify.responseBody || {}, board_id = _a.board_id, board_info_id = _a.board_info_id;
-                if (!board_id || !board_info_id)
-                    throw new Error('Internal server error');
+                board_id = (individual.data.verify.responseBody || {}).board_id;
                 return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 1:
-                data = _b.sent();
-                return [4, thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id })).unwrap()];
-            case 2:
-                _b.sent();
+                data = _a.sent();
                 thunkApi.dispatch(handlePrevScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
                 return [2, { flows: (data === null || data === void 0 ? void 0 : data.info) || [] }];
         }
     });
 }); });
-export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetails', function (_a, thunkApi) {
-    var boardId = _a.boardId, id = _a.individualId, type = _a.individualType;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var _b, individual, settings, individualData, _c, user, data, data_3, data_state;
-        var _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
-                case 0:
-                    _b = thunkApi.getState(), individual = _b.individual, settings = _b.settings;
-                    individualData = (_d = individual.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.user;
-                    return [4, API.boardService.retrieveBoardDetails(boardId)];
-                case 1:
-                    _c = _g.sent(), user = _c.user, data = __rest(_c, ["user"]);
-                    if (!((individualData === null || individualData === void 0 ? void 0 : individualData.id) === (user === null || user === void 0 ? void 0 : user.id))) return [3, 2];
-                    individualData = user;
-                    return [3, 4];
-                case 2:
-                    if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && id && type)) return [3, 4];
-                    return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: settings.data.businessCountry.iso2 })).unwrap()];
-                case 3:
-                    data_3 = (_g.sent()).data;
-                    individualData = data_3;
-                    _g.label = 4;
-                case 4:
-                    data_state = (((individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && (data === null || data === void 0 ? void 0 : data.individuals) ? data === null || data === void 0 ? void 0 : data.individuals : individualData) || {}).data_state;
-                    return [2, {
-                            data: __assign(__assign(__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: (_e = data === null || data === void 0 ? void 0 : data.user) === null || _e === void 0 ? void 0 : _e.names, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_f = data === null || data === void 0 ? void 0 : data.user) === null || _f === void 0 ? void 0 : _f.contact }), (data_state && {
-                                individuals: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.individuals), { data_state: data_state })
-                            })), { board_status: data === null || data === void 0 ? void 0 : data.status })
-                        }];
-            }
-        });
+export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetails', function (boardId) { return __awaiter(void 0, void 0, void 0, function () {
+    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:
+                _a = _d.sent(), user = _a.user, data = __rest(_a, ["user"]);
+                return [2, {
+                        data: __assign(__assign({}, data), { brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.names, individuals: data === null || data === void 0 ? void 0 : data.individuals, contact: (_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.contact, board_status: data === null || data === void 0 ? void 0 : data.status })
+                    }];
+        }
     });
-});
+}); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, countries, payload, data, userList, recipientData, publicKey, countryCode, _b, business_id, recipient, board_id, board_info_id, notification, _c, id, type, individualData, birthCountry;
-    var _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, boardInfoStatus, countryCode, publicKey, notification, _c, id, type, data_3, birthCountry, individuals, _d, is_authorized, data_state;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    return __generator(this, function (_r) {
+        switch (_r.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
+                _b = responseBody || {}, board_id = _b.board_id, board_info_id = _b.board_info_id;
                 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 = (_m.sent()).data;
-                recipientData = undefined;
-                if ((_e = data.errors) === null || _e === void 0 ? void 0 : _e.length)
+                data = (_r.sent()).data;
+                countryCode = undefined;
+                if ((_f = data.errors) === null || _f === void 0 ? void 0 : _f.length)
                     throw new Error(data.errors[0].description);
-                publicKey = (_f = data === null || data === void 0 ? void 0 : data.config) === null || _f === void 0 ? void 0 : _f.public_key;
-                countryCode = data === null || data === void 0 ? void 0 : data.country_code;
-                if (publicKey)
+                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 (!((_g = settings.data.businessCountry) === null || _g === void 0 ? void 0 : _g.iso2) && countryCode)
-                    thunkApi.dispatch(handleSetCountryByIso2(countryCode));
-                _b = data || {}, business_id = _b.business_id, recipient = _b.recipient, board_id = _b.id, board_info_id = _b.board_info_id;
-                recipientData = recipient;
-                if (!!((_h = data === null || data === void 0 ? void 0 : data.recipient) === null || _h === void 0 ? void 0 : _h.id)) return [3, 3];
-                if (!(board_id && board_info_id)) return [3, 3];
-                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
+                }
+                if (data === null || data === void 0 ? void 0 : data.country_code) {
+                    countryCode = data.country_code;
+                    thunkApi.dispatch(handleSetCountryByIso2(data.country_code));
+                }
+                if (!board_id) return [3, 3];
+                return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 2:
-                notification = (_m.sent()).notification;
-                recipientData = notification === null || notification === void 0 ? void 0 : notification.recipient;
-                if (!(recipientData === null || recipientData === void 0 ? void 0 : recipientData.id))
-                    throw new Error('individual_id_missing');
-                _m.label = 3;
+                boardData = _r.sent();
+                _r.label = 3;
             case 3:
-                _c = recipientData || {}, id = _c.id, type = _c.type;
-                return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode })).unwrap()];
+                if (!countryCode && ((_h = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _h === void 0 ? void 0 : _h.country)) {
+                    countryCode = boardData.entity.country;
+                    thunkApi.dispatch(handleSetCountryByIso2(countryCode));
+                }
+                if (!(board_id && board_info_id)) return [3, 6];
+                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 4:
-                individualData = (_m.sent()).data;
-                if (!(!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) && !isKWOrSA(countryCode))) return [3, 7];
-                if (!business_id) return [3, 6];
-                return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
+                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:
-                userList = _m.sent();
-                _m.label = 6;
+                data_3 = (_r.sent()).data;
+                individualData = data_3 || {};
+                _r.label = 6;
             case 6:
-                userList = userList === null || userList === void 0 ? void 0 : userList.filter(function (user) { return user.id === id; });
-                thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
-                return [3, 13];
-            case 7:
+                if (countryCode)
+                    thunkApi.dispatch(handleSetCountryByIso2(countryCode));
                 if (!(individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized)) return [3, 10];
-                if (!business_id) return [3, 9];
-                return [4, thunkApi.dispatch(getIndividualList(business_id)).unwrap()];
-            case 8:
-                userList = _m.sent();
-                _m.label = 9;
+                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:
+                _r.sent();
+                _r.label = 8;
+            case 8: return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 9:
+                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:
-                _m.sent();
-                _m.label = 12;
+                _r.sent();
+                _r.label = 12;
             case 12:
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP')); });
-                _m.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,
-                        countries: countries,
-                        countryCode: countryCode,
-                        formData: __assign({}, params),
-                        userList: userList
+                        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: (_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,
+                            business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
+                            flows: (boardInfoStatus === null || boardInfoStatus === void 0 ? void 0 : boardInfoStatus.info) || []
+                        },
+                        formData: __assign({}, params)
                     }];
         }
     });
@@ -562,20 +561,21 @@ export var updatePhoneInfo = createAsyncThunk('individual/updatePhoneInfo', func
     });
 });
 export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
+    var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, individual, _c, recipient, user, entity, id, countryCode, name, email, mobile, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, _d, data_status, objects, ids, 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, individualData, data, _e, isUser, isBuyer, isUserORBuyerType;
+        var _b, settings, individual, _c, notification, user, entity, id, _d, objects, ids, countryCode, name, email, mobile, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isGenderNonEditable, isNameENNonEditable, isNameARNonEditable, isEmailNonEditable, isMobileNumberNonEditable, isMobileCountryNonEditable, isNidNonEditable, isIssuedCountryNonEditable, isExpiryNonEditable, isIdTypeNonEditable, isNationalityNonEditable, isDOBNonEditable, isBirthCityNonEditable, isBirthCountryNonEditable, hasContact, hasPhone, hasIdentification, hasBirth, nameIsEditable, contact, requestBody, data, currencyData, _e, isUser, isBuyer, isUserORBuyerType;
         var _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, individual = _b.individual;
-                    _c = individual.data.verify.responseBody || {}, recipient = _c.recipient, user = _c.user, entity = _c.entity;
-                    id = (((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : recipient) || {}).id;
+                    _c = individual.data.verify.responseBody || {}, notification = _c.notification, user = _c.user, entity = _c.entity;
+                    id = (((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}).id;
+                    _d = user || {}, objects = _d.objects, ids = _d.ids;
                     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;
-                    _d = user || {}, data_status = _d.data_status, objects = _d.objects, ids = _d.ids;
+                    data_status = (user || {}).data_status;
                     userName = getUserNameObject(name);
                     identification_id_type = nid ? (nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA) : undefined;
                     if (isOtherThanKWOrSA(settings.data.businessCountry.iso2)) {
@@ -598,7 +598,7 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     hasContact = email || mobile;
                     hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
                     hasIdentification = nid && (issuedCountry || identification_id_type || expiryDate);
-                    hasBirth = (placeOfBirthCity === null || placeOfBirthCity === void 0 ? void 0 : placeOfBirthCity.id) || (placeOfBirthCountry === null || placeOfBirthCountry === void 0 ? void 0 : placeOfBirthCountry.iso2);
+                    hasBirth = placeOfBirthCity || placeOfBirthCountry;
                     nameIsEditable = userName.first && !(isNameENNonEditable && isNameARNonEditable);
                     contact = hasContact && !(isEmailNonEditable && isMobileCountryNonEditable && isMobileNumberNonEditable)
                         ? __assign({ email: isEmailNonEditable ? undefined : email }, (!(isMobileCountryNonEditable && isMobileNumberNonEditable) &&
@@ -644,14 +644,12 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                             'date_of_birth',
                             'nationality'
                         ], step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_PERSONAL_INFO });
-                    individualData = undefined;
-                    if (!isDirty) return [3, 2];
                     return [4, API.individualService.updateMultipleIndividual(requestBody)];
                 case 1:
                     data = _l.sent();
-                    individualData = data;
-                    _l.label = 2;
+                    return [4, API.countryService.getCurrency(settings.data.businessCountry.iso2)];
                 case 2:
+                    currencyData = _l.sent();
                     _e = getIndividualType(objects), isUser = _e.isUser, isBuyer = _e.isBuyer;
                     isUserORBuyerType = isUser || isBuyer;
                     if (!isUserORBuyerType) return [3, 4];
@@ -662,38 +660,35 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                 case 4:
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
                     (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: individualData, formData: originalFormData }];
+                    return [2, { data: data, formData: originalFormData, currencyData: currencyData }];
             }
         });
     });
 });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
+    var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, individual, _c, recipient, user, userList, business, id, _d, objects, ids, isKWOrSAValue, occupation, sourceIncome, monthlyIncome, isPEP, isInfluencer, shareCount, shareValue, civilID, signatureFileId, isAuthorized, isOccupationNonEditable, isSourceIncomeNonEditable, isPEPNonEditable, isInfluencerNonEditable, isMonthlyIncomeNonEditable, isAuthorizedNonEditable, isSharesAvailable, pepInfo, influencerInfo, occupationInfo, sourceIncomeInfo, monthlyIncomeInfo, isAuthorizedInfo, userPayload, shareHolderPayload, boardMemberPayload, buyerMemberPayload, _e, isUser, isShareholder, isBoardMember, isBuyer, isCustomer, isUserORBuyerType, payload, businessCountry, hasCivilIdDocument, hasSignatureDocument, isSendSignatureFile, civilIdDocument, signatureDocument, documentBody, documentBody, documentsList, documentBody, data, individualData, requestBody, user_2, userListRes;
+        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 || {}, recipient = _c.recipient, user = _c.user, userList = _c.userList, business = _c.business;
-                    id = (((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : recipient) || {}).id;
+                    _c = individual.data.verify.responseBody || {}, notification = _c.notification, user = _c.user;
+                    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;
-                    isKWOrSAValue = isKWOrSA(settings.data.businessCountry.iso2);
-                    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, isAuthorized = formData.isAuthorized;
+                    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');
                     isPEPNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'is_relative_PEP');
                     isInfluencerNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'is_influencer');
                     isMonthlyIncomeNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'monthly_income');
-                    isAuthorizedNonEditable = hasNoneEditableValue(user === null || user === void 0 ? void 0 : user.data_status, 'is_authorized');
                     isSharesAvailable = shareCount || shareValue;
                     pepInfo = isPEPNonEditable || isPEP === null ? undefined : isPEP;
                     influencerInfo = isInfluencerNonEditable || isInfluencer === null ? undefined : isInfluencer;
                     occupationInfo = isOccupationNonEditable || !(occupation === null || occupation === void 0 ? void 0 : occupation.id) ? undefined : { chapter: { id: occupation.id } };
                     sourceIncomeInfo = isSourceIncomeNonEditable || !(sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.id) ? undefined : [{ id: sourceIncome.id }];
                     monthlyIncomeInfo = isMonthlyIncomeNonEditable || !(monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.id) ? undefined : { id: monthlyIncome.id };
-                    isAuthorizedInfo = isAuthorizedNonEditable || isKWOrSAValue ? undefined : { is_authorized: isAuthorized };
                     userPayload = {
                         occupation: occupationInfo,
                         source_income: sourceIncomeInfo,
@@ -722,70 +717,58 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     isUserORBuyerType = isUser || isBuyer;
                     payload = userPayload;
                     if (objects === null || objects === void 0 ? void 0 : objects.length) {
-                        payload = __assign(__assign(__assign(__assign(__assign(__assign({}, (isUser && payload)), (isShareholder && shareHolderPayload)), (isBoardMember && boardMemberPayload)), (isBuyer && buyerMemberPayload)), (isCustomer && {})), (isAuthorizedInfo && isAuthorizedInfo));
+                        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 = _h.sent();
                     businessCountry = settings.data.businessCountry;
                     hasCivilIdDocument = (civilID || []).length > 0;
                     hasSignatureDocument = (signatureFileId || []).length > 0;
-                    isSendSignatureFile = isAuthorized && isUserORBuyerType;
+                    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, 2];
+                    if (!((civilIdDocument === null || civilIdDocument === void 0 ? void 0 : civilIdDocument.id) && hasCivilIdDocument)) return [3, 3];
                     documentBody = {
                         id: civilIdDocument.id,
                         images: civilID
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-                case 1:
-                    _h.sent();
-                    _h.label = 2;
                 case 2:
-                    if (!((signatureDocument === null || signatureDocument === void 0 ? void 0 : signatureDocument.id) && hasSignatureDocument && isSendSignatureFile)) return [3, 4];
+                    _h.sent();
+                    _h.label = 3;
+                case 3:
+                    if (!((signatureDocument === null || signatureDocument === void 0 ? void 0 : signatureDocument.id) && hasSignatureDocument && isSendSignatureFile)) return [3, 5];
                     documentBody = {
                         id: signatureDocument.id,
                         images: signatureFileId
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-                case 3:
-                    _h.sent();
-                    _h.label = 4;
                 case 4:
+                    _h.sent();
+                    _h.label = 5;
+                case 5:
                     documentsList = [];
                     if (hasCivilIdDocument && !(civilIdDocument === null || civilIdDocument === void 0 ? void 0 : civilIdDocument.id))
                         documentsList.push({ type: DocumentPurpose.IDENTITY_DOCUMENT, images: civilID });
                     if (isSendSignatureFile && hasSignatureDocument && !(signatureDocument === null || signatureDocument === void 0 ? void 0 : signatureDocument.id))
                         documentsList.push({ type: DocumentPurpose.CUSTOMER_SIGNATURE, images: signatureFileId });
-                    if (!(documentsList.length > 0)) return [3, 6];
+                    if (!(documentsList.length > 0)) return [3, 7];
                     documentBody = {
                         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 5:
-                    _h.sent();
-                    _h.label = 6;
                 case 6:
-                    data = undefined, individualData = user || {};
-                    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 });
-                    if (!isDirty) return [3, 8];
-                    return [4, API.individualService.updateMultipleIndividual(requestBody)];
+                    _h.sent();
+                    _h.label = 7;
                 case 7:
-                    data = _h.sent();
-                    user_2 = (sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [])[0];
-                    individualData = user_2;
-                    _h.label = 8;
-                case 8:
-                    userListRes = userList || [];
-                    if (!((user === null || user === void 0 ? void 0 : user.id) === (individualData === null || individualData === void 0 ? void 0 : individualData.id) && !(user === null || user === void 0 ? void 0 : user.is_authorized) && isAuthorized && (business === null || business === void 0 ? void 0 : business.id))) return [3, 10];
-                    return [4, thunkApi.dispatch(getIndividualList(business === null || business === void 0 ? void 0 : business.id)).unwrap()];
-                case 9:
-                    userListRes = _h.sent();
-                    _h.label = 10;
-                case 10:
+                    individualData = (sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [])[0];
                     thunkApi.dispatch(handleNextScreenStep());
                     (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: data, formData: originalFormData, individualData: individualData, userList: userListRes, isKWOrSACountry: isKWOrSAValue }];
+                    return [2, { data: data, formData: originalFormData, individualData: individualData }];
             }
         });
     });
@@ -816,39 +799,49 @@ 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, board_id, infoId, _c, showBoard, mode, payload, data, _d, id, iType, boardInfoStatusData;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var _a, settings, individual, _b, id, infoId, primaryUser, _c, showBoard, mode, payload, data, boardInfoStatus, individualDataRes, _d, is_authorized, userId, type;
+    var _e, _f, _g, _h, _j, _k, _l, _m;
+    return __generator(this, function (_o) {
+        switch (_o.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
-                _b = individual.data.verify.responseBody || {}, board_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;
                 _c = settings.data.appConfig, showBoard = _c.showBoard, mode = _c.mode;
-                if (!board_id)
+                if (!id)
                     return [2];
                 payload = {
                     lang: settings.data.language,
-                    step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS
+                    step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS,
+                    id: id
                 };
-                return [4, API.boardService.updateBoardInfo(__assign({ id: board_id, infoId: infoId }, payload))];
+                return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
             case 1:
-                data = _p.sent();
+                data = _o.sent();
                 if (!showBoard && mode === 'content') {
                     (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, {});
                     (_h = (_g = settings.data.appConfig).onFlowCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, { data: data });
                     return [2, { response: __assign({}, data), formData: params }];
                 }
-                _d = ((_j = data === null || data === void 0 ? void 0 : data.notification) === null || _j === void 0 ? void 0 : _j.recipient) || {}, id = _d.id, iType = _d.type;
-                return [4, Promise.all([
-                        API.boardService.retrieveBoardInfoStatus(board_id),
-                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: iType })).unwrap()
-                    ])];
+                return [4, API.boardService.retrieveBoardInfoStatus(id)];
             case 2:
-                boardInfoStatusData = (_p.sent())[0];
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, {});
-                (_o = (_m = settings.data.appConfig).onFlowCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, { data: data });
+                boardInfoStatus = _o.sent();
+                return [4, thunkApi.dispatch(retrieveBoardDetails(id))];
+            case 3:
+                _o.sent();
+                individualDataRes = undefined;
+                _d = primaryUser || {}, is_authorized = _d.is_authorized, userId = _d.id, type = _d.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 = _o.sent();
+                _o.label = 5;
+            case 5:
+                (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, {});
+                (_m = (_l = settings.data.appConfig).onFlowCompleted) === null || _m === void 0 ? void 0 : _m.call(_l, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { data: data, flows: (boardInfoStatusData === null || boardInfoStatusData === void 0 ? void 0 : boardInfoStatusData.info) || [] }];
+                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 }];
         }
     });
 }); });
@@ -870,9 +863,9 @@ var initialState = {
     error: null,
     loading: false,
     cityLoading: false,
-    addOrRequestDetailLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
+        currency: '',
         verify: {
             token: ''
         },
@@ -910,8 +903,7 @@ var initialState = {
             isPEP: null,
             isInfluencer: null,
             shareCount: '',
-            shareValue: '',
-            isAuthorized: false
+            shareValue: ''
         }
     }
 };
@@ -946,8 +938,8 @@ export var individualSlice = createSlice({
         })
             .addCase(verifyToken.fulfilled, function (state, action) {
             state.error = null;
-            var _a = action.payload, data = _a.data, token = _a.token, countries = _a.countries, countryCode = _a.countryCode, userList = _a.userList;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { countries: countries, countryCode: countryCode, board_id: data.id, userList: userList });
+            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;
         })
             .addCase(verifyToken.rejected, function (state, action) {
@@ -987,31 +979,37 @@ export var individualSlice = createSlice({
             state.error = null;
         })
             .addCase(verifyLeadOTP.fulfilled, function (state, action) {
+            var _a;
             state.loading = false;
             state.error = null;
-            var _a = action.payload, data = _a.data, countries = _a.countries, countryCode = _a.countryCode, userList = _a.userList, formData = _a.formData;
+            var _b = action.payload, data = _b.data, formData = _b.formData, boardResponse = _b.boardResponse;
+            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { countries: countries, countryCode: countryCode, userList: userList });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), boardResponse);
         })
             .addCase(verifyLeadOTP.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })
             .addCase(addDetailsAsync.pending, function (state) {
-            state.addOrRequestDetailLoading = true;
+            state.loading = true;
             state.error = null;
         })
             .addCase(addDetailsAsync.fulfilled, function (state, action) {
             var _a, _b, _c, _d;
-            state.addOrRequestDetailLoading = false;
+            state.loading = false;
             state.error = null;
             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, is_authorized = _f.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)
@@ -1069,19 +1067,17 @@ export var individualSlice = createSlice({
                 state.data.individualData.isPEP = is_relative_PEP;
             if (is_influencer !== undefined)
                 state.data.individualData.isInfluencer = is_influencer;
-            if (is_authorized !== undefined)
-                state.data.individualData.isAuthorized = is_authorized;
         })
             .addCase(addDetailsAsync.rejected, function (state, action) {
-            state.addOrRequestDetailLoading = false;
+            state.loading = false;
             state.error = action.error.message;
         })
             .addCase(requestDetailsByEmail.pending, function (state) {
-            state.addOrRequestDetailLoading = true;
+            state.loading = true;
             state.error = null;
         })
             .addCase(requestDetailsByEmail.fulfilled, function (state, action) {
-            state.addOrRequestDetailLoading = false;
+            state.loading = false;
             state.error = null;
             var _a = action.payload, data = _a.data, individualData = _a.individualData;
             var userList = (state.data.verify.responseBody || {}).userList;
@@ -1094,7 +1090,7 @@ export var individualSlice = createSlice({
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { requestEmailData: data, userList: list });
         })
             .addCase(requestDetailsByEmail.rejected, function (state, action) {
-            state.addOrRequestDetailLoading = false;
+            state.loading = false;
             state.error = action.error.message;
         })
             .addCase(retrieveIndividualInfo.pending, function (state) {
@@ -1106,7 +1102,7 @@ export var individualSlice = createSlice({
             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), { 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, is_authorized = _f.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)
@@ -1162,8 +1158,6 @@ export var individualSlice = createSlice({
             state.data.individualData.occupation = selectedOccupation;
             state.data.individualData.isPEP = is_relative_PEP;
             state.data.individualData.isInfluencer = is_influencer;
-            if (is_authorized !== undefined)
-                state.data.individualData.isAuthorized = is_authorized;
         })
             .addCase(retrieveIndividualInfo.rejected, function (state, action) {
             state.error = action.error.message;
@@ -1254,11 +1248,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;
@@ -1271,20 +1268,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, individualData = _a.individualData, userList = _a.userList, isKWOrSACountry = _a.isKWOrSACountry;
-            state.data.individualData = __assign(__assign({}, formData), { civilID: undefined, signatureFileId: undefined });
+            var _a = action.payload, data = _a.data, formData = _a.formData, individualData = _a.individualData;
+            state.data.individualData = formData;
             state.data.individualData.responseBody = data;
-            var user = (state.data.verify.responseBody || {}).user;
-            var isSameUser = (user === null || user === void 0 ? void 0 : user.id) === (individualData === null || individualData === void 0 ? void 0 : individualData.id);
-            var userInfo = __assign(__assign({}, user), (isSameUser && individualData && __assign({}, individualData)));
-            if (isSameUser && !isKWOrSACountry)
-                userInfo = __assign(__assign({}, user), { is_authorized: individualData.is_authorized });
+            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), { user: userInfo, userList: list });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { userList: list });
         })
             .addCase(updateIndividualInfo.rejected, function (state, action) {
             state.loading = false;
@@ -1336,8 +1329,18 @@ export var individualSlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var _b = action.payload || {}, flows = _b.flows, data = _b.data;
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows, recipient: (_a = data === null || data === void 0 ? void 0 : data.notification) === null || _a === void 0 ? void 0 : _a.recipient });
+            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;
+            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;