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

package/build/features/connect/screens/BusinessCountry/BusinessCountry.js

@@ -0,0 +1,113 @@
+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);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useAppSelector, useAppDispatch, useLanguage } from '../../../../hooks';
+import { ScreenContainer } from '../../../shared/Containers';
+import BusinessCountry from '../../../shared/BusinessCountry';
+import Button from '../../../shared/Button';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, updateLocationUrlWithCountry } from '../../../../utils';
+import Collapse from '../../../../components/Collapse';
+import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
+import { connectSelector, setDefaultCountryCode, updateBusinessCountry, storeIsStartFromBusinessCountry, clearError } from '../../../app/connect/connectStore';
+var BusinessCountryScreen = function (_a) {
+    var dispatch = useAppDispatch();
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = React.useState(false), isListOpen = _b[0], setListOpen = _b[1];
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    React.useEffect(function () {
+        dispatch(clearError());
+        dispatch(storeIsStartFromBusinessCountry(true));
+    }, []);
+    var defaultValue = React.useMemo(function () {
+        var _a, _b;
+        var value = ((_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2) || ((_b = settingsData.ipCountry) === null || _b === void 0 ? void 0 : _b.iso2);
+        return value;
+    }, [settingsData.businessCountry, settingsData.ipCountry]);
+    var onSelectCountry = function (iso2) { return __awaiter(void 0, void 0, void 0, function () {
+        var countryCode;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!iso2)
+                        return [2];
+                    countryCode = findCountryByIso2(settingsData.countries, iso2);
+                    dispatch(handleSetCountryByIso2(iso2));
+                    sendCustomEventToGTM({
+                        event: 'Send Event',
+                        event_category: 'User Registration Flow',
+                        event_action: 'Country selection page view',
+                        event_label: iso2
+                    });
+                    if (settingsData.appConfig.mode !== 'popup')
+                        updateLocationUrlWithCountry(iso2);
+                    if (!data.leadId) return [3, 2];
+                    return [4, dispatch(updateBusinessCountry(iso2))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (countryCode)
+                        dispatch(setDefaultCountryCode(countryCode));
+                    if (isOtherThanKWOrSA(iso2) || isKW(iso2)) {
+                        dispatch(handleNextScreenStep('CONNECT_MOBILE_STEP'));
+                        return [2];
+                    }
+                    dispatch(handleNextScreenStep('CONNECT_NID_STEP'));
+                    return [2];
+            }
+        });
+    }); };
+    return (_jsxs(ScreenContainer, { children: [_jsx(BusinessCountry, { sx: { mb: 2.5 }, countries: settingsData.businessCountries, loading: loading, defaultCountryIso2: defaultValue, onSelectCountry: onSelectCountry, onListOpen: function () { return setListOpen(true); }, onListClose: function () { return setListOpen(false); } }), _jsx(Collapse, __assign({ in: !isListOpen }, { children: _jsx(Button, __assign({ onClick: function () {
+                        onSelectCountry(defaultValue);
+                    }, loading: loading, isAr: isAr, disableBack: true, disabled: !defaultValue, error: t(error || '') }, { children: t('next') })) }))] }));
+};
+export default React.memo(BusinessCountryScreen);

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

@@ -0,0 +1,3 @@
+import BusinessCountryScreen, { BusinessCountryScreenProps } from './BusinessCountry';
+export type { BusinessCountryScreenProps };
+export default BusinessCountryScreen;

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

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

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

@@ -17,8 +17,8 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { deepCopy } from '../../../../utils';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
@@ -84,12 +84,20 @@ var CivilID = function (_a) {
             dispatch(clearError());
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Switch to mobile number Login Clicked'
+        });
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+    };
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
-    var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(CivilID);

package/build/features/{connectExpress/screens/NID → connect/screens/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/connect/screens/{NID → DOB}/DOB.js

@@ -15,9 +15,9 @@ import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
 import { alpha, styled } from '@mui/material/styles';
+import { clearError, connectSelector } from '../../../app/connect/connectStore';
 import Text from '../../../../components/Text';
 import Calender from '../../../shared/Calender';
-import { clearError, connectSelector } from '../../../app/connect/connectStore';
 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) }));
@@ -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);
+                        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/connect/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/connect/screens/DOB/DOBForm.js

