@tap-payments/auth-jsconnect 2.6.4-test → 2.6.5

package/build/features/individual/screens/IndividualPersonalInfo/IndividualPersonalInfo.js

@@ -17,8 +17,8 @@ import { useTranslation } from 'react-i18next';
 import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
-import { convertToEnglishDateFormat, deepCopy, getUserName } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified, useFormDirtyCheck } from '../../../../hooks';
+import { convertToEnglishDateFormat, deepCopy, findCountryByIddPrefix, findCountryByIso2, getUserName, isKWOrSA, isOtherThanKWOrSA, sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -50,19 +50,20 @@ var ListType;
     ListType["NationalityList"] = "NationalityList";
 })(ListType || (ListType = {}));
 var IndividualPersonalInfo = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _l = useAppSelector(individualSelector), data = _l.data, loading = _l.loading, error = _l.error, cityLoading = _l.cityLoading;
+    var _p = useAppSelector(individualSelector), data = _p.data, loading = _p.loading, error = _p.error, cityLoading = _p.cityLoading;
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
     var verify = data.verify, individualPersonalData = data.individualPersonalData;
-    var _m = verify.responseBody || {}, user = _m.user, flows = _m.flows;
+    var _q = verify.responseBody || {}, user = _q.user, flows = _q.flows;
     var name = individualPersonalData.name, email = individualPersonalData.email, mobile = individualPersonalData.mobile, countryCode = individualPersonalData.countryCode, gender = individualPersonalData.gender, nid = individualPersonalData.nid, issuedCountry = individualPersonalData.issuedCountry, expiryDate = individualPersonalData.expiryDate, dob = individualPersonalData.dob, placeOfBirthCountry = individualPersonalData.placeOfBirthCountry, placeOfBirthCity = individualPersonalData.placeOfBirthCity, nationality = individualPersonalData.nationality;
-    var _o = user || {}, data_status = _o.data_status, is_authorized = _o.is_authorized, data_verification = _o.data_verification, contact = _o.contact, genderRes = _o.gender, identification = _o.identification, birth = _o.birth, nationalityRes = _o.nationality;
+    var _r = user || {}, data_status = _r.data_status, is_authorized = _r.is_authorized, data_verification = _r.data_verification, contact = _r.contact, genderRes = _r.gender, identification = _r.identification, birth = _r.birth, nationalityRes = _r.nationality;
+    var isOtherCountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema),
+        resolver: yupResolver(IndividualInfoValidationSchema(isOtherCountry)),
         defaultValues: {
             name: name,
             email: email,
@@ -81,9 +82,51 @@ var IndividualPersonalInfo = function (_a) {
     });
     var watch = methods.watch;
     useSetFromDefaultValues(methods, data.individualPersonalData);
