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

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

@@ -22,7 +22,9 @@ import Text from '../../../../components/Text';
 import Warning from '../../../../components/Warning';
 import { useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
-import { EXTERNAL_LINKS } from '../../../../constants';
+import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
+import { settingsSelector } from '../../../../app/settings';
+import { useAppSelector } from '../../../../hooks';
 var TACContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -69,12 +71,16 @@ var TAC = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
+    var settingsData = useAppSelector(settingsSelector).data;
     var tacControl = useController({ control: control, name: 'termAndConditionChecked' });
     var tacChecked = tacControl.field.value;
     var warningMessage = (_b = tacControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var countryCode = settingsData.businessCountry.iso2.toLowerCase();
     var handleTACCheckedChange = function (event, checked) {
         tacControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(TACContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? EXTERNAL_LINKS.TOS_AR : EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(TACContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr
+                                        ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR
+                                        : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
 };
 export default React.memo(TAC);

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

@@ -1,55 +1,32 @@
 import * as yup from 'yup';
-export declare enum ValidationOptions {
-    NEW_USER = "NEW_USER",
-    EXISTING_USER_WITH_EXIST_BRAND = "EXISTING_USER_WITH_EXIST_BRAND",
-    EXISTING_USER_WITH_OTHER_BRAND = "EXISTING_USER_WITH_OTHER_BRAND"
-}
-export declare const MerchantValidationSchema: (userType: ValidationOptions) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
-    links: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-    }>>>;
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>[] | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
-    links: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-    }>>>;
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>[] | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
-    links: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+    salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
+        id: 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, {
-        website: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
-        instagram: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-        twitter: yup.StringSchema<string | null | undefined, import("yup/lib/types").AnyObject, string | null | undefined>;
-    }>>>;
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+        id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    }>>[] | undefined>;
 }>>>;

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

@@ -1,131 +1,132 @@
-import { REGEX_WEBSITE, REGEX_BRAND_NAME } from '../../../../constants';
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { REGEX_WEBSITE, REGEX_BRAND_NAME, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_PHONE_APP_NAME } from '../../../../constants';
 import * as yup from 'yup';
