@tap-payments/auth-jsconnect 2.8.10-test → 2.8.11-test
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/features/auth/screens/OTP/OTP.js +20 -5
- package/build/features/connect/screens/OTP/OTP.js +1 -1
- package/build/features/connectExpress/screens/IdentityOTP/OTP.js +1 -1
- package/build/features/connectExpress/screens/OTP/OTP.js +1 -1
- package/build/features/signIn/screens/OTP/OTP.js +1 -1
- package/package.json +1 -1
|
@@ -24,7 +24,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
|
|
|
24
24
|
import { AuthForType } from '../../../../@types';
|
|
25
25
|
import { yupResolver } from '@hookform/resolvers/yup';
|
|
26
26
|
import Form from '../../../../components/Form';
|
|
27
|
-
import { maskPhone, maskID, deepCopy } from '../../../../utils';
|
|
27
|
+
import { maskPhone, maskID, deepCopy, maskEmail } from '../../../../utils';
|
|
28
28
|
import { OTPValidation } from './validation';
|
|
29
29
|
import OTPInput from './OTPInput';
|
|
30
30
|
var OTPTitleContainerStyled = styled(Box)(function (_a) {
|
|
@@ -59,6 +59,24 @@ var OTP = function () {
|
|
|
59
59
|
});
|
|
60
60
|
var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
|
|
61
61
|
var isEmailAuth = data.otpData.authFor === AuthForType.EMAIL;
|
|
62
|
+
var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
|
|
63
|
+
var idNumber = data.nidData.nid;
|
|
64
|
+
var email = data.emailData.email;
|
|
65
|
+
var getNumber = function () {
|
|
66
|
+
var _a, _b;
|
|
67
|
+
if (isNidAuth)
|
|
68
|
+
return maskID(idNumber);
|
|
69
|
+
if (isEmailAuth)
|
|
70
|
+
return ((_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.authData) === null || _b === void 0 ? void 0 : _b.email) || maskEmail(email);
|
|
71
|
+
maskPhone(phone);
|
|
72
|
+
};
|
|
73
|
+
var getTitle = function () {
|
|
74
|
+
if (isNidAuth)
|
|
75
|
+
return t('opt_nid_sent_title', { provider: 'ABSHER' });
|
|
76
|
+
if (isEmailAuth)
|
|
77
|
+
return t('otp_email_sent_title');
|
|
78
|
+
return t('ide_opt_sent_title');
|
|
79
|
+
};
|
|
62
80
|
React.useEffect(function () {
|
|
63
81
|
if (error)
|
|
64
82
|
dispatch(clearError());
|
|
@@ -82,9 +100,6 @@ var OTP = function () {
|
|
|
82
100
|
dispatch(handlePrevScreenStep(screen));
|
|
83
101
|
};
|
|
84
102
|
var disabled = !methods.formState.isValid;
|
|
85
|
-
|
|
86
|
-
var idNumber = data.nidData.nid;
|
|
87
|
-
var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
|
|
88
|
-
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') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|
|
103
|
+
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') : getTitle(), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: getNumber() }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|
|
89
104
|
};
|
|
90
105
|
export default React.memo(OTP);
|
|
@@ -84,7 +84,7 @@ var OTP = function () {
|
|
|
84
84
|
dispatch(handlePrevScreenStep(startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
|
|
85
85
|
};
|
|
86
86
|
var disabled = !methods.formState.isValid;
|
|
87
|
-
var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) +
|
|
87
|
+
var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
|
|
88
88
|
var idNumber = data.nidData.nid;
|
|
89
89
|
var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
|
|
90
90
|
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') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|
|
@@ -79,7 +79,7 @@ var OTP = function () {
|
|
|
79
79
|
dispatch(handlePrevScreenStep());
|
|
80
80
|
};
|
|
81
81
|
var disabled = !methods.formState.isValid;
|
|
82
|
-
var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) +
|
|
82
|
+
var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
|
|
83
83
|
var idNumber = data.nidData.nid;
|
|
84
84
|
var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
|
|
85
85
|
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') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|
|
@@ -80,7 +80,7 @@ var OTP = function () {
|
|
|
80
80
|
dispatch(handlePrevScreenStep(screen));
|
|
81
81
|
};
|
|
82
82
|
var disabled = !methods.formState.isValid;
|
|
83
|
-
var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) +
|
|
83
|
+
var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
|
|
84
84
|
var idNumber = data.nidData.nid;
|
|
85
85
|
var title = isNidAuth ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
|
|
86
86
|
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') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isNidAuth ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|
|
@@ -85,7 +85,7 @@ var OTP = function () {
|
|
|
85
85
|
dispatch(handlePrevScreenStep(isEmail ? 'SIGIN_EMAIL_STEP' : 'SIGIN_MOBILE_STEP'));
|
|
86
86
|
};
|
|
87
87
|
var disabled = !methods.formState.isValid || !!error;
|
|
88
|
-
var phone = ((_a = data.auth.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) +
|
|
88
|
+
var phone = data.auth.mobile ? ((_a = data.auth.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.auth.mobile : '';
|
|
89
89
|
var email = data.auth.email || '';
|
|
90
90
|
var title = t('ide_opt_sent_title');
|
|
91
91
|
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') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isEmail ? maskEmail(email) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
|