@tap-payments/auth-jsconnect 2.0.125-test → 2.1.0

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

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

package/build/features/business/screens/VerifyPACI/VerifyPACI.d.ts

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

package/build/features/business/screens/VerifyPACI/VerifyPACI.js

@@ -1,159 +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);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import Box from '@mui/material/Box/Box';
-import { styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import Text from '../../../../components/Text';
 import { businessSelector, verifyPACI as verifyPACIFun } from '../../../app/business/businessStore';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { ScreenContainer } from '../../../shared/Containers';
-import { MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import Collapse from '../../../../components/Collapse';
-import Warning from '../../../../components/Warning';
-import { mobileOS, sleep } from '../../../../utils';
-import VerifyPACILoading from './VerifyPACILoading';
-import VerifyPACISuccess from './VerifyPACISuccess';
-var VerifyPACITitleContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: theme.direction,
-        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        marginBottom: theme.spacing(2.5)
-    });
-});
-var VerifyPACITitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightBold, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
-});
-var VerifyPACISubTitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line', textAlign: 'center' }));
-});
-var Container = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        position: 'relative',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-        maxHeight: '300px'
-    });
-});
-var BackButton = styled('button')(function (_a) {
-    var theme = _a.theme;
-    return ({
-        cursor: 'pointer',
-        height: 44,
-        appearance: 'none',
-        background: 'none',
-        pointerEvents: 'auto',
-        border: 'none',
-        color: theme.palette.primary.main,
-        fontSize: theme.typography.body1.fontSize,
-        fontWeight: theme.typography.fontWeightMedium,
-        textTransform: 'capitalize',
-        '&:hover': {
-            backgroundColor: 'transparent'
-        }
-    });
-});
+import PaciVerification from '../../../shared/PaciVerification';
 var VerifyPACI = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), isReady = _b[0], setIsReady = _b[1];
     var dispatch = useAppDispatch();
-    var _c = useAppSelector(businessSelector), data = _c.data, error = _c.error;
+    var data = useAppSelector(businessSelector).data;
     var responseBody = data.civilIdData.responseBody;
-    var t = useTranslation().t;
-    var onSuccess = function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    setSuccess(true);
-                    return [4, sleep(2000)];
-                case 1:
-                    _a.sent();
-                    return [2];
-            }
-        });
-    }); };
+    var _c = responseBody || {}, expiry = _c.expiry, app_url_android = _c.app_url_android, app_url_ios = _c.app_url_ios;
     React.useEffect(function () {
-        if (responseBody) {
+        if (responseBody && !isReady) {
             setIsReady(true);
         }
     }, [responseBody]);
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyPACIFun({ onSuccess: onSuccess }));
+        var promise = dispatch(verifyPACIFun({ onSuccess: function () { return setSuccess(true); } }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
     }, [isReady]);
-    var onRedirect = React.useCallback(function () {
-        if (os === 'Android') {
-            window.open(responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_android, '_blank');
-        }
-        if (os === 'iOS') {
-            window.open(responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios, '_blank');
-        }
-    }, [responseBody]);
     var onBack = React.useCallback(function () {
         dispatch(handlePrevScreenStep());
     }, []);