-    var _p = React.useState(), listActive = _p[0], setListActive = _p[1];
-    var _q = React.useState(false), dobActive = _q[0], setDobActive = _q[1];
-    var _r = React.useState(false), expiryDateActive = _r[0], setExpiryDateActive = _r[1];
+    var _s = React.useState(), listActive = _s[0], setListActive = _s[1];
+    var _t = React.useState(false), dobActive = _t[0], setDobActive = _t[1];
+    var _u = React.useState(false), expiryDateActive = _u[0], setExpiryDateActive = _u[1];
+    var expDateRes = (identification === null || identification === void 0 ? void 0 : identification.expiry) && convertToEnglishDateFormat(new Date(identification === null || identification === void 0 ? void 0 : identification.expiry));
+    var dobDateRes = (birth === null || birth === void 0 ? void 0 : birth.date) && convertToEnglishDateFormat(new Date(birth === null || birth === void 0 ? void 0 : birth.date));
+    var resCountryCode = React.useMemo(function () {
+        var _a;
+        if (!((_a = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _a === void 0 ? void 0 : _a.country_code))
+            return {};
+        return findCountryByIddPrefix(countries, contact.phone.country_code) || {};
+    }, [(_b = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _b === void 0 ? void 0 : _b.country_code]);
+    var resIssuedCountry = React.useMemo(function () {
+        if (!(identification === null || identification === void 0 ? void 0 : identification.issued_country_code))
+            return;
+        return findCountryByIso2(countries, identification.issued_country_code);
+    }, [identification === null || identification === void 0 ? void 0 : identification.issued_country_code]);
+    var resPlaceOfBirthCountry = React.useMemo(function () {
+        if (!(birth === null || birth === void 0 ? void 0 : birth.country))
+            return;
+        return findCountryByIso2(countries, birth.country);
+    }, [birth === null || birth === void 0 ? void 0 : birth.country]);
+    var resNationality = React.useMemo(function () {
+        if (!nationalityRes)
+            return;
+        return findCountryByIso2(countries, nationalityRes);
+    }, [nationalityRes]);
+    var isDirty = useFormDirtyCheck(methods, {
+        name: getUserName(user, false),
+        email: contact === null || contact === void 0 ? void 0 : contact.email,
+        mobile: (_c = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _c === void 0 ? void 0 : _c.number,
+        countryCode: resCountryCode,
+        gender: genderRes === null || genderRes === void 0 ? void 0 : genderRes.toLowerCase(),
+        nid: identification === null || identification === void 0 ? void 0 : identification.id,
+        issuedCountry: resIssuedCountry,
+        expiryDate: expDateRes,
+        dob: dobDateRes,
+        placeOfBirthCountry: resPlaceOfBirthCountry,
+        placeOfBirthCity: ((_d = birth === null || birth === void 0 ? void 0 : birth.city) === null || _d === void 0 ? void 0 : _d.cityId) && { id: birth.city.cityId },
+        nationality: resNationality
+    }, [
+        {
+            name: 'placeOfBirthCity',
+            keys: ['id']
+        }
+    ]).isDirty;
     var originalReadOnly = useFormReadOnly(methods);
     var noneEditable = useDataNoneEditable(data_status, [
         'name.en',
@@ -119,36 +162,50 @@ var IndividualPersonalInfo = function (_a) {
         'nationality',
         'gender'
     ]);
-    var expDateRes = (identification === null || identification === void 0 ? void 0 : identification.expiry) && convertToEnglishDateFormat(new Date(identification === null || identification === void 0 ? void 0 : identification.expiry));
-    var dobDateRes = (birth === null || birth === void 0 ? void 0 : birth.date) && convertToEnglishDateFormat(new Date(birth === null || birth === void 0 ? void 0 : birth.date));
     var isNameVerified = dataVerified['name.en'] && dataVerified['name.ar'] && getUserName(user, isAr) === watch('name');
     var isPhoneNumberVerified = dataVerified['contact.phone.number'] &&
         dataVerified['contact.phone.country_code'] &&
-        ((_b = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _b === void 0 ? void 0 : _b.number) === watch('mobile') &&
-        ((_c = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _c === void 0 ? void 0 : _c.country_code) === ((_e = (_d = watch('countryCode')) === null || _d === void 0 ? void 0 : _d.idd_prefix) === null || _e === void 0 ? void 0 : _e.toString());
+        ((_e = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _e === void 0 ? void 0 : _e.number) === watch('mobile') &&
+        ((_f = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _f === void 0 ? void 0 : _f.country_code) === ((_h = (_g = watch('countryCode')) === null || _g === void 0 ? void 0 : _g.idd_prefix) === null || _h === void 0 ? void 0 : _h.toString());
     var isEmailVerified = dataVerified['contact.email'] && (contact === null || contact === void 0 ? void 0 : contact.email) === watch('email');
     var isGenderVerified = dataVerified['gender'] && genderRes === watch('gender');
     var isIDVerified = dataVerified['identification.id'] && (identification === null || identification === void 0 ? void 0 : identification.id) === watch('nid');
-    var isIssuedCountryVerified = dataVerified['identification.issuer_country'] && (identification === null || identification === void 0 ? void 0 : identification.issued_country_code) === ((_f = watch('issuedCountry')) === null || _f === void 0 ? void 0 : _f.iso2);
+    var isIssuedCountryVerified = dataVerified['identification.issuer_country'] && (identification === null || identification === void 0 ? void 0 : identification.issued_country_code) === ((_j = watch('issuedCountry')) === null || _j === void 0 ? void 0 : _j.iso2);
     var isExpiryDateVerified = dataVerified['identification.expiry'] && expDateRes === watch('expiryDate');
     var isDOBVerified = dataVerified['birth.date'] && dobDateRes === watch('dob');
-    var isBirthCountryVerified = dataVerified['birth.country'] && (birth === null || birth === void 0 ? void 0 : birth.country) === ((_g = watch('placeOfBirthCountry')) === null || _g === void 0 ? void 0 : _g.iso2);
-    var isBirthCityVerified = dataVerified['birth.city'] && ((_h = birth === null || birth === void 0 ? void 0 : birth.city) === null || _h === void 0 ? void 0 : _h.cityId) === ((_j = watch('placeOfBirthCity')) === null || _j === void 0 ? void 0 : _j.id);
-    var isNationalityVerified = dataVerified['nationality'] && nationalityRes === ((_k = watch('nationality')) === null || _k === void 0 ? void 0 : _k.iso2);
+    var isBirthCountryVerified = dataVerified['birth.country'] && (birth === null || birth === void 0 ? void 0 : birth.country) === ((_k = watch('placeOfBirthCountry')) === null || _k === void 0 ? void 0 : _k.iso2);
+    var isBirthCityVerified = dataVerified['birth.city'] && ((_l = birth === null || birth === void 0 ? void 0 : birth.city) === null || _l === void 0 ? void 0 : _l.cityId) === ((_m = watch('placeOfBirthCity')) === null || _m === void 0 ? void 0 : _m.id);
+    var isNationalityVerified = dataVerified['nationality'] && nationalityRes === ((_o = watch('nationality')) === null || _o === void 0 ? void 0 : _o.iso2);
+    var isKWOrSaCountry = React.useMemo(function () { return isKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var onSubmit = function (data) {
-        dispatch(updateIndividualPersonalInfo(deepCopy(getFelids(data))));
+        var formData = __assign(__assign({}, deepCopy(getFelids(data))), { isDirty: isDirty });
+        dispatch(updateIndividualPersonalInfo(formData));
     };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Individual',
+            event_action: 'Update Personal Data Page',
+            event_label: settingsData.businessCountry.iso2
+        });
+    }, []);
     var onBack = function () {
         if (error)
             dispatch(clearError());
-        if (is_authorized) {
+        if (is_authorized || !isKWOrSaCountry) {
             dispatch(handleCurrentActiveScreen('INDIVIDUAL_LIST_STEP'));
             return;
         }
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'Board Flows - Individual',
+            event_action: 'Individual Details Back Button',
+            event_label: settingsData.businessCountry.iso2
+        });
         if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0) {
             dispatch(handlePrevScreenStep('INDIVIDUAL_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
             return;
@@ -172,11 +229,12 @@ var IndividualPersonalInfo = function (_a) {
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;
     var isBirthCityListActive = listActive === ListType.BirthCityList;
     var isNationalityListActive = listActive === ListType.NationalityList;
+    var disableBack = settingsData.appConfig.mode === 'content' && !(is_authorized || !isKWOrSaCountry);
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField, readOnly: readOnly['name'] || (noneEditable['name.en'] && noneEditable['name.ar']), isVerified: isNameVerified }), _jsx(MobileNumber, { readOnly: readOnly['mobile'] || noneEditable['contact.phone.number'] || noneEditable['contact.phone.country_code'], show: !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive && !isIssuedCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.MobileCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isPhoneNumberVerified }), _jsx(Email, { show: showField, readOnly: readOnly['email'] || noneEditable['contact.email'], isVerified: isEmailVerified }), _jsx(Gender, { show: showField, readOnly: readOnly['gender'] || noneEditable['gender'], isVerified: isGenderVerified }), _jsx(ID, { show: showField, readOnly: readOnly['nid'] || noneEditable['identification.id'], isVerified: isIDVerified }), _jsx(IssuedCountry, { readOnly: readOnly['issuedCountry'] || noneEditable['identification.issuer_country'], show: !isMobileCountryListActive && !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isIssuedCountryVerified }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive, readOnly: readOnly['expiryDate'] || noneEditable['identification.expiry'], isVerified: isExpiryDateVerified }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive, readOnly: readOnly['dob'] || noneEditable['birth.date'], isVerified: isDOBVerified }), _jsx(BirthCountry, { readOnly: readOnly['placeOfBirthCountry'] || noneEditable['birth.country'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCountryVerified }), _jsx(BirthCity, { readOnly: readOnly['placeOfBirthCity'] || noneEditable['birth.city'], show: !isMobileCountryListActive &&
                                     !isDateFieldActive &&
                                     !isIssuedCountryListActive &&
                                     !isBirthCountryListActive &&
-                                    !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCityVerified }), _jsx(Nationality, { readOnly: readOnly['nationality'] || noneEditable['nationality'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isNationalityVerified })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+                                    !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCityVerified }), _jsx(Nationality, { readOnly: readOnly['nationality'] || noneEditable['nationality'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isNationalityVerified })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 IndividualPersonalInfo.defaultProps = {};
 export default React.memo(IndividualPersonalInfo);

package/build/features/individual/screens/IndividualPersonalInfo/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,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 === null || countryCodeValue === void 0 ? void 0 : 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 });
@@ -135,7 +136,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    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: 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 })) : (_jsx(EndAdornment, { value: mobileValue, isVerified: isVerified, onClear: clearMobileNumber, error: error })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', '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, { readOnly: readOnly, inputProps: { maxLength: requiredMaxLen }, type: 'tel', disabled: !!anchorEl, 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 })) : (_jsx(EndAdornment, { value: mobileValue, isVerified: isVerified, onClear: clearMobileNumber, error: error })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', '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, { isVerified: isVerified })] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/Name.d.ts

