@tap-payments/auth-jsconnect 2.7.8-test → 2.7.8

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';
@@ -93,9 +93,10 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var countryName = (isAr ? (_b = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _b === void 0 ? void 0 : _b.arabic : (_c = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _c === void 0 ? void 0 : _c.english) || '';
     var error = !!mobileValue ? (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';
-    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    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 });
@@ -137,16 +138,16 @@ 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);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredMaxLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
                             if (readOnly)
                                 return;
                             toggleCountryList();
-                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !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' }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                             } })] }))] })) })));
 });

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'),
@@ -9,7 +10,8 @@ export var CollectIndividualInfoValidation = yup.object().shape({
         test: function (value) {
             var countryCode = this.parent.countryCode;
             var isSA = countryCode.iso2 === 'SA';
-            var digits = countryCode.digits;
+            var maxDigits = countryCode.max_digits;
+            var minDigits = countryCode.min_digits;
             var mobileValue = value || '';
             var valueLen = mobileValue.length;
             var isNumber = mobileValue.match(/^[0-9]/g);
@@ -21,10 +23,16 @@ export var CollectIndividualInfoValidation = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? digits - 1 : digits;
+                var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                 return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
             }
-            return valueLen === digits ? 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/screens/CreateAccountLoader/CreateAccountLoader.js

@@ -1,34 +1,24 @@
-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 { useTranslation } from 'react-i18next';
-import { isNetworkError } from '../../../../utils';
-import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import { isNetworkError, sleep } from '../../../../utils';
+import { useAppDispatch, useAppSelector } 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 isAr = useLanguage().isAr;
-    var t = useTranslation().t;
-    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
+    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]);
     React.useEffect(function () {
-        dispatch(createAccountAsync());
+        dispatch(createAccountAsync({ isRetry: false }));
     }, []);
-    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') }))) })));
+    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 });
 };
 export default React.memo(CreateAccountLoader);

package/build/features/connectExpress/screens/{NID → DOB}/DOB.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 interface DOBProps {
     onDateClicked?: (flag: boolean) => void;
-    readOnly?: boolean;
 }
-declare const DOB: ({ onDateClicked, readOnly }: DOBProps) => JSX.Element;
+declare const DOB: ({ onDateClicked }: DOBProps) => JSX.Element;
 export default DOB;

package/build/features/connectExpress/screens/{NID → DOB}/DOB.js

@@ -24,7 +24,7 @@ var InputLabelStyled = styled(Text)(function (_a) {
 });
 var DOB = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked, readOnly = _a.readOnly;
+    var onDateClicked = _a.onDateClicked;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
@@ -41,7 +41,7 @@ var DOB = function (_a) {
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
     return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
                         var spacing = _a.spacing;
-                        return spacing(2.5, 2.5, 1.5, 2.5);
-                    } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, disabled: readOnly, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
+                        return spacing(0, 2.5, 1.5, 2.5);
+                    } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
 };
 export default DOB;

package/build/features/connectExpress/screens/DOB/DOBForm.d.ts

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

package/build/features/connectExpress/screens/DOB/DOBForm.js