-    var os = React.useMemo(function () { return mobileOS(); }, []);
-    var isAndroid = React.useMemo(function () { return os === 'Android' && (responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios); }, [os, responseBody]);
-    var isIOS = React.useMemo(function () { return os === 'iOS' && (responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios); }, [os, responseBody]);
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 2.5 } }, { children: [_jsxs(VerifyPACITitleContainerStyled, { children: [_jsx(Container, { children: success ? _jsx(VerifyPACISuccess, {}) : _jsx(VerifyPACILoading, { loop: !error }) }), _jsx(VerifyPACITitleStyled, { children: t('authenticate_kuwait_mobile_title') }), _jsx(VerifyPACISubTitleStyled, { children: t('authenticate_kuwait_mobile_description') })] }), _jsx(Collapse, __assign({ in: !!error, sx: { width: '100%' } }, { children: _jsx(Warning, { children: t(error) }) })), (isAndroid || isIOS) && (_jsx(MobileButton, __assign({ onClick: onRedirect, hideIcon: true }, { children: t('Open Kuwait Mobile ID') }))), _jsx(BackButton, __assign({ onClick: onBack }, { children: t('back') }))] })));
+    if (!isReady)
+        return null;
+    return (_jsx(PaciVerification, { expiryInSeconds: expiry, success: success, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyPACI);

package/build/features/connect/Connect.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { LibConfig } from '../../@types';
 export interface ConnectLibProps extends LibConfig {
-    onClose?: () => void;
 }
-export declare function ConnectLib(props: ConnectLibProps): JSX.Element;
-export declare function renderConnectLib(config: ConnectLibProps, elementId: string): void;
-export declare function unmountConnectLib(elementId: string, unmountTimeout?: number): void;
+export declare function ConnectElement(props: ConnectLibProps): JSX.Element;
+export declare function renderConnectLib(config: ConnectLibProps, elementId: string): {
+    unmount: () => void;
+};

package/build/features/connect/Connect.js

@@ -9,19 +9,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 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, handleOpen } from '../../app/settings';
@@ -30,21 +20,26 @@ import { store } from '../../app/store';
 import { connectSelector, setDefaultCountryCode } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { reactElement, removeElement, isKW } from '../../utils';
-import { CONNECT_SCREENS_NAVIGATION, DIALOG_ID } from '../../constants';
+import { isKW, findOrCreateElementAndInject, initializeGTM, sendCustomEventToGTM, sendCustomDimension, sendPageView } from '../../utils';
+import { CONNECT_SCREENS_NAVIGATION } from '../../constants';
 import { connectFeatureScreens } from '../featuresScreens';
-import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
-var Connect = memo(function (_a) {
-    var onClose = _a.onClose, props = __rest(_a, ["onClose"]);
+var Connect = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
-    var _c = useAppSelector(connectSelector), connectError = _c.error, loading = _c.loading;
-    useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION }, props));
-    useErrorListener(connectError || error);
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var _b = useAppSelector(connectSelector), connectError = _b.error, loading = _b.loading;
+    useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION, maturity: 'full' }, props));
+    useErrorListener(connectError || error, {
+        event: 'Send Event',
+        event_category: 'User Registration Flow',
+        event_action: 'Registration Error'
+    });
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
+    React.useEffect(function () {
+        initializeGTM();
+    }, []);
     React.useEffect(function () {
         var _a;
         if (!settingLoading) {
@@ -53,32 +48,40 @@ var Connect = memo(function (_a) {
         }
     }, [settingLoading]);
     React.useEffect(function () {
-        var _a;
-        if (!!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2))
+        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_value: (_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
+            });
+            sendPageView({
+                title: 'Connect'
+            });
+        }
     }, [data.businessCountry]);
     var handleDialogClose = function () {
         dispatch(handleOpen(false));
     };
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onClose: onClose, onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                    }) }) })) })) })));
+                    }) })) })) })) })));
 });
-export function ConnectLib(props) {
+export function ConnectElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Connect, __assign({}, props)) })));
 }
 export function renderConnectLib(config, elementId) {
-    reactElement(elementId).render(_jsx(ConnectLib, __assign({}, config)));
-}
-export function unmountConnectLib(elementId, unmountTimeout) {
-    if (unmountTimeout === void 0) { unmountTimeout = 1000; }
-    var element = document.getElementById(elementId);
-    setTimeout(function () {
-        var _a;
-        ((_a = element === null || element === void 0 ? void 0 : element.children) === null || _a === void 0 ? void 0 : _a.length) && element.removeChild(element.children[0]);
-        removeElement(DIALOG_ID);
-        elementId && reactElement(elementId).unmount();
-    }, unmountTimeout);
+    var element = findOrCreateElementAndInject(elementId);
+    var root = createRoot(element);
+    root.render(_jsx(ConnectElement, __assign({}, config)));
+    var unmount = function () { return root.unmount(); };
+    return { unmount: unmount };
 }

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
@@ -72,13 +61,16 @@ var CivilID = function (_a) {
     var t = useTranslation().t;
     var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsStore = useAppSelector(settingsSelector);
-    var _c = data.civilIdData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
+    var _c = data.civilIdData, civilId = _c.civilId, termAndConditionChecked = _c.termAndConditionChecked;
     var methods = useForm({
         resolver: yupResolver(civilIDValidationSchema),
-        defaultValues: defaultValues,
+        defaultValues: {
+            civilId: civilId,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.civilIdData);
     React.useEffect(function () {
         handleClearError();
     }, [methods.formState.isValid]);

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

@@ -11,17 +11,16 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
 import { styled, alpha } from '@mui/material/styles';
 import Text from '../../../../components/Text';
-import Input from '../../../shared/Input';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { CIVIL_ID_NUMBER_LENGTH } from '../../../../constants';
+import Input from '../../../shared/Input';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -54,6 +53,6 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     };
     var idValue = civilIdControl.field.value;
     var error = (_b = civilIdControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_civil_id') }) }), _jsx(Input, { dir: 'ltr', type: 'text', inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, value: idValue, endAdornment: !error && idValue ? _jsx(CheckIcon, {}) : idValue && _jsx(ClearIcon, { onClick: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
+    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_civil_id') }) }), _jsx(Input, { dir: 'ltr', type: 'text', inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, value: idValue, endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
 });
 export default React.memo(IDNumber);

package/build/features/connect/screens/Individual/Email.js

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -47,32 +47,26 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
+import { debounce } from 'lodash-es';
 import axios from 'axios';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
 import { useController, useFormContext } from 'react-hook-form';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useTranslation } from 'react-i18next';