@@ -4,5 +4,5 @@ export interface NameProps {
     readOnly?: boolean;
     isVerified?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: NameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: NameProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/individual/screens/IndividualPersonalInfo/validation.d.ts

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualInfoValidationSchema: (isOtherCountry: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     name: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     mobile: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     email: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;

package/build/features/individual/screens/IndividualPersonalInfo/validation.js

@@ -1,68 +1,80 @@
 import * as yup from 'yup';
 import { REGEX_FULL_NAME } from '../../../../constants';
-export var IndividualInfoValidationSchema = yup.object().shape({
-    name: yup
-        .string()
-        .test({
-        test: function (value) {
-            if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
-                var name_1 = value || '';
-                var isMatch = name_1.match(REGEX_FULL_NAME);
-                return isMatch ? true : this.createError({ message: 'please write your first and last name' });
-            }
-            return true;
-        }
-    })
-        .optional(),
-    mobile: yup
-        .string()
-        .test({
-        test: function (value) {
-            if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
-                var countryCode = this.parent.countryCode;
-                var isSA = countryCode.iso2 === 'SA';
-                var digits = countryCode.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 = isStartWith5 ? digits - 1 : digits;
-                    return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
+import { getMobileNumberLen } from '../../../../utils';
+export var IndividualInfoValidationSchema = function (isOtherCountry) {
+    return yup.object().shape({
+        name: yup
+            .string()
+            .test({
+            test: function (value) {
+                if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
+                    var name_1 = value || '';
+                    var isMatch = name_1.match(REGEX_FULL_NAME);
+                    return isMatch ? true : this.createError({ message: 'please write your first and last name' });
                 }
-                return valueLen === digits ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                return true;
             }
-            return true;
-        }
-    })
-        .optional(),
-    email: yup.string().email('email_not_valid').optional(),
-    gender: yup.string().optional(),
-    nid: yup
-        .string()
-        .test({
-        test: function (value) {
-            var id = value || '';
-            if (id.length > 0) {
-                if (id.length < 10)
-                    return this.createError({ message: 'signup_invalid_national_id' });
-                var isMatch = id.match(/^(1|2)([0-9]{1,})$/g);
-                return isMatch ? true : this.createError({ message: 'signup_invalid_national_id_format' });
+        })
+            .optional(),
+        mobile: yup
+            .string()
+            .test({
+            test: function (value) {
+                if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
+                    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' });
+                }
+                return true;
             }
-            return true;
-        }
-    })
-        .optional(),
-    issuedCountry: yup.object().optional(),
-    expiryDate: yup.string().min(5).optional(),
-    dob: yup.string().min(5).optional(),
-    placeOfBirthCountry: yup.object().optional(),
-    placeOfBirthCity: yup.object().optional(),
-    nationality: yup.object().optional()
-});
+        })
+            .optional(),
+        email: yup.string().email('email_not_valid').optional(),
+        gender: yup.string().optional(),
+        nid: isOtherCountry
+            ? yup.string().min(3, 'signup_invalid_national_id').required('signup_invalid_national_id')
+            : yup
+                .string()
+                .test({
+                test: function (value) {
+                    var id = value || '';
+                    if (id.length > 0) {
+                        if (id.length < 10)
+                            return this.createError({ message: 'signup_invalid_national_id' });
+                        var isMatch = id.match(/^(1|2)([0-9]{1,})$/g);
+                        return isMatch ? true : this.createError({ message: 'signup_invalid_national_id_format' });
+                    }
+                    return true;
+                }
+            })
+                .optional(),
+        issuedCountry: yup.object().optional(),
+        expiryDate: yup.string().min(5).optional(),
+        dob: yup.string().min(5).optional(),
+        placeOfBirthCountry: yup.object().optional(),
+        placeOfBirthCity: yup.object().optional(),
+        nationality: yup.object().optional()
+    });
+};

