@tap-payments/auth-jsconnect 2.8.62-beta → 2.8.62-development

package/build/features/app/entity/entityStore.js

@@ -63,14 +63,14 @@ import { BusinessType, DocumentPurpose, FlowsTypes, LicenseType } from '../../..
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { ENTITY_STEP_NAMES } from '../../../constants';
 import moment from 'moment';
-import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData } from '../../../utils';
+import { convertNumbers2English, getRecentDocumentBasedOnPurpose, hasVerifiedValue, hasNoneEditableValue, sleep, formatNumberAsCurrency, removeAllCharsFromNumber, retrieveIndividualData, sendCustomEventToGTM } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('entityVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, data, boardData, boardInfoData, entityData, entityTypes, individualData, countryIso2, publicKey, _b, board_id, board_info_id, _c, id_1, type_1, serviceCallBack, _d, boardRes, individualRes, entityId;
-        var _e, _f, _g, _h, _j, _k, _l;
-        return __generator(this, function (_m) {
-            switch (_m.label) {
+        var payload, data, entityData, entityTypes, _b, country_code, config, publicKey, _c, entity_id, boardId, data_1;
+        var _d, _e, _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     payload = __assign({ service_name: 'tap_email', verify_token: token }, (isInternally && {
                         notification: {
@@ -79,76 +79,47 @@ export var verifyLeadToken = createAsyncThunk('entityVerifyLeadToken', function
                     }));
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_m.sent()).data;
-                    countryIso2 = undefined;
-                    if (!(!(data === null || data === void 0 ? void 0 : data.errors) && !(data === null || data === void 0 ? void 0 : data.mw_error))) return [3, 10];
+                    data = (_g.sent()).data;
+                    entityTypes = undefined;
+                    if (((_d = data === null || data === void 0 ? void 0 : 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 = ENTITY_STEP_NAMES.ENTITY_INFO;
-                    if (data === null || data === void 0 ? void 0 : data.country_code) {
-                        countryIso2 = data.country_code;
-                        if (countryIso2)
-                            thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                    }
-                    publicKey = (_e = data === null || data === void 0 ? void 0 : data.config) === null || _e === void 0 ? void 0 : _e.public_key;
-                    if (publicKey) {
+                    _b = data || {}, country_code = _b.country_code, config = _b.config;
+                    publicKey = config === null || config === void 0 ? void 0 : config.public_key;
+                    if (country_code)
+                        thunkApi.dispatch(handleSetCountryByIso2(country_code));
+                    if (publicKey)
                         thunkApi.dispatch(handlePublicKey(publicKey));
-                    }
-                    if (!(data.step_name !== ENTITY_STEP_NAMES.PHONE_AUTH)) return [3, 10];
-                    _b = data || {}, board_id = _b.id, board_info_id = _b.board_info_id;
-                    if (!board_id) return [3, 6];
-                    return [4, API.boardService.retrieveBoardDetails(board_id)];
+                    if (!(data.step_name !== ENTITY_STEP_NAMES.PHONE_AUTH)) return [3, 7];
+                    _c = data || {}, entity_id = _c.entity_id, boardId = _c.id;
+                    if (!!entity_id) return [3, 3];
+                    return [4, API.boardService.retrieveBoardDetails(boardId)];
                 case 2:
-                    boardData = _m.sent();
-                    if (!board_info_id) return [3, 4];
-                    return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
-                case 3:
-                    boardInfoData = _m.sent();
-                    _m.label = 4;
+                    data_1 = _g.sent();
+                    if (!((_e = data_1 === null || data_1 === void 0 ? void 0 : data_1.entity) === null || _e === void 0 ? void 0 : _e.id))
+                        throw new Error('entity_id_missing');
+                    entityData = data_1;
+                    return [3, 5];
+                case 3: return [4, API.entityService.retrieveEntity(entity_id)];
                 case 4:
-                    _c = ((_f = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _f === void 0 ? void 0 : _f.recipient) || {}, id_1 = _c.id, type_1 = _c.type;
-                    serviceCallBack = function () { return API.individualService.retrieveIndividual(id_1, type_1); };
-                    return [4, retrieveIndividualData(type_1, boardData, serviceCallBack)];
+                    entityData = _g.sent();
+                    _g.label = 5;
                 case 5:
-                    _d = _m.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
-                    boardData = boardRes;
-                    individualData = individualRes;
-                    _m.label = 6;
-                case 6:
-                    entityId = (_g = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _g === void 0 ? void 0 : _g.id;
-                    if (!entityId) return [3, 8];
-                    return [4, API.entityService.retrieveEntity(entityId)];
-                case 7:
-                    entityData = _m.sent();
-                    _m.label = 8;
-                case 8:
-                    if (!countryIso2 && ((_h = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _h === void 0 ? void 0 : _h.country)) {
-                        countryIso2 = (_j = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _j === void 0 ? void 0 : _j.country;
-                        thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                    }
+                    if (!country_code && ((_f = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _f === void 0 ? void 0 : _f.country))
+                        thunkApi.dispatch(handleSetCountryByIso2(entityData.entity.country));
                     return [4, API.entityService.retrieveEntityType()];
-                case 9:
-                    entityTypes = _m.sent();
+                case 6:
+                    entityTypes = _g.sent();
                     if (isInternally)
                         sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('ENTITY_NAME_STEP')); });
                     else
                         thunkApi.dispatch(handleNextScreenStep('ENTITY_NAME_STEP'));
-                    _m.label = 10;
-                case 10: return [2, {
+                    _g.label = 7;
+                case 7: return [2, {
                         data: data,
-                        individualData: individualData,
-                        boardResponse: {
-                            user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
-                            brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
-                            bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
-                            entity: entityData === null || entityData === void 0 ? void 0 : entityData.entity,
-                            merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
-                            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: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
-                            business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
-                            entityTypes: entityTypes,
-                            notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
-                        },
+                        entityData: entityData === null || entityData === void 0 ? void 0 : entityData.entity,
+                        entityTypes: entityTypes,
                         token: token
                     }];
             }
@@ -173,132 +144,119 @@ export var resendOTP = createAsyncThunk('entityResendOTP', function (params, thu
     });
 }); });
 export var verifyEntityLeadOTP = createAsyncThunk('verifyEntityLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, entity, settings, responseBody, payload, data, boardData, entityData, entityTypes, boardInfoData, individualData, countryIso2, _b, board_id, board_info_id, config, country_code, publicKey, _c, id_2, type_2, serviceCallBack, _d, boardRes, individualRes, entityId;
-    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var _a, entity, settings, responseBody, payload, data, _b, entity_id, config, boardId, country_code, entityData, publicKey, countryIso2, data_2, entityTypes;
+    var _c, _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 _a = thunkApi.getState(), entity = _a.entity, settings = _a.settings;
                 responseBody = entity.data.verify.responseBody;
                 payload = {
                     data: params.otp,
-                    service_name: (_e = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _e === void 0 ? void 0 : _e.service_name,
+                    service_name: (_c = responseBody === null || responseBody === void 0 ? void 0 : responseBody.verification_by) === null || _c === void 0 ? void 0 : _c.service_name,
                     verify_token: responseBody === null || responseBody === void 0 ? void 0 : responseBody.verify_token,
                     step_name: ENTITY_STEP_NAMES.PHONE_AUTH,
                     encryption_contract: ['data']
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_p.sent()).data;
-                if ((_f = data === null || data === void 0 ? void 0 : data.errors) === null || _f === void 0 ? void 0 : _f.length)
+                data = (_j.sent()).data;
+                if ((_d = data === null || data === void 0 ? void 0 : data.errors) === null || _d === void 0 ? void 0 : _d.length)
                     throw new Error(data.errors[0].description);
-                countryIso2 = undefined;
-                if (!!data.errors) return [3, 10];
-                _b = data || {}, board_id = _b.id, board_info_id = _b.board_info_id, config = _b.config, country_code = _b.country_code;
+                _b = data || {}, entity_id = _b.entity_id, config = _b.config, boardId = _b.id, country_code = _b.country_code;
+                entityData = undefined;
                 publicKey = config === null || config === void 0 ? void 0 : config.public_key;
-                if (publicKey) {
+                countryIso2 = country_code || (responseBody === null || responseBody === void 0 ? void 0 : responseBody.country_code);
+                if (publicKey)
                     thunkApi.dispatch(handlePublicKey(publicKey));
-                }
-                if (country_code) {
-                    countryIso2 = country_code;
+                if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                }
-                if (!board_id) return [3, 6];
-                return [4, API.boardService.retrieveBoardDetails(board_id)];
+                if (!!entity_id) return [3, 3];
+                return [4, API.boardService.retrieveBoardDetails(boardId)];
             case 2:
-                boardData = _p.sent();
-                if (!board_info_id) return [3, 4];
-                return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
-            case 3:
-                boardInfoData = _p.sent();
-                _p.label = 4;
+                data_2 = _j.sent();
+                if (!((_e = data_2 === null || data_2 === void 0 ? void 0 : data_2.entity) === null || _e === void 0 ? void 0 : _e.id))
+                    throw new Error('entity_id_missing');
+                entityData = data_2;
+                return [3, 5];
+            case 3: return [4, API.entityService.retrieveEntity(entity_id)];
             case 4:
-                _c = ((_g = boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification) === null || _g === void 0 ? void 0 : _g.recipient) || {}, id_2 = _c.id, type_2 = _c.type;
-                serviceCallBack = function () { return API.individualService.retrieveIndividual(id_2, type_2); };
-                return [4, retrieveIndividualData(type_2, boardData, serviceCallBack)];
+                entityData = _j.sent();
+                _j.label = 5;
             case 5:
-                _d = _p.sent(), boardRes = _d.boardRes, individualRes = _d.individualRes;
-                boardData = boardRes;
-                individualData = individualRes;
-                _p.label = 6;
-            case 6:
-                entityId = (_h = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _h === void 0 ? void 0 : _h.id;
-                if (!entityId) return [3, 8];
-                return [4, API.entityService.retrieveEntity(entityId)];
-            case 7:
-                entityData = _p.sent();
-                _p.label = 8;
-            case 8:
-                if (!countryIso2 && ((_j = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _j === void 0 ? void 0 : _j.country)) {
-                    countryIso2 = entityData.entity.country;
-                    thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                }
-                (_l = (_k = settings.data.appConfig).onStepCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, settings.data.activeScreen.name, { otp: params.otp });
+                if (!countryIso2 && ((_f = entityData === null || entityData === void 0 ? void 0 : entityData.entity) === null || _f === void 0 ? void 0 : _f.country))
+                    thunkApi.dispatch(handleSetCountryByIso2(entityData.entity.country));
+                (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, { otp: params.otp });
                 return [4, API.entityService.retrieveEntityType()];
-            case 9:
-                entityTypes = _p.sent();
+            case 6:
+                entityTypes = _j.sent();
                 sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('ENTITY_NAME_STEP')); });
-                _p.label = 10;
-            case 10: return [2, {
-                    data: data,
-                    individualData: individualData,
-                    boardResponse: {
-                        user: boardData === null || boardData === void 0 ? void 0 : boardData.user,
-                        brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand,
-                        bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account,
-                        entity: entityData === null || entityData === void 0 ? void 0 : entityData.entity,
-                        merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
-                        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,
-                        business: boardData === null || boardData === void 0 ? void 0 : boardData.business,
+                return [2, {
+                        data: data,
+                        entityData: entityData === null || entityData === void 0 ? void 0 : entityData.entity,
                         entityTypes: entityTypes,
-                        notification: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.notification
-                    },
-                    formData: params
-                }];
+                        formData: params
+                    }];
         }
     });
 }); });
 export var retrieveBoardStatus = createAsyncThunk('entity/retrieveBoardStatus', function (parmas, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var entity, board_id, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var entity, _a, board_id, board_info_id, recipient, _b, id, type, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 entity = thunkApi.getState().entity;
-                board_id = (entity.data.verify.responseBody || {}).board_id;
-                return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
+                _a = entity.data.verify.responseBody || {}, board_id = _a.board_id, board_info_id = _a.board_info_id, recipient = _a.recipient;
+                if (!board_id || !board_info_id)
+                    throw new Error('Internal server error');
+                _b = recipient || {}, id = _b.id, type = _b.type;
+                return [4, Promise.all([
+                        API.boardService.retrieveBoardInfoStatus(board_id),
+                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()
+                    ])];
             case 1:
-                data = _a.sent();
+                data = (_c.sent())[0];
                 thunkApi.dispatch(handlePrevScreenStep());
                 return [2, { flows: (data === null || data === void 0 ? void 0 : data.info) || [] }];
         }
     });
 }); });