@@ -0,0 +1,63 @@
+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 * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { styled } from '@mui/material/styles';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { DOBValidationSchema } from './validation';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { clearError, connectExpressSelector, updateLeadDOBAsync } from '../../../app/connectExpress/connectExpressStore';
+import Form from '../../../../components/Form';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import { AuthForType } from '../../../../@types';
+import Collapse from '../../../../components/Collapse';
+import DOB from './DOB';
+import { deepCopy } from '../../../../utils';
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var DOBForm = function (_a) {
+    var _b = React.useState(false), collapse = _b[0], setCollapse = _b[1];
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var dobData = data.dobData, otpData = data.otpData;
+    var startWithNIDMissed = otpData.authFor === AuthForType.NATIONAL_ID_MISSED;
+    var methods = useForm({
+        resolver: yupResolver(DOBValidationSchema),
+        defaultValues: dobData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var onSubmit = function (data) {
+        dispatch(updateLeadDOBAsync(deepCopy(data)));
+    };
+    var handleCollapseOpenClose = function (flag) {
+        setCollapse(flag);
+    };
+    var onBack = function () {
+        var screen = startWithNIDMissed ? 'CONNECT_EXPRESS_NID_MISSED_STEP' : 'CONNECT_EXPRESS_NID_STEP';
+        dispatch(handlePrevScreenStep(screen));
+    };
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ sx: { mt: 10 }, loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+};
+export default React.memo(DOBForm);

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var DOBValidationSchema = yup.object().shape({
+    dob: yup.string().min(5).required('enter_valid_birth_date')
+});

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/IdentityVerifyNafath/IdentityVerifyNafath.d.ts

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

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

@@ -0,0 +1,35 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { connectExpressSelector, verifyNafathIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
+import NafathVerification from '../../../shared/NafathVerification';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+var IdentityVerifyNafath = 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 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;
+    React.useEffect(function () {
+        if (authData && !isReady) {
+            setIsReady(true);
+        }
+    }, [authData]);
+    React.useEffect(function () {
+        if (!isReady)
+            return;
+        var promise = dispatch(verifyNafathIdentityAsync({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        return function () {
+            promise === null || promise === void 0 ? void 0 : promise.abort();
+        };
+    }, [isReady]);
+    var onBack = React.useCallback(function () {
+        dispatch(handlePrevScreenStep());
+    }, []);
+    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(); } }));
+};
+export default React.memo(IdentityVerifyNafath);

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

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

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

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

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

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { styled, alpha } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
-import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
+import Button, { NafathButton, MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useCountry, useFormErrorAndUpdateReadOnly, useFormReadOnly } from '../../../../hooks';
 import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
@@ -30,7 +30,7 @@ import MobileNumber from './MobileNumber';
 import { PhoneValidationSchema } from './validation';
 import { ICONS_NAMES } from '../../../../constants';
 import TAC from './TAC';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -96,6 +96,13 @@ var Mobile = function (_a) {
     };
     var onBack = function () {
         var screen = isKuwait ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP';
+        var eventAction = isKuwait ? 'PACI Click' : 'Abser Click';
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: eventAction,
+            event_label: settingData.businessCountry.iso2
+        });
         dispatch(handlePrevScreenStep(screen));
     };
     var onBackToCountryList = function () {
@@ -110,6 +117,6 @@ var Mobile = function (_a) {
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var disabled = !methods.formState.isValid;
-    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') })))] }))] }))] })) })) }));
+    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(NafathButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('nafath_button_label') })))] }))] }))] })) })) }));
 };
 export default React.memo(Mobile);

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) {
@@ -97,9 +97,10 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var countryName = (isAr ? (_b = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _b === void 0 ? void 0 : _b.arabic : (_c = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _c === void 0 ? void 0 : _c.english) || '';
     var error = !!mobileValue ? (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';
-    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    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);
     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)
@@ -142,16 +143,16 @@ 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);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : isOtherThanKWOrSACountry ? '117px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl || readOnly, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : isOtherThanKWOrSACountry ? '117px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredMaxLen }, type: 'tel', readOnly: !!anchorEl || readOnly, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
                             if (readOnly)
                                 return;
                             toggleCountryList();
-                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: !anchorEl ? error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                             } })] }))] })) })));
 });

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) {
@@ -9,7 +10,8 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
                 test: function (value) {
                     var countryCode = this.parent.countryCode;
                     var isSA = countryCode.iso2 === 'SA';
-                    var digits = countryCode.digits;
+                    var maxDigits = countryCode.max_digits;
+                    var minDigits = countryCode.min_digits;
                     var mobileValue = value || '';
                     var valueLen = mobileValue.length;
                     var isNumber = mobileValue.match(/^[0-9]/g);
@@ -21,10 +23,16 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
                     if (isSA) {
                         if (!isSaudiNumber)
                             return this.createError({ message: 'start_with_number' });
-                        var requiredLen = isStartWith5 ? digits - 1 : digits;
+                        var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                         return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
                     }
-                    return valueLen === digits ? 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')
@@ -37,7 +45,8 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
             test: function (value) {
                 var countryCode = this.parent.countryCode;
                 var isSA = countryCode.iso2 === 'SA';
-                var digits = countryCode.digits;
+                var maxDigits = countryCode.max_digits;
+                var minDigits = countryCode.min_digits;
                 var mobileValue = value || '';
                 var valueLen = mobileValue.length;
                 var isNumber = mobileValue.match(/^[0-9]/g);
@@ -49,10 +58,16 @@ export var PhoneValidationSchema = function (isLeadIdPassed) {
                 if (isSA) {
                     if (!isSaudiNumber)
                         return this.createError({ message: 'start_with_number' });
-                    var requiredLen = isStartWith5 ? digits - 1 : digits;
+                    var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                     return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
                 }
-                return valueLen === digits ? 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/screens/MobileOwnership/CollectMobileOwnership.d.ts

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

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

@@ -0,0 +1,106 @@
+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 { connectExpressSelector, skipUpdateLeadMobile, updateLeadMobile } from '../../../../features/app/connectExpress/connectExpressStore';
+import { AuthForType } from '../../../../@types';
+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(connectExpressSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
+    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(startWithNID ? 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP' : 'CONNECT_EXPRESS_NID_MISSED_STEP'));
+    };
+    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/connectExpress/screens/MobileOwnership/MobileNumber.d.ts

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