@tap-payments/auth-jsconnect 1.0.33 → 1.0.36

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

@@ -15,13 +15,13 @@ import { useSelector } from 'react-redux';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useLanguage } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
-import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { FormProvider, useForm } from 'react-hook-form';
 import Form from '../../../../components/Form';
 import Input from '../../../shared/Input';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { businessSelector } from '../../../app/business/businessStore';
+import { businessSelector, createAccount } from '../../../app/business/businessStore';
 import { BusinessType as BusinessTypeEnum } from '../../../../@types';
 var InputStyled = styled(Input)(function (_a) {
     var theme = _a.theme;
@@ -41,7 +41,7 @@ var Confirm = function () {
     var _a = data.businessInfo, licenseNumber = _a.licenseNumber, brandName = _a.brandName, legalName = _a.legalName;
     var isCR = data.businessTypeData.businessType === BusinessTypeEnum.CR;
     var onSubmit = function () {
-        dispatch(handleNextScreenStep());
+        dispatch(createAccount());
     };
     var methods = useForm({
         defaultValues: data.businessInfo,

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

@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch } from '../../../../hooks';
-import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import { CustomerInfoValidation } from './validation';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
@@ -30,6 +30,7 @@ import RefundPolicy from './RefundPolicy';
 import TransactionPolicy from './TransactionPolicy';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
+import { updateCustomersInfo } from '../../../app/business/businessStore';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -56,7 +57,7 @@ var Customers = function (_a) {
     });
     var onSubmit = function (data) {
         console.log('data', data);
-        dispatch(handleNextScreenStep());
+        dispatch(updateCustomersInfo(__assign(__assign({}, data), { isResend: false })));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

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

@@ -55,6 +55,6 @@ var IDBOD = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(ID, {}) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, sx: { mt: 6 }, isAr: isAr, disabled: disabled, onClick: function () { return onBack(); }, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(ID, {}) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, isAr: isAr, disabled: disabled, onBackClicked: function () { return onBack(); }, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(IDBOD);

package/build/features/business/screens/IDBOD/validation.js

@@ -3,8 +3,7 @@ export var NIDValidationSchema = yup.object().shape({
     dob: yup.string().min(5).required('enter_valid_birth_date'),
     nid: yup
         .string()
-        .matches(/^(1)([0-9]{1,})$/g, 'signup_invalid_national_id_format')
-        .min(8, 'signup_invalid_national_id_format')
-        .max(10, 'signup_invalid_national_id_format')
+        .matches(/^(1|2)([0-9]{1,})$/g, 'signup_invalid_national_id_format')
+        .min(10, 'signup_invalid_national_id')
         .required('signup_invalid_national_id')
 });

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

@@ -1,9 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
+import { useAppDispatch } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { updateLeadSuccess } from '../../../app/business/businessStore';
 var Success = function (_a) {
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    React.useEffect(function () {
+        dispatch(updateLeadSuccess());
+    }, []);
     var onSuccess = function () {
         window.open('mailto:');
     };

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

@@ -20,6 +20,7 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
+import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -69,6 +70,6 @@ var VerifyNumber = function (_a) {
     };
     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(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') }))] })) })) }));
+    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/Individual.js

@@ -24,7 +24,7 @@ import { IndividualValidation, IndividualMobileValidation } from './validation';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { clearError, connectSelector, updateLeadIndividual } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
@@ -58,6 +58,11 @@ var Individual = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetIndividualScreen());
+        };
+    }, []);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
         if (!!name)

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

@@ -20,7 +20,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetMerchantScreen, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
@@ -47,6 +47,11 @@ var Merchant = function (_a) {
         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')

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, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
+import { clearError, resetMobileScreen, connectSelector, createMobileAuth } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
@@ -101,6 +101,11 @@ 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/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, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
+import { clearError, resetNIDScreen, connectSelector, createNIDAuth } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -73,6 +73,11 @@ 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

@@ -16,7 +16,7 @@ import { styled } from '@mui/material/styles';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
-import { clearError, connectSelector, verifyAuth } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resetOTPScreen, verifyAuth } from '../../../app/connect/connectStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch } from '../../../../hooks';
@@ -63,6 +63,11 @@ var OTP = function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetOTPScreen());
+        };
+    }, []);
     var onSubmit = function (formData) {
         dispatch(verifyAuth(formData));
     };

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

@@ -37,9 +37,6 @@ var OTPInput = function (_a) {
     var mobileData = data.mobileData;
     var nidData = data.nidData;
     var isAbsher = data.otpData.isAbsher;
-    React.useEffect(function () {
-        otpControl.field.onChange('');
-    }, []);
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };

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 } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, createVerifyAuthPassword, resetPasswordScreen } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -46,6 +46,11 @@ 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/utils/string.js

@@ -60,6 +60,7 @@ export var capitalizeTheFirstLetterOfEachWord = function (words) {
     return separateWord.join(' ');
 };
 export var getRequestHeaders = function (deviceInfo) {
+    console.log(deviceInfo);
     var app = deviceInfo.app, browser = deviceInfo.browser, connection = deviceInfo.connection, device = deviceInfo.device, source = deviceInfo.source;
     return {
         al: encryptString(app.language || ''),
@@ -78,7 +79,7 @@ export var getRequestHeaders = function (deviceInfo) {
         bn: encryptString(browser.name || ''),
         bb: encryptString(''),
         bv: encryptString(browser.version || ''),
-        bua: encryptString(browser.user_agent),
+        bua: encryptString((browser.user_agent || '').substring(0, 80)),
         bi: encryptString(browser.browser_id || ''),
         ci: encryptString(connection.ip || ''),
         cm: encryptString(connection.mac || ''),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "1.0.33",
+	"version": "1.0.36",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",