@tap-payments/auth-jsconnect 1.0.45 → 1.0.48

package/build/features/business/screens/Customers/ExpectedSalesRange.js

@@ -78,7 +78,7 @@ var ExpectedSalesRange = function (_a) {
     };
     var expectedSalesRangeValue = expectedSalesRangeControl.field.value || expectedSalesRangeList;
     var expectedSalesRangeSelected = expectedSalesRangeValue;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_yearly') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.nameAR : expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.name, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedSalesRangeList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_yearly') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.titleAr : expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.title, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, placeholder: t('choose_expected_sales'), endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedSalesRangeList, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.id) }, { children: isAr ? item.titleAr : item.title })) }), item.id === (expectedSalesRangeSelected === null || expectedSalesRangeSelected === void 0 ? void 0 : expectedSalesRangeSelected.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] }) })));
 };

package/build/features/connect/screens/Individual/Email.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 export interface EmailProps {
     show: boolean;
+    fetchingEmail: (flag: boolean) => void;
+    emailChecking: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show }: EmailProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, fetchingEmail, emailChecking }: EmailProps) => JSX.Element>;
 export default _default;

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

@@ -9,9 +9,46 @@ var __assign = (this && this.__assign) || function () {
     };
     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 } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
+import axios from 'axios';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { useController, useFormContext } from 'react-hook-form';
@@ -30,30 +67,41 @@ var InputStyled = styled(Input)(function (_a) {
         }
     });
 });
+var cancelToken = null;
 var Email = function (_a) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, fetchingEmail = _a.fetchingEmail, emailChecking = _a.emailChecking;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var control = useFormContext().control;
     var emailControl = useController({ name: 'email', control: control });
     var emailValue = emailControl.field.value;
     var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var checkEmail = debounce(function (value) {
-        dispatch(checkEmailAvailability(value));
-    }, 500);
+    var checkEmail = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
+        var onSuccess;
+        return __generator(this, function (_a) {
+            if (cancelToken) {
+                cancelToken.cancel('Aborted');
+            }
+            cancelToken = axios.CancelToken.source();
+            onSuccess = function () { return fetchingEmail(false); };
+            dispatch(checkEmailAvailability({ email: value, cancelToken: cancelToken.token, onSuccess: onSuccess }));
+            return [2];
+        });
+    }); }, 500);
     var handleEmailChange = function (event) {
         emailControl.field.onChange(event.target.value);
     };
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;
         if (isValid) {
+            fetchingEmail(true);
             checkEmail(emailValue);
         }
     }, [emailValue, error]);
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && emailValue ? _jsx(CheckIcon, {}) : emailValue && _jsx(ClearIcon, { onClick: clearNumber }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: emailChecking ? t('checking...') : error && t(error), endAdornment: !error && emailValue ? _jsx(CheckIcon, {}) : emailValue && _jsx(ClearIcon, { onClick: clearNumber }) }) }) })));
 };
 export default React.memo(Email);

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

@@ -35,31 +35,32 @@ var FormStyled = styled(Form)(function () { return ({
 }); });
 var Individual = function (_a) {
     var _b, _c, _d;
-    var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
-    var _f = useSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error, searchActive = _f.searchActive;
-    var _g = React.useState(data.individualData.countryCode.digits), mobileLength = _g[0], setMobileLength = _g[1];
+    var _e = React.useState(false), isSA = _e[0], setIsSA = _e[1];
+    var _f = React.useState(false), listActive = _f[0], setListActive = _f[1];
+    var _g = React.useState(false), emailChecking = _g[0], setEmailChecking = _g[1];
+    var _h = useSelector(connectSelector), data = _h.data, loading = _h.loading, error = _h.error;
+    var _j = React.useState(data.individualData.countryCode.digits), mobileLength = _j[0], setMobileLength = _j[1];
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var isAbsher = (_b = data.otpData) === null || _b === void 0 ? void 0 : _b.isAbsher;
     var individualData = data.individualData;
     var methods = useForm({
-        resolver: yupResolver(isAbsher ? IndividualMobileValidation(mobileLength) : IndividualValidation()),
+        resolver: yupResolver(isAbsher ? IndividualMobileValidation(mobileLength, isSA) : IndividualValidation()),
         defaultValues: data.individualData,
         mode: 'onChange'
     });
+    var countryCodeSA = methods.getValues('countryCode').iso2 === 'SA';
     var onSubmit = function (formData) {
         dispatch(updateLeadIndividual(formData));
     };
     var onBack = function () {
+        dispatch(resetIndividualScreen());
         dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
-        return function () {
-            dispatch(resetIndividualScreen());
-        };
     }, [methods.formState.isValid]);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
