@tap-payments/auth-jsconnect 2.8.2-test → 2.8.3

package/build/features/connectExpress/screens/MobileOwnership/MobileNumber.js

@@ -0,0 +1,72 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled, alpha } from '@mui/material/styles';
+import { getMobileNumberLen, removeAllCharsFromNumber } from '../../../../utils';
+import { useAppSelector } from '../../../../hooks';
+import Text from '../../../../components/Text';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import { settingsSelector } from '../../../../app/settings';
+var LabelContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        padding: theme.spacing(0, 2.5, 1.25, 2.5)
+    });
+});
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
+});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
+var MobileNumber = function () {
+    var _a;
+    var t = useTranslation().t;
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var data = useAppSelector(settingsSelector).data;
+    var phoneControl = useController({ name: 'mobile', control: control });
+    var countryCodeValue = data.businessCountry;
+    var mobileValue = phoneControl.field.value || '';
+    var error = !!mobileValue ? (_a = phoneControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message : '';
+    var isSA = countryCodeValue.iso2 === 'SA';
+    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);
+    React.useEffect(function () {
+        if (mobileValue)
+            setValue('mobile', mobileValue, { shouldValidate: true });
+    }, []);
+    var onPhoneNumberChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllCharsFromNumber(target.value);
+        phoneControl.field.onChange(value);
+    };
+    var clearMobileNumber = function () {
+        phoneControl.field.onChange('');
+    };
+    return (_jsx(_Fragment, { children: _jsxs(ScreenContainer, __assign({ sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('new_mobile_number') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredMaxLen }, type: 'tel', onChange: onPhoneNumberChange, value: mobileValue, startAdornment: "+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), endAdornment: !error && mobileValue ? _jsx(CheckIcon, {}) : mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber }), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) })] })) }));
+};
+export default React.memo(MobileNumber);

package/build/features/connectExpress/screens/MobileOwnership/index.d.ts

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

package/build/features/connectExpress/screens/MobileOwnership/index.js

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

package/build/features/connectExpress/screens/MobileOwnership/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const PhoneValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    mobile: 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, {
+    mobile: 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, {
+    mobile: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/connectExpress/screens/MobileOwnership/validation.js

@@ -0,0 +1,38 @@
+import { getMobileNumberLen } from '../../../../utils';
+import * as yup from 'yup';
+export var PhoneValidationSchema = function () {
+    return yup.object().shape({
+        mobile: yup
+            .string()
+            .test({
+            test: function (value) {
+                var countryCode = this.parent.countryCode;
+                var isSA = countryCode.iso2 === 'SA';
+                var maxDigits = countryCode.max_digits;
+                var minDigits = countryCode.min_digits;
+                var mobileValue = value || '';
+                var valueLen = mobileValue.length;
+                var isNumber = mobileValue.match(/^[0-9]/g);
+                if (!isNumber)
+                    return this.createError({ message: 'enter_valid_mobile_number' });
+                var isStartWithZero = mobileValue.startsWith('05');
+                var isStartWith5 = mobileValue.startsWith('5');
+                var isSaudiNumber = isStartWith5 || isStartWithZero;
+                if (isSA) {
+                    if (!isSaudiNumber)
+                        return this.createError({ message: 'start_with_number' });
+                    var requiredLen = isStartWithZero ? maxDigits + 1 : maxDigits;
+                    return valueLen === requiredLen ? 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/connectExpress/screens/NID/IDNumber.d.ts

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

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

@@ -38,7 +38,7 @@ var InputLabelStyled = styled(Text)(function (_a) {
 });
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var show = _a.show, readOnly = _a.readOnly;
+    var show = _a.show, readOnly = _a.readOnly, isValid = _a.isValid;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var nidControl = useController({ control: control, name: 'nid' });
@@ -55,6 +55,6 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var isLeadIdPassed = data.isLeadIdPassed, responseData = data.responseData;
     var isLeadIdentityIdAvailable = !!((_d = (_c = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _c === void 0 ? void 0 : _c.identification) === null || _d === void 0 ? void 0 : _d.id);
-    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, { readOnly: readOnly, dir: 'ltr', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, disabled: isLeadIdPassed && isLeadIdentityIdAvailable, 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, { readOnly: readOnly, dir: 'ltr', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, disabled: isLeadIdPassed && isLeadIdentityIdAvailable, 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/connectExpress/screens/NID/NID.d.ts

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

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

@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useFormReadOnly, useFormErrorAndUpdateReadOnly } from '../../../../hooks';
 import { handleCurrentActiveScreen, handlePrevScreenStep } from '../../../../app/settings';
-import { clearError, connectExpressSelector, createNIDAuthAsync } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, createNafathAuth } from '../../../app/connectExpress/connectExpressStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -27,9 +27,8 @@ 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';
 import TAC from './TAC';
-import { deepCopy } from '../../../../utils';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -60,11 +59,10 @@ var OrBoxStyled = styled(Box)(function (_a) {
 });
 var NID = function (_a) {
     var _b, _c;
-    var _d = React.useState(false), collapse = _d[0], setCollapse = _d[1];
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _e = useAppSelector(connectExpressSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _d = useAppSelector(connectExpressSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var isLeadIdPassed = data.isLeadIdPassed, responseData = data.responseData;
     var methods = useForm({
         resolver: yupResolver(NIDValidationSchema(isLeadIdPassed)),
@@ -78,12 +76,14 @@ var NID = function (_a) {
     React.useEffect(function () {
     }, []);
     var onSubmit = function (data) {
-        dispatch(createNIDAuthAsync(deepCopy(data)));
-    };
-    var handleCollapseOpenClose = function (flag) {
-        setCollapse(flag);
+        dispatch(createNafathAuth(deepCopy(data)));
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Switch to mobile number Login Clicked'
+        });
         dispatch(handlePrevScreenStep());
     };
     var onBackToCountryList = function () {
@@ -93,6 +93,6 @@ var NID = function (_a) {
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var disabled = !methods.formState.isValid;
     var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
-    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, readOnly: readOnly['nid'] }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose, readOnly: readOnly['dob'] }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !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 }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
+    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, readOnly: readOnly['nid'] }), _jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !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 }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(NID);

package/build/features/connectExpress/screens/NID/TAC.d.ts

@@ -8,12 +8,12 @@ export declare const TACContainerStyled: import("@emotion/styled").StyledCompone
     component?: React.ElementType<any> | undefined;
     ref?: React.Ref<unknown> | undefined;
     sx?: import("@mui/material/styles").SxProps<import("@mui/material/styles").Theme> | undefined;
-} & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
+} & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "key" | keyof React.HTMLAttributes<HTMLDivElement>> & {
     ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
-}, ("border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "right" | "bottom" | "left" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "component" | "ref" | "sx"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & TACContainerStyledProps, {}, {}>;
+}, keyof import("@mui/material/OverridableComponent").CommonProps | ("left" | "right" | "border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "bottom" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "component" | "ref" | "sx"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & TACContainerStyledProps, {}, {}>;
 interface TACProps {
     show: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: TACProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: TACProps) => JSX.Element>;
 export default _default;

package/build/features/connectExpress/screens/NID/TAC.js

@@ -62,7 +62,7 @@ var CollapseStyled = styled(Collapse)(function () { return ({
     width: '100%'
 }); });
 var TAC = function (_a) {
-    var _b;
+    var _b, _c, _d;
     var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -71,7 +71,7 @@ var TAC = function (_a) {
     var tacControl = useController({ control: control, name: 'termAndConditionChecked' });
     var tacChecked = tacControl.field.value;
     var warningMessage = (_b = tacControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var countryCode = settingsData.businessCountry.iso2.toLowerCase();
+    var countryCode = (_d = (_c = settingsData.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2) === null || _d === void 0 ? void 0 : _d.toLowerCase();
     var handleTACCheckedChange = function (event, checked) {
         if (readOnly)
             return;

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

@@ -1,11 +1,8 @@
 import * as yup from 'yup';
 export declare const NIDValidationSchema: (isLeadIdPassed: boolean) => 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/connectExpress/screens/NID/validation.js

@@ -2,7 +2,6 @@ import * as yup from 'yup';
 export var NIDValidationSchema = function (isLeadIdPassed) {
     if (isLeadIdPassed) {
         return yup.object().shape({
-            dob: yup.string().min(5).required('enter_valid_birth_date'),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
             nid: yup
                 .string()
@@ -12,7 +11,6 @@ export var NIDValidationSchema = function (isLeadIdPassed) {
         });
     }
     return 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/connectExpress/screens/NIDMissed/DOB.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 interface DOBProps {
     onDateClicked?: (flag: boolean) => void;
 }
-declare const DOB: ({ onDateClicked }: DOBProps) => import("react/jsx-runtime").JSX.Element;
+declare const DOB: ({ onDateClicked }: DOBProps) => JSX.Element;
 export default DOB;

package/build/features/connectExpress/screens/NIDMissed/NID.d.ts

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

package/build/features/connectExpress/screens/NIDMissed/NID.js

@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDOtherCountryValidationSchema, NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectExpressSelector, createNIDAuthIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, createNIDNafathAuthIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -48,7 +48,7 @@ var NID = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createNIDAuthIdentityAsync(deepCopy(data)));
+        dispatch(createNIDNafathAuthIdentityAsync(deepCopy(data)));
     };
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);
@@ -57,6 +57,6 @@ var NID = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid;
-    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 }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, 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(IDNumber, { show: !collapse }) })), _jsx(Collapse, __assign({ in: isOtherCountry }, { children: _jsx(DOB, { onDateClicked: handleCollapseOpenClose }) })), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ sx: !isOtherCountry ? { mt: 10 } : {}, loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(NID);

package/build/features/connectExpress/screens/NIDMissed/validation.d.ts

@@ -1,12 +1,9 @@
 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>;
 }>>>;
 export declare const NIDOtherCountryValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {

package/build/features/connectExpress/screens/NIDMissed/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/connectExpress/screens/OTP/OTP.d.ts

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

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

@@ -15,17 +15,16 @@ import { styled } from '@mui/material/styles';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
-import { clearError, connectExpressSelector, verifyMobileOtpAsync, verifyNIDOtpAsync, resetOTPValue } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, verifyMobileOtpAsync, resetOTPValue } from '../../../app/connectExpress/connectExpressStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, 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';
 import Form from '../../../../components/Form';
-import { maskPhone, maskID, deepCopy } from '../../../../utils';
+import { maskPhone, deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
@@ -52,37 +51,36 @@ var OTP = function () {
     var dispatch = useAppDispatch();
     var _b = useAppSelector(connectExpressSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var t = useTranslation().t;
+    var st = useSanitizedTranslation();
     var isAr = useLanguage().isAr;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
         mode: 'onChange'
     });
-    var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
     React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'First OTP Page Viewed'
+        });
         return function () {
             dispatch(resetOTPValue());
         };
     }, []);
     var onSubmit = function (formData) {
-        if (isNidAuth) {
-            dispatch(verifyNIDOtpAsync(deepCopy(formData)));
-            return;
-        }
         dispatch(verifyMobileOtpAsync(deepCopy(formData)));
     };
     var onBack = function () {
-        var screen = isNidAuth ? 'CONNECT_EXPRESS_NID_STEP' : 'CONNECT_EXPRESS_MOBILE_STEP';
-        dispatch(handlePrevScreenStep(screen));
+        dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid;
-    var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
-    var idNumber = data.nidData.nid;
-    var title = isNidAuth ? 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: 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') }))] })) })) }));
+    var phone = data.mobileData.mobile ? ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + data.mobileData.mobile : '';
+    var title = 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 ? st('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: 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/connectExpress/screens/OTP/OTPInput.d.ts

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

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

@@ -17,9 +17,9 @@ 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 { resendMobileAuthOTP, resendNIDAuthOTP, connectExpressSelector, clearError } from '../../../app/connectExpress/connectExpressStore';
+import { resendMobileAuthOTP, connectExpressSelector, clearError } from '../../../app/connectExpress/connectExpressStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { sendCustomEventToGTM } from '../../../../utils';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -34,8 +34,14 @@ var OTPInput = function (_a) {
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
     var _c = useAppSelector(connectExpressSelector), data = _c.data, error = _c.error;
-    var mobileData = data.mobileData, nidData = data.nidData, responseData = data.responseData;
-    var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
+    var mobileData = data.mobileData;
+    var sendEventAskAnotherOTP = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Another OTP asked'
+        });
+    };
     var handleOnOTPChange = function (otp) {
         if (error)
             dispatch(clearError());
@@ -44,14 +50,10 @@ var OTPInput = function (_a) {
     var handleOnResendOTP = function () {
         if (otpControl.field.value)
             setValue('otp', '', { shouldValidate: true });
+        sendEventAskAnotherOTP();
         dispatch(resendMobileAuthOTP(mobileData));
     };
-    var handleOnResendAbsherOTP = function () {
-        if (otpControl.field.value)
-            setValue('otp', '', { shouldValidate: true });
-        dispatch(resendNIDAuthOTP(nidData));
-    };
     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: isNidAuth ? 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/connectExpress/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/connectExpress/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/connectExpress/screens/OperatorError/index.d.ts

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

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

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

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

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

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

@@ -0,0 +1,34 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { isNetworkError } from '../../../../utils';
+import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import Button from '../../../shared/Button';
+import { connectExpressSelector, retrieveDetailsAfterCreateAccountAsync } from '../../../app/connectExpress/connectExpressStore';
+var PrepareDataLoading = function (_a) {
+    var dispatch = useAppDispatch();
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
+    React.useEffect(function () {
+        dispatch(retrieveDetailsAfterCreateAccountAsync());
+    }, []);
+    var onReTry = function () {
+        dispatch(retrieveDetailsAfterCreateAccountAsync());
+    };
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
+    return (_jsx(DataLoading, __assign({ error: error }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
+};
+export default React.memo(PrepareDataLoading);

package/build/features/connectExpress/screens/PrepareDataLoading/index.d.ts

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

package/build/features/connectExpress/screens/PrepareDataLoading/index.js

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

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

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

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

@@ -27,8 +27,8 @@ var SuccessWithFlowButtons = function () {
     };
     var _b = data.responseData || {}, boardData = _b.boardData, leadData = _b.leadData, boardInfo = _b.boardInfo;
     var name = (leadData || {}).name;
-    var _c = boardData || {}, business = _c.business, merchant = _c.merchant, bank = _c.bank_account, user = _c.user, individuals = _c.individuals, entity = _c.entity, brand = _c.brand;
-    var flows = (boardInfo || {}).info;
+    var _c = boardData || {}, business = _c.business, merchant = _c.merchant, bank = _c.bank_account, user = _c.user, individuals = _c.individuals, entity = _c.entity, brand = _c.brand, status = _c.status;
+    var _d = boardInfo || {}, flows = _d.info, recipient = _d.recipient;
     var boardInfoId = boardInfo === null || boardInfo === void 0 ? void 0 : boardInfo.id;
     var boardId = boardData === null || boardData === void 0 ? void 0 : boardData.id;
     var individualsInfo = __assign(__assign({}, individuals), (!(user === null || user === void 0 ? void 0 : user.is_authorized) && { data_state: user === null || user === void 0 ? void 0 : user.data_state }));
@@ -36,6 +36,6 @@ var SuccessWithFlowButtons = function () {
         var name = _a.name;
         return name !== FlowsTypes.PASSWORD;
     }); }, [flows]);
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, loading: loading, boardId: boardId, boardInfoId: boardInfoId, brand: brand, business: business, entity: entity, flows: filteredFlows || [], merchant: merchant, individuals: individualsInfo, user: __assign({ names: { en: name } }, user), onClose: isScopeAuthentication ? onClose : undefined }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, loading: loading, boardId: boardId, boardInfoId: boardInfoId, brand: brand, business: business, entity: entity, flows: filteredFlows || [], merchant: merchant, individuals: individualsInfo, user: __assign({ names: { en: name } }, user), onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: status }));
 };
 export default memo(SuccessWithFlowButtons);