-export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', function (boardId) { return __awaiter(void 0, void 0, void 0, function () {
-    var data;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
-            case 1:
-                data = _c.sent();
-                return [2, {
-                        data: __assign(__assign({}, data), { user: data === null || data === void 0 ? void 0 : data.user, brand: data === null || data === void 0 ? void 0 : data.brand, bank_account: data === null || data === void 0 ? void 0 : data.bank_account, entity: data === null || data === void 0 ? void 0 : data.entity, merchant: data === null || data === void 0 ? void 0 : data.merchant, name: (_a = data === null || data === void 0 ? void 0 : data.user) === null || _a === void 0 ? void 0 : _a.names, contact: (_b = data === null || data === void 0 ? void 0 : data.user) === null || _b === void 0 ? void 0 : _b.contact, individuals: data === null || data === void 0 ? void 0 : data.individuals, board_status: data === null || data === void 0 ? void 0 : data.status })
-                    }];
-        }
+export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', function (_a) {
+    var boardId = _a.boardId, id = _a.individualId, type = _a.individualType;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var data, individualData, boardData, serviceCallBack, _b, boardRes, individualRes;
+        var _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0: return [4, API.boardService.retrieveBoardDetails(boardId)];
+                case 1:
+                    data = _f.sent();
+                    individualData = data === null || data === void 0 ? void 0 : data.user;
+                    boardData = data;
+                    if (!(((_c = data === null || data === void 0 ? void 0 : data.user) === null || _c === void 0 ? void 0 : _c.id) !== id)) return [3, 3];
+                    serviceCallBack = function () { return API.individualService.retrieveIndividual(id, type); };
+                    return [4, retrieveIndividualData(type, data, serviceCallBack)];
+                case 2:
+                    _b = _f.sent(), boardRes = _b.boardRes, individualRes = _b.individualRes;
+                    individualData = individualRes;
+                    boardData = boardRes;
+                    _f.label = 3;
+                case 3: return [2, __assign(__assign({}, boardData), { brand: boardData === null || boardData === void 0 ? void 0 : boardData.brand, bank_account: boardData === null || boardData === void 0 ? void 0 : boardData.bank_account, entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity, merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant, name: (_d = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _d === void 0 ? void 0 : _d.names, individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals, contact: (_e = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _e === void 0 ? void 0 : _e.contact, user: individualData, board_status: boardData === null || boardData === void 0 ? void 0 : boardData.status })];
+            }
+        });
     });
