@tap-payments/auth-jsconnect 2.8.45-test → 2.8.49-development

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

@@ -63,7 +63,7 @@ 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 () {
@@ -247,15 +247,16 @@ export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', f
     });
 });
 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();
@@ -295,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: [
@@ -321,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 ({
@@ -368,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;
@@ -383,12 +392,16 @@ 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 }];
             }
         });
     });
@@ -412,6 +425,12 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardEntitySuccess', fun
                 return [4, API.boardService.updateBoardInfo(__assign({ id: board_id, infoId: infoId }, payload))];
             case 1:
                 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') {
                     (_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 });
@@ -642,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;

package/build/features/app/individual/individualStore.d.ts

@@ -211,7 +211,7 @@ export declare const updateIndividualPersonalInfo: import("@reduxjs/toolkit").As
 export declare const updateIndividualInfo: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     formData: IndividualExtraFormValues;
-    individualData: User;
+    individualData: any;
     userList: any;
     isKWOrSACountry: boolean;
 }, AsyncThunkParams<IndividualExtraFormValues>, {

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

@@ -562,9 +562,9 @@ export var updatePhoneInfo = createAsyncThunk('individual/updatePhoneInfo', func
     });
 });
 export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', 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, individual, _c, recipient, 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, _e, isUser, isBuyer, isUserORBuyerType;
+        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 _f, _g, _h, _j, _k;
         return __generator(this, function (_l) {
             switch (_l.label) {
@@ -572,11 +572,10 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     _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;
-                    _d = user || {}, objects = _d.objects, ids = _d.ids;
                     countryCode = (originalFormData || {}).countryCode;
                     name = formData.name, email = formData.email, mobile = formData.mobile, gender = formData.gender, nid = formData.nid, issuedCountry = formData.issuedCountry, expiryDate = formData.expiryDate, dob = formData.dob, placeOfBirthCountry = formData.placeOfBirthCountry, placeOfBirthCity = formData.placeOfBirthCity, nationality = formData.nationality;
                     code = entity === null || entity === void 0 ? void 0 : entity.country;
-                    data_status = (user || {}).data_status;
+                    _d = user || {}, data_status = _d.data_status, objects = _d.objects, ids = _d.ids;
                     userName = getUserNameObject(name);
                     identification_id_type = nid ? (nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA) : undefined;
                     if (isOtherThanKWOrSA(settings.data.businessCountry.iso2)) {
@@ -645,28 +644,33 @@ 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;
+                case 2:
                     _e = getIndividualType(objects), isUser = _e.isUser, isBuyer = _e.isBuyer;
                     isUserORBuyerType = isUser || isBuyer;
-                    if (!isUserORBuyerType) return [3, 3];
+                    if (!isUserORBuyerType) return [3, 4];
                     return [4, thunkApi.dispatch(retrieveDataList(code))];
-                case 2:
-                    _l.sent();
-                    _l.label = 3;
                 case 3:
+                    _l.sent();
+                    _l.label = 4;
+                case 4:
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep()); });
                     (_k = (_j = settings.data.appConfig).onStepCompleted) === null || _k === void 0 ? void 0 : _k.call(_j, settings.data.activeScreen.name, requestBody);
-                    return [2, { data: data, formData: originalFormData }];
+                    return [2, { data: individualData, formData: originalFormData }];
             }
         });
     });
 });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', 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, 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, requestBody, data, individualData, userListRes;
+        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 _f, _g;
         return __generator(this, function (_h) {
             switch (_h.label) {
@@ -762,18 +766,23 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     _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)];
                 case 7:
                     data = _h.sent();
-                    individualData = (sortUserList(mapUserList(data === null || data === void 0 ? void 0 : data.individuals)) || [])[0];
+                    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, 9];
+                    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 8:
-                    userListRes = _h.sent();
-                    _h.label = 9;
                 case 9:
+                    userListRes = _h.sent();
+                    _h.label = 10;
+                case 10:
                     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 }];
@@ -1263,11 +1272,11 @@ export var individualSlice = createSlice({
             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 = formData;
+            state.data.individualData = __assign(__assign({}, formData), { civilID: undefined, signatureFileId: undefined });
             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 === null || individualData === void 0 ? void 0 : individualData.documents) && { documents: individualData === null || individualData === void 0 ? void 0 : individualData.documents }));