@@ -0,0 +1,59 @@
+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, connectSelector, updateLeadDOB } from '../../../app/connect/connectStore';
+import Form from '../../../../components/Form';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+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(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var methods = useForm({
+        resolver: yupResolver(DOBValidationSchema),
+        defaultValues: data.dobData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var onSubmit = function (data) {
+        dispatch(updateLeadDOB(deepCopy(data)));
+    };
+    var handleCollapseOpenClose = function (flag) {
+        setCollapse(flag);
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    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/connect/screens/DOB/index.d.ts

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

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

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

package/build/features/connect/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/connect/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/connect/screens/Individual/Individual.js

@@ -37,7 +37,6 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
-import { countriesCode } from '../../../../constants';
 import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
@@ -55,7 +54,7 @@ var Individual = function (_a) {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData;
+    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData, dobData = data.dobData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     var isMobile = mobileData.mobile;
     var contact = (otpData.responseBody || {}).contact;
@@ -83,9 +82,16 @@ var Individual = function (_a) {
     };
     var onBack = function () {
         var _a;
-        dispatch(resetIndividualScreen());
+        if (!individualData.isPrevDob) {
+            dispatch(resetIndividualScreen());
+        }
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
+        var screen = 'CONNECT_MOBILE_STEP';
+        if (startWithNID) {
+            screen = individualData.isPrevDob ? 'CONNECT_DOB_STEP' : 'CONNECT_NID_STEP';
+            if (isKW(code))
+                screen = 'CONNECT_CIVIL_ID_STEP';
+        }
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
@@ -101,8 +107,8 @@ var Individual = function (_a) {
     }, [responseBody]);
     var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
     var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
-    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
+    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: settingsData.countries }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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';
@@ -95,9 +95,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 _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 () {
@@ -141,12 +142,12 @@ 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, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl || readOnly, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: readOnly ? undefined : function () { 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) {
+    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, { inputProps: { maxLength: requiredMaxLen }, type: 'tel', readOnly: !!anchorEl || readOnly, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: readOnly ? undefined : function () { 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, { 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/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'),
@@ -13,7 +14,8 @@ export var IndividualMobileValidation = 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);
@@ -25,10 +27,16 @@ export var IndividualMobileValidation = 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/connect/screens/Merchant/BrandList.js

@@ -60,9 +60,9 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var getBrandName = function (_a) {
-        var name = _a.name;
-        return (isAr ? name === null || name === void 0 ? void 0 : name.ar : name === null || name === void 0 ? void 0 : name.en) || '';
+    var getBrandName = function (brand) {
+        var _a, _b;
+        return (isAr ? (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.en) || '';
     };
     var getBrandId = function (item) {
         return item.id || '';

package/build/features/connect/screens/Merchant/BrandName.js

@@ -63,6 +63,8 @@ import { checkBrandNameAvailability, connectSelector } from '../../../app/connec
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import { removeAllOtherThanCharsNumbersAndSpace, removeLeadingSpace } from '../../../../utils';
+import { BRAND_NAME_MAX_LENGTH } from '../../../../constants';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -119,7 +121,8 @@ var BrandName = function (_a) {
     }); }, 500);
     var handleBrandNameChange = function (_a) {
         var target = _a.target;
-        brandControl.field.onChange(target.value);
+        var value = removeLeadingSpace(removeAllOtherThanCharsNumbersAndSpace(target.value));
+        brandControl.field.onChange(value);
     };
     React.useEffect(function () {
         var brandList = (data.brandData.responseBody || {}).brand_list;
@@ -135,6 +138,6 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName }) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), inputProps: { maxLength: BRAND_NAME_MAX_LENGTH }, warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName }) })] })) })));
 };
 export default React.memo(BrandName);

package/build/features/connect/screens/Merchant/Merchant.js

@@ -84,7 +84,7 @@ var Merchant = function (_a) {
         if (termAndConditionChecked === true)
             methods.setValue('termAndConditionChecked', termAndConditionChecked);
     }, [termAndConditionChecked]);
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName;
     var disabled = brandErrChecks || brandNameChecking || ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.response_code) === '5';
     var hasBrandList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
     var isOtherBrand = (brandListItem === null || brandListItem === void 0 ? void 0 : brandListItem.id) === 'other' && hasBrandList;

package/build/features/connect/screens/Merchant/SalesChannels.js

@@ -15,7 +15,7 @@ var SalesChannels = function (_a) {
     var channelList = (responseBody || {}).channel_list;
     var selectedBrandControl = getValues('selectedBrandItem');
     React.useEffect(function () {
-        if (selectedBrandItem.id) {
+        if (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) {
             setValue('selectedBrandItem', selectedBrandItem);
             var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
             field.onChange(sales);

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

@@ -7,7 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { REGEX_WEBSITE, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
+import { REGEX_WEBSITE, DIGITS_ONLY, REGEX_ALPHANUMERIC, BRAND_NAME_MAX_LENGTH } from '../../../../constants';
 import * as yup from 'yup';
 var validationSalesChannels = function (channels) {
     if (channels === void 0) { channels = []; }
@@ -79,7 +79,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
                 test: function (value) {
                     if ((value === null || value === void 0 ? void 0 : value.length) === 0)
                         return true;
-                    if (value && value.length >= 3)
+                    if (value && value.length >= 3 && value.length <= BRAND_NAME_MAX_LENGTH)
                         return true;
                     return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
                 }

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

@@ -18,14 +18,14 @@ 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, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
-import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
+import { deepCopy, isKW, isOtherThanKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import Text from '../../../../components/Text';
 import MIDTitle from './Title';
 import MobileNumber from './MobileNumber';
@@ -92,6 +92,7 @@ var Mobile = function (_a) {
     useSetFromDefaultValues(methods, data.mobileData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var country = (_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2;
     var handleMenuListClick = function (flag) {
         setListType(flag);
     };
@@ -107,24 +108,30 @@ var Mobile = function (_a) {
         dispatch(resetNIDScreen());
         dispatch(resetCivilScreen());
     };
-    var isKWCountry = React.useMemo(function () { var _a; return isKW((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2]);
+    var isKWCountry = React.useMemo(function () { return isKW(country); }, [country]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(country); }, [country]);
     var onBack = function () {
+        var eventAction = isKWCountry ? 'PACI Click' : 'Abser Click';
         sendCustomEventToGTM({
             event: 'Send Event',
             event_category: 'User Registration Flow',
-            event_action: 'Switch to ID Login Clicked'
+            event_action: eventAction,
+            event_label: country
         });
         dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+    };
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
     var isBusinessListActive = listType === ListType.BusinessList;
     var isCountryListActive = listType === ListType.CountryCodeList;
     var listActive = isBusinessListActive || isCountryListActive;
-    var disabled = !methods.formState.isValid || !!error;
+    var disabled = !methods.formState.isValid;
     var title = t('join_our_community');
     var subTitle = t('ide_terms_and_conditions_description');
-    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid && !isOtherThanKWOrSACountry }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(NafathButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('nafath_button_label') })))] }))] }))] })) }))] }));
 };
 export default React.memo(Mobile);