-}); });
+});
 export var updateEntityName = createAsyncThunk('entityUpdateEntityName', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, entity, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, data, documentResponse, document, documentBody, documentBody, list;
-        var _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _b, settings, entity, entityRes, _c, id, data_status, data_verification, documents, issuingDate, expiryDate, licenseType, licenseNumber, articleId, unifiedNumber, legalName, certificateId, entityType, issueDate, expDate, isFL, isLegalNameENNonEditable, isLegalNameARNonEditable, isLicenseTypeNonEditable, isEntityTypeNonEditable, isLicenseNumberNonEditable, isUnifiedNumberNonEditable, isIssuingDateNonEditable, isExpiryDateNonEditable, isDocumentsNonEditable, isAOAFileNonEditable, isEntityTypeVerified, isLicenseNonEditable, isLicenseAvailable, payload, entityData, documentData, activityList, entity_1, documentResponse, document, documentBody, documentBody, entity_2, list;
+        var _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, entity = _b.entity;
-                    _c = ((_d = entity.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.entity) || {}, id = _c.id, data_status = _c.data_status, data_verification = _c.data_verification, documents = _c.documents;
+                    entityRes = (entity.data.verify.responseBody || {}).entity;
+                    _c = entityRes || {}, id = _c.id, data_status = _c.data_status, data_verification = _c.data_verification, documents = _c.documents;
                     issuingDate = formData.issuingDate, expiryDate = formData.expiryDate, licenseType = formData.licenseType, licenseNumber = formData.licenseNumber, articleId = formData.articleId, unifiedNumber = formData.unifiedNumber, legalName = formData.legalName, certificateId = formData.certificateId, entityType = formData.entityType;
                     issueDate = issuingDate && new Date(issuingDate).getTime();
                     expDate = expiryDate && new Date(expiryDate).getTime();
@@ -338,22 +296,27 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
                             'license.additional_info.unified_number',
                             'type'
                         ] });