+import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
-import { styled } from '@mui/material/styles';
-import CircularProgress from '@mui/material/CircularProgress';
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        input: {
-            textTransform: 'lowercase'
-        }
-    });
-});
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { EndAdornment } from '../../../shared/EndAdornment';
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'lowercase'
+    }
+}); });
 var cancelToken = null;
 var Email = function (_a) {
-    var _b;
+    var _b, _c, _d;
     var show = _a.show, fetchingEmail = _a.fetchingEmail, emailChecking = _a.emailChecking;
-    var _c = React.useState(''), storedEmail = _c[0], setStoredEmail = _c[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectSelector).data;
     var t = useTranslation().t;
@@ -80,6 +74,8 @@ var Email = function (_a) {
     var emailControl = useController({ name: 'email', control: control });
     var emailValue = emailControl.field.value;
     var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var email = (_d = (_c = data.otpData.responseBody) === null || _c === void 0 ? void 0 : _c.contact) === null || _d === void 0 ? void 0 : _d.email;
+    var readOnly = email && !error;
     var checkEmail = debounce(function (value) { return __awaiter(void 0, void 0, void 0, function () {
         var onSuccess;
         return __generator(this, function (_a) {
@@ -95,15 +91,9 @@ var Email = function (_a) {
     var handleEmailChange = function (event) {
         emailControl.field.onChange(event.target.value);
     };
-    React.useEffect(function () {
-        var _a, _b;
-        var email = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.email;
-        if (!!email)
-            setStoredEmail(email);
-    }, [data.otpData.responseBody]);
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;
-        if (isValid && emailValue != storedEmail) {
+        if (isValid && emailValue != email) {
             fetchingEmail(true);
             checkEmail(emailValue);
         }
@@ -111,6 +101,6 @@ var Email = function (_a) {
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: emailChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && emailValue ? (_jsx(CheckIcon, {})) : (emailValue && _jsx(ClearIcon, { onClick: clearNumber })) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, readOnly: readOnly, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: emailValue, loading: emailChecking, error: error, onClear: clearNumber }) }) }) })));
 };
 export default React.memo(Email);

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

@@ -40,10 +40,12 @@ import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
 import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
-import { isKW } from '../../../../utils';
+import { isKW, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
-    flexDirection: 'column'
+    flexDirection: 'column',
+    minHeight: '240px',
+    justifyContent: 'space-between'
 }); });
 var Individual = function (_a) {
     var _b = React.useState(false), listActive = _b[0], setListActive = _b[1];
@@ -56,15 +58,26 @@ var Individual = function (_a) {
     var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     var isMobile = mobileData.mobile;
-    var _e = otpData.responseBody || {}, contact = _e.contact, name = _e.name, userInfoMissed = _e.userInfoMissed, is_new_individual = _e.is_new_individual;
+    var contact = (otpData.responseBody || {}).contact;
     var responseBody = individualData.responseBody, defaultValues = __rest(individualData, ["responseBody"]);
     var is_available = (responseBody || {}).is_available;
     var methods = useForm({
         resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
-        defaultValues: defaultValues,
+        defaultValues: individualData,
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues, true);
+    useSetFromDefaultValues(methods, individualData, true);
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Name and Email Page Viewed'
+        });
+    }, []);
+    React.useEffect(function () {
+        if (defaultValues.countryCode.iso2 !== methods.getValues('countryCode.iso2'))
+            methods.setValue('countryCode', defaultValues.countryCode);
+    }, [defaultValues.countryCode]);
     var onSubmit = function (formData) {
         dispatch(updateLeadIndividual(formData));
     };
@@ -80,7 +93,7 @@ var Individual = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var handleMenuListClick = function () {
-        listActive ? setListActive(false) : setListActive(true);
+        setListActive(!listActive);
     };
     React.useEffect(function () {
         if (is_available === false)
@@ -90,9 +103,6 @@ var Individual = function (_a) {
     var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
-    var isNameRequired = (userInfoMissed && !name) || is_new_individual;
-    var isEmailRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.email)) || is_new_individual;
-    var isMobileRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.phone)) || is_new_individual;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive && isNameRequired }), _jsx(MobileNumber, { show: !isMobile && isMobileRequired, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive && isEmailRequired, 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, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { 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(Individual);