@tap-payments/auth-jsconnect 1.0.36 → 1.0.40

package/build/features/business/screens/BusinessType/CompanyLicense.js

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     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';
@@ -54,9 +63,9 @@ var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var CompanyLicense = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var licenseList = React.useState(list)[0];
-    var _b = React.useState(), selectedLicense = _b[0], setSelectedLicense = _b[1];
-    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var _b = React.useState(list), licenseList = _b[0], setLicenseList = _b[1];
+    var _c = React.useState(), selectedLicense = _c[0], setSelectedLicense = _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;
@@ -71,12 +80,17 @@ var CompanyLicense = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     React.useEffect(function () {
-        var first = list[0];
-        if (first) {
-            setSelectedLicense(first);
-            setValue('crNumber', getLicenseNumber(first), { shouldValidate: true });
-            if (!list.find(function (item) { return isOtherLicense(item); }))
-                list.push(OTHER_CR_LICENSE);
+        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) {
+                setSelectedLicense(first);
+                setValue('crNumber', getLicenseNumber(first), { shouldValidate: true });
+                if (!hasOther)
+                    array = __spreadArray(__spreadArray([], array, true), [OTHER_CR_LICENSE], false);
+                setLicenseList(array);
+            }
         }
     }, [show, list]);
     var getLicenseNumber = function (item) {

package/build/features/business/screens/BusinessType/FreelanceLicense.js

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     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';
@@ -54,9 +63,9 @@ var LicenseNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var FreelanceLicense = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var licenseList = React.useState(list)[0];
-    var _b = React.useState(), selectedLicense = _b[0], setSelectedLicense = _b[1];
-    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var _b = React.useState(list), licenseList = _b[0], setLicenseList = _b[1];
+    var _c = React.useState(), selectedLicense = _c[0], setSelectedLicense = _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;
@@ -71,12 +80,17 @@ var FreelanceLicense = function (_a) {
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
     React.useEffect(function () {
-        var first = list[0];
-        if (!!first) {
-            setSelectedLicense(first);
-            setValue('flNumber', getLicenseNumber(first), { shouldValidate: true });
-            if (!list.find(function (item) { return isOtherLicense(item); }))
-                list.push(OTHER_FL_LICENSE);
+        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) {
+                setSelectedLicense(first);
+                setValue('flNumber', getLicenseNumber(first), { shouldValidate: true });
+                if (!hasOther)
+                    array = __spreadArray(__spreadArray([], array, true), [OTHER_FL_LICENSE], false);
+                setLicenseList(array);
+            }
         }
     }, [show, list]);
     var getLicenseNumber = function (item) {

package/build/features/business/screens/Confirm/Confirm.js

@@ -37,8 +37,8 @@ var Confirm = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var data = useSelector(businessSelector).data;
-    var _a = data.businessInfo, licenseNumber = _a.licenseNumber, brandName = _a.brandName, legalName = _a.legalName;
+    var _a = useSelector(businessSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var _b = data.businessInfo, licenseNumber = _b.licenseNumber, brandName = _b.brandName, legalName = _b.legalName;
     var isCR = data.businessTypeData.businessType === BusinessTypeEnum.CR;
     var onSubmit = function () {
         dispatch(createAccount());
@@ -50,6 +50,7 @@ var Confirm = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
+    var disabled = !methods.formState.isValid || !!error;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
 };
 export default React.memo(Confirm);

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

@@ -57,7 +57,7 @@ var Customers = function (_a) {
     });
     var onSubmit = function (data) {
         console.log('data', data);
-        dispatch(updateCustomersInfo(__assign(__assign({}, data), { isResend: false })));
+        dispatch(updateCustomersInfo(__assign({}, data)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

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

@@ -23,7 +23,7 @@ import { useLanguage } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
-import { businessSelector, clearError, verifyLeadOTP } from '../../../app/business/businessStore';
+import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { maskID } from '../../../../utils';
 import { OTPValidation } from './validation';
@@ -41,7 +41,7 @@ var OTPTitleContainerStyled = styled(Box)(function (_a) {
 });
 var OTPTitleStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightLight, color: theme.palette.text.primary, marginBlock: theme.spacing(1.75), marginInlineStart: theme.spacing(2.5), lineHeight: 1.75 }));
+    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightLight, color: theme.palette.text.primary, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -60,6 +60,9 @@ var OTP = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
+        return function () {
+            dispatch(resetOTPScreen());
+        };
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(verifyLeadOTP(formData));

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

@@ -25,8 +25,7 @@ var BoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         flexDirection: 'column',
-        fontFamily: theme.typography.fontFamily,
-        marginBottom: theme.spacing(5)
+        fontFamily: theme.typography.fontFamily
     });
 });
 var OTPInput = function (_a) {

package/build/features/business/screens/Verify/OTPInput.js

@@ -22,8 +22,7 @@ var BoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         flexDirection: 'column',
-        fontFamily: theme.typography.fontFamily,
-        marginBottom: theme.spacing(5)
+        fontFamily: theme.typography.fontFamily
     });
 });
 var OTPInput = function (_a) {

package/build/features/business/screens/Verify/Verify.js

@@ -24,7 +24,7 @@ import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
-import { businessSelector, clearError, verifyLeadOTP } from '../../../app/business/businessStore';
+import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
@@ -61,6 +61,9 @@ var VerifyNumber = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
+        return function () {
+            dispatch(resetOTPScreen());
+        };
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(verifyLeadOTP(formData));
@@ -68,8 +71,8 @@ var VerifyNumber = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var disabled = !methods.formState.isValid || !!error;
-    var phone = ((_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number) || '';
-    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') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone)) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
+    var disabled = !methods.formState.isValid || !!error || !phone;
+    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') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, type: 'submit', isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

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

@@ -21,6 +21,15 @@ import { checkEmailAvailability } from '../../../app/connect/connectStore';
 import { useAppDispatch } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
+import { styled } from '@mui/material/styles';
+var InputStyled = styled(Input)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        input: {
+            textTransform: 'lowercase'
+        }
+    });
+});
 var Email = function (_a) {
     var _b;
     var show = _a.show;
@@ -45,6 +54,6 @@ var Email = function (_a) {
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('signup_email_lable'), value: emailValue, 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, 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 }) }) }) })));
 };
 export default React.memo(Email);

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