+                    entityData = entityRes, activityList = undefined;
+                    if (!isDirty) return [3, 2];
                     return [4, API.entityService.updateEntity(payload)];
                 case 1:
-                    data = _g.sent();
+                    entity_1 = (_f.sent()).entity;
+                    entityData = entity_1;
+                    _f.label = 2;
+                case 2:
                     documentResponse = undefined;
                     document = getRecentDocumentBasedOnPurpose(documents, DocumentPurpose.CR);
-                    if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 7];
-                    if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 3];
+                    if (!(!isDocumentsNonEditable && (certificateId || []).length > 0)) return [3, 8];
+                    if (!(document === null || document === void 0 ? void 0 : document.id)) return [3, 4];
                     documentBody = {
                         id: document.id,
                         images: certificateId
                     };
                     return [4, API.documentService.addFilesToExistingDocument(documentBody)];
-                case 2:
-                    documentResponse = _g.sent();
-                    return [3, 5];
                 case 3:
+                    documentResponse = _f.sent();
+                    return [3, 6];
+                case 4:
                     documentBody = {
                         entity_id: id || '',
                         documents: [
@@ -364,45 +327,48 @@ export var updateEntityName = createAsyncThunk('entityUpdateEntityName', functio
                         ]
                     };
                     return [4, API.documentService.updateDocumentInfo(documentBody)];
-                case 4:
-                    documentResponse = _g.sent();
-                    _g.label = 5;
-                case 5: return [4, API.entityService.retrieveEntity(id)];
-                case 6:
-                    data = _g.sent();
-                    data.documentData = documentResponse;
-                    _g.label = 7;
-                case 7: return [4, API.dataService.getActivitiesIsIc()];
-                case 8:
-                    list = (_g.sent()).list;
-                    data.activityList = list;
+                case 5:
+                    documentResponse = _f.sent();
+                    _f.label = 6;
+                case 6: return [4, API.entityService.retrieveEntity(id)];
+                case 7:
+                    entity_2 = (_f.sent()).entity;
+                    entityData = entity_2;
+                    documentData = documentResponse;
+                    _f.label = 8;
+                case 8: return [4, API.dataService.getActivitiesIsIc()];
+                case 9:
+                    list = (_f.sent()).list;
+                    activityList = list;
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
-                    return [2, { data: data, formData: originalFormData }];
+                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
+                    return [2, { data: { entity: entityData, documentData: documentData, activityList: activityList }, formData: originalFormData }];
             }
         });
     });
 });
 export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', function (_a, thunkApi) {
