@tap-payments/auth-jsconnect 2.4.99-test → 2.5.0

package/build/features/connectExpress/screens/CollectBusinessInfo/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<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "key" | keyof React.HTMLAttributes<HTMLDivElement>> & {
+} & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     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, {}, {}>;
 interface TACProps {
     show: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: TACProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: TACProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -1,4 +1,17 @@
 import * as yup from 'yup';
+export declare const OtherThanKWOrSABusinessDataSchema: (isLeadIdPassed: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    selectedLicense: any;
+    licenseNumber: 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, {
+    brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    selectedLicense: any;
+    licenseNumber: 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, {
+    brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    selectedLicense: any;
+    licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;
 export declare const BusinessDataSchema: (isLeadIdPassed: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     selectedLicense: any;

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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH } from '../../../../constants';
+import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, BRAND_NAME_MAX_LENGTH } from '../../../../constants';
 import { BusinessType } from '../../../../@types';
 var objectElements = {
     legal_name: yup.object().shape({
@@ -11,6 +11,73 @@ var objectElements = {
     }),
     type: yup.string()
 };
+export var OtherThanKWOrSABusinessDataSchema = function (isLeadIdPassed) {
+    if (!isLeadIdPassed) {
+        return yup.object().shape({
+            brandName: yup
+                .string()
+                .test({
+                test: function (value) {
+                    if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                        return true;
+                    if (value && value.length >= 3 && value.length <= BRAND_NAME_MAX_LENGTH)
+                        return true;
+                    return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+                }
+            })
+                .required('enter_brand_name_english_chars_numbers_space'),
+            selectedLicense: yup.object().shape(objectElements).required(''),
+            licenseNumber: yup
+                .string()
+                .test({
+                test: function (value) {
+                    var selectedLicense = this.parent.selectedLicense;
+                    var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (length === 0)
+                        return true;
+                    if (isCR) {
+                        return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+                    }
+                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                }
+            })
+                .required(''),
+            termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond')
+        });
+    }
+    return yup.object().shape({
+        brandName: yup
+            .string()
+            .test({
+            test: function (value) {
+                if ((value === null || value === void 0 ? void 0 : value.length) === 0)
+                    return true;
+                if (value && value.length >= 3)
+                    return true;
+                return this.createError({ message: 'enter_brand_name_english_chars_numbers_space' });
+            }
+        })
+            .required('enter_brand_name_english_chars_numbers_space'),
+        selectedLicense: yup.object().shape(objectElements).required(''),
+        licenseNumber: yup
+            .string()
+            .test({
+            test: function (value) {
+                var selectedLicense = this.parent.selectedLicense;
+                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                if (isCR) {
+                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+                }
+                return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+            }
+        })
+            .required('')
+    });
+};
 export var BusinessDataSchema = function (isLeadIdPassed) {
     if (!isLeadIdPassed) {
         return yup.object().shape({

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

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

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

@@ -18,8 +18,7 @@ import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useExcludeReadOnlyFelids, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
 import { AuthForType } from '../../../../@types';
 import { useLanguage } from '../../../../hooks';
-import { isKW } from '../../../../utils';
-import { countriesCode } from '../../../../constants';
+import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
@@ -47,6 +46,7 @@ var CollectIndividualInfo = function (_a) {
     var isAr = useLanguage().isAr;
     var individualData = data.individualData, otpData = data.otpData, responseData = data.responseData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
+    var startWithNIDMissed = otpData.authFor === AuthForType.NATIONAL_ID_MISSED;
     var contact = ((responseData === null || responseData === void 0 ? void 0 : responseData.leadData) || {}).contact;
     var countryCode = individualData.countryCode;
     var isEmailAvailable = (responseData || {}).isEmailAvailable;
@@ -59,18 +59,28 @@ var CollectIndividualInfo = function (_a) {
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Name and Email Page Viewed'
+        });
+    }, []);
     React.useEffect(function () {
         if (countryCode.iso2 !== methods.getValues('countryCode.iso2'))
             methods.setValue('countryCode', countryCode);
     }, [countryCode]);
     var onSubmit = function (formData) {
-        dispatch(updateLeadIndividualAsync(getFelids(formData)));
+        dispatch(updateLeadIndividualAsync(deepCopy(getFelids(formData))));
     };
     var onBack = function () {
         var _a;
         dispatch(resetIndividualScreen());
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
         var screen = startWithNID ? (isKW(code) ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP') : 'CONNECT_EXPRESS_MOBILE_STEP';
+        if (startWithNIDMissed) {
+            screen = isKW(code) ? 'CONNECT_EXPRESS_CIVIL_ID_MISSED_STEP' : 'CONNECT_EXPRESS_NID_MISSED_STEP';
+        }
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
@@ -86,9 +96,9 @@ var CollectIndividualInfo = function (_a) {
     }, [responseData]);
     var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
     var isEmailValid = typeof isEmailAvailable === 'undefined' ? isLeadEmailAvailable : isEmailAvailable;
-    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
+    var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
     var emailReadOnly = readOnly['email'] && !((_b = methods.getFieldState('email').error) === null || _b === void 0 ? void 0 : _b.message) && !methods.getFieldState('email').isDirty;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { readOnly: readOnly['name'], show: !listActive }), _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { readOnly: emailReadOnly, show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { readOnly: readOnly['name'], show: !listActive }), _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: settingsData.countries }), _jsx(Email, { readOnly: emailReadOnly, show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(CollectIndividualInfo);

package/build/features/connectExpress/screens/CollectIndividualInfo/Email.d.ts

@@ -5,5 +5,5 @@ export interface EmailProps {
     emailChecking: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, fetchingEmail, emailChecking, readOnly }: EmailProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, fetchingEmail, emailChecking, readOnly }: EmailProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -93,9 +93,12 @@ 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 mobileMaxLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.max_digits;
+    var mobileMinLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.min_digits;
     var isStartsWith5 = mobileValue.startsWith('5');
-    var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    var requiredSALen = isStartsWith5 ? mobileMaxLen - 1 : mobileMaxLen;
+    var requiredMinLen = isSA ? requiredSALen : mobileMinLen;
+    var requiredMaxLen = isSA ? requiredSALen : mobileMaxLen;
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -142,11 +145,11 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredMaxLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
                             if (readOnly)
                                 return;
                             toggleCountryList();
-                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { minLength: requiredMinLen, length: requiredMaxLen, number: '05|5' }) }), _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/connectExpress/screens/CollectIndividualInfo/Name.d.ts

@@ -3,5 +3,5 @@ export interface NameProps {
     show: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: NameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: NameProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -9,7 +9,8 @@ export var CollectIndividualInfoValidation = 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);
@@ -21,10 +22,14 @@ export var CollectIndividualInfoValidation = yup.object().shape({
             if (isSA) {
                 if (!isSaudiNumber)
                     return this.createError({ message: 'start_with_number' });
-                var requiredLen = isStartWith5 ? digits - 1 : digits;
+                var requiredLen = isStartWith5 ? 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' });
+            if (valueLen >= minDigits && valueLen <= maxDigits)
+                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/CreateAccountLoader/CreateAccountLoader.d.ts

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

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

@@ -1,34 +1,24 @@
-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 { isNetworkError, sleep } from '../../../../utils';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { connectExpressSelector, createAccountAsync } from '../../../app/connectExpress/connectExpressStore';
 import CreateAccountLoading from '../../../shared/CreateAccountLoading';
-import Button from '../../../shared/Button';
 var CreateAccountLoader = function (_a) {
     var dispatch = useAppDispatch();
-    var isAr = useLanguage().isAr;
-    var t = useTranslation().t;
-    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading;
+    var error = useAppSelector(connectExpressSelector).error;
+    var _b = React.useState(0), isRetryCount = _b[0], setIsRetryCount = _b[1];
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
     React.useEffect(function () {
-        dispatch(createAccountAsync());
+        dispatch(createAccountAsync({ isRetry: false }));
     }, []);
-    var onReTry = function () {
-        dispatch(createAccountAsync());
-    };
-    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
-    return (_jsx(CreateAccountLoading, __assign({ error: error }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
+    React.useEffect(function () {
+        if (isNE && isRetryCount <= 3) {
+            sleep(2000);
+            setIsRetryCount(isRetryCount + 1);
+            dispatch(createAccountAsync({ isRetry: true }));
+        }
+    }, [isNE]);
+    return _jsx(CreateAccountLoading, { error: isNE && isRetryCount <= 3 ? '' : error });
 };
 export default React.memo(CreateAccountLoader);

package/build/features/connectExpress/screens/IdentityOTP/OTP.d.ts

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

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

@@ -15,7 +15,7 @@ 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, resetOTPValue, verifyNIDOtpLeadIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, resetOTPValue, verifyNIDOtpLeadIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
@@ -25,7 +25,7 @@ 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 } from '../../../../utils';
+import { maskPhone, maskID, deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
@@ -58,28 +58,29 @@ var OTP = function () {
         defaultValues: data.otpData,
         mode: 'onChange'
     });
-    var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
+    var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID_MISSED;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
     React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Absher OTP Page Viewed'
+        });
         return function () {
             dispatch(resetOTPValue());
         };
     }, []);
     var onSubmit = function (formData) {
-        if (isNidAuth) {
-            dispatch(verifyNIDOtpLeadIdentityAsync(formData));
-            return;
-        }
-        dispatch(verifyMobileOtpAsync(formData));
+        dispatch(verifyNIDOtpLeadIdentityAsync(deepCopy(formData)));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    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 = 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') }))] })) })) }));

package/build/features/connectExpress/screens/IdentityOTP/OTPInput.d.ts

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

package/build/features/connectExpress/screens/IdentityOTP/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 { resendNIDAuthIdentityOTP, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+import { resendNIDAuthIdentityOTP, 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 ({
@@ -33,20 +33,24 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
-    var data = useAppSelector(connectExpressSelector).data;
+    var _c = useAppSelector(connectExpressSelector), data = _c.data, error = _c.error;
     var nidData = data.nidData;
-    var isNidAuth = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var handleOnOTPChange = function (otp) {
+        if (error)
+            dispatch(clearError());
         otpControl.field.onChange(otp);
     };
-    var handleOnResendOTP = function () {
-    };
     var handleOnResendAbsherOTP = function () {
         if (otpControl.field.value)
             setValue('otp', '', { shouldValidate: true });
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Another Absher OTP asked'
+        });
         dispatch(resendNIDAuthIdentityOTP(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: handleOnResendAbsherOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

package/build/features/connectExpress/screens/IdentityVerifyPACI/VerifyPACI.d.ts

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

package/build/features/connectExpress/screens/IdentityVerifyPACI/VerifyPACI.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { connectExpressSelector, verifyPACIAsync } from '../../../app/connectExpress/connectExpressStore';
+import { connectExpressSelector, verifyPaciLeadIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
 import PaciVerification from '../../../shared/PaciVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
@@ -19,7 +19,7 @@ var VerifyPACI = function () {
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyPACIAsync({ onSuccess: function () { return setSuccess(true); } }));
+        var promise = dispatch(verifyPaciLeadIdentityAsync({ onSuccess: function () { return setSuccess(true); } }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };

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

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

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

@@ -20,7 +20,7 @@ import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useCountry, useFormErrorAndUpdateReadOnly, useFormReadOnly } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, resetStore, connectExpressSelector, createMobileAuthAsync } from '../../../app/connectExpress/connectExpressStore';
 import { useLanguage } from '../../../../hooks';
@@ -30,6 +30,7 @@ import MobileNumber from './MobileNumber';
 import { PhoneValidationSchema } from './validation';
 import { ICONS_NAMES } from '../../../../constants';
 import TAC from './TAC';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -75,9 +76,9 @@ var Mobile = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var isKuwait = useCountry(settingData.businessCountry.iso2).isKuwait;
+    var _f = useCountry(settingData.businessCountry.iso2), isKuwait = _f.isKuwait, isOther = _f.isOther;
     var responseData = data.responseData, isLeadIdPassed = data.isLeadIdPassed;
-    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);
+    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;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema(isLeadIdPassed)),
         defaultValues: data.mobileData,
@@ -91,12 +92,22 @@ var Mobile = function (_a) {
         dispatch(resetStore());
     }, []);
     var onSubmit = function (formData) {
-        dispatch(createMobileAuthAsync(formData));
+        dispatch(createMobileAuthAsync(deepCopy(formData)));
     };
     var onBack = function () {
         var screen = isKuwait ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP';
+        var eventAction = isKuwait ? 'PACI Click' : 'Abser Click';
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: eventAction,
+            event_label: settingData.businessCountry.iso2
+        });
         dispatch(handlePrevScreenStep(screen));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_BUSINESS_COUNTRY_STEP'));
+    };
     var handleCountryOpen = function () {
         setAnchor(true);
     };
@@ -105,7 +116,7 @@ var Mobile = function (_a) {
     };
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
-    var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, countries: settingData.countries, onListOpen: handleCountryOpen, onListClose: handleCountryClose }) }), _jsxs(Collapse, __assign({ in: !anchor }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKuwait ? (_jsx(MobileButton, __assign({ disabled: loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('absher_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(InputsContainerStyled, { children: _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, countries: settingData.countries, onListOpen: handleCountryOpen, onListClose: handleCountryClose }) }), _jsxs(Collapse, __assign({ in: !anchor }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: (isLeadIdPassed ? !isLeadIdentityIdAvailable : !methods.formState.isValid) && !isOther }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKuwait ? (_jsx(MobileButton, __assign({ disabled: loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) })) }));
 };
 export default React.memo(Mobile);