@tap-payments/auth-jsconnect 2.4.12 → 2.4.13

package/build/@types/form.d.ts

@@ -150,3 +150,6 @@ export type AuthenticationListFormValues = {
     licenseNumber?: string;
     legalName?: string;
 };
+export type AuthMerchantFormValues = {
+    merchantInfo?: AuthMerchantInfo;
+};

package/build/constants/app.js

@@ -134,7 +134,7 @@ export var CONNECT_EXPRESS_SCREENS_NAVIGATION = [
     },
     {
         name: 'CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP',
-        next: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
+        next: ['CONNECT_EXPRESS_AUTH_MERCHANT_LIST_STEP', 'CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP'],
         prev: ['CONNECT_EXPRESS_MOBILE_STEP', 'CONNECT_EXPRESS_NID_STEP', 'CONNECT_EXPRESS_CIVIL_ID_STEP'],
         order: 3
     },
@@ -150,6 +150,18 @@ export var CONNECT_EXPRESS_SCREENS_NAVIGATION = [
         prev: 'CONNECT_EXPRESS_MOBILE_STEP',
         order: 3
     },
+    {
+        name: 'CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP',
+        next: '',
+        prev: 'CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP',
+        order: 4
+    },
+    {
+        name: 'CONNECT_EXPRESS_AUTH_MERCHANT_LIST_STEP',
+        next: 'CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP',
+        prev: 'CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP',
+        order: 4
+    },
     {
         name: 'CONNECT_EXPRESS_VERIFY_PACI_IDENTITY_STEP',
         next: ['CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP', 'CONNECT_EXPRESS_WAITING_FOR_CREATING_ACCOUNT_STEP'],

package/build/features/app/connectExpress/connectExpressStore.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { MobileFormValues, NIDFormValues, CivilFormValues, OTPFormValues, IndividualFormValues, SharedState, FlowsTypes, ActionState, CountryCode, AuthForType, BusinessDataFormValues, AsyncThunkParams, AuthenticationListFormValues } from '../../../@types';
+import { MobileFormValues, NIDFormValues, CivilFormValues, OTPFormValues, IndividualFormValues, SharedState, FlowsTypes, ActionState, CountryCode, AuthForType, BusinessDataFormValues, AsyncThunkParams, AuthenticationListFormValues, AuthMerchantFormValues } from '../../../@types';
 import { CancelToken } from 'axios';
 export declare const updateBusinessCountryAsync: import("@reduxjs/toolkit").AsyncThunk<any, string, {
     state?: unknown;
@@ -69,10 +69,11 @@ export declare const retrieveAuthenticationListAsync: import("@reduxjs/toolkit")
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
-export declare const getMerchantListAsync: import("@reduxjs/toolkit").AsyncThunk<any, {
-    entityId: string;
-    brandId: string;
-}, {
+export declare const getMerchantListAsync: import("@reduxjs/toolkit").AsyncThunk<{
+    list: any;
+    brandInfo: import("../../../@types").BrandInfo | undefined;
+    entityInfo: import("../../../@types").EntityLicenseAuth | undefined;
+}, AuthenticationListFormValues, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;
@@ -332,7 +333,7 @@ export declare const updateLeadBusinessDataAsync: import("@reduxjs/toolkit").Asy
     fulfilledMeta?: unknown;
     rejectedMeta?: unknown;
 }>;
-export declare const updateOperatorInfoAsync: import("@reduxjs/toolkit").AsyncThunk<void, AuthenticationListFormValues, {
+export declare const confirmInfo: import("@reduxjs/toolkit").AsyncThunk<void, AuthenticationListFormValues, {
     state?: unknown;
     dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;
@@ -369,12 +370,11 @@ export interface ConnectExpressData {
     individualData: IndividualFormValues;
     businessData: BusinessDataFormValues;
     authenticationData: AuthenticationListFormValues;
+    authMerchantData: AuthMerchantFormValues;
     isStartFromBusinessCountry?: boolean;
 }
 export interface ConnectExpressState extends SharedState<ConnectExpressData & ResponseData> {
     customLoading?: boolean;
-    merchantLoading?: boolean;
-    terminalLoading?: boolean;
 }
 export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpressState, {
     setLeadId(state: ConnectExpressState, action: ActionState<string>): void;

package/build/features/app/connectExpress/connectExpressStore.js

@@ -213,25 +213,34 @@ export var retrieveAuthenticationListAsync = createAsyncThunk('connectExpress/re
         });
     });
 });