@@ -80,8 +81,11 @@ var Individual = function (_a) {
         if (((_b = (_a = data.individualData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.is_available) === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
     }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
+    React.useEffect(function () {
+        setIsSA(countryCodeSA);
+    }, [countryCodeSA]);
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
-    var disabled = emailErrChecks || searchActive || !((_d = data.individualData.responseBody) === null || _d === void 0 ? void 0 : _d.is_available);
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { setMobileLength: setMobileLength, show: isAbsher, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive }), _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') })) }))] })) })) }));
+    var disabled = emailErrChecks || emailChecking || !((_d = data.individualData.responseBody) === null || _d === void 0 ? void 0 : _d.is_available);
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { setMobileLength: setMobileLength, show: isAbsher, 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') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -9,7 +9,7 @@ export declare const IndividualValidation: () => yup.ObjectSchema<import("yup/li
     name: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     email: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;
-export declare const IndividualMobileValidation: (length: number) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualMobileValidation: (length: number, isSA: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     name: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     email: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     mobile: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;

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

@@ -1,4 +1,4 @@
-import { REGEX_FULL_NAME } from '../../../../constants';
+import { REGEX_FULL_NAME, REGEX_SAUDI_NUMBER } from '../../../../constants';
 import * as yup from 'yup';
 export var IndividualValidation = function () {
     return yup.object().shape({
@@ -9,13 +9,17 @@ export var IndividualValidation = function () {
         email: yup.string().email('email_not_valid').required('email_not_valid')
     });
 };
-export var IndividualMobileValidation = function (length) {
+export var IndividualMobileValidation = function (length, isSA) {
     return 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'),
         email: yup.string().email('email_not_valid').required('email_not_valid'),
-        mobile: yup.string().length(length, 'enter_valid_mobile_number').required('mobile_number_error')
+        mobile: yup
+            .string()
+            .length(length, 'enter_valid_mobile_number')
+            .matches(isSA ? REGEX_SAUDI_NUMBER : /^[0-9]/g, 'start_with_number')
+            .required('mobile_number_error')
     });
 };

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

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { BrandInfo } from '../../../../@types';
+interface BrandListProps {
+    show: boolean;
+    list: Array<BrandInfo>;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+    showTerms?: () => void;
+    hideTerms?: () => void;
+}
+declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,118 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+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 { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useLanguage } from '../../../../hooks';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import CheckIcon from '../../../shared/CheckIcon';
+import SimpleList from '../../../../components/SimpleList';
+import Text from '../../../../components/Text';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import Collapse from '../../../../components/Collapse';
+import { OTHER_BRAND } from '../../../../constants';
+var InputStyled = styled(Input)(function () { return ({
+    '& .MuiInputBase-input': {
+        cursor: 'pointer'
+    }
+}); });
+var BrandContainer = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var BrandNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+});
+var BrandList = function (_a) {
+    var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
+    var _b = React.useState(list), brandList = _b[0], setBrandList = _b[1];
+    var _c = React.useState(), selectedBrand = _c[0], setSelectedBrand = _c[1];
+    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var setValue = useFormContext().setValue;
+    var onOpenBrandList = function (event) {
+        var _a;
+        setAnchorEl(event.currentTarget);
+        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var onCloseBrandList = function () {
+        var _a;
+        setAnchorEl(null);
+        (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    React.useEffect(function () {
+        var array = list;
+        if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
+            var hasOther = array === null || array === void 0 ? void 0 : array.find(function (item) { return isOtherLicense(item); });
+            var first = array[0];
+            if (first) {
+                setSelectedBrand(first);
+                setValue('brandName', getBrandName(first), { shouldValidate: true });
+                if (!hasOther)
+                    array = __spreadArray(__spreadArray([], array, true), [OTHER_BRAND], false);
+                setBrandList(array);
+            }
+        }
+    }, [show, list]);
+    var getBrandName = function (item) {
+        var _a, _b;
+        return (isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    };
+    var getBrandId = function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) || '';
+    };
+    var isOtherLicense = function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) === 'other';
+    };
+    var onSelectItem = function (brand) {
+        var _a, _b;
+        setSelectedBrand(brand);
+        onCloseBrandList();
+        if (isOtherLicense(brand)) {
+            setValue('brandName', '', { shouldValidate: true });
+            (_a = rest.showTerms) === null || _a === void 0 ? void 0 : _a.call(rest);
+            return;
+        }
+        setValue('brandName', getBrandName(brand), { shouldValidate: true });
+        (_b = rest.hideTerms) === null || _b === void 0 ? void 0 : _b.call(rest);
+    };
+    var hasList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseBrandList(); } : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: brandList, onSelectItem: onSelectItem, renderItem: function (item) {
+                                return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
+                            } }) }))] })) }) })));
+};
+export default React.memo(BrandList);

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