+            var userInfo = __assign(__assign({}, user), (isSameUser && individualData && __assign({}, individualData)));
             if (isSameUser && !isKWOrSACountry)
                 userInfo = __assign(__assign({}, user), { is_authorized: individualData.is_authorized });
             var list = userList || [];

package/build/features/app/tax/taxStore.js

@@ -439,6 +439,7 @@ export var taxSlice = createSlice({
             state.error = null;
             var _a = action.payload, data = _a.data, formData = _a.formData;
             state.data.taxData = formData;
+            state.data.taxData = __assign(__assign({}, formData), { documentId: undefined });
             state.data.taxData.responseBody = data;
         })
             .addCase(updateTaxInfo.rejected, function (state, action) {

package/build/features/auth/screens/AuthSwitch/AuthSwitch.js

@@ -17,7 +17,7 @@ import { handleNextScreenStep, settingsSelector } from '../../../../app/settings
 import { resetStore } from '../../../app/auth/authStore';
 import { AbsherButton, MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { isKW, isSA } from '../../../../utils';
+import { isKW, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { ICONS_NAMES } from '../../../../constants';
 var AuthSwitch = function (_a) {
     var dispatch = useAppDispatch();
@@ -35,9 +35,21 @@ var AuthSwitch = function (_a) {
         dispatch(handleNextScreenStep('AUTH_EMAIL_STEP'));
     };
     var onOpenNID = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Abser Click',
+            event_label: data.businessCountry.iso2
+        });
         dispatch(handleNextScreenStep('AUTH_NID_STEP'));
     };
     var onOpenPACI = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'PACI Click',
+            event_label: data.businessCountry.iso2
+        });
         dispatch(handleNextScreenStep('AUTH_CIVIL_ID_STEP'));
     };
     return (_jsxs(ScreenContainer, { children: [_jsx(MobileButton, __assign({ sx: { mt: 2.5 }, onClick: function () { return onOpenMobile(); } }, { children: t('mobile_button_label') })), _jsx(MobileButton, __assign({ onClick: function () { return onOpenEmail(); }, icon: ICONS_NAMES.email_icon }, { children: t('email_button_label') })), isKWCountry ? (_jsx(MobileButton, __assign({ onClick: function () { return onOpenPACI(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (isSACountry && _jsx(AbsherButton, __assign({ onClick: function () { return onOpenNID(); } }, { children: t('absher_button_label') })))] }));

package/build/features/auth/screens/BusinessCountry/BusinessCountry.js

@@ -52,7 +52,7 @@ import { useAppSelector, useAppDispatch, useLanguage } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
 import BusinessCountry from '../../../shared/BusinessCountry';
 import Button from '../../../shared/Button';
-import { findCountryByIso2, isSA } from '../../../../utils';
+import { findCountryByIso2, isSA, sendCustomEventToGTM } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
 import { authSelector, updateBusinessCountry, storeIsStartFromBusinessCountry, clearError, resetStore, setMobileCountryCode } from '../../../app/auth/authStore';
@@ -81,6 +81,12 @@ var BusinessCountryScreen = function (_a) {
                         return [2];
                     countryCode = findCountryByIso2(settingsData.countries, iso2);
                     dispatch(handleSetCountryByIso2(iso2));
+                    sendCustomEventToGTM({
+                        event: 'Send Event',
+                        event_category: 'User Registration Flow',
+                        event_action: 'Country selection page view',
+                        event_label: iso2
+                    });
                     if (!data.leadId) return [3, 2];
                     return [4, dispatch(updateBusinessCountry(iso2)).unwrap()];
                 case 1:

package/build/features/bank/screens/BankDetails/BankDetails.js

@@ -29,7 +29,7 @@ import Form from '../../../../components/Form';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ConfirmPolicy from './ConfirmPolicy';
 import BankStatement from './BankStatement';
-import { deepCopy, getFileDetailsFromDocument, isKW, isStringHasOneAsterisk } from '../../../../utils';
+import { deepCopy, getFileDetailsFromDocument, isKW, isStringHasOneAsterisk, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column',
@@ -71,6 +71,12 @@ var BankDetails = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Wallet',
+            event_action: 'Wallet Details Back button',
+            event_label: settingsData.businessCountry.iso2
+        });
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
             dispatch(handlePrevScreenStep());
             return;
@@ -107,7 +113,6 @@ var BankDetails = function () {
         bankName: bank_name,
         confirmPolicy: is_acknowledged
     }).isDirty;
-    console.log('isDirty', isDirty);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (data) {
         var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });

package/build/features/brand/screens/BrandActivities/BrandActivities.js

@@ -15,13 +15,13 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { FormProvider, useForm } from 'react-hook-form';
 import Form from '../../../../components/Form';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { BrandActivitiesValidationSchema } from './validation';
 import Button from '../../../shared/Button';
 import { brandSelector, updateBrandActivities } from '../../../app/brand/brandStore';
-import { handlePrevScreenStep } from '../../../../app/settings';
-import { deepCopy } from '../../../../utils';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { useTranslation } from 'react-i18next';
 import ActivitiesList from './ActivitiesList';
 import CustomerBase from './CustomerBase';
@@ -36,11 +36,12 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var BrandActivities = function (_a) {
-    var _b, _c, _d, _e, _f;
-    var _g = React.useState(), listActive = _g[0], setListActive = _g[1];
+    var _b, _c, _d, _e;
+    var _f = React.useState(), listActive = _f[0], setListActive = _f[1];
     var dispatch = useAppDispatch();
-    var _h = useAppSelector(brandSelector), data = _h.data, loading = _h.loading, error = _h.error;
-    var _j = data.brandActivities, activities = _j.activities, customerLocations = _j.customerLocations, expectedCustomer = _j.expectedCustomer, expectedSale = _j.expectedSale, termAndConditionChecked = _j.termAndConditionChecked, refundPolicy = _j.refundPolicy, transactionPolicy = _j.transactionPolicy;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _g = useAppSelector(brandSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var _h = data.brandActivities, activities = _h.activities, customerLocations = _h.customerLocations, expectedCustomer = _h.expectedCustomer, expectedSale = _h.expectedSale, termAndConditionChecked = _h.termAndConditionChecked, refundPolicy = _h.refundPolicy, transactionPolicy = _h.transactionPolicy;
     var ListType;
     (function (ListType) {
         ListType["ActivitiesList"] = "ActivitiesList";
@@ -48,6 +49,14 @@ var BrandActivities = function (_a) {
         ListType["ExpectedCustomerList"] = "ExpectedCustomerList";
         ListType["ExpectedSalesList"] = "ExpectedSalesList";
     })(ListType || (ListType = {}));
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Brand',
+            event_action: 'Update Brand Activities Details Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     var methods = useForm({
         resolver: yupResolver(BrandActivitiesValidationSchema()),
         defaultValues: {
@@ -62,7 +71,8 @@ var BrandActivities = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.brandActivities, true);
-    var _k = ((_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.brand) || {}, data_status = _k.data_status, data_verification = _k.data_verification, operations = _k.operations;
+    var _j = data.verify.responseBody || {}, activitiesDefaultValues = _j.activitiesDefaultValues, brand = _j.brand;
+    var _k = brand || {}, data_status = _k.data_status, data_verification = _k.data_verification, operations = _k.operations;
     var originalReadOnly = useFormReadOnly(methods);
     var noneEditable = useDataNoneEditable(data_status, [
         'activities',
@@ -78,6 +88,32 @@ var BrandActivities = function (_a) {
         'operations.sales_range'
     ]);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    var isDirty = useFormDirtyCheck(methods, {
+        activities: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.activities,
+        customerLocations: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.customerLocations,
+        expectedCustomer: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.expectedCustomer,
+        expectedSale: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.expectedSale,
+        termAndConditionChecked: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.termAndConditionChecked,
+        refundPolicy: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.transactionPolicy,
+        transactionPolicy: activitiesDefaultValues === null || activitiesDefaultValues === void 0 ? void 0 : activitiesDefaultValues.refundPolicy
+    }, [
+        {
+            name: 'activities',
+            keys: ['id']
+        },
+        {
+            name: 'customerLocations',
+            keys: ['id']
+        },
+        {
+            name: 'expectedCustomer',
+            keys: ['id']
+        },
+        {
+            name: 'expectedSale',
+            keys: ['id']
+        }
+    ]).isDirty;
     var locations = methods.watch('customerLocations');
     var isCustomerLocationsHasVerifiedValue = React.useMemo(function () {
         var _a, _b;
@@ -92,10 +128,11 @@ var BrandActivities = function (_a) {
         return (locationIds === null || locationIds === void 0 ? void 0 : locationIds.length) === (Ids === null || Ids === void 0 ? void 0 : Ids.length) && locationIds.every(function (locationId) { return Ids.includes(locationId); });
     }, [locations, operations]);
     var isCustomerLocationsVerified = dataVerified['operations.customer_base_location'] && isCustomerLocationsHasVerifiedValue;
-    var isExpectedSalesRangeVerified = dataVerified['operations.sales_range'] && ((_c = operations === null || operations === void 0 ? void 0 : operations.sales) === null || _c === void 0 ? void 0 : _c.id) === ((_d = methods.watch('expectedSale')) === null || _d === void 0 ? void 0 : _d.id);
-    var isExpectedCustomersVerified = dataVerified['operations.customer_base'] && ((_e = operations === null || operations === void 0 ? void 0 : operations.customer_base) === null || _e === void 0 ? void 0 : _e.id) === ((_f = methods.watch('expectedCustomer')) === null || _f === void 0 ? void 0 : _f.id);
+    var isExpectedSalesRangeVerified = dataVerified['operations.sales_range'] && ((_b = operations === null || operations === void 0 ? void 0 : operations.sales) === null || _b === void 0 ? void 0 : _b.id) === ((_c = methods.watch('expectedSale')) === null || _c === void 0 ? void 0 : _c.id);
+    var isExpectedCustomersVerified = dataVerified['operations.customer_base'] && ((_d = operations === null || operations === void 0 ? void 0 : operations.customer_base) === null || _d === void 0 ? void 0 : _d.id) === ((_e = methods.watch('expectedCustomer')) === null || _e === void 0 ? void 0 : _e.id);
     var onSubmit = function (data) {
-        dispatch(updateBrandActivities(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateBrandActivities(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

package/build/features/brand/screens/BrandInfo/BrandInfo.js

@@ -14,11 +14,11 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FormProvider, useForm } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
-import { deepCopy, mapSalesChannel } from '../../../../utils';
+import { deepCopy, mapSalesChannel, sendCustomEventToGTM } from '../../../../utils';
 import Button from '../../../shared/Button';
 import { clearError, brandSelector, updateBrand, retrieveBoardStatus } from '../../../app/brand/brandStore';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -39,7 +39,7 @@ var BrandInfo = function (_a) {
     var settingsData = useAppSelector(settingsSelector).data;
     var _d = data.brandData, brandName = _d.brandName, salesChannels = _d.salesChannels, brandLogoId = _d.brandLogoId, responseBody = _d.responseBody;
     var _e = data.verify.responseBody || {}, brand = _e.brand, flows = _e.flows;
-    var _f = brand || {}, logo_details = _f.logo_details, data_status = _f.data_status, data_verification = _f.data_verification, name = _f.name;
+    var _f = brand || {}, logo_details = _f.logo_details, data_status = _f.data_status, data_verification = _f.data_verification, name = _f.name, channel_services = _f.channel_services;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
@@ -52,6 +52,17 @@ var BrandInfo = function (_a) {
     var watch = methods.watch;
     useSetFromDefaultValues(methods, data.brandData, true);
     var defaultBrandLogoFile = React.useMemo(function () { return logo_details && __assign(__assign({}, logo_details), { docId: '' }); }, [logo_details]);
+    var initialSalesChannels = React.useMemo(function () { return mapSalesChannel(channel_services || []); }, [channel_services]);
+    var isDirty = useFormDirtyCheck(methods, {
+        brandName: ((name === null || name === void 0 ? void 0 : name.en) || '').trim(),
+        salesChannels: initialSalesChannels,
+        brandLogoId: defaultBrandLogoFile === null || defaultBrandLogoFile === void 0 ? void 0 : defaultBrandLogoFile.id
+    }, [
+        {
+            name: 'salesChannels',
+            keys: ['id', 'address', 'code', 'sub']
+        }
+    ]).isDirty;
     var originalReadOnly = useFormReadOnly(methods, { brandLogoId: defaultBrandLogoFile });
     var noneEditable = useDataNoneEditable(data_status, ['name.en', 'name.ar', 'channel_services', 'logo']);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
@@ -59,9 +70,16 @@ var BrandInfo = function (_a) {
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var isBrandNameVerified = dataVerified['name.en'] && dataVerified['name.ar'] && ((name === null || name === void 0 ? void 0 : name.en) === watch('brandName') || (name === null || name === void 0 ? void 0 : name.ar) === watch('brandName'));
     var onSubmit = function (data) {
-        dispatch(updateBrand(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateBrand(formData));
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Brand',
+            event_action: 'Brand Details Back button',
+            event_label: settingsData.businessCountry.iso2
+        });
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
             dispatch(handlePrevScreenStep());
             return;