@tap-payments/auth-jsconnect 2.8.63-development → 2.8.64-beta

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, useFormDirtyCheck } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } 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, settingsSelector } from '../../../../app/settings';
-import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { deepCopy } from '../../../../utils';
 import { useTranslation } from 'react-i18next';
 import ActivitiesList from './ActivitiesList';
 import CustomerBase from './CustomerBase';
@@ -36,12 +36,11 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var BrandActivities = function (_a) {
-    var _b, _c, _d, _e;
-    var _f = React.useState(), listActive = _f[0], setListActive = _f[1];
+    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 _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 _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 ListType;
     (function (ListType) {
         ListType["ActivitiesList"] = "ActivitiesList";
@@ -49,14 +48,6 @@ 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: {
@@ -71,8 +62,7 @@ var BrandActivities = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.brandActivities, true);
-    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 _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 originalReadOnly = useFormReadOnly(methods);
     var noneEditable = useDataNoneEditable(data_status, [
         'activities',
@@ -88,32 +78,6 @@ 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;
@@ -128,11 +92,10 @@ 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'] && ((_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 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 onSubmit = function (data) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
-        dispatch(updateBrandActivities(formData));
+        dispatch(updateBrandActivities(deepCopy(getFelids(data))));
     };
     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, useFormDirtyCheck } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
-import { deepCopy, mapSalesChannel, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, mapSalesChannel } 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, channel_services = _f.channel_services;
+    var _f = brand || {}, logo_details = _f.logo_details, data_status = _f.data_status, data_verification = _f.data_verification, name = _f.name;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
@@ -52,17 +52,6 @@ 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);
@@ -70,16 +59,9 @@ 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) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
-        dispatch(updateBrand(formData));
+        dispatch(updateBrand(deepCopy(getFelids(data))));
     };
     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;

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, useFormDirtyCheck } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
-import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import { clearError, brandSelector, updateSegmentBrand } from '../../../app/brand/brandStore';
 import Button from '../../../shared/Button';
@@ -46,10 +46,9 @@ 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 _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 brand = (data.verify.responseBody || {}).brand;
+    var _o = brand || {}, data_status = _o.data_status, data_verification = _o.data_verification, resSegment = _o.segment;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema()),
         defaultValues: {
@@ -62,12 +61,6 @@ 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',
@@ -88,20 +81,11 @@ 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) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
-        dispatch(updateSegmentBrand(formData));
+        dispatch(updateSegmentBrand(deepCopy(getFelids(data))));
     };
     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

@@ -20,7 +20,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Button from '../../../shared/Button';
-import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import OperationStartDate from './OperationStartDate';
@@ -65,14 +65,6 @@ 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/LicenseNumber.js

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { CR_MIN_LICENSE_LENGTH, CR_NUMBER_MAX_LENGTH, FL_MIN_LICENSE_LENGTH, FL_NUMBER_MAX_LENGTH, KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH } from '../../../../constants';
-import { removeAllOtherThanCharsAndNumber, isOtherLicense, isKW, isOtherThanKWOrSA } from '../../../../utils';
+import { isOtherLicense, isKW, isOtherThanKWOrSA, cleanFLandCRNumber } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -38,7 +38,7 @@ var LicenseNumber = function (_a) {
     var readOnly = !isOtherLicense(selectedLicense) || (selectedEntityLicense && !isOtherLicense(selectedEntityLicense));
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
-        var value = removeAllOtherThanCharsAndNumber(target.value);
+        var value = cleanFLandCRNumber(target.value);
         licenseNumberControl.field.onChange(value);
     };
     var clearLicenseNumber = function () {

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

@@ -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, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -76,14 +76,6 @@ 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/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, sendCustomEventToGTM, updateLocationUrlWithCountry } from '../../../../utils';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA, 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,12 +81,6 @@ 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/connectExpress/screens/AuthenticationList/LicenseNumber.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH, LICENSE_NUMBER_MAX_LENGTH, LICENSE_NUMBER_MIN_LENGTH } from '../../../../constants';
-import { removeAllOtherThanCharsNumberSlashAndHyphen, isSA } from '../../../../utils';
+import { isSA, cleanFLandCRNumber } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -19,7 +19,7 @@ var LicenseNumber = function () {
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
-        var value = removeAllOtherThanCharsNumberSlashAndHyphen(target.value);
+        var value = cleanFLandCRNumber(target.value);
         licenseNumberControl.field.onChange(value);
     };
     var clearLicenseNumber = function () {

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseNumber.js

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { CR_MIN_LICENSE_LENGTH, CR_NUMBER_MAX_LENGTH, FL_MIN_LICENSE_LENGTH, FL_NUMBER_MAX_LENGTH, KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH } from '../../../../constants';
-import { removeAllOtherThanCharsAndNumber, isKW, isOtherThanKWOrSA } from '../../../../utils';
+import { isKW, isOtherThanKWOrSA, cleanFLandCRNumber } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -36,7 +36,7 @@ var LicenseNumber = function (_a) {
     var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
-        var value = removeAllOtherThanCharsAndNumber(target.value);
+        var value = cleanFLandCRNumber(target.value);
         licenseNumberControl.field.onChange(value);
     };
     var clearLicenseNumber = 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, useFormDirtyCheck } from '../../../../hooks';
-import { deepCopy, formatNumberAsCurrency, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { deepCopy, removeAllCharsFromNumber } from '../../../../utils';
 import { clearError, entitySelector, updateEntityCapital } from '../../../app/entity/entityStore';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
@@ -39,36 +39,21 @@ 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, 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 _l = entity || {}, data_verification = _l.data_verification, capital = _l.capital;
     var methods = useForm({
         resolver: yupResolver(EntityCapitalValidationSchema()),
         defaultValues: {
             activities: activities,
             capitalPaid: capitalPaid,
-            capitalShareCount: capitalShareCount === null || capitalShareCount === void 0 ? void 0 : capitalShareCount.toString(),
+            capitalShareCount: capitalShareCount,
             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',
@@ -79,20 +64,11 @@ 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'] && 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 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 onSubmit = function (data) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
-        dispatch(updateEntityCapital(formData));
+        dispatch(updateEntityCapital(deepCopy(getFelids(data))));
     };
     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, useFormDirtyCheck } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useDataNoneEditable, useFormReadOnly, useLanguage, useSetFromDefaultValues, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { convertToEnglishDateFormat, deepCopy, getFileDetailsFromDocument, isKW, isSA, sendCustomEventToGTM } from '../../../../utils';
+import { convertToEnglishDateFormat, deepCopy, getFileDetailsFromDocument, isKW, isSA } 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, _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 _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 settingsData = useAppSelector(settingsSelector).data;
     var isAr = useLanguage().isAr;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    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 _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 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 _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 _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 getSchema = function () {
         if (isSACountry)
             return EntityNameValidationSchema();
@@ -80,18 +80,6 @@ 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',
@@ -116,16 +104,17 @@ 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'] && ((_c = license === null || license === void 0 ? void 0 : license.additional_info) === null || _c === void 0 ? void 0 : _c.unified_number) === watch('unifiedNumber');
+    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 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) {
-        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
-        dispatch(updateEntityName(formData));
+        dispatch(updateEntityName(deepCopy(getFelids(data))));
     };
     var handleIssueDateOpenClose = function (flag) {
         setIssueAnchorEl(flag);
@@ -137,12 +126,6 @@ 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;