@@ -34,14 +34,14 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b, _c, _d, _e;
-    var _f = React.useState(false), listActive = _f[0], setListActive = _f[1];
-    var _g = useSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error, searchActive = _g.searchActive;
-    var _h = React.useState(((_b = data.individualData.countryCode) === null || _b === void 0 ? void 0 : _b.digits) || 9), mobileLength = _h[0], setMobileLength = _h[1];
+    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 dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = (_c = data.otpData) === null || _c === void 0 ? void 0 : _c.isAbsher;
+    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()),
@@ -57,12 +57,10 @@ var Individual = function (_a) {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
-    }, [methods.formState.isValid]);
-    React.useEffect(function () {
         return function () {
             dispatch(resetIndividualScreen());
         };
-    }, []);
+    }, [methods.formState.isValid]);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
         if (!!name)
@@ -81,9 +79,9 @@ var Individual = function (_a) {
         var _a, _b;
         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' });
-    }, [(_d = data.individualData) === null || _d === void 0 ? void 0 : _d.responseBody]);
+    }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
-    var disabled = emailErrChecks || searchActive || !((_e = data.individualData.responseBody) === null || _e === void 0 ? void 0 : _e.is_available);
+    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') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -36,7 +36,6 @@ import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage } from '../../../../hooks';
-import { SAUDI_NUMBER_LENGTH } from '../../../../constants';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -87,23 +86,11 @@ 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 = (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
     var isSA = countryCodeValue.iso2 === 'SA';
-    var isStartingWithZero = mobileValue.startsWith('0');
-    var mobileLen = isSA
-        ? isStartingWithZero
-            ? countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits
-            : SAUDI_NUMBER_LENGTH
-        : countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
+    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
     React.useEffect(function () {
-        if (mobileValue) {
+        if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
-        }
     }, []);
-    React.useEffect(function () {
-        var _a;
-        if ((mobileValue === null || mobileValue === void 0 ? void 0 : mobileValue.length) === 1 && isSA) {
-            (_a = rest.setMobileLength) === null || _a === void 0 ? void 0 : _a.call(rest, mobileLen);
-        }
-    }, [mobileValue]);
     var onPhoneNumberChange = function (_a) {
         var target = _a.target;
         var value = removeAllCharsFromNumber(target.value);
@@ -129,7 +116,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         countryCodeControl.field.onChange(country);
         (_a = rest.setMobileLength) === null || _a === void 0 ? void 0 : _a.call(rest, country.digits);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mb: 3 }, ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: mobileLen }, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: mobileLen }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mb: 3 }, ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, type: 'tel', inputProps: { maxLength: mobileLen }, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: mobileLen }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 });

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

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 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';
@@ -24,7 +25,7 @@ import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
+import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { useAppDispatch } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -66,6 +67,7 @@ var BrandName = function (_a) {
     var brandControl = useController({ control: control, name: 'brandName' });
     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);
