@tap-payments/auth-jsconnect 2.6.4-test → 2.6.5

package/build/features/connect/screens/VerifyPACI/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/ConnectExpress.d.ts

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+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 { confirmInfo, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+import Button from '../../../shared/Button';
+import DataLoading from '../../../shared/DataLoading';
+var AccountCreatedLoader = function (_a) {
+    var dispatch = useAppDispatch();
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = useAppSelector(connectExpressSelector), error = _b.error, loading = _b.loading, data = _b.data;
+    var _c = data.authenticationData, brandInfo = _c.brandInfo, entityInfo = _c.entityInfo;
+    var merchantInfo = data.authMerchantData.merchantInfo;
+    React.useEffect(function () {
+        dispatch(confirmInfo({ entityInfo: entityInfo, brandInfo: brandInfo, merchantInfo: merchantInfo }));
+    }, []);
+    var onReTry = function () {
+        dispatch(confirmInfo({ entityInfo: entityInfo, brandInfo: brandInfo, merchantInfo: merchantInfo }));
+    };
+    var isNE = React.useMemo(function () { return isNetworkError(error); }, [error]);
+    return (_jsx(DataLoading, __assign({ error: error, title: 'account_already_created', hideSubtitle: true }, { children: isNE && (_jsx(Button, __assign({ onClick: onReTry, disableBack: true, isAr: isAr, loading: loading }, { children: t('try_again') }))) })));
+};
+export default React.memo(AccountCreatedLoader);

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

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

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

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

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

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

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

@@ -0,0 +1,74 @@
+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 } from "react/jsx-runtime";
+import * as React from 'react';
+import { useForm, FormProvider } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import Collapse from '@mui/material/Collapse';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import Form from '../../../../components/Form';
+import { ScreenContainer } from '../../../shared/Containers';
+import Button from '../../../shared/Button';
+import { clearError, connectExpressSelector, confirmInfo } from '../../../app/connectExpress/connectExpressStore';
+import { useLanguage } from '../../../../hooks';
+import { AuthMerchantValidationSchema } from './validation';
+import MerchantList from './MerchantList';
+var AuthMerchant = function (_a) {
+    var _b;
+    var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo;
+    var merchantInfo = data.authMerchantData.merchantInfo;
+    var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
+    var merchantList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authMerchantData) || {}).merchantList;
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Authentication Flow',
+            event_action: 'Authentication Merchant List Step'
+        });
+    }, []);
+    var methods = useForm({
+        resolver: yupResolver(AuthMerchantValidationSchema),
+        defaultValues: {
+            merchantInfo: merchantInfo
+        },
+        mode: 'onChange'
+    });
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var onSubmit = function (formData) {
+        dispatch(confirmInfo(__assign({ brandInfo: brandInfo, entityInfo: entityInfo }, deepCopy(formData))));
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    React.useEffect(function () {
+        if (merchantInfo && !methods.getValues('merchantInfo'))
+            methods.setValue('merchantInfo', merchantInfo, { shouldValidate: true });
+    }, [merchantInfo]);
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var disabled = !methods.formState.isValid;
+    var handleMenuClick = function (flag) {
+        if (error)
+            dispatch(clearError());
+        setListActive(flag);
+    };
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(MerchantList, { list: merchantList || [], onListOpen: function () { return handleMenuClick(true); }, onListClose: function () { return handleMenuClick(false); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('confirm') })) }))] })) })) }));
+};
+export default React.memo(AuthMerchant);

package/build/features/connectExpress/screens/{AuthenticationList/TerminalList.d.ts → AuthMerchant/MerchantList.d.ts}

@@ -1,10 +1,11 @@
 import * as React from 'react';
-interface TerminalListProps {
-    show: boolean;
+import { AuthMerchantInfo } from '../../../../@types';
+interface MerchantListProps {
+    list: Array<AuthMerchantInfo>;
     onListOpen?: () => void;
     onListClose?: () => void;
     readOnly?: boolean;
     isVerified?: boolean;
 }
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<TerminalListProps & React.RefAttributes<unknown>>>;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<MerchantListProps & React.RefAttributes<unknown>>>;
 export default _default;

package/build/features/connectExpress/screens/AuthMerchant/MerchantList.js

@@ -0,0 +1,64 @@
+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, Fragment as _Fragment, 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 { styled } from '@mui/material/styles';
+import Collapse from '../../../../components/Collapse';
+import Text from '../../../../components/Text';
+import SimpleList from '../../../../components/SimpleList';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import InputSelect from '../../../shared/InputSelect';
+import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
+import CheckIcon from '../../../shared/CheckIcon';
+var MerchantContainer = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var MerchantNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
+});
+var MerchantList = React.forwardRef(function (_a, ref) {
+    var _b;
+    var list = _a.list, onListOpen = _a.onListOpen, onListClose = _a.onListClose, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
+    var t = useTranslation().t;
+    var _d = useFormContext(), control = _d.control, getValues = _d.getValues;
+    var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
+    var merchantValue = merchantInfoControl.field.value;
+    var error = (_b = merchantInfoControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var onOpenMerchantSelect = function (event) {
+        if (readOnly)
+            return;
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseMerchantSelect = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (merchant) {
+        onCloseMerchantSelect();
+        merchantInfoControl.field.onChange(merchant);
+    };
+    var getName = function (merchant) {
+        if (!merchant)
+            return '';
+        return merchant.display_name;
+    };
+    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: { mt: 2.5, mb: 2.5 } }, { children: [_jsx(InputSelect, { label: t('select_merchant_label'), readOnly: readOnly, placeholder: t('select_merchant_placeholder'), value: getName(getValues('merchantInfo')) || '', warningMessage: error && t(error), onClick: !!anchorEl ? function () { return onCloseMerchantSelect(); } : onOpenMerchantSelect, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { list: list || [], onSelectItem: onSelectItem, renderItem: function (item) {
+                        return (_jsxs(_Fragment, { children: [_jsx(MerchantContainer, { children: _jsx(MerchantNameText, __assign({ isSelected: item.id === (merchantValue === null || merchantValue === void 0 ? void 0 : merchantValue.id) }, { children: getName(item) })) }), item.id === (merchantValue === null || merchantValue === void 0 ? void 0 : merchantValue.id) && _jsx(CheckIcon, { isVerified: isVerified })] }));
+                    } }) }))] })));
+});
+export default React.memo(MerchantList);

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

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

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

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

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

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const AuthMerchantValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    merchantInfo: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    merchantInfo: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    merchantInfo: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
+}>>>;

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

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var AuthMerchantValidationSchema = yup.object().shape({
+    merchantInfo: yup.object().required('auth_merchant_required')
+});

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

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

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

