@tap-payments/auth-jsconnect 1.0.35 → 1.0.38

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/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);

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

@@ -19,7 +19,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, resetNIDScreen, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -73,11 +73,6 @@ var NID = function (_a) {
     React.useEffect(function () {
         handleClearError();
     }, [methods.formState.isValid]);
-    React.useEffect(function () {
-        return function () {
-            dispatch(resetNIDScreen());
-        };
-    }, []);
     var onSubmit = function (data) {
         dispatch(createNIDAuth(__assign(__assign({}, data), { isResend: false })));
     };

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

@@ -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), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInlineStart: theme.spacing(2.5), lineHeight: 1.75 }));
+    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -62,12 +62,10 @@ var OTP = function () {
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
-    }, [methods.formState.isValid]);
-    React.useEffect(function () {
         return function () {
             dispatch(resetOTPScreen());
         };
-    }, []);
+    }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
         dispatch(verifyAuth(formData));
     };

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

@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { clearError, connectSelector, createVerifyAuthPassword, resetPasswordScreen } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createVerifyAuthPassword } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -46,11 +46,6 @@ var Password = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    React.useEffect(function () {
-        return function () {
-            dispatch(resetPasswordScreen());
-        };
-    }, []);
     var onSubmit = function (formData) {
         dispatch(createVerifyAuthPassword(formData));
     };

package/build/features/shared/Button/Button.js

@@ -54,15 +54,23 @@ var ButtonBoxStyled = styled(Box)(function (_a) {
     return ({
         margin: theme.spacing(0, 2.5, 2.5, 2.5),
         marginBlockStart: theme.spacing(5),
-        display: 'flex'
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center'
     });
 });
-var ButtonStyled = styled(Button, { shouldForwardProp: function (prop) { return prop !== 'isBack'; } })(function (_a) {
-    var theme = _a.theme, isBack = _a.isBack;
-    return ({
-        paddingInlineStart: theme.spacing(2.5),
-        marginInlineStart: isBack ? theme.spacing(-5) : theme.spacing(0)
-    });
+var ButtonStyled = styled(Button, {
+    shouldForwardProp: function (prop) { return prop !== 'isBack' && prop !== 'isLoading'; }
+})(function (_a) {
+    var theme = _a.theme, isBack = _a.isBack, isLoading = _a.isLoading;
+    return (__assign({ paddingInlineStart: theme.spacing(2.5), marginInlineStart: isBack ? theme.spacing(-5) : theme.spacing(0), paddingLeft: isLoading ? 8 : 'auto', paddingRight: isLoading ? 8 : 'auto', transition: theme.transitions.create(['width', 'padding'], {
+            easing: theme.transitions.easing.easeInOut,
+            duration: theme.transitions.duration.complex * 2
+        }) }, (isLoading && {
+        minWidth: 0,
+        width: theme.spacing(6),
+        borderRadius: 30
+    })));
 });
 var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { return prop !== 'isAr'; } })(function (_a) {
     var theme = _a.theme, isAr = _a.isAr;
@@ -77,8 +85,5 @@ var BackButtonStyled = styled(Button, { shouldForwardProp: function (prop) { ret
 export default function CustomButton(_a) {
     var children = _a.children, disabled = _a.disabled, isAr = _a.isAr, loading = _a.loading, disableBack = _a.disableBack, onBackClicked = _a.onBackClicked, error = _a.error, props = __rest(_a, ["children", "disabled", "isAr", "loading", "disableBack", "onBackClicked", "error"]);
     var isBackEnabled = !disableBack && !loading;
-    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled || loading, type: 'submit', isBack: isBackEnabled, endIcon: _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }), startIcon: _jsx(Loader, { style: {
-                                visibility: disableBack && !loading ? 'hidden' : loading ? 'visible' : 'hidden',
-                                display: !disableBack && !loading ? 'none' : 'block'
-                            }, innerColor: 'white', outerColor: 'white', size: 30, toggleAnimation: !!loading }) }, props, { children: _jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '20px' } }, { children: [" ", children] })) }))] })] }));
+    return (_jsxs(Fragment, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(Warning, __assign({ sx: { mb: 1 }, warningType: 'error' }, { children: error })) })), _jsxs(ButtonBoxStyled, { children: [isBackEnabled && (_jsx(BackButtonStyled, __assign({ onClick: function () { return onBackClicked === null || onBackClicked === void 0 ? void 0 : onBackClicked(); }, isAr: isAr, type: 'reset', startIcon: _jsx(BackIconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props))), _jsx(ButtonStyled, __assign({ disabled: disabled, isLoading: loading, type: !loading ? 'submit' : 'button', isBack: isBackEnabled, endIcon: !loading && _jsx(IconStyled, { isAr: isAr, src: ICONS_NAMES.WHITE_ARROW }) }, props, { children: !loading ? (_jsxs(Text, __assign({ sx: { marginInlineEnd: isBackEnabled ? '-24px' : '-15px' } }, { children: [" ", children] }))) : (_jsx(Loader, { innerColor: 'white', outerColor: 'white', size: 25, toggleAnimation: !!loading })) }))] })] }));
 }

package/build/features/shared/SuccessScreen/SuccessScreen.js

@@ -51,12 +51,17 @@ var ContainerStyled = styled(Container)(function (_a) {
     });
 });
 var IconStyled = styled(Icon)(function (_a) {
+    var _b;
     var theme = _a.theme;
-    return ({
-        width: theme.spacing(10),
-        height: theme.spacing(10),
-        marginBlockEnd: theme.spacing(7.5)
-    });
+    return (_b = {
+            width: theme.spacing(10),
+            height: theme.spacing(10),
+            marginBlockEnd: theme.spacing(7.5)
+        },
+        _b[theme.breakpoints.down('sm')] = {
+            marginBlock: theme.spacing(7.5)
+        },
+        _b);
 });
 var ThankYou = function (_a) {
     var onSuccess = _a.onSuccess, title = _a.title;

package/build/hooks/index.d.ts

@@ -8,3 +8,4 @@ export * from './useLanguage';
 export * from './useContainerDimensions';
 export * from './useAppConfig';
 export * from './useErrorListener';
+export * from './useWindowSize';

package/build/hooks/index.js

@@ -8,3 +8,4 @@ export * from './useLanguage';
 export * from './useContainerDimensions';
 export * from './useAppConfig';
 export * from './useErrorListener';
+export * from './useWindowSize';

package/build/hooks/useWindowSize.d.ts

@@ -0,0 +1,6 @@
+interface WindowSize {
+    width: number;
+    height: number;
+}
+export declare const useWindowSize: () => WindowSize;
+export {};

package/build/hooks/useWindowSize.js

@@ -0,0 +1,19 @@
+import { useEffect, useState } from 'react';
+export var useWindowSize = function () {
+    var _a = useState({
+        width: 0,
+        height: 0
+    }), windowSize = _a[0], setWindowSize = _a[1];
+    var handleSize = function () {
+        setWindowSize({
+            width: window.innerWidth,
+            height: window.innerHeight
+        });
+    };
+    useEffect(function () {
+        window.addEventListener('resize', handleSize);
+        handleSize();
+        return function () { return window.removeEventListener('resize', handleSize); };
+    }, []);
+    return windowSize;
+};