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

package/build/features/connectExpress/screens/AuthenticationList/validation.js

@@ -34,16 +34,6 @@ export var AuthenticationListValidationSchema = yup.object().shape({
             .required('');
     })
         .required(''),
-    licenseType: yup
-        .string()
-        .when('entityInfo', function (entityInfo) {
-        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
-        if (!isAddEntity) {
-            return yup.string().optional();
-        }
-        return yup.string().required('choose_license_type');
-    })
-        .required(''),
     legalName: yup
         .string()
         .when('entityInfo', function (entityInfo) {

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, sendCustomEventToGTM } from '../../../../utils';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA } from '../../../../utils';
 import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
 import { clearError, connectExpressSelector, setDefaultCountryCode, storeIsStartFromBusinessCountry, updateBusinessCountryAsync } from '../../../app/connectExpress/connectExpressStore';
 var BusinessCountryScreen = function (_a) {
@@ -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 (!data.leadId) return [3, 2];
                     return [4, dispatch(updateBusinessCountryAsync(iso2))];
                 case 1:

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

@@ -89,7 +89,7 @@ var CivilID = function (_a) {
     var onBackToCountryList = function () {
         dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_BUSINESS_COUNTRY_STEP'));
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };

package/build/features/connectExpress/screens/CivilIDMissed/CivilID.js

@@ -48,7 +48,7 @@ var CivilID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: 5, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(CivilID);

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

@@ -87,7 +87,7 @@ var CollectBusinessInfo = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName;
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || isBrandNameAvailable == false;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'], show: true, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(LicenseList, { readOnly: readOnly['selectedLicense'], onListOpen: function () {
                             setListActive(true);

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

@@ -96,7 +96,7 @@ var CollectIndividualInfo = function (_a) {
     }, [responseData]);
     var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
     var isEmailValid = typeof isEmailAvailable === 'undefined' ? isLeadEmailAvailable : isEmailAvailable;
-    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email;
+    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
     var emailReadOnly = readOnly['email'] && !((_b = methods.getFieldState('email').error) === null || _b === void 0 ? void 0 : _b.message) && !methods.getFieldState('email').isDirty;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { readOnly: readOnly['name'], show: !listActive }), _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: settingsData.countries }), _jsx(Email, { readOnly: emailReadOnly, show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));

package/build/features/connectExpress/screens/CollectIndividualInfo/Email.js

@@ -53,7 +53,6 @@ import { useController, useFormContext } from 'react-hook-form';
 import axios from 'axios';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { removeAllOtherThanCharsNumbersAtAndDot } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -89,8 +88,7 @@ var Email = function (_a) {
         });
     }); }, 500);
     var handleEmailChange = function (event) {
-        var value = removeAllOtherThanCharsNumbersAtAndDot(event.target.value);
-        emailControl.field.onChange(value);
+        emailControl.field.onChange(event.target.value);
     };
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;

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

@@ -1,24 +1,34 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { isNetworkError, sleep } from '../../../../utils';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { useTranslation } from 'react-i18next';
+import { isNetworkError } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { connectExpressSelector, createAccountAsync } from '../../../app/connectExpress/connectExpressStore';
 import CreateAccountLoading from '../../../shared/CreateAccountLoading';
+import Button from '../../../shared/Button';
 var CreateAccountLoader = function (_a) {
     var dispatch = useAppDispatch();
-    var error = useAppSelector(connectExpressSelector).error;
-    var _b = React.useState(0), isRetryCount = _b[0], setIsRetryCount = _b[1];
-    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
     React.useEffect(function () {
-        dispatch(createAccountAsync({ isRetry: false }));
+        dispatch(createAccountAsync());
     }, []);
-    React.useEffect(function () {
-        if (isNE && isRetryCount <= 3) {
-            sleep(2000);
-            setIsRetryCount(isRetryCount + 1);
-            dispatch(createAccountAsync({ isRetry: true }));
-        }
-    }, [isNE]);
-    return _jsx(CreateAccountLoading, { error: isNE && isRetryCount <= 3 ? '' : error });
+    var onReTry = function () {
+        dispatch(createAccountAsync());
+    };
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
+    return (_jsx(CreateAccountLoading, __assign({ error: error }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
 };
 export default React.memo(CreateAccountLoader);

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, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -96,13 +96,6 @@ 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 () {
@@ -116,7 +109,7 @@ var Mobile = function (_a) {
     };
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, countries: settingData.countries, onListOpen: handleCountryOpen, onListClose: handleCountryClose }) }), _jsxs(Collapse, __assign({ in: !anchor }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: (isLeadIdPassed ? !isLeadIdentityIdAvailable : !methods.formState.isValid) && !isOther }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKuwait ? (_jsx(MobileButton, __assign({ disabled: loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) })) }));
 };
 export default React.memo(Mobile);

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

