@tap-payments/auth-jsconnect 2.8.98-development → 2.9.0

package/build/features/business/screens/MobileOwnership/validation.js

@@ -0,0 +1,38 @@
+import { getMobileNumberLen } from '../../../../utils';
+import * as yup from 'yup';
+export var PhoneValidationSchema = function () {
+    return yup.object().shape({
+        mobile: yup
+            .string()
+            .test({
+            test: function (value) {
+                var countryCode = this.parent.countryCode;
+                var isSA = countryCode.iso2 === 'SA';
+                var maxDigits = countryCode.max_digits;
+                var minDigits = countryCode.min_digits;
+                var mobileValue = value || '';
+                var valueLen = mobileValue.length;
+                var isNumber = mobileValue.match(/^[0-9]/g);
+                if (!isNumber)
+                    return this.createError({ message: 'enter_valid_mobile_number' });
+                var isStartWithZero = mobileValue.startsWith('05');
+                var isStartWith5 = mobileValue.startsWith('5');
+                var isSaudiNumber = isStartWith5 || isStartWithZero;
+                if (isSA) {
+                    if (!isSaudiNumber)
+                        return this.createError({ message: 'start_with_number' });
+                    var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
+                    return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                }
+                var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+                var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+                if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
+                    return true;
+                if (minDigits === maxDigits)
+                    return this.createError({ message: 'enter_valid_mobile_number' });
+                return this.createError({ message: 'enter_valid_mobile_number_min_max_length' });
+            }
+        })
+            .required('mobile_number_error')
+    });
+};

package/build/features/connect/Connect.js

@@ -141,7 +141,7 @@ var Connect = memo(function (props) {
             (_a = props.unmount) === null || _a === void 0 ? void 0 : _a.call(props);
         }, 1100);
     };
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, animationDirection: animationDirection, onClose: ((_c = appConfig.features) === null || _c === void 0 ? void 0 : _c.closeButton) ? handleDialogClose : undefined, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.tapTextLogo) && activeScreen.name !== 'CONNECT_BUSINESS_COUNTRY_STEP', poweredBy: false }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading || data.isMaturityExpress }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, animationDirection: animationDirection, onClose: ((_c = appConfig.features) === null || _c === void 0 ? void 0 : _c.closeButton) ? handleDialogClose : undefined, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.tapTextLogo) && activeScreen.name !== 'CONNECT_BUSINESS_COUNTRY_STEP', poweredBy: false }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.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/connect/screens/Individual/MobileNumber.js

@@ -34,7 +34,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { removeAllCharsFromNumber } from '../../../../utils';
+import { getMobileNumberLen, removeAllCharsFromNumber } from '../../../../utils';
 import { useAppSelector, useLanguage } from '../../../../hooks';
 import Search from '../../../shared/Search';
 import { connectSelector } from '../../../app/connect/connectStore';
@@ -97,10 +97,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var isSA = countryCodeValue.iso2 === 'SA';
     var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
     var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredSALen = isStartsWith5 ? mobileMaxLen - 1 : mobileMaxLen;