@@ -1,5 +1,8 @@
 import * as React from 'react';
 interface BrandNameProps {
+    show: boolean;
+    fetchingBrandName: (flag: boolean) => void;
+    brandNameChecking: boolean;
 }
-declare const _default: React.MemoExoticComponent<({}: BrandNameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName }: BrandNameProps) => JSX.Element>;
 export default _default;

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

@@ -9,12 +9,49 @@ var __assign = (this && this.__assign) || function () {
     };
     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 { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
+import axios from 'axios';
 import { styled, alpha } from '@mui/material/styles';
 import InfoIcon from '@mui/icons-material/Info';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
@@ -23,6 +60,7 @@ import Text from '../../../../components/Text';
 import Input from '../../../shared/Input';
 import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
+import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
 import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
@@ -58,8 +96,10 @@ var InfoIconStyled = styled(InfoIcon)(function (_a) {
         color: alpha(theme.palette.text.primary, 0.4)
     });
 });
+var cancelToken = null;
 var BrandName = function (_a) {
     var _b;
+    var show = _a.show, brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName;
     var dispatch = useAppDispatch();
     var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
     var t = useTranslation().t;
@@ -68,9 +108,18 @@ var BrandName = function (_a) {
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var data = useSelector(connectSelector).data;
-    var checkBrand = debounce(function (value) {
-        dispatch(checkBrandNameAvailability(value));
-    }, 500);
+    var checkBrand = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
+        var onSuccess;
+        return __generator(this, function (_a) {
+            if (cancelToken) {
+                cancelToken.cancel('Aborted');
+            }
+            cancelToken = axios.CancelToken.source();
+            onSuccess = function () { return fetchingBrandName(false); };
+            dispatch(checkBrandNameAvailability({ name: value, cancelToken: cancelToken.token, onSuccess: onSuccess }));
+            return [2];
+        });
+    }); }, 500);
     var handleBrandNameChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
@@ -80,12 +129,14 @@ var BrandName = function (_a) {
         var _a;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
         var brandName = brandNameValue + ((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2);
-        if (isValid)
+        if (isValid) {
+            fetchingBrandName(true);
             checkBrand(brandName);
+        }
     }, [brandNameValue, error]);
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 3 } }, { 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: !error && brandNameValue ? _jsx(CheckIcon, {}) : brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName }) })] })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 3 } }, { 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: brandNameChecking ? t('checking...') : error && t(error), endAdornment: !error && brandNameValue ? _jsx(CheckIcon, {}) : brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName }) })] })) })));
 };
 export default React.memo(BrandName);

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

@@ -14,6 +14,7 @@ import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
+import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
@@ -26,18 +27,23 @@ import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
 import SocialMedia from './SocialMedia';
 import TAC from './TAC';
+import BrandList from './BrandList';
 var Merchant = function (_a) {
-    var _b, _c, _d, _e;
-    var _f = useSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error, searchActive = _f.searchActive;
+    var _b, _c, _d, _e, _f, _g, _h;
+    var _j = React.useState(false), brandNameChecking = _j[0], setBrandNameChecking = _j[1];
+    var _k = useSelector(connectSelector), data = _k.data, loading = _k.loading, error = _k.error;
+    var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
+    var _l = React.useState(isNewUser), showTermsCheck = _l[0], setShowTermsCheck = _l[1];
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema),
+        resolver: yupResolver(MerchantValidationSchema(showTermsCheck)),
         defaultValues: data.brandData,
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
+    var isAbsher = data.otpData.isAbsher;
+    var _m = React.useState(false), listActive = _m[0], setListActive = _m[1];
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
@@ -46,7 +52,7 @@ var Merchant = function (_a) {
             dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
             return;
         }