@@ -96,7 +96,7 @@ var NID = function (_a) {
     };
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse, readOnly: readOnly['nid'] }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose, readOnly: readOnly['dob'] }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
 };

package/build/features/connectExpress/screens/NIDMissed/NID.js

@@ -56,7 +56,7 @@ var NID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || !!error;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(NID);

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

@@ -27,7 +27,7 @@ var SuccessWithFlowButtons = function () {
     };
     var _b = data.responseData || {}, boardData = _b.boardData, leadData = _b.leadData, boardInfo = _b.boardInfo;
     var name = (leadData || {}).name;
-    var _c = boardData || {}, business = _c.business, merchant = _c.merchant, bank = _c.bank_account, user = _c.user, individuals = _c.individuals, entity = _c.entity, brand = _c.brand;
+    var _c = boardData || {}, business = _c.business, merchant = _c.merchant, bank = _c.bank_account, user = _c.user, individuals = _c.individuals, entity = _c.entity, brand = _c.brand, status = _c.status;
     var _d = boardInfo || {}, flows = _d.info, recipient = _d.recipient;
     var boardInfoId = boardInfo === null || boardInfo === void 0 ? void 0 : boardInfo.id;
     var boardId = boardData === null || boardData === void 0 ? void 0 : boardData.id;
@@ -36,6 +36,6 @@ var SuccessWithFlowButtons = function () {
         var name = _a.name;
         return name !== FlowsTypes.PASSWORD;
     }); }, [flows]);
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, loading: loading, boardId: boardId, boardInfoId: boardInfoId, brand: brand, business: business, entity: entity, flows: filteredFlows || [], merchant: merchant, individuals: individualsInfo, user: __assign({ names: { en: name } }, user), onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, loading: loading, boardId: boardId, boardInfoId: boardInfoId, brand: brand, business: business, entity: entity, flows: filteredFlows || [], merchant: merchant, individuals: individualsInfo, user: __assign({ names: { en: name } }, user), onClose: isScopeAuthentication ? onClose : undefined, status: status }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/entity/Entity.d.ts