-export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, payload, merchants;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                payload = {
-                    business_entity_id: params.entityId,
-                    brand_id: params.brandId,
-                    create_if_not_present: true,
-                    platforms: settings.data.appConfig.platforms
-                };
-                return [4, API.entityService.getMerchantListUsingEntityId(payload)];
-            case 1:
-                merchants = (_a.sent()).merchants;
-                return [2, merchants || []];
-        }
+export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantListAsync', function (_a, thunkApi) {
+    var brandInfo = _a.brandInfo, entityInfo = _a.entityInfo;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var settings, payload, merchants, list;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    settings = thunkApi.getState().settings;
+                    payload = {
+                        business_entity_id: (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) || '',
+                        brand_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id) || '',
+                        create_if_not_present: true,
+                        platforms: settings.data.appConfig.platforms
+                    };
+                    return [4, API.entityService.getMerchantListUsingEntityId(payload)];
+                case 1:
+                    merchants = (_b.sent()).merchants;
+                    list = merchants || [];
+                    if ((list === null || list === void 0 ? void 0 : list.length) > 1) {
+                        thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTH_MERCHANT_LIST_STEP'));
+                        return [2, { list: list, brandInfo: brandInfo, entityInfo: entityInfo }];
+                    }
+                    sleep(50).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP')); });
+                    return [2, { list: list, brandInfo: brandInfo, entityInfo: entityInfo }];
+            }
+        });
     });
-}); });
+});
 export var createMobileAuthAsync = createAsyncThunk('connectExpress/createMobileAuthAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connectExpress, requestBody, data;
     var _b, _c;
@@ -993,7 +1002,7 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
         });
     });
 });
