@tap-payments/auth-jsconnect 2.10.7-beta → 2.10.7

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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, BRAND_NAME_MAX_LENGTH } from '../../../../constants';
+import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, BRAND_NAME_MAX_LENGTH, UNIFIED_NUMBER_MIN_LENGTH } from '../../../../constants';
 import { BusinessType } from '../../../../@types';
 var objectElements = {
     legal_name: yup.object().shape({
@@ -7,7 +7,7 @@ var objectElements = {
         en: yup.string()
     }),
     license: yup.object().shape({
-        number: yup.string()
+        number: yup.string().nullable()
     }),
     type: yup.string()
 };
@@ -94,22 +94,40 @@ export var BusinessDataSchema = function (isLeadIdPassed) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             selectedLicense: yup.object().shape(objectElements).required(''),
-            licenseNumber: yup
-                .string()
-                .test({
+            unifiedNumber: yup.string().test({
+                name: 'unifiedNumber',
+                message: '',
                 test: function (value) {
+                    var _a;
                     var selectedLicense = this.parent.selectedLicense;
-                    var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                    var isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                        return false;
+                    if (isFL || length >= UNIFIED_NUMBER_MIN_LENGTH)
+                        return true;
                     if (length === 0)
+                        return this.createError({ message: '' });
+                    return this.createError({ message: 'unified_number_required' });
+                }
+            }),
+            licenseNumber: yup.string().test({
+                name: 'licenseNumber',
+                message: '',
+                test: function (value) {
+                    var _a;
+                    var selectedLicense = this.parent.selectedLicense;
+                    var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                        return false;
+                    if (isCR || length >= FL_MIN_LICENSE_LENGTH)
                         return true;
-                    if (isCR) {
-                        return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
-                    }
-                    return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                    if (length === 0)
+                        return this.createError({ message: '' });
+                    return this.createError({ message: 'fl_max_length' });
                 }
-            })
-                .required(''),
+            }),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond')
         });
     }
@@ -127,22 +145,40 @@ export var BusinessDataSchema = function (isLeadIdPassed) {
         })
             .required('enter_brand_name_english_chars_numbers_space'),
         selectedLicense: yup.object().shape(objectElements).required(''),
-        licenseNumber: yup
-            .string()
-            .test({
+        unifiedNumber: yup.string().test({
+            name: 'unifiedNumber',
+            message: '',
             test: function (value) {
+                var _a;
                 var selectedLicense = this.parent.selectedLicense;
-                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                var isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                 var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                    return false;
+                if (isFL || length >= UNIFIED_NUMBER_MIN_LENGTH)
+                    return true;
                 if (length === 0)
+                    return this.createError({ message: '' });
+                return this.createError({ message: 'unified_number_required' });
+            }
+        }),
+        licenseNumber: yup.string().test({
+            name: 'licenseNumber',
+            message: '',
+            test: function (value) {
+                var _a;
+                var selectedLicense = this.parent.selectedLicense;
+                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                    return false;
+                if (isCR || length >= FL_MIN_LICENSE_LENGTH)
                     return true;
-                if (isCR) {
-                    return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
-                }
-                return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                if (length === 0)
+                    return this.createError({ message: '' });
+                return this.createError({ message: 'fl_max_length' });
             }
         })
-            .required('')
     });
 };
 export var KWBusinessDataSchema = function (isLeadIdPassed) {

package/build/features/connectExpress/screens/GenericPrepareDataLoading/GenericPrepareDataLoading.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const GenericPrepareDataLoading: () => JSX.Element;
+export default GenericPrepareDataLoading;

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useAppSelector } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+var GenericPrepareDataLoading = function () {
+    var error = useAppSelector(connectExpressSelector).error;
+    return _jsx(DataLoading, { error: error });
+};
+export default GenericPrepareDataLoading;

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.d.ts

@@ -0,0 +1,2 @@
+import GenericPrepareDataLoading from './GenericPrepareDataLoading';
+export default GenericPrepareDataLoading;

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.js