-    var formData = _a.formData, originalFormData = _a.originalFormData;
+    var formData = _a.formData, originalFormData = _a.originalFormData, isDirty = _a.isDirty;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, settings, entity, _c, id, data_status, entityActivities, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, capitalShareCount, capitalShareValue, activities, capitalPaid, hasCapitalShares, isCapitalNonEditable, removedActivities, payload_1, activityIds, payload, data;
-        var _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _b, settings, entity, entityRes, _c, id, data_status, entityActivities, isCapitalPaidNonEditable, isCapitalShareCountNonEditable, isCapitalShareValueNonEditable, isActivitiesNonEditable, capitalShareCount, capitalShareValue, activities, capitalPaid, entityData, hasCapitalShares, isCapitalNonEditable, removedActivities, payload_1, activityIds, payload, entity_3;
+        var _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     _b = thunkApi.getState(), settings = _b.settings, entity = _b.entity;
-                    _c = ((_d = entity.data.verify.responseBody) === null || _d === void 0 ? void 0 : _d.entity) || {}, id = _c.id, data_status = _c.data_status, entityActivities = _c.activities;
+                    entityRes = (entity.data.verify.responseBody || {}).entity;
+                    _c = entityRes || {}, id = _c.id, data_status = _c.data_status, entityActivities = _c.activities;
                     isCapitalPaidNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'paid');
                     isCapitalShareCountNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'shares.count');
                     isCapitalShareValueNonEditable = hasNoneEditableValue(data_status === null || data_status === void 0 ? void 0 : data_status.capital, 'shares.value');
                     isActivitiesNonEditable = hasNoneEditableValue(data_status, 'activities');
                     capitalShareCount = formData.capitalShareCount, capitalShareValue = formData.capitalShareValue, activities = formData.activities, capitalPaid = formData.capitalPaid;