@@ -22,27 +22,27 @@ import { AuthForType } from '../../../../@types';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { clearError, connectExpressSelector, updateOperatorInfoAsync } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, createEntity, resetAuthenticationScreen, getMerchantListAsync } from '../../../app/connectExpress/connectExpressStore';
 import { useLanguage } from '../../../../hooks';
 import { AuthenticationListValidationSchema } from './validation';
 import BrandList from './BrandList';
 import EntityList from './EntityList';
-import MerchantList from './MerchantList';
-import TerminalList from './TerminalList';
+import LicenseNumber from './LicenseNumber';
+import EntityLegalName from './EntityLegalName';
+import LicenseType from './EntityLicenseType';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
     ListType["EntityList"] = "EntityList";
-    ListType["MerchantList"] = "MerchantList";
-    ListType["TerminalList"] = "TerminalList";
 })(ListType || (ListType = {}));
 var AuthenticationList = function (_a) {
     var _b;
     var settingsData = useAppSelector(settingsSelector).data;
-    var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error, merchantLoading = _c.merchantLoading, terminalLoading = _c.terminalLoading;
-    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo, merchantInfo = _d.merchantInfo, terminalInfo = _d.terminalInfo;
+    var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo;
     var _e = React.useState(), listActive = _e[0], setListActive = _e[1];
-    var _f = ((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}, brandList = _f.brandList, entityList = _f.entityList;
+    var brandList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).brandList;
+    var _f = React.useState(false), isAddEntity = _f[0], setIsAddEntity = _f[1];
     var otpData = data.otpData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
@@ -53,12 +53,10 @@ var AuthenticationList = function (_a) {
         });
     }, []);
     var methods = useForm({
-        resolver: yupResolver(AuthenticationListValidationSchema()),
+        resolver: yupResolver(AuthenticationListValidationSchema),
         defaultValues: {
             brandInfo: brandInfo,
-            entityInfo: entityInfo,
-            merchantInfo: merchantInfo,
-            terminalInfo: terminalInfo
+            entityInfo: entityInfo
         },
         mode: 'onChange'
     });
@@ -66,19 +64,34 @@ var AuthenticationList = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var onSubmit = function (formData) {
-        dispatch(updateOperatorInfoAsync(deepCopy(formData)));
+        if (isAddEntity) {
+            var licenseNumber = formData.licenseNumber, legalName = formData.legalName, brandInfo_1 = formData.brandInfo, licenseType = formData.licenseType;
+            var data_1 = { licenseNumber: licenseNumber, legalName: legalName, brandInfo: brandInfo_1, licenseType: licenseType };
+            dispatch(createEntity(deepCopy(data_1)));
+            return;
+        }
+        dispatch(getMerchantListAsync(deepCopy(formData)));
     };
     var onBack = function () {
         var _a;
+        if (isAddEntity) {
+            setIsAddEntity(false);
+            methods.setValue('licenseNumber', '');
+            methods.setValue('legalName', '');
+            methods.setValue('licenseType', '');
+            methods.setValue('entityInfo', undefined, { shouldValidate: true });
+            return;
+        }
         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';
+        dispatch(resetAuthenticationScreen());
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid || !!error || merchantLoading || terminalLoading;
+    var disabled = !methods.formState.isValid;
     var handleMenuClick = function (flag) {
         if (error)
             dispatch(clearError());
@@ -86,8 +99,6 @@ var AuthenticationList = function (_a) {
     };
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
-    var isMerchantList = listActive === ListType.MerchantList;
-    var isTerminalList = listActive === ListType.TerminalList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isEntityList && !isMerchantList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { list: entityList || [], countryList: settingsData.countries || [], show: !isBrandList && !isMerchantList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(MerchantList, { show: !isBrandList && !isEntityList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.MerchantList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TerminalList, { show: !isBrandList && !isEntityList && !isMerchantList, onListOpen: function () { return handleMenuClick(ListType.TerminalList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList, handleAddEntity: function (flag) { return setIsAddEntity(flag); }, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsxs(Collapse, __assign({ in: isAddEntity && !isBrandList && !isEntityList }, { children: [_jsx(EntityLegalName, {}), _jsx(LicenseType, {}), _jsx(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: isAddEntity ? t('create_new_entity') : t('next') })) }))] })) })) }));
 };
 export default React.memo(AuthenticationList);

package/build/features/connectExpress/screens/AuthenticationList/BrandList.d.ts

@@ -6,5 +6,5 @@ interface BrandListProps {
     onListOpen?: () => void;
     onListClose?: () => void;
 }
-declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/connectExpress/screens/AuthenticationList/EntityLegalName.d.ts

@@ -0,0 +1,2 @@
+declare const EntityLegalName: () => import("react/jsx-runtime").JSX.Element;
+export default EntityLegalName;