@@ -0,0 +1,2 @@
+import GenericPrepareDataLoading from './GenericPrepareDataLoading';
+export default GenericPrepareDataLoading;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/OTPInput.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface OTPProps {
+}
+declare const _default: React.MemoExoticComponent<({}: OTPProps) => JSX.Element>;
+export default _default;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/OTPInput.js

@@ -0,0 +1,49 @@
+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 { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import OTPField from '../../../shared/OTP';
+import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { connectExpressSelector, clearError, resendLeadMobileAuthOTP } from '../../../app/connectExpress/connectExpressStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        fontFamily: theme.typography.fontFamily
+    });
+});
+var OTPInput = function (_a) {
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    var otpControl = useController({ name: 'otp', control: control });
+    var error = useAppSelector(connectExpressSelector).error;
+    var handleOnOTPChange = function (otp) {
+        if (error)
+            dispatch(clearError());
+        otpControl.field.onChange(otp);
+    };
+    var handleOnResendOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
+        dispatch(resendLeadMobileAuthOTP());
+    };
+    var otpValue = otpControl.field.value;
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+};
+export default React.memo(OTPInput);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/VerifyMobileAuthOTP.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface VerifyMobileAuthOTPProps {
+}
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,88 @@
+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, jsxs as _jsxs } from "react/jsx-runtime";
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import Text from '../../../../components/Text';
+import { clearError, connectExpressSelector, verifyAuthMobileOtpAsync, resetVerifyAuthOTPValue } from '../../../app/connectExpress/connectExpressStore';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import { useAppDispatch, useAppSelector, useSanitizedTranslation } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useLanguage } from '../../../../hooks';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Form from '../../../../components/Form';
+import { maskPhone, deepCopy } from '../../../../utils';
+import { AuthForScreen } from '../../../../@types';
+import { OTPValidation } from './validation';
+import OTPInput from './OTPInput';
+var OTPTitleContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        background: theme.palette.common.white,
+        border: '1px solid',
+        borderColor: theme.palette.divider,
+        direction: theme.direction,
+        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
+        marginBottom: theme.spacing(5.75)
+    });
+});
+var OTPTitleStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
+});
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var VerifyMobileAuthOTP = function () {
+    var _a, _b, _c, _d, _e, _f;
+    var dispatch = useAppDispatch();
+    var _g = useAppSelector(connectExpressSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var t = useTranslation().t;
+    var st = useSanitizedTranslation();
+    var isAr = useLanguage().isAr;
+    var methods = useForm({
+        resolver: yupResolver(OTPValidation),
+        defaultValues: data.verifyAuthOtpData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetVerifyAuthOTPValue());
+        };
+    }, []);
+    var onSubmit = function (formData) {
+        dispatch(verifyAuthMobileOtpAsync(deepCopy(formData)));
+    };
+    var onBack = function () {
+        var authFor = data.verifyAuthOtpData.authFor;
+        var step_name = 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP';
+        if (authFor === AuthForScreen.DOB)
+            step_name = 'CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP';
+        else if (authFor === AuthForScreen.MOBILE_OWNERSHIP)
+            step_name = 'COLLECT_MOBILE_OWNERSHIP';
+        dispatch(handlePrevScreenStep(step_name));
+    };
+    var disabled = !methods.formState.isValid;
+    var phone = ((_c = (_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.verifyAuthMobile) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to) ? (_f = (_e = (_d = data.responseData) === null || _d === void 0 ? void 0 : _d.verifyAuthMobile) === null || _e === void 0 ? void 0 : _e.verification_by) === null || _f === void 0 ? void 0 : _f.sent_to : '';
+    var title = t('ide_opt_sent_title');
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, { children: t('next') }))] })) })) }));
+};
+export default React.memo(VerifyMobileAuthOTP);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.d.ts

@@ -0,0 +1,3 @@
+import VerifyMobileAuthOTP, { VerifyMobileAuthOTPProps } from './VerifyMobileAuthOTP';
+export type { VerifyMobileAuthOTPProps };
+export default VerifyMobileAuthOTP;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.js