@@ -2,7 +2,6 @@ import { LibConfig } from '../../@types';
 export interface EntityLibProps extends LibConfig {
     verifyToken?: string;
     configToken?: string;
-    loaderColor?: string;
 }
 export declare function EntityElement(props: EntityLibProps): import("react/jsx-runtime").JSX.Element;
 export declare function renderEntityLib(config: EntityLibProps, elementId: string): {

package/build/features/entity/Entity.js

@@ -36,7 +36,7 @@ import { entityFeatureScreens } from '../featuresScreens';
 import { entitySelector, verifyLeadToken } from '../app/entity/entityStore';
 import Background from '../shared/Background';
 var Entity = memo(function (_a) {
-    var configToken = _a.configToken, verifyToken = _a.verifyToken, loaderColor = _a.loaderColor, props = __rest(_a, ["configToken", "verifyToken", "loaderColor"]);
+    var configToken = _a.configToken, verifyToken = _a.verifyToken, props = __rest(_a, ["configToken", "verifyToken"]);
     var theme = useAppTheme().theme;
     var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
     var _c = useAppSelector(entitySelector), customLoading = _c.customLoading, entityError = _c.error, loading = _c.loading;
@@ -49,11 +49,8 @@ var Entity = memo(function (_a) {
         loadingScreenName: 'ENTITY_LOADING_DATA_STEP',
         navigation: featureScreensNavigation,
         open: open,
-        mode: props.mode,
         internalToken: verifyToken,
-        settingLoading: settingLoading,
-        operatorErrorScreenName: 'ENTITY_OPERATOR_ERROR_STEP',
-        isValidOperator: data.isValidOperator
+        settingLoading: settingLoading
     });
     React.useEffect(function () {
         initializeGTM();
@@ -61,8 +58,8 @@ var Entity = memo(function (_a) {
             title: 'Entity'
         });
     }, []);
-    var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, open: open, error: error, loading: initialLoading, loaderColor: loaderColor, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: entityFeatureScreens.map(function (_a, index) {
+    var initialLoading = verifyToken ? settingLoading : settingLoading || customLoading;
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, open: open, error: error, loading: initialLoading, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: entityFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -14,17 +14,16 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { settingsSelector } from '../../../../app/settings';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
-import { clearError } from '../../../app/entity/entityStore';
+import { clearError, entitySelector } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
 var CapitalPaid = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
     var t = useTranslation().t;
-    var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(entitySelector).data;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
     var handleChange = function (_a) {
@@ -34,14 +33,11 @@ var CapitalPaid = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalPaidControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalPaidControl = useController({ control: control, name: 'capitalPaid' });
     var capitalPaidValue = capitalPaidControl.field.value;
     var error = (_b = capitalPaidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_paid_label', {
-                currency: getCurrency
+                currency: t(data.currency)
             }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalPaid);

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

@@ -13,18 +13,17 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { settingsSelector } from '../../../../app/settings';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
-import { clearError } from '../../../app/entity/entityStore';
+import { clearError, entitySelector } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
 var CapitalShareValue = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
     var t = useTranslation().t;
-    var settingsData = useAppSelector(settingsSelector).data;
+    var data = useAppSelector(entitySelector).data;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
     var handleChange = function (_a) {
@@ -34,14 +33,11 @@ var CapitalShareValue = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalShareValueControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalShareValueControl = useController({ control: control, name: 'capitalShareValue' });
     var capitalShareValueValue = capitalShareValueControl.field.value;
     var error = (_b = capitalShareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_share_value_label', {
-                currency: getCurrency
+                currency: t(data.currency)
             }), required: true, onChange: handleChange, value: capitalShareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalShareValueValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalShareValue);

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());
@@ -104,7 +80,7 @@ var EntityCapital = function (_a) {
     var handleActivitiesOpenClose = function (flag) {
         setAnchorEl(flag);
     };
-    var disabled = !methods.formState.isValid || uploading;
+    var disabled = !methods.formState.isValid || !!error || uploading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(ActivityList, { readOnly: readOnly['activities'] || noneEditable['activities'], onListOpen: function () { return handleActivitiesOpenClose(true); }, onListClose: function () { return handleActivitiesOpenClose(false); } }), _jsxs(Collapse, __assign({ in: !anchorEl }, { children: [_jsx(CapitalPaid, { readOnly: readOnly['capitalPaid'] || noneEditable['capital.paid'], isVerified: isCapitalPaidVerified }), _jsx(CapitalShareCount, { readOnly: readOnly['capitalShareCount'] || noneEditable['capital.shares.count'], isVerified: isCapitalShareCountVerified }), _jsx(CapitalShareValue, { readOnly: readOnly['capitalShareValue'] || noneEditable['capital.shares.value'], isVerified: isCapitalShareValueVerified }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] }))] })) })) }));
 };
 export default EntityCapital;

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;
@@ -153,7 +136,7 @@ var EntityName = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid || uploading || uploadingArticle;
+    var disabled = !methods.formState.isValid || !!error || uploading || uploadingArticle;
     var showLicenseNumber = isKWCountry ? isCR : true;
     var showUnifiedNumber = isSACountry ? isCR : false;
     var disableBack = settingsData.appConfig.mode === 'content';

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

@@ -21,10 +21,10 @@ var SuccessWithFlowButtons = function () {
     var _a = useAppSelector(entitySelector), data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals, recipient = _b.recipient;
+    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals, recipient = _b.recipient, board_status = _b.board_status;
     var onClose = function () {
         dispatch(onCloseCompleteEntity());
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, 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 || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, 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 || [], onClose: isScopeAuthentication ? onClose : undefined, status: board_status }));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -72,7 +72,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyEntityLeadOTP(deepCopy(formData)));
     };
-    var disabled = !methods.formState.isValid || !phone || resendLoading;
+    var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);