-export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOperatorInfoAsync', function (_a, thunkApi) {
+export var confirmInfo = createAsyncThunk('connectExpress/confirmInfo', function (_a, thunkApi) {
     var brandInfo = _a.brandInfo, entityInfo = _a.entityInfo, merchantInfo = _a.merchantInfo;
     return __awaiter(void 0, void 0, void 0, function () {
         var _b, connectExpress, settings, responseData, _c, postURL, redirectUrl, bi, authId, body, data, urlQueryStart;
@@ -1053,8 +1062,6 @@ var initialState = {
     error: null,
     loading: false,
     customLoading: false,
-    merchantLoading: false,
-    terminalLoading: false,
     data: {
         showBoard: true,
         isLeadIdPassed: false,
@@ -1090,7 +1097,9 @@ var initialState = {
         },
         authenticationData: {
             brandInfo: undefined,
-            entityInfo: undefined,
+            entityInfo: undefined
+        },
+        authMerchantData: {
             merchantInfo: undefined
         }
     }
@@ -1519,33 +1528,35 @@ export var connectSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(getMerchantListAsync.pending, function (state) {
-            state.merchantLoading = true;
+            state.loading = true;
             state.error = null;
         })
             .addCase(getMerchantListAsync.fulfilled, function (state, action) {
-            state.merchantLoading = false;
+            state.loading = false;
             state.error = null;
             var data = state.data.responseData;
-            var merchantList = action.payload;
-            if (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) {
-                state.data.authenticationData.merchantInfo = merchantList[0];
+            var _a = action.payload, list = _a.list, brandInfo = _a.brandInfo, entityInfo = _a.entityInfo;
+            state.data.authenticationData.brandInfo = brandInfo;
+            state.data.authenticationData.entityInfo = entityInfo;
+            if (list === null || list === void 0 ? void 0 : list.length) {
+                state.data.authMerchantData.merchantInfo = list[0];
             }
-            state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { merchantList: merchantList }) });
+            state.data.responseData = __assign(__assign({}, data), { authMerchantData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authMerchantData), { merchantList: list }) });
         })
             .addCase(getMerchantListAsync.rejected, function (state, action) {
-            state.merchantLoading = false;
+            state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateOperatorInfoAsync.pending, function (state) {
+            .addCase(confirmInfo.pending, function (state) {
             state.loading = true;
             state.error = null;
         })
-            .addCase(updateOperatorInfoAsync.fulfilled, function (state) {
+            .addCase(confirmInfo.fulfilled, function (state) {
             state.loading = false;
             state.error = null;
             state.data.responseData = __assign({}, state.data.responseData);
         })
-            .addCase(updateOperatorInfoAsync.rejected, function (state, action) {
+            .addCase(confirmInfo.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
         })

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 → AuthMerchant}/MerchantList.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
+import { AuthMerchantInfo } from '../../../../@types';
 interface MerchantListProps {
-    show: boolean;
+    list: Array<AuthMerchantInfo>;
     onListOpen?: () => void;
     onListClose?: () => void;
     readOnly?: boolean;

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.js

@@ -22,28 +22,26 @@ import { AuthForType } from '../../../../@types';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { clearError, connectExpressSelector, createEntity, resetAuthenticationScreen, updateOperatorInfoAsync } from '../../../app/connectExpress/connectExpressStore';
+import { clearError, connectExpressSelector, createEntity, resetAuthenticationScreen, getMerchantListAsync } from '../../../app/connectExpress/connectExpressStore';
 import { useLanguage } from '../../../../hooks';
-import { AddEntityValidationSchema, AuthenticationListValidationSchema } from './validation';
+import { AuthenticationListValidationSchema } from './validation';
 import BrandList from './BrandList';
 import EntityList from './EntityList';
-import MerchantList from './MerchantList';
 import LicenseNumber from './LicenseNumber';
 import EntityLegalName from './EntityLegalName';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
     ListType["EntityList"] = "EntityList";
-    ListType["MerchantList"] = "MerchantList";
 })(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;
+    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, merchantList = _f.merchantList;
-    var _g = React.useState(false), isAddEntity = _g[0], setIsAddEntity = _g[1];
+    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 () {
@@ -54,11 +52,10 @@ var AuthenticationList = function (_a) {
         });
     }, []);
     var methods = useForm({
-        resolver: yupResolver(isAddEntity ? AddEntityValidationSchema : AuthenticationListValidationSchema),
+        resolver: yupResolver(AuthenticationListValidationSchema),
         defaultValues: {
             brandInfo: brandInfo,
-            entityInfo: entityInfo,
-            merchantInfo: merchantInfo
+            entityInfo: entityInfo
         },
         mode: 'onChange'
     });
@@ -71,7 +68,7 @@ var AuthenticationList = function (_a) {
             dispatch(createEntity(deepCopy(data_1)));
             return;
         }
-        dispatch(updateOperatorInfoAsync(deepCopy(formData)));
+        dispatch(getMerchantListAsync(deepCopy(formData)));
     };
     var onBack = function () {
         var _a;
@@ -87,15 +84,11 @@ var AuthenticationList = function (_a) {
         dispatch(resetAuthenticationScreen());
         dispatch(handlePrevScreenStep(screen));
     };
-    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 || !!error || merchantLoading || terminalLoading;
+    var disabled = !methods.formState.isValid;
     var handleMenuClick = function (flag) {
         if (error)
             dispatch(clearError());
@@ -103,8 +96,6 @@ var AuthenticationList = function (_a) {
     };
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
-    var isMerchantList = listActive === ListType.MerchantList;
-    var showLoader = !(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) ? merchantLoading : merchantList.length === 1 && merchantLoading;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isAddEntity && !isEntityList && !isMerchantList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList && !isMerchantList, 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(LicenseNumber, {})] })), _jsx(Collapse, __assign({ in: !isAddEntity }, { children: _jsx(MerchantList, { show: !isBrandList && !isEntityList, onListOpen: function () { return handleMenuClick(ListType.MerchantList); }, 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 || showLoader }, { children: isAddEntity ? t('create_new_entity') : 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(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/EntityList.js

@@ -119,10 +119,8 @@ var EntityList = function (_a) {
     };
     var onSelectItem = function (entity) {
         selectedEntityControl.field.onChange(entity);
-        if (entity.id === ADD_ENTITY) {
-            setValue('merchantInfo', undefined);
+        if (entity.id === ADD_ENTITY)
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
-        }
         else
             handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
         onCloseEntityList();

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

@@ -1,27 +1,17 @@
 import * as yup from 'yup';
 export declare const AuthenticationListValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandInfo: 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>>;
-    entityInfo: 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>>;
-    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, {
-    brandInfo: 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>>;
-    entityInfo: 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>>;
-    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, {
-    brandInfo: 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>>;
-    entityInfo: 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>>;
-    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>>;
-}>>>;
-export declare const AddEntityValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    brandInfo: 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>>;
+    entityInfo: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     legalName: 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, {
     brandInfo: 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>>;
+    entityInfo: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     legalName: 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, {
     brandInfo: 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>>;
+    entityInfo: any;
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     legalName: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
 }>>>;

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

@@ -1,33 +1,58 @@
 import * as yup from 'yup';
-import { LICENSE_NUMBER_MIN_LENGTH, REGEX_LEGAL_NAME } from '../../../../constants';
+import { ADD_ENTITY, LICENSE_NUMBER_MIN_LENGTH, REGEX_LEGAL_NAME } from '../../../../constants';
+var objectElements = {
+    id: yup.string().required(),
+    business_id: yup.string(),
+    legal_name: yup.object().shape({
+        ar: yup.string(),
+        en: yup.string()
+    }),
+    license: yup.object().shape({
+        number: yup.string()
+    })
+};
 export var AuthenticationListValidationSchema = yup.object().shape({
     brandInfo: yup.object().required('auth_brand_required'),
-    entityInfo: yup.object().required('auth_entity_required'),
-    merchantInfo: yup.object().required('auth_merchant_required')
-});
-export var AddEntityValidationSchema = yup.object().shape({
-    brandInfo: yup.object().required('auth_brand_required'),
+    entityInfo: yup.object().shape(objectElements).required('auth_entity_required'),
     licenseNumber: yup
         .string()
-        .test({
-        test: function (value) {
-            var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-            if (length === 0)
-                return true;
-            return length >= LICENSE_NUMBER_MIN_LENGTH ? true : this.createError({ message: 'enter_license_number' });
+        .when('entityInfo', function (entityInfo) {
+        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
+        if (!isAddEntity) {
+            return yup.string().optional();
         }
+        return yup
+            .string()
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return length >= LICENSE_NUMBER_MIN_LENGTH ? true : this.createError({ message: 'enter_license_number' });
+            }
+        })
+            .required('');
     })
         .required(''),
     legalName: yup
         .string()
-        .required('')
-        .test({
-        test: function (value) {
-            var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-            if (length === 0)
-                return true;
-            return (value === null || value === void 0 ? void 0 : value.match(REGEX_LEGAL_NAME)) && length >= 3 ? true : this.createError({ message: 'enter_valid_legal_name' });
+        .when('entityInfo', function (entityInfo) {
+        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
+        if (!isAddEntity) {
+            return yup.string().optional();
         }
+        return yup
+            .string()
+            .required('')
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return (value === null || value === void 0 ? void 0 : value.match(REGEX_LEGAL_NAME)) && length >= 3 ? true : this.createError({ message: 'enter_valid_legal_name' });
+            }
+        })
+            .required('');
     })
         .required('')
 });

package/build/features/featuresScreens.js

@@ -22,9 +22,11 @@ import ConnectExpressIdentityVerifyOTPScreen from './connectExpress/screens/Iden
 import ConnectExpressCollectIndividualScreen from './connectExpress/screens/CollectIndividualInfo';
 import ConnectExpressCollectBusinessScreen from './connectExpress/screens/CollectBusinessInfo';
 import ConnectExpressCreateAccountLoaderScreen from './connectExpress/screens/CreateAccountLoader';
-import ConnectExpressSuccessFlowButtonsScreen from '../features/connectExpress/screens/SuccessWithFlowButtons';
-import ConnectExpressAccountAlreadyCreatedScreen from '../features/connectExpress/screens/AccountAlreadyCreated';
-import ConnectExpressAuthenticationListScreen from '../features/connectExpress/screens/AuthenticationList';
+import ConnectExpressSuccessFlowButtonsScreen from './connectExpress/screens/SuccessWithFlowButtons';
+import ConnectExpressAccountAlreadyCreatedScreen from './connectExpress/screens/AccountAlreadyCreated';
+import ConnectExpressAuthenticationListScreen from './connectExpress/screens/AuthenticationList';
+import ConnectExpressAuthMerchantScreen from './connectExpress/screens/AuthMerchant';
+import ConnectExpressAuthAccountCreatedLoaderScreen from './connectExpress/screens/AccountCreatedLoader';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -196,6 +198,14 @@ export var connectExpressFeatureScreens = [
     {
         name: 'CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP',
         element: ConnectExpressAuthenticationListScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_AUTH_MERCHANT_LIST_STEP',
+        element: ConnectExpressAuthMerchantScreen
+    },
+    {
+        name: 'CONNECT_EXPRESS_AUTH_ACCOUNT_CREATED_STEP',
+        element: ConnectExpressAuthAccountCreatedLoaderScreen
     }
 ];
 export var businessFeatureScreens = [

package/build/features/shared/DataLoading/DataLoading.d.ts

@@ -1,6 +1,9 @@
 import * as React from 'react';
 export interface DataLoadingProps {
     error?: string | null;
+    children?: React.ReactNode;
+    title?: string;
+    hideSubtitle?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ error }: DataLoadingProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ error, children, title, hideSubtitle }: DataLoadingProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/shared/DataLoading/DataLoading.js

@@ -51,8 +51,8 @@ var SubTitleStyled = styled(Text)(function (_a) {
     return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium, lineHeight: '16.8px', textAlign: 'center' }));
 });
 var DataLoading = function (_a) {
-    var error = _a.error;
+    var error = _a.error, children = _a.children, title = _a.title, hideSubtitle = _a.hideSubtitle;
     var t = useTranslation().t;
-    return (_jsx(ScreenContainer, __assign({ sx: { mb: 2.5 } }, { children: _jsxs(TitleContainerStyled, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(GenericError, { error: error || '', errorTitle: 'oops' }) })), _jsxs(Collapse, __assign({ in: !error }, { children: [_jsx(Container, { children: _jsx(LottieFile, { file: LottieAnimationFiles.account_creation, loop: true, height: '375px' }) }), _jsxs(_Fragment, { children: [_jsx(TitleStyled, { children: t('prepare_data_title') }), _jsx(SubTitleStyled, { children: t('prepare_data_description') })] })] }))] }) })));
+    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 2.5 } }, { children: [_jsxs(TitleContainerStyled, { children: [_jsx(Collapse, __assign({ in: !!error }, { children: _jsx(GenericError, { error: error || '', errorTitle: 'oops' }) })), _jsxs(Collapse, __assign({ in: !error }, { children: [_jsx(Container, { children: _jsx(LottieFile, { file: LottieAnimationFiles.account_creation, loop: true, height: '375px' }) }), _jsxs(_Fragment, { children: [_jsx(TitleStyled, { children: t(title || 'prepare_data_title') }), !hideSubtitle && _jsx(SubTitleStyled, { children: t('prepare_data_description') })] })] }))] }), children] })));
 };
 export default React.memo(DataLoading);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.4.12",
