@tap-payments/auth-jsconnect 2.6.7-test → 2.6.7

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

@@ -26,6 +26,7 @@ import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled, alpha } from '@mui/material/styles';
+import { settingsSelector } from '../../../../app/settings';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ClearIcon from '../../../shared/ClearIcon';
@@ -35,7 +36,7 @@ import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
+import { getMobileNumberLen, isOtherThanKWOrSA, removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -80,14 +81,15 @@ var InputStyled = styled(Input)(function () { return ({
     }
 }); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e;
     var countries = _a.countries, rest = __rest(_a, ["countries"]);
-    var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
-    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
+    var _f = React.useState(countries || []), countriesCode = _f[0], setCountries = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
+    var _h = useFormContext(), control = _h.control, setValue = _h.setValue;
     var loading = useAppSelector(connectSelector).loading;
+    var settingsStore = useAppSelector(settingsSelector);
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
@@ -95,9 +97,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 = !!mobileValue ? (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';
-    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
-    var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    var mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
+    var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
+    var requiredMaxLen = getMobileNumberLen(mobileMaxLen, mobileValue);
+    var requiredMinLen = getMobileNumberLen(mobileMinLen, mobileValue);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { var _a; return isOtherThanKWOrSA((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_e = settingsStore.data.businessCountry) === null || _e === void 0 ? void 0 : _e.iso2]);
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -146,12 +150,12 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         var filteredCountries = countries.filter(function (country) {
             return country.idd_prefix.toString().toLowerCase().startsWith(value.replace('+', '').toLowerCase()) ||
                 country.capital.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.arabic.toLowerCase().startsWith(value.toLowerCase()) ||
-                country.name.english.toLowerCase().startsWith(value.toLowerCase());
+                country.name.arabic.toLowerCase().includes(value.toLowerCase()) ||
+                country.name.english.toLowerCase().includes(value.toLowerCase());
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, 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: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _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, sx: { minHeight: mobileValue ? '133px' : isOtherThanKWOrSACountry ? '117px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredMaxLen }, type: 'tel', readOnly: !!anchorEl, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, 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: !anchorEl ? error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _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/Mobile/validation.js

@@ -1,3 +1,4 @@
+import { getMobileNumberLen } from '../../../../utils';
 import * as yup from 'yup';
 export var PhoneValidationSchema = yup.object().shape({
     mobile: yup
@@ -6,7 +7,8 @@ export var PhoneValidationSchema = yup.object().shape({
         test: function (value) {
             var countryCode = this.parent.countryCode;
             var isSA = countryCode.iso2 === 'SA';
-            var digits = countryCode.digits;
+            var maxDigits = countryCode.max_digits;
+            var minDigits = countryCode.min_digits;
             var mobileValue = value || '';
             var valueLen = mobileValue.length;
             var isNumber = mobileValue.match(/^[0-9]/g);
@@ -18,10 +20,16 @@ export var PhoneValidationSchema = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? digits - 1 : digits;
+                var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
                 return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
             }
-            return valueLen === digits ? true : this.createError({ message: 'enter_valid_mobile_number' });
+            var requiredMaxLen = getMobileNumberLen(maxDigits, mobileValue);
+            var requiredMinLen = getMobileNumberLen(minDigits, mobileValue);
+            if (valueLen >= requiredMinLen && valueLen <= requiredMaxLen)
+                return true;
+            if (minDigits === maxDigits)
+                return this.createError({ message: 'enter_valid_mobile_number' });
+            return this.createError({ message: 'enter_valid_mobile_number_min_max_length' });
         }
     })
         .required('mobile_number_error')

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

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

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

@@ -36,7 +36,7 @@ var InputLabelStyled = styled(Text)(function (_a) {
 });
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, isValid = _a.isValid;
     var t = useTranslation().t;
     var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var nidControl = useController({ control: control, name: 'nid' });
@@ -54,6 +54,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', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber }), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: isValid ? 5 : 0 } }, { 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: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber }), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
 });
 export default React.memo(IDNumber);

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

@@ -17,8 +17,8 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createNIDAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { clearError, connectSelector, createNafathAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -28,7 +28,6 @@ import Box from '@mui/material/Box';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
 import IDNumber from './IDNumber';
-import DOB from './DOB';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -58,17 +57,15 @@ var OrBoxStyled = styled(Box)(function (_a) {
     });
 });
 var NID = function (_a) {
-    var _b = React.useState(false), collapse = _b[0], setCollapse = _b[1];
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
-    var _d = data.nidData, dob = _d.dob, nid = _d.nid;
+    var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var nid = data.nidData.nid;
     var settingsStore = useAppSelector(settingsSelector);
     var methods = useForm({
         resolver: yupResolver(NIDValidationSchema),
         defaultValues: {
-            dob: dob,
             nid: nid
         },
         mode: 'onChange'
@@ -77,12 +74,9 @@ var NID = function (_a) {
         handleClearError();
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createNIDAuth(deepCopy(data)));
+        dispatch(createNafathAuth(deepCopy(data)));
         dispatch(resetMobileScreen(settingsStore.data.businessCountry));
     };
-    var handleCollapseOpenClose = function (flag) {
-        setCollapse(flag);
-    };
     var handleClearError = function () {
         if (error)
             dispatch(clearError());
@@ -95,10 +89,13 @@ var NID = function (_a) {
         });
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+    };
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
-    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(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { isValid: methods.formState.isValid, show: true }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(NID);

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

@@ -1,11 +1,8 @@
 import * as yup from 'yup';
 export declare const NIDValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     nid: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;

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

@@ -1,6 +1,5 @@
 import * as yup from 'yup';
 export var NIDValidationSchema = yup.object().shape({
-    dob: yup.string().min(5).required('enter_valid_birth_date'),
     nid: yup
         .string()
         .matches(/^(1|2)([0-9]{1,})$/g, 'signup_invalid_national_id_format')

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

@@ -18,9 +18,8 @@ import Text from '../../../../components/Text';
 import { clearError, connectSelector, resetOTPScreen, verifyAuth } from '../../../app/connect/connectStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useLanguage, useSetFromDefaultValues, useSanitizedTranslation } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useLanguage } from '../../../../hooks';
 import { AuthForType } from '../../../../@types';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -50,6 +49,7 @@ var FormStyled = styled(Form)(function () { return ({
 var OTP = function () {
     var _a;
     var dispatch = useAppDispatch();
+    var t = useTranslation().t;
     var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var otp = data.otpData.otp;
     var methods = useForm({
@@ -60,7 +60,7 @@ var OTP = function () {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.otpData);
-    var t = useTranslation().t;
+    var st = useSanitizedTranslation();
     var isAr = useLanguage().isAr;
     var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
@@ -83,10 +83,10 @@ var OTP = function () {
     var onBack = function () {
         dispatch(handlePrevScreenStep(startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
-    var disabled = !methods.formState.isValid || !!error;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
+    var disabled = !methods.formState.isValid;
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
     var idNumber = data.nidData.nid;
-    var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    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') }))] })) })) }));
+    var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : st('ide_opt_sent_title');
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('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: st(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

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

@@ -17,8 +17,7 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { AuthForType } from '../../../../@types';
-import { clearError, connectSelector, resendOTPMobile, resendOTPNID } from '../../../app/connect/connectStore';
+import { clearError, connectSelector, resendOTPMobile } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { sendCustomEventToGTM } from '../../../../utils';
 var BoxStyled = styled(Box)(function (_a) {
@@ -34,8 +33,7 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
-    var _c = useAppSelector(connectSelector), data = _c.data, error = _c.error;
-    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
+    var error = useAppSelector(connectSelector).error;
     var handleOnOTPChange = function (otp) {
         if (error)
             dispatch(clearError());
@@ -54,13 +52,7 @@ var OTPInput = function (_a) {
         sendEventAskAnotherOTP();
         dispatch(resendOTPMobile());
     };
-    var handleOnResendAbsherOTP = function () {
-        if (otpControl.field.value)
-            setValue('otp', '', { shouldValidate: true });
-        sendEventAskAnotherOTP();
-        dispatch(resendOTPNID());
-    };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: startWithNID ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

package/build/features/connect/screens/OperatorError/OperatorError.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface OperatorErrorProps {
+}
+declare const _default: React.MemoExoticComponent<({}: OperatorErrorProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import GenericError from '../../../shared/GenericError';
+var OperatorError = function (_a) {
+    var t = useTranslation().t;
+    return _jsx(GenericError, { error: t('operator_is_invalid'), errorTitle: t('oops') });
+};
+export default React.memo(OperatorError);

package/build/features/connect/screens/OperatorError/index.d.ts

@@ -0,0 +1,3 @@
+import OperatorError, { OperatorErrorProps } from './OperatorError';
+export type { OperatorErrorProps };
+export default OperatorError;

package/build/features/connect/screens/OperatorError/index.js

@@ -0,0 +1,2 @@
+import OperatorError from './OperatorError';
+export default OperatorError;

package/build/features/connect/screens/VerifyNafath/VerifyNafath.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface VerifyNafathProps {
+}
+declare const _default: React.MemoExoticComponent<() => JSX.Element | null>;
+export default _default;

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

@@ -0,0 +1,35 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { connectSelector, verifyNafath as verifyNafathFun } from '../../../app/connect/connectStore';
+import NafathVerification from '../../../shared/NafathVerification';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+var VerifyNafath = function () {
+    var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
+    var _b = React.useState(false), failed = _b[0], setFailed = _b[1];
+    var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var dispatch = useAppDispatch();
+    var data = useAppSelector(connectSelector).data;
+    var responseBody = data.nidData.responseBody;
+    var _d = responseBody || {}, expiry = _d.expiry, app_url_android = _d.app_url_android, app_url_ios = _d.app_url_ios, random = _d.random;
+    React.useEffect(function () {
+        if (responseBody && !isReady) {
+            setIsReady(true);
+        }
+    }, [responseBody]);
+    React.useEffect(function () {
+        if (!isReady)
+            return;
+        var promise = dispatch(verifyNafathFun({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        return function () {
+            promise === null || promise === void 0 ? void 0 : promise.abort();
+        };
+    }, [isReady]);
+    var onBack = React.useCallback(function () {
+        dispatch(handlePrevScreenStep());
+    }, []);
+    if (!isReady)
+        return null;
+    return (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
+};
+export default React.memo(VerifyNafath);

package/build/features/connect/screens/VerifyNafath/index.d.ts

@@ -0,0 +1,3 @@
+import VerifyNafath, { VerifyNafathProps } from './VerifyNafath';
+export type { VerifyNafathProps };
+export default VerifyNafath;

package/build/features/connect/screens/VerifyNafath/index.js

@@ -0,0 +1,2 @@
+import VerifyNafath from './VerifyNafath';
+export default VerifyNafath;

package/build/features/connectExpress/ConnectExpress.d.ts

@@ -2,10 +2,13 @@
 import { LibConfig } from '../../@types';
 export interface ConnectExpressLibProps extends LibConfig {
     leadId?: string;
-    showBoard?: boolean;
     configToken?: string;
 }
-export declare function ConnectExpressElement(props: ConnectExpressLibProps): JSX.Element;
+interface ConnectExpressFullProps extends ConnectExpressLibProps {
+    unmount?: () => void;
+}
+export declare function ConnectExpressElement(props: ConnectExpressFullProps): JSX.Element;
 export declare function renderConnectExpressLib(config: ConnectExpressLibProps, elementId: string): {
     unmount: () => void;
 };
+export {};

package/build/features/connectExpress/ConnectExpress.js

@@ -61,69 +61,102 @@ import React, { memo } from 'react';
 import { createRoot } from 'react-dom/client';
 import { FeatureContainer } from '../shared/Containers';
 import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useAppDispatch } from '../../hooks';
-import { handleCurrentActiveScreen, settingsSelector } from '../../app/settings';
+import { handleCurrentActiveScreen, handleOpen, settingsSelector } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectExpressSelector, setIsLeadIdPassed, setLeadId, retrieveLeadIdentityByIdAsync, setShowBoard } from '../app/connectExpress/connectExpressStore';
+import { connectExpressSelector, setIsLeadIdPassed, setLeadId, retrieveLeadIdentityByIdAsync, setDefaultCountryCode } from '../app/connectExpress/connectExpressStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { isKW, findOrCreateElementAndInject, sendPageView } from '../../utils';
+import { isKW, findOrCreateElementAndInject, sendPageView, isOtherThanKWOrSA, initializeGTM, sendCustomEventToGTM, sendCustomDimension } from '../../utils';
 import { CONNECT_EXPRESS_SCREENS_NAVIGATION } from '../../constants';
 import { connectExpressFeatureScreens } from '../featuresScreens';
 import Background from '../shared/Background';
 var ConnectExpress = memo(function (_a) {
-    var leadId = _a.leadId, postURL = _a.postURL, showBoard = _a.showBoard, configToken = _a.configToken, props = __rest(_a, ["leadId", "postURL", "showBoard", "configToken"]);
+    var _b, _c, _d;
+    var leadId = _a.leadId, postURL = _a.postURL, configToken = _a.configToken, props = __rest(_a, ["leadId", "postURL", "configToken"]);
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
-    var _c = useAppSelector(connectExpressSelector), connectExpressError = _c.error, loading = _c.loading, customLoading = _c.customLoading, connectData = _c.data;
+    var _e = useAppSelector(settingsSelector), data = _e.data, error = _e.error, settingLoading = _e.loading;
+    var _f = useAppSelector(connectExpressSelector), connectExpressError = _f.error, loading = _f.loading, customLoading = _f.customLoading, connectData = _f.data;
     var onVerifyConfigTokenSuccess = function (data) { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, lead_id, board;
-        return __generator(this, function (_b) {
-            _a = data || {}, lead_id = _a.lead_id, board = _a.board;
-            if (lead_id) {
+        var lead;
+        return __generator(this, function (_a) {
+            lead = (data || {}).lead;
+            if (lead === null || lead === void 0 ? void 0 : lead.id) {
                 dispatch(setIsLeadIdPassed(true));
-                dispatch(setLeadId(lead_id));
+                dispatch(setLeadId(lead.id));
             }
-            if (typeof board === 'boolean')
-                dispatch(setShowBoard(board));
             return [2];
         });
     }); };
     useAppConfig(__assign(__assign(__assign({ navigation: CONNECT_EXPRESS_SCREENS_NAVIGATION, maturity: 'express' }, props), { postURL: postURL, configToken: configToken }), (configToken && { onVerifyConfigTokenSuccess: onVerifyConfigTokenSuccess })));
-    useErrorListener(connectExpressError || error);
+    useErrorListener(connectExpressError || error, {
+        event: 'Send Event',
+        event_category: 'User Registration Flow',
+        event_action: 'Registration Error'
+    });
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant, appConfig = data.appConfig;
+    var animationDirection = open ? (_b = appConfig.features) === null || _b === void 0 ? void 0 : _b.dialogStartTransition : (_c = appConfig.features) === null || _c === void 0 ? void 0 : _c.dialogEndTransition;
     React.useEffect(function () {
-        if (!postURL)
-            throw new Error('postURL is required and you have to pass it in the lib configuration!');
-        if (typeof showBoard === 'boolean')
-            dispatch(setShowBoard(showBoard));
+        initializeGTM();
         sendPageView({
-            title: 'Connect Express'
+            title: 'Connect Express',
+            connect_flow: 'Express'
         });
     }, []);
     React.useEffect(function () {
-        if (data.isValidOperator && props.open && !settingLoading) {
-            if (configToken) {
-                if (connectData.leadId)
-                    dispatch(retrieveLeadIdentityByIdAsync(connectData.leadId));
-                return;
-            }
-            if (leadId && props.scope !== 'auth') {
+        var _a, _b, _c;
+        if (!!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
+            dispatch(setDefaultCountryCode(data.businessCountry));
+            sendCustomEventToGTM({
+                event: 'Send Event',
+                event_category: 'User Registration Flow',
+                event_action: 'Registration Landing Page Viewed',
+                event_label: (_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2
+            });
+            sendCustomDimension({
+                event: 'PageView',
+                website_country: (_c = data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2
+            });
+        }
+    }, [data.businessCountry]);
+    React.useEffect(function () {
+        var _a, _b;
+        if (settingLoading || !props.open)
+            return;
+        if (!data.isValidOperator) {
+            dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_OPERATOR_ERROR_STEP'));
+            return;
+        }
+        if (configToken && connectData.leadId) {
+            dispatch(retrieveLeadIdentityByIdAsync(connectData.leadId));
+            return;
+        }
+        if (leadId) {
+            if (props.scope !== 'auth') {
                 dispatch(setIsLeadIdPassed(true));
-                dispatch(setLeadId(leadId));
-                dispatch(retrieveLeadIdentityByIdAsync(leadId));
             }
+            dispatch(setLeadId(leadId));
+            dispatch(retrieveLeadIdentityByIdAsync(leadId));
+            return;
         }
-    }, [data.isValidOperator, settingLoading]);
-    React.useEffect(function () {
-        var _a;
-        if (!settingLoading && isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
+        if (!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
+            dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_BUSINESS_COUNTRY_STEP'));
+            return;
+        }
+        if (((_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2) && (isKW(data.businessCountry.iso2) || isOtherThanKWOrSA(data.businessCountry.iso2))) {
             dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
         }
-    }, [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, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: true }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true }, { children: connectExpressFeatureScreens.map(function (_a, index) {
+    }, [data.isValidOperator, settingLoading]);
+    var handleDialogClose = function () {
+        dispatch(handleOpen(false));
+        setTimeout(function () {
+            var _a;
+            (_a = props.unmount) === null || _a === void 0 ? void 0 : _a.call(props);
+        }, 1100);
+    };
+    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, animationDirection: animationDirection, onClose: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.closeButton) ? handleDialogClose : undefined, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: !isTapOrigin, dialogEdgeFormat: appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: false, poweredBy: !isTapOrigin }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true, isTapOrigin: isTapOrigin }, { children: connectExpressFeatureScreens.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));
@@ -135,7 +168,7 @@ export function ConnectExpressElement(props) {
 export function renderConnectExpressLib(config, elementId) {
     var el = findOrCreateElementAndInject(elementId);
     var root = createRoot(el);
-    root.render(_jsx(ConnectExpressElement, __assign({}, config)));
     var unmount = function () { return root.unmount(); };
+    root.render(_jsx(ConnectExpressElement, __assign({}, config, { unmount: unmount })));
     return { unmount: unmount };
 }

package/build/features/connectExpress/screens/AccountAlreadyCreated/AccountAlreadyCreated.js

@@ -1,14 +1,26 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useAppDispatch } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import SuccessScreen from '../../../shared/SuccessScreen';
-import { handleOpen } from '../../../../app/settings';
+import { handleOpen, settingsSelector } from '../../../../app/settings';
+import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
 var AccountAlreadyCreated = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
+    var data = useAppSelector(settingsSelector).data;
+    var expressData = useAppSelector(connectExpressSelector).data;
     var onSuccess = function () {
+        var _a, _b, _c;
+        var _d = data.appConfig, mode = _d.mode, redirectUrl = _d.redirectUrl;
+        var authId = (_c = (_b = (_a = expressData === null || expressData === void 0 ? void 0 : expressData.responseData) === null || _a === void 0 ? void 0 : _a.authData) === null || _b === void 0 ? void 0 : _b.auth) === null || _c === void 0 ? void 0 : _c.id;
+        var bi = data.deviceInfo.browser.browser_id;
         dispatch(handleOpen(false));
+        if (redirectUrl && mode === 'page') {
+            var urlQueryStart = redirectUrl.includes('?') ? '&' : '?';
+            window.open("".concat(redirectUrl).concat(urlQueryStart, "authentication_id=").concat(authId, "&bi=").concat(bi), '_self');
+            return { account: data };
+        }
     };
     return (_jsx(SuccessScreen, { title: t('express_account_already_created_title'), description: t('express_account_already_created_description'), onSuccess: onSuccess, successTitle: t('express_account_already_created_close_button') }));
 };

package/build/features/connectExpress/screens/AccountCreatedLoader/AccountCreatedLoader.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface AccountCreatedLoaderProps {
+}
+declare const _default: React.MemoExoticComponent<({}: AccountCreatedLoaderProps) => JSX.Element>;
+export default _default;