-    var requiredMinLen = isSA ? requiredSALen : mobileMinLen;
-    var requiredMaxLen = isSA ? requiredSALen : mobileMaxLen;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
     var _k = ((_f = (_e = data.otpData.responseBody) === null || _e === void 0 ? void 0 : _e.contact) === null || _f === void 0 ? void 0 : _f.phone) || {}, number = _k.number, country_code = _k.country_code;
     var readOnly = number && country_code && !error;
     React.useEffect(function () {
@@ -144,8 +142,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         var filteredCountries = countries.filter(function (country) {
             return country.idd_prefix.toString().toLowerCase().startsWith(value.replace('+', '').toLowerCase()) ||
                 country.capital.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.arabic.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.english.toLowerCase().startsWith(value.toLowerCase());
+                country.name.arabic.toLowerCase().includes(value.toLowerCase()) ||
+                country.name.english.toLowerCase().includes(value.toLowerCase());
         });
         setCountries(filteredCountries);
     };

package/build/features/connect/screens/Individual/validation.js

@@ -1,4 +1,5 @@
 import { REGEX_FULL_NAME } from '../../../../constants';
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var IndividualValidation = yup.object().shape({
     name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
@@ -26,10 +27,12 @@ export var IndividualMobileValidation = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? maxDigits - 1 : maxDigits;
+                var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                 return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
             }
-            if (valueLen >= minDigits && valueLen <= maxDigits)
+            var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+            var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+            if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
                 return true;
             if (minDigits === maxDigits)
                 return this.createError({ message: 'enter_valid_mobile_number' });

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

@@ -36,7 +36,7 @@ import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { isOtherThanKWOrSA, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
+import { getMobileNumberLen, isOtherThanKWOrSA, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -99,10 +99,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var isSA = countryCodeValue.iso2 === 'SA';
     var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
     var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredSALen = isStartsWith5 ? mobileMaxLen - 1 : mobileMaxLen;
-    var requiredMinLen = isSA ? requiredSALen : mobileMinLen;
-    var requiredMaxLen = isSA ? requiredSALen : mobileMaxLen;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
     var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_e = settingsStore.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2]);
     React.useEffect(function () {
         if (mobileValue)
@@ -152,8 +150,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         var filteredCountries = countries.filter(function (country) {
             return country.idd_prefix.toString().toLowerCase().startsWith(value.replace('+', '').toLowerCase()) ||
                 country.capital.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.arabic.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.english.toLowerCase().startsWith(value.toLowerCase());
+                country.name.arabic.toLowerCase().includes(value.toLowerCase()) ||
+                country.name.english.toLowerCase().includes(value.toLowerCase());
         });
         setCountries(filteredCountries);
     };

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

@@ -1,3 +1,4 @@
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var PhoneValidationSchema = yup.object().shape({
     mobile: yup
@@ -19,10 +20,12 @@ export var PhoneValidationSchema = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? maxDigits - 1 : maxDigits;
+                var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                 return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
             }
-            if (valueLen >= minDigits && valueLen <= maxDigits)
+            var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+            var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+            if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
                 return true;
             if (minDigits === maxDigits)
                 return this.createError({ message: 'enter_valid_mobile_number' });

package/build/features/connect/screens/MobileOwnership/CollectMobileOwnership.d.ts

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

package/build/features/connect/screens/MobileOwnership/CollectMobileOwnership.js

@@ -0,0 +1,104 @@
+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 { FormProvider, useForm } from 'react-hook-form';
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import { styled } from '@mui/material/styles';
+import Form from '../../../../components/Form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { PhoneValidationSchema } from './validation';
+import { Box, alpha } from '@mui/material';
+import { useTranslation } from 'react-i18next';
+import Text from '../../../../components/Text';
+import { Button as SharedButton } from '../../../shared/Button';
+import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { connectSelector, skipUpdateLeadMobile, updateLeadMobile } from '../../../../features/app/connect/connectStore';
+import MobileNumber from './MobileNumber';
+import { deepCopy } from '../../../../utils';
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'flex-start'
+}); });
+var TitleContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        background: theme.palette.common.white,
+        borderTop: '1px solid rgba(227, 232, 238, 0.8)',
+        borderBottom: '1px solid rgba(227, 232, 238, 0.8)',
+        borderRadius: theme.spacing(0, 0, 1.25, 1.25)
+    });
+});
+var TitleStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, margin: theme.spacing(1.75, 2.5), lineHeight: 1.2 }));
+});
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightRegular }, theme.typography.caption), { lineHeight: 1.2 }));
+});
+var CurrentMobileContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        rowGap: theme.spacing(1.6),
+        height: theme.spacing(9.375),
+        marginTop: theme.spacing(2.85),
+        marginInlineStart: theme.spacing(2.375)
+    });
+});
+var MobileNumberContainer = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return (__assign({ display: 'flex', columnGap: theme.spacing(0.9), direction: 'ltr' }, (theme.direction === 'rtl' && {
+        marginLeft: 'auto'
+    })));
+});
+var CountryCodeStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium, lineHeight: 1.2 }));
+});
+var MobileNumberStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightRegular, lineHeight: 1.2 }));
+});
+var UpdateLaterContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginLeft: theme.spacing(2.5),
+        marginRight: theme.spacing(2.5)
+    });
+});
+var CollectMobileOwnership = function () {
+    var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _a = useAppSelector(connectSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var methods = useForm({
+        resolver: yupResolver(PhoneValidationSchema()),
+        defaultValues: { mobile: '', countryCode: settingsData.businessCountry },
+        mode: 'onChange'
+    });
+    var onSubmit = function (data) {
+        dispatch(updateLeadMobile(deepCopy(data)));
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    var onUpdateLater = function () {
+        dispatch(skipUpdateLeadMobile());
+    };
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(TitleContainerStyled, { children: _jsx(TitleStyled, { children: t('mobile_ownership_title') }) }), _jsxs(CurrentMobileContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('current_mobile_number') }), _jsxs(MobileNumberContainer, { children: [_jsxs(CountryCodeStyled, { children: ["+", data.individualData.countryCode.idd_prefix] }), _jsx(MobileNumberStyled, { children: data.individualData.mobile })] })] }), _jsx(MobileNumber, {}), _jsx(SharedButton, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('update_mobile_number') }))] })) })) }));
+};
+export default CollectMobileOwnership;