-        dispatch(handlePrevScreenStep('CONNECT_PASSWORD_STEP'));
+        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     React.useEffect(function () {
         if (error)
@@ -58,7 +64,8 @@ var Merchant = function (_a) {
             methods.setError('brandName', { message: 'Profile Name already exists' });
     }, [(_c = data.brandData) === null || _c === void 0 ? void 0 : _c.responseBody]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
-    var disabled = brandErrChecks || searchActive || ((_e = (_d = data.brandData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.response_code) === '5';
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, {}), _jsx(SocialMedia, {}), _jsx(TAC, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') }))] })) })) }));
+    var disabled = brandErrChecks || brandNameChecking || ((_e = (_d = data.brandData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.response_code) === '5';
+    var showBrandList = ((_g = (((_f = data.brandData) === null || _f === void 0 ? void 0 : _f.brandList) || [])) === null || _g === void 0 ? void 0 : _g.length) > 0 && !isNewUser;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: showBrandList, list: ((_h = data.brandData) === null || _h === void 0 ? void 0 : _h.brandList) || [], onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); }, showTerms: function () { return setShowTermsCheck(true); }, hideTerms: function () { return setShowTermsCheck(false); } }), _jsx(BrandName, { show: !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SocialMedia, { show: !listActive, sx: !showTermsCheck ? { mb: 0 } : {} }), _jsx(TAC, { show: !listActive && showTermsCheck }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -1,5 +1,8 @@
 import * as React from 'react';
+import { Theme, SxProps } from '@mui/material/styles';
 interface SocialMediaProps {
+    show: boolean;
+    sx?: SxProps<Theme>;
 }
-declare const _default: React.MemoExoticComponent<({}: SocialMediaProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, sx }: SocialMediaProps) => JSX.Element>;
 export default _default;

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

@@ -57,6 +57,7 @@ var ClearIconStyled = styled(ClearIcon)(function (_a) {
 });
 var SocialMedia = function (_a) {
     var _b, _c, _d;
+    var show = _a.show, sx = _a.sx;
     var _e = React.useState(SocialMediaTypes.WEB), socialMediaType = _e[0], setSocialMediaType = _e[1];
     var t = useTranslation().t;
     var control = useFormContext().control;
@@ -78,8 +79,8 @@ var SocialMedia = function (_a) {
     var websiteError = (_b = errors === null || errors === void 0 ? void 0 : errors.website) === null || _b === void 0 ? void 0 : _b.message;
     var twitterError = (_c = errors === null || errors === void 0 ? void 0 : errors.twitter) === null || _c === void 0 ? void 0 : _c.message;
     var instagramError = (_d = errors === null || errors === void 0 ? void 0 : errors.instagram) === null || _d === void 0 ? void 0 : _d.message;
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 3, direction: 'ltr' } }, { children: [_jsx(SocialMediaGroupStyled, { defaultValue: socialMediaType, exclusive: true, onChange: function (e, value) {
-                    setSocialMediaType(value);
-                } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: __assign({ mb: 3, direction: 'ltr' }, sx) }, { children: [_jsx(SocialMediaGroupStyled, { defaultValue: socialMediaType, exclusive: true, onChange: function (e, value) {
+                        setSocialMediaType(value);
+                    } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));
 };
 export default React.memo(SocialMedia);

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

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

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

@@ -65,6 +65,7 @@ var CollapseStyled = styled(Collapse)(function () { return ({
 }); });
 var TAC = function (_a) {
     var _b;
+    var show = _a.show;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
@@ -74,6 +75,6 @@ var TAC = function (_a) {
     var handleTACCheckedChange = function (event, checked) {
         tacControl.field.onChange(checked);
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 5 } }, { 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 ? 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) })) }))] }) })));
 };
 export default React.memo(TAC);

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

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
-export declare const MerchantValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const MerchantValidationSchema: (termsIsRequired: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    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>;
@@ -17,7 +17,7 @@ export declare const MerchantValidationSchema: yup.ObjectSchema<import("yup/lib/
     }>>>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    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>;
@@ -33,7 +33,7 @@ export declare const MerchantValidationSchema: yup.ObjectSchema<import("yup/lib/
     }>>>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, true>;
+    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>;