+	"version": "2.4.13",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",

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

@@ -1,126 +0,0 @@
-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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-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 CircularProgress from '@mui/material/CircularProgress';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
-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 { getMerchantListAsync, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
-import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
-import CheckIcon from '../../../shared/CheckIcon';
-import { ADD_ENTITY } from '../../../../constants';
-import { isNetworkError } from '../../../../utils';
-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, _c;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, readOnly = _a.readOnly, isVerified = _a.isVerified;
-    var _d = React.useState([]), list = _d[0], setList = _d[1];
-    var _e = React.useState(0), count = _e[0], setCount = _e[1];
-    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
-    var t = useTranslation().t;
-    var dispatch = useAppDispatch();
-    var _g = useFormContext(), control = _g.control, watch = _g.watch, setValue = _g.setValue, getValues = _g.getValues;
-    var _h = useAppSelector(connectExpressSelector), data = _h.data, merchantLoading = _h.merchantLoading, bckError = _h.error;
-    var merchantList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).merchantList;
-    var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
-    var entityInfo = watch('entityInfo');
-    var brandInfo = getValues('brandInfo');
-    var merchantValue = merchantInfoControl.field.value;
-    var error = (_c = merchantInfoControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
-    React.useEffect(function () {
-        if ((merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0) {
-            var list_1 = __spreadArray([], merchantList, true);
-            setList(list_1);
-        }
-    }, [merchantList]);
-    React.useEffect(function () {
-        if (!bckError)
-            return;
-        if (!isNetworkError(bckError) || count > 2)
-            return;
-        if ((brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id) && (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id)) {
-            setCount(count + 1);
-            dispatch(getMerchantListAsync({ entityId: entityInfo.id, brandId: brandInfo.id }));
-        }
-    }, [bckError]);
-    React.useEffect(function () {
-        var _a;
-        if (!entityInfo)
-            return;
-        if (merchantLoading)
-            return;
-        var brandInfoId = brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id;
-        var entityId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_a = merchantList[0]) === null || _a === void 0 ? void 0 : _a.business_entity_id : '';
-        var id = (entityInfo || {}).id;
-        if (!id || id === ADD_ENTITY)
-            return;
-        if (entityId && id && entityId !== id) {
-            setValue('merchantInfo', undefined);
-            dispatch(getMerchantListAsync({ entityId: id, brandId: brandInfoId }));
-            return;
-        }
-        if (entityId && id && entityId === id && (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
-            setValue('merchantInfo', merchantList[0], { shouldValidate: true });
-            return;
-        }
-        if (!(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
-            dispatch(getMerchantListAsync({ entityId: id, brandId: brandInfoId }));
-        }
-    }, [entityInfo, merchantList]);
-    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();
-        setList(merchantList);
-    };
-    var onSelectItem = function (merchant) {
-        onCloseMerchantSelect();
-        merchantInfoControl.field.onChange(merchant);
-    };
-    var getName = function (merchant) {
-        if (!merchant)
-            return '';
-        return merchant.display_name;
-    };
-    return (_jsx(Collapse, __assign({ in: show && (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 1 }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mt: 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: merchantLoading ? undefined : !!anchorEl ? function () { return onCloseMerchantSelect(); } : onOpenMerchantSelect, endAdornment: merchantLoading ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : (_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);