@@ -75,9 +77,11 @@ var BrandName = function (_a) {
         brandControl.field.onChange(value);
     };
     React.useEffect(function () {
+        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)
-            checkBrand(brandNameValue);
+            checkBrand(brandName);
     }, [brandNameValue, error]);
     var clearBrandName = function () {
         brandControl.field.onChange('');

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

@@ -20,15 +20,15 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { clearError, connectSelector, resetMerchantScreen, updateLeadBrand } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
 import SocialMedia from './SocialMedia';
 import TAC from './TAC';
 var Merchant = function (_a) {
-    var _b, _c, _d;
-    var _e = useSelector(connectSelector), data = _e.data, loading = _e.loading, error = _e.error, searchActive = _e.searchActive;
+    var _b, _c, _d, _e;
+    var _f = useSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error, searchActive = _f.searchActive;
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema),
         defaultValues: data.brandData,
@@ -37,28 +37,28 @@ var Merchant = function (_a) {
     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 onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
     var onBack = function () {
-        dispatch(handlePrevScreenStep());
+        if (isNewUser) {
+            dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
+            return;
+        }
+        dispatch(handlePrevScreenStep('CONNECT_PASSWORD_STEP'));
     };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    React.useEffect(function () {
-        return function () {
-            dispatch(resetMerchantScreen());
-        };
-    }, []);
     React.useEffect(function () {
         var _a, _b;
         if (((_b = (_a = data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.response_code) === '5')
             methods.setError('brandName', { message: 'Profile Name already exists' });
-    }, [(_b = data.brandData) === null || _b === void 0 ? void 0 : _b.responseBody]);
+    }, [(_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 || ((_d = (_c = data.brandData) === null || _c === void 0 ? void 0 : _c.responseBody) === null || _d === void 0 ? void 0 : _d.response_code) === '5';
+    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') }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -35,7 +35,8 @@ var InputStyled = styled(Input)(function (_a) {
         padding: theme.spacing(0, 2, 0, 0),
         paddingInlineEnd: theme.spacing(2),
         input: {
-            paddingInlineStart: theme.spacing(0)
+            paddingInlineStart: theme.spacing(0),
+            textTransform: 'lowercase'
         }
     });
 });

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

@@ -34,7 +34,7 @@ var TACContainerStyled = styled(Box)(function (_a) {
 });
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre', height: 'fit-content' }, theme.typography.body2));
+    return (__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.body2));
 });
 var LinkStyled = styled(Link)(function (_a) {
     var theme = _a.theme;

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

@@ -1,3 +1,4 @@
+import { REGEX_WEBSITE } from '../../../../constants';
 import * as yup from 'yup';
 export var MerchantValidationSchema = yup.object().shape({
     brandName: yup
@@ -11,7 +12,7 @@ export var MerchantValidationSchema = yup.object().shape({
             if (!instagram && !twitter) {
                 return yup
                     .string()
-                    .matches(/^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,63}(:[0-9]{1,5})?(\/.*)?$/, 'ide_not_valid_url')
+                    .matches(REGEX_WEBSITE, 'ide_not_valid_url')
                     .transform(function (value) { return (!!value ? value : null); })
                     .nullable()
                     .required('enter_at_least_one');
@@ -19,7 +20,7 @@ export var MerchantValidationSchema = yup.object().shape({
             else {
                 return yup
                     .string()
-                    .matches(/(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]/, 'ide_not_valid_url')
+                    .matches(REGEX_WEBSITE, 'ide_not_valid_url')
                     .transform(function (value) { return (!!value ? value : null); })
                     .nullable()
                     .optional();

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

@@ -35,6 +35,6 @@ var BusinessCountry = React.forwardRef(function (_a, ref) {
     var country = _a.country, show = _a.show;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ ref: ref, sx: { marginBottom: '25px' } }, { children: _jsx(Input, { sx: { cursor: 'auto' }, label: t('signup_select_country'), readOnly: true, startAdornment: _jsx(CountrySpanStyled, { children: _jsx(CountryIconStyled, { src: (country === null || country === void 0 ? void 0 : country.logo) || '' }) }), placeholder: t('ide_mobile_placeholder'), value: (isAr ? (_b = country === null || country === void 0 ? void 0 : country.name) === null || _b === void 0 ? void 0 : _b.arabic : (_c = country === null || country === void 0 ? void 0 : country.name) === null || _c === void 0 ? void 0 : _c.english) || '' }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ ref: ref, sx: { marginBottom: '25px' } }, { children: _jsx(Input, { sx: { cursor: 'auto' }, label: t('signup_select_country'), readOnly: true, disabled: true, startAdornment: _jsx(CountrySpanStyled, { children: _jsx(CountryIconStyled, { src: (country === null || country === void 0 ? void 0 : country.logo) || '' }) }), placeholder: t('ide_mobile_placeholder'), value: (isAr ? (_b = country === null || country === void 0 ? void 0 : country.name) === null || _b === void 0 ? void 0 : _b.arabic : (_c = country === null || country === void 0 ? void 0 : country.name) === null || _c === void 0 ? void 0 : _c.english) || '' }) })) })));
 });
 export default React.memo(BusinessCountry);

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

@@ -23,7 +23,7 @@ import Button, { AbsherButton } from '../../../shared/Button';
 import { useAppDispatch } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, resetMobileScreen, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
@@ -90,9 +90,6 @@ var Mobile = function (_a) {
         setListType(flag);
     };
     React.useEffect(function () {
-        if (data.mobileData.countryCode.digits) {
-            setMobileLength(data.mobileData.countryCode.digits);
-        }
         if (data.mobileData.countryCode) {
             methods.setValue('countryCode', data.mobileData.countryCode);
         }
@@ -101,11 +98,6 @@ var Mobile = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    React.useEffect(function () {
-        return function () {
-            dispatch(resetMobileScreen());
-        };
-    }, []);
     var onSubmit = function (formData) {
         dispatch(createMobileAuth(__assign(__assign({}, formData), { isResend: false })));
     };

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

@@ -36,7 +36,6 @@ import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage } from '../../../../hooks';
-import { SAUDI_NUMBER_LENGTH } from '../../../../constants';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -87,23 +86,11 @@ 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 = (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
     var isSA = countryCodeValue.iso2 === 'SA';
-    var isStartingWithZero = mobileValue.startsWith('0');
-    var mobileLen = isSA
-        ? isStartingWithZero
-            ? countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits
-            : SAUDI_NUMBER_LENGTH
-        : countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
+    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
     React.useEffect(function () {
-        if (mobileValue) {
+        if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
-        }
     }, []);
-    React.useEffect(function () {
-        var _a;
-        if (mobileValue.length === 1 && isSA) {
-            (_a = rest.setMobileLength) === null || _a === void 0 ? void 0 : _a.call(rest, mobileLen);
-        }
-    }, [mobileValue]);
     var onPhoneNumberChange = function (_a) {
         var target = _a.target;
         var value = removeAllCharsFromNumber(target.value);
@@ -129,7 +116,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         countryCodeControl.field.onChange(country);
         (_a = rest.setMobileLength) === null || _a === void 0 ? void 0 : _a.call(rest, country.digits);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: mobileLen }, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: mobileLen }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: mobileLen }, type: 'tel', onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: mobileLen }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 });

package/build/features/connect/screens/NID/IDNumber.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 interface IDNumberProps {
     show: boolean;
-    onSwitchToMobileNumber?: () => void;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<IDNumberProps & React.RefAttributes<unknown>>>;
 export default _default;

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

@@ -37,7 +37,7 @@ var InputLabelStyled = styled(Text)(function (_a) {
 });
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b;
-    var onSwitchToMobileNumber = _a.onSwitchToMobileNumber, show = _a.show;
+    var show = _a.show;
     var t = useTranslation().t;
     var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var nidControl = useController({ control: control, name: 'nid' });
@@ -55,6 +55,6 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     };
     var nidValue = nidControl.field.value;
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { dir: 'ltr', inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: !error && nidValue ? _jsx(CheckIcon, {}) : nidValue && _jsx(ClearIcon, { onClick: clearIdNumber }), placeholder: '0000000000', warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { dir: 'ltr', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: !error && nidValue ? _jsx(CheckIcon, {}) : nidValue && _jsx(ClearIcon, { onClick: clearIdNumber }), placeholder: '0000000000', warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
 });
 export default React.memo(IDNumber);