@@ -0,0 +1,2 @@
+import VerifyMobileAuthOTP from './VerifyMobileAuthOTP';
+export default VerifyMobileAuthOTP;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const OTPValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

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

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var OTPValidation = yup.object().shape({
+    otp: yup.string().min(6, 'otp_min_length').required('otp_required')
+});

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

@@ -4,14 +4,16 @@ import { connectExpressSelector, verifyNafathAsync } from '../../../app/connectE
 import NafathVerification from '../../../shared/NafathVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import GenericPrepareDataLoading from '../GenericPrepareDataLoading';
 var VerifyNafath = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), failed = _b[0], setFailed = _b[1];
     var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var _d = React.useState(false), showLoadingScreen = _d[0], setShowLoadingScreen = _d[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectExpressSelector).data;
     var authData = (data.responseData || {}).authData;
-    var _d = authData || {}, expiry = _d.expiry, app_url_android = _d.app_url_android, app_url_ios = _d.app_url_ios, random = _d.random;
+    var _e = authData || {}, expiry = _e.expiry, app_url_android = _e.app_url_android, app_url_ios = _e.app_url_ios, random = _e.random;
     React.useEffect(function () {
         if (authData && !isReady) {
             setIsReady(true);
@@ -20,7 +22,11 @@ var VerifyNafath = function () {
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyNafathAsync({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        var promise = dispatch(verifyNafathAsync({
+            onSuccess: function () { return setSuccess(true); },
+            onFailure: function () { return setFailed(true); },
+            showLoadingScreenAfterNafathSuccess: function () { return setShowLoadingScreen(true); }
+        }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
@@ -30,6 +36,6 @@ var VerifyNafath = function () {
     }, []);
     if (!isReady)
         return null;
-    return (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
+    return showLoadingScreen ? (_jsx(GenericPrepareDataLoading, {})) : (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyNafath);

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

@@ -15,11 +15,12 @@ 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 { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalPaid = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ 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
-            }), 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 }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_paid_input_label'), countryCode: settingsData.businessCountry.iso2 }), 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,13 +13,14 @@ 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 { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalShareValue = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ 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
-            }), 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 }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_share_value_input_label'), countryCode: settingsData.businessCountry.iso2 }), 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/EntityName/EntityName.js

@@ -54,12 +54,23 @@ var EntityName = function (_a) {
     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 noneEditable = useDataNoneEditable(data_status, [
+        'legal_name.en',
+        'legal_name.ar',
+        'type',
+        'license.number',
+        'license.additional_info',
+        'license.issuing_date',
+        'license.expiry_date',
+        'documents',
+        'AOA_file_id'
+    ]);
     var getSchema = function () {
         if (isSACountry)
-            return EntityNameValidationSchema();
+            return EntityNameValidationSchema(noneEditable);
         if (isKWCountry)
-            return EntityNameKWValidationSchema();
-        return EntityNameOtherCountryValidationSchema();
+            return EntityNameKWValidationSchema(noneEditable);
+        return EntityNameOtherCountryValidationSchema(noneEditable);
     };
     var methods = useForm({
         resolver: yupResolver(getSchema()),
@@ -93,17 +104,6 @@ var EntityName = function (_a) {
         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',
-        'legal_name.ar',
-        'type',
-        'license.number',
-        'license.additional_info',
-        'license.issuing_date',
-        'license.expiry_date',
-        'documents',
-        'AOA_file_id'
-    ]);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly, noneEditable);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var dataVerified = useDataVerified(data_verification, [
@@ -155,8 +155,9 @@ var EntityName = function (_a) {
     }, [methods.formState.isValid]);
     var disabled = !methods.formState.isValid || uploading || uploadingArticle;
     var showLicenseNumber = isKWCountry ? isCR : true;
+    var showExpiryDate = isSACountry ? !isCR : true;
     var showUnifiedNumber = isSACountry ? isCR : false;
     var disableBack = settingsData.appConfig.mode === 'content';
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(LegalName, { readOnly: readOnly['legalName'] || (noneEditable['legal_name.en'] && noneEditable['legal_name.ar']), isVerified: isLegalNameVerified }) })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl }, { children: _jsx(EntityTypeList, { readOnly: readOnly['entityType'] || noneEditable['type'], onListOpen: function () { return handleEntityOpenClose(true); }, onListClose: function () { return handleEntityOpenClose(false); }, isVerified: isEntityTypeVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseNumber, { show: showLicenseNumber, readOnly: readOnly['licenseNumber'] || noneEditable['license.number'], isVerified: isLicenseNumberVerified }), _jsx(UnifiedNumber, { show: showUnifiedNumber, readOnly: readOnly['unifiedNumber'] || noneEditable['license.additional_info'], isVerified: isUnifiedNumberVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !entityTypeAnchorEl }, { children: _jsx(IssuingDate, { onDateClicked: handleIssueDateOpenClose, readOnly: readOnly['issuingDate'] || noneEditable['license.issuing_date'], isVerified: isIssuingDateVerified }) })), _jsx(Collapse, __assign({ in: !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(ExpiryDate, { onDateClicked: handleExpiryDateOpenClose, readOnly: readOnly['expiryDate'] || noneEditable['license.expiry_date'], isVerified: isExpiryDateVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseCertificate, { defaultFiles: defaultCertificateFiles, show: isSACountry ? false : !isKWCountry || isCR, readOnly: readOnly['certificateId'] || noneEditable['documents'] }), _jsx(Article, { defaultFile: defaultArticleFile, show: !isSACountry, readOnly: readOnly['articleId'] || noneEditable['AOA_file_id'], isVerified: isArticleIdVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(LegalName, { readOnly: readOnly['legalName'] || (noneEditable['legal_name.en'] && noneEditable['legal_name.ar']), isVerified: isLegalNameVerified }) })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl }, { children: _jsx(EntityTypeList, { readOnly: readOnly['entityType'] || noneEditable['type'], onListOpen: function () { return handleEntityOpenClose(true); }, onListClose: function () { return handleEntityOpenClose(false); }, isVerified: isEntityTypeVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(UnifiedNumber, { show: showUnifiedNumber, readOnly: readOnly['unifiedNumber'] || noneEditable['license.additional_info'], isVerified: isUnifiedNumberVerified }), _jsx(LicenseNumber, { show: showLicenseNumber, readOnly: readOnly['licenseNumber'] || noneEditable['license.number'], isVerified: isLicenseNumberVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !entityTypeAnchorEl }, { children: _jsx(IssuingDate, { onDateClicked: handleIssueDateOpenClose, readOnly: readOnly['issuingDate'] || noneEditable['license.issuing_date'], isVerified: isIssuingDateVerified }) })), _jsx(Collapse, __assign({ in: !issueAnchorEl && !entityTypeAnchorEl && showExpiryDate }, { children: _jsx(ExpiryDate, { onDateClicked: handleExpiryDateOpenClose, readOnly: readOnly['expiryDate'] || noneEditable['license.expiry_date'], isVerified: isExpiryDateVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseCertificate, { defaultFiles: defaultCertificateFiles, show: isSACountry ? false : !isKWCountry || isCR, readOnly: readOnly['certificateId'] || noneEditable['documents'] }), _jsx(Article, { defaultFile: defaultArticleFile, show: !isSACountry, readOnly: readOnly['articleId'] || noneEditable['AOA_file_id'], isVerified: isArticleIdVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default EntityName;

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

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
+import { removeAllCharsFromNumber } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -31,7 +31,7 @@ var UnifiedNumber = function (_a) {
         var target = _a.target;
         if (bckError)
             dispatch(clearError());
-        var value = removeAllOtherThanCharsAndNumber(target.value);
+        var value = removeAllCharsFromNumber(target.value);
         unifiedNumberControl.field.onChange(value);
     };
     var unifiedNumberControl = useController({ control: control, name: 'unifiedNumber' });