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

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

@@ -14,12 +14,12 @@ 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 { handlePrevScreenStep } from '../../../../app/settings';
+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 Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import { clearError, brandSelector, updateSegmentBrand } from '../../../app/brand/brandStore';
 import Button from '../../../shared/Button';
@@ -46,9 +46,10 @@ var BrandInfo = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _l = useAppSelector(brandSelector), data = _l.data, loading = _l.loading, error = _l.error;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _m = data.brandSegmentData, segmentLocation = _m.segmentLocation, segmentProfit = _m.segmentProfit, segmentTech = _m.segmentTech, teamSize = _m.teamSize;
-    var brand = (data.verify.responseBody || {}).brand;
-    var _o = brand || {}, data_status = _o.data_status, data_verification = _o.data_verification, resSegment = _o.segment;
+    var _o = data.verify.responseBody || {}, brand = _o.brand, segmentDefaultValues = _o.segmentDefaultValues;
+    var _p = brand || {}, data_status = _p.data_status, data_verification = _p.data_verification, resSegment = _p.segment;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
@@ -61,6 +62,12 @@ var BrandInfo = function (_a) {
     });
     var watch = methods.watch;
     useSetFromDefaultValues(methods, data.brandSegmentData, true);
+    var isDirty = useFormDirtyCheck(methods, {
+        segmentLocation: segmentDefaultValues === null || segmentDefaultValues === void 0 ? void 0 : segmentDefaultValues.segmentLocation,
+        segmentProfit: segmentDefaultValues === null || segmentDefaultValues === void 0 ? void 0 : segmentDefaultValues.segmentProfit,
+        segmentTech: segmentDefaultValues === null || segmentDefaultValues === void 0 ? void 0 : segmentDefaultValues.segmentTech,
+        teamSize: segmentDefaultValues === null || segmentDefaultValues === void 0 ? void 0 : segmentDefaultValues.teamSize
+    }).isDirty;
     var originalReadOnly = useFormReadOnly(methods);
     var noneEditable = useDataNoneEditable(data_status, [
         'segment.location_type',
@@ -81,11 +88,20 @@ var BrandInfo = function (_a) {
     var isSegmentTechVerified = dataVerified['segment.tech_type'] && ((_f = resSegment === null || resSegment === void 0 ? void 0 : resSegment.tech_type) === null || _f === void 0 ? void 0 : _f.id) === ((_g = watch('segmentTech')) === null || _g === void 0 ? void 0 : _g.id);
     var isTeamSizeVerified = dataVerified['segment.teams'] && ((_h = resSegment === null || resSegment === void 0 ? void 0 : resSegment.team) === null || _h === void 0 ? void 0 : _h.id) === ((_j = watch('teamSize')) === null || _j === void 0 ? void 0 : _j.id);
     var onSubmit = function (data) {
-        dispatch(updateSegmentBrand(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateSegmentBrand(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Brand',
+            event_action: 'Update Business Market & Size',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/business/screens/Activities/Activities.js

@@ -18,9 +18,9 @@ import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues, u
 import Form from '../../../../components/Form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Button from '../../../shared/Button';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
@@ -36,6 +36,7 @@ var Activities = function () {
     var _b = React.useState(false), anchorEl = _b[0], setAnchorEl = _b[1];
     var _c = React.useState(false), collapse = _c[0], setCollapse = _c[1];
     var dispatch = useAppDispatch();
+    var settingsData = useAppSelector(settingsSelector).data;
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var _d = useAppSelector(businessSelector), data = _d.data, loading = _d.loading, error = _d.error;
@@ -64,6 +65,14 @@ var Activities = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'Brand Activities Details Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/business/screens/BusinessType/BusinessType.js

@@ -23,7 +23,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { businessSelector, clearError, updateLeadBusinessType } from '../../../app/business/businessStore';
 import { BusinessType as Type } from '../../../../@types';
 import Button from '../../../shared/Button';
-import { deepCopy, isKW, isOtherLicense, isOtherThanKWOrSA, isSA } from '../../../../utils';
+import { deepCopy, isKW, isOtherLicense, isOtherThanKWOrSA, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { KWLicenseValidationSchema, LicenseValidationSchema, OtherCountryLicenseValidationSchema } from './validation';
 import LicenseList from './LicenseList';
 import LicenseCertificate from './LicenseCertificate';
@@ -46,6 +46,14 @@ var BusinessType = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'CR Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };

package/build/features/business/screens/Customers/Customers.js

@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector, useDataNoneEditable, useDataVerified, useExcludeReadOnlyFelids, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { CustomerInfoValidation } from './validation';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
@@ -30,7 +30,7 @@ import TransactionPolicy from './TransactionPolicy';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import { businessSelector, clearError, updateCustomersInfo } from '../../../app/business/businessStore';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -45,6 +45,7 @@ var Customers = function (_a) {
     var _b, _c, _d, _e, _f;
     var _g = React.useState(), listActive = _g[0], setListActive = _g[1];
     var dispatch = useAppDispatch();
+    var settingsData = useAppSelector(settingsSelector).data;
     var _h = useAppSelector(businessSelector), data = _h.data, loading = _h.loading, error = _h.error;
     var _j = data.customersData, customerLocations = _j.customerLocations, expectedCustomer = _j.expectedCustomer, expectedSale = _j.expectedSale, refundPolicy = _j.refundPolicy, transactionPolicy = _j.transactionPolicy;
     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, terms = _k.terms;
@@ -75,6 +76,14 @@ var Customers = function (_a) {
         'operations.sales_range'
     ]);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'Business Market and Size Details Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     React.useEffect(function () {
         var _a, _b;
         var isTermsAgreed = !!((_b = (_a = terms === null || terms === void 0 ? void 0 : terms.find) === null || _a === void 0 ? void 0 : _a.call(terms, function (_a) {

package/build/features/business/screens/IDBOD/IDBOD.js

@@ -22,7 +22,7 @@ import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { businessSelector, clearError, updateLeadIdentity } from '../../../app/business/businessStore';
 import Collapse from '../../../../components/Collapse';
-import { deepCopy, isOtherThanKWOrSA } from '../../../../utils';
+import { deepCopy, isOtherThanKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import { NIDOtherCountryValidationSchema, NIDValidationSchema } from './validation';
 import ID from './ID';
 import DOB from './DOB';
@@ -44,6 +44,14 @@ var IDBOD = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.nidData);
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'ID Details Step',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

package/build/features/business/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -10,13 +10,24 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo } from 'react';
+import React, { memo } from 'react';
 import { useAppSelector } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
+import { sendCustomEventToGTM } from '../../../../utils';
+import { settingsSelector } from '../../../../app/settings';
 var SuccessWithFlowButtons = function () {
     var data = useAppSelector(businessSelector).data;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name, individuals = _a.individuals, recipient = _a.recipient;
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'Board Page View',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, individuals: individuals, boardInfoId: board_info_id, flows: flows || [], recipient: recipient }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/business/screens/Verify/Verify.js

@@ -17,9 +17,9 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
-import { deepCopy, maskPhone } from '../../../../utils';
+import { deepCopy, maskPhone, sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -49,6 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c;
     var dispatch = useAppDispatch();
+    var settingsData = useAppSelector(settingsSelector).data;
     var _d = useAppSelector(businessSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
@@ -59,6 +60,15 @@ var VerifyNumber = function (_a) {
     var isAr = useLanguage().isAr;
     var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
     var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
+    React.useEffect(function () {
+        var _a;
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Account Creation Flow',
+            event_action: 'Business OTP Step',
+            event_label: (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2
+        });
+    }, []);
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
             dispatch(clearError());

package/build/features/connect/Connect.js

@@ -120,14 +120,15 @@ var Connect = memo(function (props) {
                 event: 'Send Event',
                 event_category: 'User Registration Flow',
                 event_action: 'Registration Landing Page Viewed',
-                event_value: (_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2
+                event_label: (_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2
             });
             sendCustomDimension({
                 event: 'PageView',
                 website_country: (_c = data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2
             });
             sendPageView({
-                title: 'Connect'
+                title: 'Connect',
+                connect_flow: 'Normal'
             });
         }
     }, [data.businessCountry]);

package/build/features/connect/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, isKW, isOtherThanKWOrSA, updateLocationUrlWithCountry } from '../../../../utils';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, updateLocationUrlWithCountry } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
 import { connectSelector, setDefaultCountryCode, updateBusinessCountry, storeIsStartFromBusinessCountry, clearError } from '../../../app/connect/connectStore';
@@ -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 (settingsData.appConfig.mode !== 'popup')
                         updateLocationUrlWithCountry(iso2);
                     if (!data.leadId) return [3, 2];

package/build/features/connect/screens/Mobile/Mobile.js

@@ -74,12 +74,12 @@ var ListType;
     ListType["CountryCodeList"] = "CountryCodeList";
 })(ListType || (ListType = {}));
 var Mobile = function (_a) {
-    var _b, _c;
+    var _b;
     var settingsStore = useAppSelector(settingsSelector);
-    var _d = useAppSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var _e = React.useState(), listType = _e[0], setListType = _e[1];
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = React.useState(), listType = _d[0], setListType = _d[1];
     var dispatch = useAppDispatch();
-    var _f = data.mobileData, mobile = _f.mobile, countryCode = _f.countryCode, termAndConditionChecked = _f.termAndConditionChecked;
+    var _e = data.mobileData, mobile = _e.mobile, countryCode = _e.countryCode, termAndConditionChecked = _e.termAndConditionChecked;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
         defaultValues: {
@@ -92,6 +92,7 @@ var Mobile = function (_a) {
     useSetFromDefaultValues(methods, data.mobileData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var country = (_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2;
     var handleMenuListClick = function (flag) {
         setListType(flag);
     };
@@ -107,13 +108,15 @@ var Mobile = function (_a) {
         dispatch(resetNIDScreen());
         dispatch(resetCivilScreen());
     };
-    var isKWCountry = React.useMemo(function () { var _a; return isKW((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2]);
-    var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_c = settingsStore.data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2]);
+    var isKWCountry = React.useMemo(function () { return isKW(country); }, [country]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(country); }, [country]);
     var onBack = function () {
+        var eventAction = isKWCountry ? 'PACI Click' : 'Abser Click';
         sendCustomEventToGTM({
             event: 'Send Event',
             event_category: 'User Registration Flow',
-            event_action: 'Switch to ID Login Clicked'
+            event_action: eventAction,
+            event_label: country
         });
         dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
     };

package/build/features/connectExpress/ConnectExpress.js

@@ -94,7 +94,8 @@ var ConnectExpress = memo(function (_a) {
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
     React.useEffect(function () {
         sendPageView({
-            title: 'Connect Express'
+            title: 'Connect Express',
+            connect_flow: 'Express'
         });
     }, []);
     React.useEffect(function () {

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

@@ -53,7 +53,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import BusinessCountry from '../../../shared/BusinessCountry';
 import Button from '../../../shared/Button';
 import Collapse from '../../../../components/Collapse';
-import { findCountryByIso2, isKW, isOtherThanKWOrSA } from '../../../../utils';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
 import { clearError, connectExpressSelector, setDefaultCountryCode, storeIsStartFromBusinessCountry, updateBusinessCountryAsync } from '../../../app/connectExpress/connectExpressStore';
 var BusinessCountryScreen = function (_a) {
@@ -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(updateBusinessCountryAsync(iso2))];
                 case 1:

package/build/features/connectExpress/screens/Mobile/Mobile.js

@@ -30,7 +30,7 @@ import MobileNumber from './MobileNumber';
 import { PhoneValidationSchema } from './validation';
 import { ICONS_NAMES } from '../../../../constants';
 import TAC from './TAC';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -96,6 +96,13 @@ var Mobile = function (_a) {
     };
     var onBack = function () {
         var screen = isKuwait ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP';
+        var eventAction = isKuwait ? 'PACI Click' : 'Abser Click';
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: eventAction,
+            event_label: settingData.businessCountry.iso2
+        });
         dispatch(handlePrevScreenStep(screen));
     };
     var onBackToCountryList = function () {

package/build/features/entity/screens/EntityCapital/EntityCapital.js

@@ -15,11 +15,11 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import Collapse from '@mui/material/Collapse';
-import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
-import { deepCopy, removeAllCharsFromNumber } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
+import { deepCopy, formatNumberAsCurrency, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
 import { clearError, entitySelector, updateEntityCapital } from '../../../app/entity/entityStore';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
@@ -39,21 +39,36 @@ var EntityCapital = function (_a) {
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
+    var settingsData = useAppSelector(settingsSelector).data;
     var _k = data.entityCapitalData, responseBody = _k.responseBody, capitalPaid = _k.capitalPaid, capitalShareCount = _k.capitalShareCount, capitalShareValue = _k.capitalShareValue, activities = _k.activities;
     var entity = (data.verify.responseBody || {}).entity;
-    var _l = entity || {}, data_verification = _l.data_verification, capital = _l.capital;
+    var _l = entity || {}, data_verification = _l.data_verification, capital = _l.capital, resActivities = _l.activities;
+    var resCapitalPaidValue = (_b = capital === null || capital === void 0 ? void 0 : capital.paid) === null || _b === void 0 ? void 0 : _b.toString();
+    var resCapitalShareCount = (_d = (_c = capital === null || capital === void 0 ? void 0 : capital.shares) === null || _c === void 0 ? void 0 : _c.count) === null || _d === void 0 ? void 0 : _d.toString();
+    var resCapitalShareValue = (_f = (_e = capital === null || capital === void 0 ? void 0 : capital.shares) === null || _e === void 0 ? void 0 : _e.value) === null || _f === void 0 ? void 0 : _f.toString();
     var methods = useForm({
         resolver: yupResolver(EntityCapitalValidationSchema()),
         defaultValues: {
             activities: activities,
             capitalPaid: capitalPaid,
-            capitalShareCount: capitalShareCount,
+            capitalShareCount: capitalShareCount === null || capitalShareCount === void 0 ? void 0 : capitalShareCount.toString(),
             capitalShareValue: capitalShareValue
         },
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.entityCapitalData, true);
     var watch = methods.watch;
+    var isDirty = useFormDirtyCheck(methods, {
+        activities: resActivities,
+        capitalPaid: resCapitalPaidValue && formatNumberAsCurrency(resCapitalPaidValue),
+        capitalShareCount: resCapitalShareCount,
+        capitalShareValue: resCapitalShareValue && formatNumberAsCurrency(resCapitalShareValue)
+    }, [
+        {
+            name: 'activities',
+            keys: ['id']
+        }
+    ]).isDirty;
     var originalReadOnly = useFormReadOnly(methods);
     var noneEditable = useDataNoneEditable(entity === null || entity === void 0 ? void 0 : entity.data_status, [
         'activities',
@@ -64,11 +79,20 @@ var EntityCapital = function (_a) {
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var dataVerified = useDataVerified(data_verification, ['capital.paid', 'capital.shares.count', 'capital.shares.value']);
-    var isCapitalPaidVerified = dataVerified['capital.paid'] && ((_b = capital === null || capital === void 0 ? void 0 : capital.paid) === null || _b === void 0 ? void 0 : _b.toString()) === removeAllCharsFromNumber(watch('capitalPaid'));
-    var isCapitalShareCountVerified = dataVerified['capital.shares.count'] && ((_d = (_c = capital === null || capital === void 0 ? void 0 : capital.shares) === null || _c === void 0 ? void 0 : _c.count) === null || _d === void 0 ? void 0 : _d.toString()) === ((_e = watch('capitalShareCount')) === null || _e === void 0 ? void 0 : _e.toString());
-    var isCapitalShareValueVerified = dataVerified['capital.shares.value'] && ((_g = (_f = capital === null || capital === void 0 ? void 0 : capital.shares) === null || _f === void 0 ? void 0 : _f.value) === null || _g === void 0 ? void 0 : _g.toString()) === removeAllCharsFromNumber(watch('capitalShareValue'));
+    var isCapitalPaidVerified = dataVerified['capital.paid'] && resCapitalPaidValue === removeAllCharsFromNumber(watch('capitalPaid'));
+    var isCapitalShareCountVerified = dataVerified['capital.shares.count'] && resCapitalShareCount === ((_g = watch('capitalShareCount')) === null || _g === void 0 ? void 0 : _g.toString());
+    var isCapitalShareValueVerified = dataVerified['capital.shares.value'] && resCapitalShareValue === removeAllCharsFromNumber(watch('capitalShareValue'));
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Entity',
+            event_action: 'Entity Activities and Capital Details Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     var onSubmit = function (data) {
-        dispatch(updateEntityCapital(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateEntityCapital(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

package/build/features/entity/screens/EntityName/EntityName.js

@@ -15,9 +15,9 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 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 { convertToEnglishDateFormat, deepCopy, getFileDetailsFromDocument, isKW, isSA } from '../../../../utils';
+import { convertToEnglishDateFormat, deepCopy, getFileDetailsFromDocument, isKW, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { BusinessType, DocumentPurpose } from '../../../../@types';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
@@ -38,22 +38,22 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var EntityName = function (_a) {
-    var _b;
-    var _c = React.useState(false), issueAnchorEl = _c[0], setIssueAnchorEl = _c[1];
-    var _d = React.useState(false), expiryAnchorEl = _d[0], setExpiryAnchorEl = _d[1];
-    var _e = React.useState(false), entityTypeAnchorEl = _e[0], setEntityTypeAnchorEl = _e[1];
-    var _f = useAppSelector(entitySelector), data = _f.data, loading = _f.loading, error = _f.error, uploading = _f.uploading, uploadingArticle = _f.uploadingArticle;
+    var _b, _c;
+    var _d = React.useState(false), issueAnchorEl = _d[0], setIssueAnchorEl = _d[1];
+    var _e = React.useState(false), expiryAnchorEl = _e[0], setExpiryAnchorEl = _e[1];
+    var _f = React.useState(false), entityTypeAnchorEl = _f[0], setEntityTypeAnchorEl = _f[1];
+    var _g = useAppSelector(entitySelector), data = _g.data, loading = _g.loading, error = _g.error, uploading = _g.uploading, uploadingArticle = _g.uploadingArticle;
     var settingsData = useAppSelector(settingsSelector).data;
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _g = data.entityNameData, legalName = _g.legalName, licenseNumber = _g.licenseNumber, licenseType = _g.licenseType, entityType = _g.entityType, issuingDate = _g.issuingDate, expiryDate = _g.expiryDate, unifiedNumber = _g.unifiedNumber, certificateId = _g.certificateId, articleId = _g.articleId;
+    var _h = data.entityNameData, legalName = _h.legalName, licenseNumber = _h.licenseNumber, licenseType = _h.licenseType, entityType = _h.entityType, issuingDate = _h.issuingDate, expiryDate = _h.expiryDate, unifiedNumber = _h.unifiedNumber, certificateId = _h.certificateId, articleId = _h.articleId;
     var country_code = settingsData.businessCountry.iso2;
     var isSACountry = React.useMemo(function () { return isSA(country_code); }, [country_code]);
     var isKWCountry = React.useMemo(function () { return isKW(country_code); }, [country_code]);
     var isCR = licenseType === BusinessType.CR;
-    var _h = data.verify.responseBody || {}, entity = _h.entity, flows = _h.flows;
-    var _j = entity || {}, AOA_file = _j.AOA_file, id = _j.id, documents = _j.documents, data_status = _j.data_status, data_verification = _j.data_verification, legal_name = _j.legal_name, type = _j.type, license = _j.license;
+    var _j = data.verify.responseBody || {}, entity = _j.entity, flows = _j.flows, entityTypes = _j.entityTypes;
+    var _k = entity || {}, AOA_file = _k.AOA_file, id = _k.id, documents = _k.documents, data_status = _k.data_status, data_verification = _k.data_verification, legal_name = _k.legal_name, type = _k.type, license = _k.license;
     var getSchema = function () {
         if (isSACountry)
             return EntityNameValidationSchema();
@@ -80,6 +80,18 @@ var EntityName = function (_a) {
     useSetFromDefaultValues(methods, data.entityNameData, true);
     var defaultCertificateFiles = React.useMemo(function () { return getFileDetailsFromDocument(documents, DocumentPurpose.CR); }, [documents]);
     var defaultArticleFile = React.useMemo(function () { return AOA_file && __assign(__assign({}, AOA_file), { docId: id }); }, [AOA_file]);
+    var issueDateRes = (license === null || license === void 0 ? void 0 : license.issuing_date) && convertToEnglishDateFormat(new Date(license.issuing_date));
+    var expDateRes = (license === null || license === void 0 ? void 0 : license.expiry_date) && convertToEnglishDateFormat(new Date(license.expiry_date));
+    var isDirty = useFormDirtyCheck(methods, {
+        legalName: (legal_name === null || legal_name === void 0 ? void 0 : legal_name.en) || (legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar),
+        licenseNumber: license === null || license === void 0 ? void 0 : license.number,
+        licenseType: (license === null || license === void 0 ? void 0 : license.type) === 'freelance' ? BusinessType.FL : BusinessType.CR,
+        entityType: type || (entityTypes === null || entityTypes === void 0 ? void 0 : entityTypes[0]),
+        issuingDate: issueDateRes,
+        expiryDate: expDateRes,
+        unifiedNumber: (_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number,
+        articleId: defaultArticleFile === null || defaultArticleFile === void 0 ? void 0 : defaultArticleFile.id
+    }).isDirty;
     var originalReadOnly = useFormReadOnly(methods, { certificateId: defaultCertificateFiles, articleId: defaultArticleFile });
     var noneEditable = useDataNoneEditable(data_status, [
         'legal_name.en',
@@ -104,17 +116,16 @@ var EntityName = function (_a) {
         'license.expiry_date',
         'AOA_file_id'
     ]);
-    var issueDateRes = (license === null || license === void 0 ? void 0 : license.issuing_date) && convertToEnglishDateFormat(new Date(license.issuing_date));
-    var expDateRes = (license === null || license === void 0 ? void 0 : license.expiry_date) && convertToEnglishDateFormat(new Date(license.expiry_date));
     var isLegalNameVerified = dataVerified['legal_name.en'] && dataVerified['legal_name.ar'] && ((legal_name === null || legal_name === void 0 ? void 0 : legal_name.en) === watch('legalName') || (legal_name === null || legal_name === void 0 ? void 0 : legal_name.ar) === watch('legalName'));
     var isEntityTypeVerified = dataVerified['type'] && type === watch('entityType');
     var isLicenseNumberVerified = dataVerified['license.number'] && (license === null || license === void 0 ? void 0 : license.number) === watch('licenseNumber');
-    var isUnifiedNumberVerified = dataVerified['license.additional_info'] && ((_b = license === null || license === void 0 ? void 0 : license.additional_info) === null || _b === void 0 ? void 0 : _b.unified_number) === watch('unifiedNumber');
+    var isUnifiedNumberVerified = dataVerified['license.additional_info'] && ((_c = license === null || license === void 0 ? void 0 : license.additional_info) === null || _c === void 0 ? void 0 : _c.unified_number) === watch('unifiedNumber');
     var isIssuingDateVerified = dataVerified['license.issuing_date'] && issueDateRes === watch('issuingDate');
     var isExpiryDateVerified = dataVerified['license.expiry_date'] && expDateRes === watch('expiryDate');
     var isArticleIdVerified = dataVerified['AOA_file_id'];
     var onSubmit = function (data) {
-        dispatch(updateEntityName(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateEntityName(formData));
     };
     var handleIssueDateOpenClose = function (flag) {
         setIssueAnchorEl(flag);
@@ -126,6 +137,12 @@ var EntityName = function (_a) {
         setEntityTypeAnchorEl(flag);
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Entity',
+            event_action: 'Entity Details Back button',
+            event_label: settingsData.businessCountry.iso2
+        });
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
             dispatch(handlePrevScreenStep());
             return;