-export var ValidationOptions;
-(function (ValidationOptions) {
-    ValidationOptions["NEW_USER"] = "NEW_USER";
-    ValidationOptions["EXISTING_USER_WITH_EXIST_BRAND"] = "EXISTING_USER_WITH_EXIST_BRAND";
-    ValidationOptions["EXISTING_USER_WITH_OTHER_BRAND"] = "EXISTING_USER_WITH_OTHER_BRAND";
-})(ValidationOptions || (ValidationOptions = {}));
-export var MerchantValidationSchema = function (userType) {
-    var askingForBrandInfo = userType === ValidationOptions.NEW_USER || userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
-    if (askingForBrandInfo) {
+var validationSalesChannels = function (channels) {
+    if (channels === void 0) { channels = []; }
+    var dic = {};
+    var typeDic = {};
+    channels.forEach(function (channel) {
+        var _a, _b, _c;
+        if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
+            var key_1 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+            if (key_1)
+                dic[key_1] = [];
+            channel.sub.forEach(function (sub) {
+                dic[key_1].push(sub.address || '');
+                typeDic[sub.code] = sub.address || '';
+            });
+        }
+        else {
+            var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+            if (key)
+                dic[key] = [channel.address || ''];
+            typeDic[key] = channel.address || '';
+        }
+    });
+    for (var key in dic) {
+        var values = dic[key];
+        var atLestOne = values.every(function (item) { return item === ''; });
+        if (atLestOne)
+            return "enter_at_least_one_".concat(key);
+    }
+    console.log('dic', dic);
+    console.log('typeDic', typeDic);
+    for (var key in typeDic) {
+        var value = typeDic[key];
+        if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
+            return 'invalid_url';
+        }
+        if (key === 'linkedin' && value && !value.match(LINKEDIN_URL)) {
+            return 'invalid_linkedin_profile_url';
+        }
+        if (key === 'facebook' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_facebook_username';
+        }
+        if (key === 'instagram' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_instagram_username';
+        }
+        if (key === 'twitter' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_twitter_username';
+        }
+        if (key === 'physical_store' && value && value.length < 3) {
+            return 'invalid_physical_store_location';
+        }
+        if (key === 'ios' && value && !value.match(REGEX_PHONE_APP_NAME)) {
+            return 'invalid_ios_app';
+        }
+        if (key === 'android' && value && !value.match(REGEX_PHONE_APP_NAME)) {
+            return 'invalid_android_app';
+        }
+        if (key === 'call_center' && value && !value.match(DIGITS_ONLY)) {
+            return 'invalid_call_center_number';
+        }
+    }
+    return true;
+};
+export var MerchantValidationSchema = function (isNewBrand) {
+    if (isNewBrand === void 0) { isNewBrand = true; }
+    if (isNewBrand)
         return yup.object().shape({
             brandName: yup
                 .string()
+                .test({
+                test: function (value) {
+                    if (length === 0)
+                        return true;
+                    if (length < 3 || !(value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)))
+                        return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+                    return true;
+                }
+            })
+                .required('enter_brand_name_english_chars_numbers_space'),
+            termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
+            salesChannels: yup
+                .array()
+                .min(1, 'choose_atleast_one_channel')
+                .of(yup.object().shape({
+                id: yup.string().required('choose_atleast_one_channel')
+            }))
                 .test({
                 test: function (value) {
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                     if (length === 0)
                         return true;
-                    return !(value === null || value === void 0 ? void 0 : value.match(REGEX_BRAND_NAME)) || (value === null || value === void 0 ? void 0 : value.length) < 3
-                        ? this.createError({ message: 'enter_brand_name_english_chars_numbers_space' })
-                        : true;
+                    var channels = __spreadArray([], (value || []), true);
+                    var result = validationSalesChannels(channels);
+                    if (result === true)
+                        return true;
+                    return this.createError({ message: result });
                 }
             })
-                .required(''),
-            termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond'),
-            links: yup.object().shape({
-                website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
-                    if (!instagram && !twitter) {
-                        return yup
-                            .string()
-                            .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                            .transform(function (value) { return (!!value ? value : null); })
-                            .nullable()
-                            .required('enter_at_least_one');
-                    }
-                    else {
-                        return yup
-                            .string()
-                            .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                            .transform(function (value) { return (!!value ? value : null); })
-                            .nullable()
-                            .optional();
-                    }
-                }),
-                instagram: yup
-                    .string()
-                    .nullable()
-                    .transform(function (value) { return (!!value ? value : null); })
-                    .when(['twitter', 'website'], function (twitter, website) {
-                    if (!website && !twitter) {
-                        return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-                    }
-                    else {
-                        return yup.string().optional();
-                    }
-                }),
-                twitter: yup
-                    .string()
-                    .nullable()
-                    .transform(function (value) { return (!!value ? value : null); })
-                    .min(2, 'enter_at_least_one')
-                    .when(['website', 'instagram'], function (website, instagram) {
-                    if (!website && !instagram) {
-                        return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-                    }
-                    else {
-                        return yup.string().optional();
-                    }
-                })
-            }, [
-                ['instagram', 'website'],
-                ['twitter', 'website'],
-                ['instagram', 'twitter']
-            ])
+                .required('choose_atleast_one_channel')
         });