package/build/features/individual/screens/IndividualPhoneInfo/MobileNumber.js

@@ -26,8 +26,8 @@ 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 { useLanguage, useAppSelector } from '../../../../hooks';
+import { getMobileNumberLen, removeAllCharsFromNumber } from '../../../../utils';
+import { useLanguage } from '../../../../hooks';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
@@ -36,7 +36,6 @@ import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { individualSelector } from '../../../app/individual/individualStore';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -86,18 +85,17 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
-    var data = useAppSelector(individualSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
-    var mobileValue = phoneControl.field.value;
+    var mobileValue = phoneControl.field.value || '';
     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 === null || countryCodeValue === void 0 ? void 0 : 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 verify = data.verify;
+    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 });
@@ -135,11 +133,11 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { 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: sx }, { 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' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', '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' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', '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/individual/screens/IndividualPhoneInfo/PhoneInfo.d.ts

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

package/build/features/individual/screens/IndividualPhoneInfo/PhoneInfo.js

@@ -58,7 +58,7 @@ var PhoneInfo = function (_a) {
         if (error && methods.formState.isValid)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid || !!error;
+    var disabled = !methods.formState.isValid;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, sx: { mb: 7.5 }, countries: countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(PhoneInfo);

package/build/features/individual/screens/IndividualPhoneInfo/validation.js

@@ -1,3 +1,4 @@
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var IndividualPhoneInfoValidationSchema = yup.object().shape({
     mobile: yup
@@ -7,7 +8,8 @@ export var IndividualPhoneInfoValidationSchema = yup.object().shape({
             if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
                 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);
@@ -19,10 +21,16 @@ export var IndividualPhoneInfoValidationSchema = 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' });
             }
             return true;
         }

package/build/features/individual/screens/OperatorError/OperatorError.d.ts

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

package/build/features/individual/screens/OperatorError/OperatorError.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import GenericError from '../../../shared/GenericError';
+var OperatorError = function (_a) {
+    var t = useTranslation().t;
+    return _jsx(GenericError, { error: t('operator_is_invalid'), errorTitle: t('oops') });
+};
+export default React.memo(OperatorError);

package/build/features/individual/screens/OperatorError/index.d.ts

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

package/build/features/individual/screens/OperatorError/index.js

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

package/build/features/individual/screens/PrepareDataLoading/PrepareDataLoading.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-export declare const PrepareDataLoading: () => JSX.Element;
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export declare const PrepareDataLoading: () => import("react/jsx-runtime").JSX.Element;
+declare const _default: React.MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/individual/screens/ResetPasswordSuccess/ResetPasswordSuccess.d.ts

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

package/build/features/individual/screens/Success/Success.d.ts

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

package/build/features/individual/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -21,11 +21,10 @@ var SuccessWithFlowButtons = function () {
     var _a = useAppSelector(individualSelector), data = _a.data, loading = _a.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var redirectUrl = settingsData.appConfig.redirectUrl;
-    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals;
+    var _b = data.verify.responseBody || {}, flows = _b.flows, entity = _b.entity, brand = _b.brand, bank = _b.bank_account, merchant = _b.merchant, user = _b.user, business = _b.business, board_id = _b.board_id, board_info_id = _b.board_info_id, name = _b.name, individuals = _b.individuals, recipient = _b.recipient, board_status = _b.board_status;
     var onClose = function () {
         dispatch(onCloseCompleteIndividual());
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication && redirectUrl ? onClose : undefined }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: flows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: board_status }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/individual/screens/Verify/OTPInput.d.ts

@@ -3,5 +3,5 @@ export interface OTPProps {
     loading: boolean;
     setLoading: (flag: boolean) => void;
 }
-declare const _default: React.MemoExoticComponent<({ loading, setLoading }: OTPProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ loading, setLoading }: OTPProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/individual/screens/Verify/Verify.d.ts

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