package/build/features/connect/screens/MobileOwnership/MobileNumber.d.ts

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

package/build/features/connect/screens/MobileOwnership/MobileNumber.js

@@ -0,0 +1,72 @@
+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, Fragment as _Fragment } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled, alpha } from '@mui/material/styles';
+import { getMobileNumberLen, removeAllCharsFromNumber } from '../../../../utils';
+import { useAppSelector } from '../../../../hooks';
+import Text from '../../../../components/Text';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import { settingsSelector } from '../../../../app/settings';
+var LabelContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        padding: theme.spacing(0, 2.5, 1.25, 2.5)
+    });
+});
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
+});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
+var MobileNumber = function () {
+    var _a;
+    var t = useTranslation().t;
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var data = useAppSelector(settingsSelector).data;
+    var phoneControl = useController({ name: 'mobile', control: control });
+    var countryCodeValue = data.businessCountry;
+    var mobileValue = phoneControl.field.value || '';
+    var error = !!mobileValue ? (_a = phoneControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message : '';
+    var isSA = countryCodeValue.iso2 === 'SA';
+    var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
+    var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
+    React.useEffect(function () {
+        if (mobileValue)
+            setValue('mobile', mobileValue, { shouldValidate: true });
+    }, []);
+    var onPhoneNumberChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllCharsFromNumber(target.value);
+        phoneControl.field.onChange(value);
+    };
+    var clearMobileNumber = function () {
+        phoneControl.field.onChange('');
+    };
+    return (_jsx(_Fragment, { children: _jsxs(ScreenContainer, __assign({ sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('new_mobile_number') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredMaxLen }, type: 'tel', onChange: onPhoneNumberChange, value: mobileValue, startAdornment: "+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), endAdornment: !error && mobileValue ? _jsx(CheckIcon, {}) : mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber }), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) })] })) }));
+};
+export default React.memo(MobileNumber);

package/build/features/connect/screens/MobileOwnership/index.d.ts

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

package/build/features/connect/screens/MobileOwnership/index.js

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

package/build/features/connect/screens/MobileOwnership/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const PhoneValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    mobile: 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, {
+    mobile: 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, {
+    mobile: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/connect/screens/MobileOwnership/validation.js

@@ -0,0 +1,38 @@
+import { getMobileNumberLen } from '../../../../utils';
+import * as yup from 'yup';
+export var PhoneValidationSchema = function () {
+    return yup.object().shape({
+        mobile: yup
+            .string()
+            .test({
+            test: function (value) {
+                var countryCode = this.parent.countryCode;
+                var isSA = countryCode.iso2 === 'SA';
+                var maxDigits = countryCode.max_digits;
+                var minDigits = countryCode.min_digits;
+                var mobileValue = value || '';
+                var valueLen = mobileValue.length;
+                var isNumber = mobileValue.match(/^[0-9]/g);
+                if (!isNumber)
+                    return this.createError({ message: 'enter_valid_mobile_number' });
+                var isStartWithZero = mobileValue.startsWith('05');
+                var isStartWith5 = mobileValue.startsWith('5');
+                var isSaudiNumber = isStartWith5 || isStartWithZero;
+                if (isSA) {
+                    if (!isSaudiNumber)
+                        return this.createError({ message: 'start_with_number' });
+                    var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
+                    return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                }
+                var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+                var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+                if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
+                    return true;
+                if (minDigits === maxDigits)
+                    return this.createError({ message: 'enter_valid_mobile_number' });
+                return this.createError({ message: 'enter_valid_mobile_number_min_max_length' });
+            }
+        })
+            .required('mobile_number_error')
+    });
+};

package/build/features/connectExpress/ConnectExpress.js

@@ -156,7 +156,7 @@ var ConnectExpress = memo(function (_a) {
             (_a = props.unmount) === null || _a === void 0 ? void 0 : _a.call(props);
         }, 1100);
     };
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, animationDirection: animationDirection, onClose: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.closeButton) ? handleDialogClose : undefined, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: !isTapOrigin, dialogEdgeFormat: appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: false, poweredBy: !isTapOrigin }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true }, { children: connectExpressFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, animationDirection: animationDirection, onClose: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.closeButton) ? handleDialogClose : undefined, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: !isTapOrigin, dialogEdgeFormat: appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: false, poweredBy: !isTapOrigin }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true, isTapOrigin: isTapOrigin }, { children: connectExpressFeatureScreens.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/connectExpress/screens/CollectIndividualInfo/MobileNumber.js

@@ -26,7 +26,7 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled, alpha } from '@mui/material/styles';
-import { removeAllCharsFromNumber } from '../../../../utils';
+import { getMobileNumberLen, removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage } from '../../../../hooks';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
@@ -95,10 +95,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var isSA = countryCodeValue.iso2 === 'SA';
     var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
     var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredSALen = isStartsWith5 ? mobileMaxLen - 1 : mobileMaxLen;
-    var requiredMinLen = isSA ? requiredSALen : mobileMinLen;
-    var requiredMaxLen = isSA ? requiredSALen : mobileMaxLen;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -140,8 +138,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         var filteredCountries = countries.filter(function (country) {
             return country.idd_prefix.toString().toLowerCase().startsWith(value.replace('+', '').toLowerCase()) ||
                 country.capital.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.arabic.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.english.toLowerCase().startsWith(value.toLowerCase());
+                country.name.arabic.toLowerCase().includes(value.toLowerCase()) ||
+                country.name.english.toLowerCase().includes(value.toLowerCase());
         });
         setCountries(filteredCountries);
     };

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