-    }
     return yup.object().shape({
-        brandName: yup.string().optional(),
-        termAndConditionChecked: yup.boolean().optional(),
-        links: yup.object().shape({
-            website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
-                if (!instagram && !twitter) {
-                    return yup
-                        .string()
-                        .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                        .transform(function (value) { return (!!value ? value : null); })
-                        .nullable()
-                        .required('enter_at_least_one');
-                }
-                else {
-                    return yup
-                        .string()
-                        .matches(REGEX_WEBSITE, 'ide_not_valid_url')
-                        .transform(function (value) { return (!!value ? value : null); })
-                        .nullable()
-                        .optional();
-                }
-            }),
-            instagram: yup
-                .string()
-                .nullable()
-                .transform(function (value) { return (!!value ? value : null); })
-                .when(['twitter', 'website'], function (twitter, website) {
-                if (!website && !twitter) {
-                    return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-                }
-                else {
-                    return yup.string().optional();
-                }
-            }),
-            twitter: yup
-                .string()
-                .nullable()
-                .transform(function (value) { return (!!value ? value : null); })
-                .min(2, 'enter_at_least_one')
-                .when(['website', 'instagram'], function (website, instagram) {
-                if (!website && !instagram) {
-                    return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
-                }
-                else {
-                    return yup.string().optional();
-                }
-            })
-        }, [
-            ['instagram', 'website'],
-            ['twitter', 'website'],
-            ['instagram', 'twitter']
-        ])
+        salesChannels: yup
+            .array()
+            .min(1, 'choose_atleast_one_channel')
+            .of(yup.object().shape({
+            id: yup.string().required('choose_atleast_one_channel')
+        }))
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                var channels = __spreadArray([], (value || []), true);
+                var result = validationSalesChannels(channels);
+                if (result === true)
+                    return true;
+                return this.createError({ message: result });
+            }
+        })
+            .required('choose_atleast_one_channel')
     });
 };

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

@@ -18,17 +18,19 @@ 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 } from '../../../shared/Button';
+import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
+import { isKW } from '../../../../utils';
 import Text from '../../../../components/Text';
 import MIDTitle from './Title';
 import MobileNumber from './MobileNumber';
 import { PhoneValidationSchema } from './validation';
+import { ICONS_NAMES } from '../../../../constants';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -72,9 +74,10 @@ var ListType;
     ListType["CountryCodeList"] = "CountryCodeList";
 })(ListType || (ListType = {}));
 var Mobile = function (_a) {
+    var _b;
     var settingsStore = useAppSelector(settingsSelector);
-    var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
-    var _c = React.useState(), listType = _c[0], setListType = _c[1];
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = React.useState(), listType = _d[0], setListType = _d[1];
     var dispatch = useAppDispatch();
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
@@ -91,15 +94,21 @@ var Mobile = function (_a) {
             methods.setValue('countryCode', data.mobileData.countryCode);
         }
     }, [data.mobileData]);
+    React.useEffect(function () {
+        dispatch(resetOTPScreen());
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(createMobileAuth(formData));
+        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 onBack = function () {
-        dispatch(handlePrevScreenStep());
+        dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
     };
     var isBusinessListActive = listType === ListType.BusinessList;
     var isCountryListActive = listType === ListType.CountryCodeList;
@@ -107,6 +116,6 @@ var Mobile = function (_a) {
     var disabled = !methods.formState.isValid || !!error;
     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, {})] }), _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({ 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') })))] }))] }))] })) }))] }));
 };
 export default React.memo(Mobile);

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

@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createNIDAuth, resetMobileScreen } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -73,6 +73,7 @@ var NID = function (_a) {
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
         dispatch(createNIDAuth(data));
+        dispatch(resetMobileScreen(settingsStore.data.businessCountry));
     };
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);

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

@@ -21,6 +21,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
+import { AuthForType } from '../../../../@types';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
@@ -57,7 +58,7 @@ var OTP = function () {
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = data.otpData.isAbsher;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -69,12 +70,12 @@ var OTP = function () {
         dispatch(verifyAuth(formData));
     };
     var onBack = function () {
-        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
+        dispatch(handlePrevScreenStep(startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid || !!error;
     var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
     var idNumber = data.nidData.nid;
-    var title = isAbsher ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isAbsher ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

package/build/features/connect/screens/OTP/OTPInput.js

@@ -17,6 +17,7 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { AuthForType } from '../../../../@types';
 import { connectSelector, resendOTPMobile, resendOTPNID } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
@@ -33,7 +34,7 @@ var OTPInput = function (_a) {
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
     var data = useAppSelector(connectSelector).data;
-    var isAbsher = data.otpData.isAbsher;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
@@ -48,6 +49,6 @@ var OTPInput = function (_a) {
         dispatch(resendOTPNID());
     };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: isAbsher ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: startWithNID ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

package/build/features/connect/screens/VerifyPACI/VerifyPACI.d.ts

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