+                    entityData = entityRes;
                     hasCapitalShares = capitalShareCount || capitalShareValue;
                     isCapitalNonEditable = (isCapitalPaidNonEditable && isCapitalShareCountNonEditable && isCapitalShareValueNonEditable) || (!capitalPaid && !hasCapitalShares);
                     removedActivities = (activities === null || activities === void 0 ? void 0 : activities.length) > 0 &&
                         (entityActivities || []).filter(function (entityActivity) { return !(activities || []).some(function (activity) { return activity.id === entityActivity.id; }); });
-                    if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0)) return [3, 2];
+                    if (!(!isActivitiesNonEditable && (removedActivities === null || removedActivities === void 0 ? void 0 : removedActivities.length) > 0 && isDirty)) return [3, 2];
                     payload_1 = {
                         id: id,
                         activities: removedActivities.map(function (a) { return ({
@@ -411,8 +377,8 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
                     };
                     return [4, API.entityService.removeEntityActivities(payload_1)];
                 case 1:
-                    _g.sent();
-                    _g.label = 2;
+                    _f.sent();
+                    _f.label = 2;
                 case 2:
                     activityIds = (activities || []).map(function (_a) {
                         var id = _a.id;
@@ -426,50 +392,61 @@ export var updateEntityCapital = createAsyncThunk('entityUpdateEntityCapital', f
                             }
                         }))
                     }));
+                    if (!isDirty) return [3, 4];
                     return [4, API.entityService.updateEntity(payload)];
                 case 3:
-                    data = _g.sent();
+                    entity_3 = (_f.sent()).entity;
+                    entityData = entity_3;
+                    _f.label = 4;
+                case 4:
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
-                    return [2, { data: data, formData: originalFormData }];
+                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, id);
+                    return [2, { data: entityData, formData: originalFormData }];
             }
         });
     });
 });
 export var updateBoardSuccess = createAsyncThunk('updateBoardEntitySuccess', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, entity, _b, id, infoId, _c, showBoard, mode, payload, data, boardInfoData;
-    var _d, _e, _f, _g, _h, _j, _k, _l;
-    return __generator(this, function (_m) {
-        switch (_m.label) {
+    var _a, settings, entity, _b, board_id, infoId, _c, showBoard, mode, payload, data, _d, id, type, boardInfoStatusData;
+    var _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, entity = _a.entity;
-                _b = entity.data.verify.responseBody || {}, id = _b.board_id, infoId = _b.board_info_id;
+                _b = entity.data.verify.responseBody || {}, board_id = _b.board_id, infoId = _b.board_info_id;
                 _c = settings.data.appConfig, showBoard = _c.showBoard, mode = _c.mode;
-                if (!id)
+                if (!board_id)
                     return [2];
                 payload = {
                     lang: settings.data.language,
                     step_name: ENTITY_STEP_NAMES.ENTITY_SUCCESS,
-                    id: id
+                    id: board_id
                 };
-                return [4, API.boardService.updateBoardInfo(__assign({ id: id, infoId: infoId }, payload))];
+                return [4, API.boardService.updateBoardInfo(__assign({ id: board_id, infoId: infoId }, payload))];
             case 1:
-                data = _m.sent();
+                data = _p.sent();
+                sendCustomEventToGTM({
+                    event: 'Send Event',
+                    event_category: 'Board Flows - Entity',
+                    event_action: 'Entity Update Success Page',
+                    event_label: settings.data.businessCountry.iso2
+                });
                 if (!showBoard && mode === 'content') {
-                    (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, {});
-                    (_g = (_f = settings.data.appConfig).onFlowCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, { data: data });
-                    return [2, { response: __assign({}, data), formData: params }];
+                    (_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, { data: data }];
                 }
-                return [4, API.boardService.retrieveBoardInfoStatus(id)];
+                _d = ((_j = data === null || data === void 0 ? void 0 : data.notification) === null || _j === void 0 ? void 0 : _j.recipient) || {}, id = _d.id, type = _d.type;
+                return [4, Promise.all([
+                        API.boardService.retrieveBoardInfoStatus(board_id),
+                        thunkApi.dispatch(retrieveBoardDetails({ boardId: board_id, individualId: id, individualType: type })).unwrap()
+                    ])];
             case 2:
-                boardInfoData = _m.sent();
-                return [4, thunkApi.dispatch(retrieveBoardDetails(id))];
-            case 3:
-                _m.sent();
-                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, {});
-                (_l = (_k = settings.data.appConfig).onFlowCompleted) === null || _l === void 0 ? void 0 : _l.call(_k, { data: data });
+                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 });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: __assign(__assign({}, data), { flows: (boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.info) || [] }), formData: params }];
+                return [2, { data: data, flows: (boardInfoStatusData === null || boardInfoStatusData === void 0 ? void 0 : boardInfoStatusData.info) || [] }];
         }
     });
 }); });
