@tap-payments/auth-jsconnect 2.1.100-test → 2.2.0

package/build/features/individual/screens/IndividualPersonalInfo/Nationality.js

@@ -20,22 +20,20 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
-import CheckIcon from '@mui/icons-material/Check';
-import { useLanguage, useAppSelector } from '../../../../hooks';
-import { FieldType } from '../../../../@types';
+import { useLanguage } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
-import ExpandIcon from '../../../../components/ExpandIcon';
 import Text from '../../../../components/Text';
 import SimpleList from '../../../../components/SimpleList';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
-import { individualSelector } from '../../../app/individual/individualStore';
+import InputSelect from '../../../shared/InputSelect';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import CheckIcon from '../../../shared/CheckIcon';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -43,29 +41,19 @@ var CountryNameText = styled(Text, { shouldForwardProp: function (prop) { return
     var theme = _a.theme, isSelected = _a.isSelected;
     return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
 });
-var CheckIconStyled = styled(CheckIcon)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        color: theme.palette.success.main,
-        display: 'flex',
-        alignItems: 'flex-end'
-    });
-});
 var Nationality = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d, _e;
-    var countries = _a.countries, rest = __rest(_a, ["countries"]);
-    var _f = React.useState(countries), locationCountries = _f[0], setCountries = _f[1];
-    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var _b, _c, _d;
+    var countries = _a.countries, readOnly = _a.readOnly, isVerified = _a.isVerified, rest = __rest(_a, ["countries", "readOnly", "isVerified"]);
+    var _e = React.useState(countries), locationCountries = _e[0], setCountries = _e[1];
+    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
-    var data = useAppSelector(individualSelector).data;
-    var verify = data.verify;
-    var user = (verify.responseBody || {}).user;
     var nationalityControl = useController({ control: control, name: 'nationality' });
-    var disabled = ((_b = user === null || user === void 0 ? void 0 : user.data_status) === null || _b === void 0 ? void 0 : _b.nationality) === FieldType.NON_EDITABLE;
     var onOpenCountrySelect = function (event) {
         var _a;
+        if (readOnly)
+            return;
         setAnchorEl(event.currentTarget);
         (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
@@ -80,9 +68,9 @@ var Nationality = React.forwardRef(function (_a, ref) {
         nationalityControl.field.onChange(country);
     };
     var location = nationalityControl.field.value;
-    var error = (_c = nationalityControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('nationality_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_nationality'), value: (isAr ? (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.arabic : (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
+    var error = (_b = nationalityControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('nationality_label'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }), placeholder: t('choose_nationality'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIcon, { isVerified: isVerified })] }));
                         } }) }))] })) })));
 });
 export default React.memo(Nationality);

package/build/features/individual/screens/IndividualPhoneInfo/MobileNumber.d.ts

@@ -7,6 +7,7 @@ interface MobileNumberProps {
     onListOpen?: () => void;
     onListClose?: () => void;
     sx?: SxProps<Theme>;
+    readOnly?: boolean;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<MobileNumberProps & React.RefAttributes<unknown>>>;
 export default _default;

package/build/features/individual/screens/IndividualPhoneInfo/MobileNumber.js

@@ -80,7 +80,7 @@ var InputStyled = styled(Input)(function () { return ({
 }); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var countries = _a.countries, sx = _a.sx, rest = __rest(_a, ["countries", "sx"]);
+    var countries = _a.countries, sx = _a.sx, readOnly = _a.readOnly, rest = __rest(_a, ["countries", "sx", "readOnly"]);
     var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
     var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
     var t = useTranslation().t;
@@ -98,7 +98,6 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var isStartsWith5 = mobileValue.startsWith('5');
     var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
     var verify = data.verify;
-    var user = (verify.responseBody || {}).user;
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -136,7 +135,11 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, 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: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
+                            if (readOnly)
+                                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: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', '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/individual/screens/IndividualPhoneInfo/PhoneInfo.js

@@ -16,7 +16,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
-import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
+import { useAppDispatch, useExcludeReadOnlyFelids, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
@@ -47,14 +47,17 @@ var PhoneInfo = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var originalReadOnly = useFormReadOnly(methods);
+    var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
+    var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
     var onSubmit = function (formData) {
-        dispatch(updatePhoneInfo(formData));
+        dispatch(updatePhoneInfo(getFelids(formData)));
     };
     React.useEffect(function () {
         if (error && methods.formState.isValid)
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(MobileNumber, { show: true, sx: { mb: 7.5 }, countries: countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, 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(MobileNumber, { readOnly: readOnly['mobile'], show: true, sx: { mb: 7.5 }, countries: countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(PhoneInfo);

package/build/features/individual/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import { maskEmail } from '../../../../utils';
 import { individualSelector } from '../../../../features/app/individual/individualStore';
-import { useAppSelector } from '../../../../hooks';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(individualSelector).data;
-    var email = ((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact).email;
+    var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

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

@@ -11,14 +11,15 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { resendOTP } from '../../../app/individual/individualStore';
+import { isTokenExpired } from '../../../../utils';
+import { individualSelector, resendOTP } from '../../../app/individual/individualStore';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -33,6 +34,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var otpControl = useController({ name: 'otp', control: control });
     var dispatch = useAppDispatch();
+    var error = useAppSelector(individualSelector).error;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
@@ -42,6 +44,6 @@ var OTPInput = function (_a) {
         dispatch(resendOTP());
     };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, hasError: isTokenExpired(error), onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

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

@@ -17,7 +17,6 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
@@ -73,12 +72,9 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyLeadOTP(formData));
     };
-    var onBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     var dataLoading = loading || cityLoading;
     var showMobileNumber = !loading && !cityLoading && phone;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [dataLoading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), showMobileNumber && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, 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: [dataLoading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), showMobileNumber && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/build/features/password/Password.js

@@ -19,11 +19,10 @@ import { store } from '../../app/store';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
 import { FeatureContainer } from '../shared/Containers';
-import { getParameterByName, findOrCreateElementAndInject } from '../../utils';
+import { getParameterByName, findOrCreateElementAndInject, sendPageView } from '../../utils';
 import { PASSWORD_OPERATION_TYPE, PASSWORD_SCREENS_NAVIGATION } from '../../constants';
 import { passwordFeatureScreens } from '../featuresScreens';
 import { passwordSelector, verifyLeadToken, verifyOperationToken } from '../app/password/passwordStore';
-import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
 var Password = memo(function (props) {
     var theme = useAppTheme().theme;
@@ -33,7 +32,7 @@ var Password = memo(function (props) {
     useAppConfig(__assign({ navigation: PASSWORD_SCREENS_NAVIGATION }, props));
     useErrorListener(passwordError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant, isMaturityExpress = data.isMaturityExpress;
     var verifyToken = function () {
         var token = getParameterByName('token');
         var lang = getParameterByName('lang');
@@ -44,6 +43,9 @@ var Password = memo(function (props) {
             dispatch(handleLanguage(lang));
         if (!token)
             throw new Error('Auth token is not found!');
+        sendPageView({
+            title: 'Password'
+        });
         if (operationType === PASSWORD_OPERATION_TYPE.RESET_PASSWORD) {
             dispatch(verifyOperationToken({ token: token, boardId: boardId, boardInfoId: boardInfoId }));
             return;
@@ -54,11 +56,11 @@ var Password = memo(function (props) {
         if (!settingLoading && open)
             verifyToken();
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: passwordFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: isMaturityExpress }, { children: passwordFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                    }) }) })) })) })));
+                    }) })) })) })) })));
 });
 export function PasswordElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Password, __assign({}, props)) })));