@@ -1,4 +1,5 @@
 import { REGEX_FULL_NAME } from '../../../../constants';
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var CollectIndividualInfoValidation = yup.object().shape({
     name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
@@ -22,10 +23,12 @@ export var CollectIndividualInfoValidation = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? maxDigits - 1 : maxDigits;
+                var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                 return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
             }
-            if (valueLen >= minDigits && valueLen <= maxDigits)
+            var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+            var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+            if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
                 return true;
             if (minDigits === maxDigits)
                 return this.createError({ message: 'enter_valid_mobile_number' });

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/Mobile/MobileNumber.js

@@ -36,7 +36,7 @@ import { connectExpressSelector } from '../../../app/connectExpress/connectExpre
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { isOtherThanKWOrSA, removeAllCharsFromNumber } from '../../../../utils';
+import { getMobileNumberLen, isOtherThanKWOrSA, removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -99,10 +99,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var isSA = countryCodeValue.iso2 === 'SA';
     var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
     var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredSALen = isStartsWith5 ? mobileMaxLen - 1 : mobileMaxLen;
-    var requiredMinLen = isSA ? requiredSALen : mobileMinLen;
-    var requiredMaxLen = isSA ? requiredSALen : mobileMaxLen;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
     var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_e = settingsStore.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2]);
     React.useEffect(function () {
         if (mobileValue)
@@ -145,8 +143,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         var filteredCountries = countries.filter(function (country) {
             return country.idd_prefix.toString().toLowerCase().startsWith(value.replace('+', '').toLowerCase()) ||
                 country.capital.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.arabic.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.english.toLowerCase().startsWith(value.toLowerCase());
+                country.name.arabic.toLowerCase().includes(value.toLowerCase()) ||
+                country.name.english.toLowerCase().includes(value.toLowerCase());
         });
         setCountries(filteredCountries);
     };

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

@@ -1,3 +1,4 @@
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var PhoneValidationSchema = function (isLeadIdPassed) {
     if (isLeadIdPassed) {
@@ -22,10 +23,12 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
                     if (isSA) {
                         if (!isSaudiNumber)
                             return this.createError({ message: 'start_with_number' });
-                        var requiredLen = isStartWith5 ? maxDigits - 1 : maxDigits;
+                        var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                         return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
                     }
-                    if (valueLen >= minDigits && valueLen <= maxDigits)
+                    var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+                    var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+                    if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
                         return true;
                     if (minDigits === maxDigits)
                         return this.createError({ message: 'enter_valid_mobile_number' });
@@ -55,10 +58,12 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
                 if (isSA) {
                     if (!isSaudiNumber)
                         return this.createError({ message: 'start_with_number' });
-                    var requiredLen = isStartWith5 ? maxDigits - 1 : maxDigits;
+                    var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                     return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
                 }
-                if (valueLen >= minDigits && valueLen <= maxDigits)
+                var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+                var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+                if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
                     return true;
                 if (minDigits === maxDigits)
                     return this.createError({ message: 'enter_valid_mobile_number' });

package/build/features/connectExpress/screens/MobileOwnership/CollectMobileOwnership.d.ts

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