@@ -549,28 +526,22 @@ export var entitySlice = createSlice({
             state.customLoading = true;
         })
             .addCase(verifyLeadToken.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             state.error = null;
             state.customLoading = false;
-            var _e = action.payload, data = _e.data, token = _e.token, boardResponse = _e.boardResponse, individualData = _e.individualData;
-            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.verify.responseBody = __assign(__assign(__assign(__assign({}, data), state.data.verify.responseBody), boardResponse), { board_id: data.id, individualData: individualData });
+            var _d = action.payload, data = _d.data, token = _d.token, entity = _d.entityData, entityTypes = _d.entityTypes;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { entity: entity, entityTypes: entityTypes, board_id: data.id });
             state.data.verify.token = token;
-            var _f = boardResponse || {}, entity = _f.entity, entityTypes = _f.entityTypes;
             if (entity) {
-                var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name;
+                var _e = entity || {}, license = _e.license, type = _e.type, capital = _e.capital, activities = _e.activities, legal_name = _e.legal_name;
                 var legalName = legal_name;
                 var licenseNumber = license === null || license === void 0 ? void 0 : license.number;
-                var unifiedNumber = (_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number;
+                var unifiedNumber = (_a = license === null || license === void 0 ? void 0 : license.additional_info) === null || _a === void 0 ? void 0 : _a.unified_number;
                 var licenseType = (license === null || license === void 0 ? void 0 : license.type) === 'freelance' ? BusinessType.FL : BusinessType.CR;
                 var entityType = type || (entityTypes === null || entityTypes === void 0 ? void 0 : entityTypes[0]);
-                var _h = capital || {}, paid = _h.paid, shares = _h.shares;
-                var entityIssueDate = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.issuing_date;
-                var entityExpiredDate = (_d = entity === null || entity === void 0 ? void 0 : entity.license) === null || _d === void 0 ? void 0 : _d.expiry_date;
+                var _f = capital || {}, paid = _f.paid, shares = _f.shares;
+                var entityIssueDate = (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+                var entityExpiredDate = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.expiry_date;
                 var issuingDate = void 0, expiryDate = undefined;
                 if (entityIssueDate) {
                     var date = new Date(entityIssueDate);
@@ -630,28 +601,22 @@ export var entitySlice = createSlice({
             state.error = null;
         })
             .addCase(verifyEntityLeadOTP.fulfilled, function (state, action) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             state.loading = false;
             state.error = null;
-            var _e = action.payload, data = _e.data, boardResponse = _e.boardResponse, formData = _e.formData, individualData = _e.individualData;
-            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 _d = action.payload, data = _d.data, entity = _d.entityData, entityTypes = _d.entityTypes, formData = _d.formData;
             state.data.otpData = formData;
             state.data.otpData.responseBody = data;
-            state.data.verify.responseBody = __assign(__assign(__assign({}, state.data.verify.responseBody), boardResponse), { individualData: individualData });
-            var _f = boardResponse || {}, entity = _f.entity, entityTypes = _f.entityTypes;
-            var _g = entity || {}, license = _g.license, type = _g.type, capital = _g.capital, activities = _g.activities, legal_name = _g.legal_name;
+            state.data.verify.responseBody = __assign(__assign(__assign({}, data), state.data.verify.responseBody), { entity: entity, entityTypes: entityTypes });
+            var _e = entity || {}, license = _e.license, type = _e.type, capital = _e.capital, activities = _e.activities, legal_name = _e.legal_name;
             var legalName = legal_name;
             var licenseNumber = license === null || license === void 0 ? void 0 : license.number;
-            var unifiedNumber = (_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number;
+            var unifiedNumber = (_a = license === null || license === void 0 ? void 0 : license.additional_info) === null || _a === void 0 ? void 0 : _a.unified_number;
             var licenseType = (license === null || license === void 0 ? void 0 : license.type) === 'freelance' ? BusinessType.FL : BusinessType.CR;
             var entityType = type || (entityTypes === null || entityTypes === void 0 ? void 0 : entityTypes[0]);
-            var _h = capital || {}, paid = _h.paid, shares = _h.shares;
-            var entityIssueDate = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.issuing_date;
-            var entityExpiredDate = (_d = entity === null || entity === void 0 ? void 0 : entity.license) === null || _d === void 0 ? void 0 : _d.expiry_date;
+            var _f = capital || {}, paid = _f.paid, shares = _f.shares;
+            var entityIssueDate = (_b = entity === null || entity === void 0 ? void 0 : entity.license) === null || _b === void 0 ? void 0 : _b.issuing_date;
+            var entityExpiredDate = (_c = entity === null || entity === void 0 ? void 0 : entity.license) === null || _c === void 0 ? void 0 : _c.expiry_date;
             var issuingDate, expiryDate = undefined;
             if (entityIssueDate) {
                 var date = new Date(entityIssueDate);
@@ -696,12 +661,12 @@ export var entitySlice = createSlice({
             state.loading = false;
             state.error = null;
             var _a = action.payload, data = _a.data, formData = _a.formData;
-            var _b = data || {}, activityList = _b.activityList, rest = __rest(_b, ["activityList"]);
+            var _b = data || {}, entity = _b.entity, activityList = _b.activityList, rest = __rest(_b, ["entity", "activityList"]);
             state.data.entityNameData = __assign(__assign({}, formData), { certificateId: undefined });
             state.data.entityNameData.responseBody = __assign(__assign({}, state.data.entityNameData.responseBody), { rest: rest });
-            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: data === null || data === void 0 ? void 0 : data.entity, activityList: activityList });
-            if (rest === null || rest === void 0 ? void 0 : rest.activities)
-                state.data.entityCapitalData = __assign(__assign({}, state.data.entityCapitalData), { activities: rest === null || rest === void 0 ? void 0 : rest.activities });
+            state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { entity: entity, activityList: activityList });
+            if (entity === null || entity === void 0 ? void 0 : entity.activities)
+                state.data.entityCapitalData = __assign(__assign({}, state.data.entityCapitalData), { activities: entity === null || entity === void 0 ? void 0 : entity.activities });
         })
             .addCase(updateEntityName.rejected, function (state, action) {
             state.loading = false;
@@ -729,7 +694,7 @@ export var entitySlice = createSlice({
             .addCase(retrieveBoardDetails.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
-            var data = (action.payload || {}).data;
+            var data = action.payload || {};
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), data);
         })
             .addCase(retrieveBoardDetails.rejected, function (state, action) {
@@ -743,7 +708,7 @@ export var entitySlice = createSlice({
             .addCase(retrieveBoardStatus.fulfilled, function (state, action) {
             state.error = null;
             state.loading = false;
-            var flows = action.payload.flows;
+            var flows = (action.payload || {}).flows;
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { flows: flows });
         })
             .addCase(retrieveBoardStatus.rejected, function (state, action) {
@@ -754,18 +719,8 @@ export var entitySlice = createSlice({
             var _a;
             state.loading = false;
             state.error = null;
-            var response = (action.payload || {}).response;
-            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 _b = state.data.verify.responseBody || {}, individuals = _b.individuals, individualData = _b.individualData;
-            var data_state = (((individualData === null || individualData === void 0 ? void 0 : individualData.is_authorized) ? individuals : individualData) || {}).data_state;
-            state.data.verify.responseBody = __assign(__assign(__assign(__assign({}, state.data.verify.responseBody), { flows: flows }), (individualData && { user: individualData })), (data_state && {
-                individuals: __assign(__assign({}, individuals), { data_state: data_state })
-            }));
+            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 });
         })
             .addCase(updateBoardSuccess.pending, function (state) {
             state.loading = true;