package/build/features/password/screens/CreatePassword/CreatePassword.js

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -49,14 +38,18 @@ var CreatePassword = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var _b = useSelector(passwordSelector), data = _b.data, loading = _b.loading, error = _b.error;
-    var operationType = data.verify.operationType;
-    var _c = data.passwordData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
+    var _c = data.verify, operationType = _c.operationType, responseBody = _c.responseBody;
+    var _d = data.passwordData, password = _d.password, confirmPassword = _d.confirmPassword;
+    var flows = (responseBody || {}).flows;
     var methods = useForm({
         resolver: yupResolver(PasswordValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            password: password,
+            confirmPassword: confirmPassword
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.passwordData);
     var onSubmit = function (data) {
         if (operationType === PASSWORD_OPERATION_TYPE.RESET_PASSWORD) {
             dispatch(storePasswordScreen(data));
@@ -68,6 +61,6 @@ var CreatePassword = function (_a) {
     var onBack = function () {
         dispatch(handleCurrentActiveScreen('PASSWORD_SUCCESS_FOUR_FLOWS_BUTTONS_STEP'));
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(Password, {}) }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(Password, {}) }), _jsx(Button, __assign({ disableBack: !(flows === null || flows === void 0 ? void 0 : flows.length), onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(CreatePassword);

package/build/features/password/screens/ResetPasswordSuccess/ResetPasswordSuccess.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { useAppSelector } from '../../../../hooks';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { maskEmail } from '../../../../utils';
 import { passwordSelector } from '../../../app/password/passwordStore';
 var ResetPasswordSuccess = function (_a) {
     var _b, _c;
     var t = useTranslation().t;
+    var dispatch = useAppDispatch();
     var data = useAppSelector(passwordSelector).data;
-    var email = ((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact).email;
+    var email = (((_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.primary_contact) || {}).email;
     var maskedEmail = maskEmail(email);
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true }));
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
 };
 export default React.memo(ResetPasswordSuccess);

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

@@ -11,14 +11,15 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { useController, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { resendOTP } from '../../../app/password/passwordStore';
+import { isTokenExpired } from '../../../../utils';
+import { passwordSelector, resendOTP } from '../../../app/password/passwordStore';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -33,6 +34,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var otpControl = useController({ name: 'otp', control: control });
     var dispatch = useAppDispatch();
+    var error = useAppSelector(passwordSelector).error;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
@@ -42,6 +44,6 @@ var OTPInput = function (_a) {
         dispatch(resendOTP());
     };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { loading: loading, timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, hasError: isTokenExpired(error), onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
@@ -28,7 +17,6 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
-import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import { maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
@@ -61,16 +49,18 @@ var VerifyNumber = function (_a) {
     var _b, _c, _d;
     var dispatch = useAppDispatch();
     var _e = useAppSelector(passwordSelector), data = _e.data, loading = _e.loading, error = _e.error;
-    var _f = data.otpData, responseBody = _f.responseBody, defaultValues = __rest(_f, ["responseBody"]);
+    var otp = data.otpData.otp;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            otp: otp
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.otpData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _g = React.useState(false), resendLoading = _g[0], setResendLoading = _g[1];
+    var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
     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;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
@@ -82,10 +72,7 @@ var VerifyNumber = function (_a) {
     var onSubmit = function (formData) {
         dispatch(verifyPasswordLeadOTP(formData));
     };
-    var onBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
-    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, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled || resendLoading, 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, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled || resendLoading, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);