@tap-payments/auth-jsconnect 2.6.87-test → 2.6.89-test

package/build/features/connect/screens/NID/DOB.d.ts

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

package/build/features/connect/screens/NID/NID.d.ts

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

package/build/features/connect/screens/OTP/OTP.d.ts

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

package/build/features/connect/screens/OTP/OTPInput.d.ts

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

package/build/features/connect/screens/OperatorError/OperatorError.d.ts

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

package/build/features/connect/screens/ThankYou/ThankYou.d.ts

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

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<() => import("react/jsx-runtime").JSX.Element | null>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element | null>;
 export default _default;

package/build/features/connectExpress/ConnectExpress.d.ts

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

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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        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]) {

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) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({}: AccountAlreadyCreatedProps) => JSX.Element>;
 export default _default;

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) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({}: AuthenticationListProps) => JSX.Element>;
 export default _default;

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

@@ -22,12 +22,14 @@ 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, updateOperatorInfoAsync } from '../../../app/connectExpress/connectExpressStore';
 import { useLanguage } from '../../../../hooks';
-import { AuthenticationListValidationSchema } from './validation';
+import { AddEntityValidationSchema, 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";
@@ -40,7 +42,8 @@ var AuthenticationList = function (_a) {
     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 _e = React.useState(), listActive = _e[0], setListActive = _e[1];
-    var brandList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).brandList;
+    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 otpData = data.otpData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
@@ -51,7 +54,7 @@ var AuthenticationList = function (_a) {
         });
     }, []);
     var methods = useForm({
-        resolver: yupResolver(AuthenticationListValidationSchema()),
+        resolver: yupResolver(isAddEntity ? AddEntityValidationSchema : AuthenticationListValidationSchema),
         defaultValues: {
             brandInfo: brandInfo,
             entityInfo: entityInfo,
@@ -63,12 +66,25 @@ var AuthenticationList = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var onSubmit = function (formData) {
+        if (isAddEntity) {
+            var data_1 = { licenseNumber: formData.licenseNumber, legalName: formData.legalName, brandInfo: formData.brandInfo };
+            dispatch(createEntity(deepCopy(data_1)));
+            return;
+        }
         dispatch(updateOperatorInfoAsync(deepCopy(formData)));
     };
     var onBack = function () {
         var _a;
+        if (isAddEntity) {
+            setIsAddEntity(false);
+            methods.setValue('licenseNumber', '');
+            methods.setValue('legalName', '');
+            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 () {
@@ -88,6 +104,7 @@ var AuthenticationList = function (_a) {
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
     var isMerchantList = listActive === ListType.MerchantList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isEntityList && !isMerchantList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { countryList: settingsData.countries || [], show: !isBrandList && !isMerchantList, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _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 }, { children: t('next') })) }))] })) })) }));
+    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') })) }))] })) })) }));
 };
 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) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
 export default _default;

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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const EntityLegalName: () => JSX.Element;
+export default EntityLegalName;

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

@@ -0,0 +1,48 @@
+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 { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
+import Box from '@mui/material/Box';
+import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
+import Input from '../../../shared/Input';
+import { EndAdornment } from '../../../shared/EndAdornment';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        direction: theme.direction,
+        fontFamily: theme.typography.fontFamily,
+        overflow: 'hidden',
+        paddingBlockEnd: theme.spacing(2.5)
+    });
+});
+var EntityLegalName = function () {
+    var _a;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var entityNameControl = useController({ control: control, name: 'legalName' });
+    var entityNameValue = entityNameControl.field.value;
+    var error = (_a = entityNameControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var handleChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
+        entityNameControl.field.onChange(value);
+    };
+    var clearEntityLegalName = function () {
+        entityNameControl.field.onChange('');
+    };
+    return (_jsx(BoxStyled, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('license_name_label'), onChange: handleChange, required: true, value: entityNameValue || '', endAdornment: _jsx(EndAdornment, { value: entityNameValue, error: error, onClear: clearEntityLegalName }), placeholder: t('license_name_hint'), warningType: 'alert', warningMessage: error && t(error) }) })));
+};
+export default EntityLegalName;

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

@@ -5,6 +5,7 @@ interface EntityListProps {
     countryList: Array<CountryCode>;
     onListOpen?: () => void;
     onListClose?: () => void;
+    handleAddEntity?: (flag: boolean) => void;
 }
-declare const _default: React.MemoExoticComponent<({ show, countryList, ...rest }: EntityListProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, countryList, handleAddEntity, ...rest }: EntityListProps) => JSX.Element>;
 export default _default;

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

@@ -20,6 +20,15 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+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, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
@@ -36,6 +45,7 @@ import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
 import Icon from '../../../../components/Icon';
 import { connectExpressSelector } from '../../../../features/app/connectExpress/connectExpressStore';
+import { ADD_ENTITY } from '../../../../constants';
 var EntityContainer = styled(Box)(function () { return ({
     display: 'flex',
     alignItems: 'center'
@@ -53,7 +63,7 @@ var EntityNameText = styled(Text, { shouldForwardProp: function (prop) { return
 });
 var EntityList = function (_a) {
     var _b, _c;
-    var show = _a.show, countryList = _a.countryList, rest = __rest(_a, ["show", "countryList"]);
+    var show = _a.show, countryList = _a.countryList, handleAddEntity = _a.handleAddEntity, rest = __rest(_a, ["show", "countryList", "handleAddEntity"]);
     var _d = React.useState([]), list = _d[0], setList = _d[1];
     var _e = React.useState(null), anchorEl = _e[0], setAnchorEl = _e[1];
     var t = useTranslation().t;
@@ -66,10 +76,13 @@ var EntityList = function (_a) {
     React.useEffect(function () {
         if (entityList.length > 0) {
             var filteredEntityList = entityList.filter(function (entity) { return (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) && entity.business_id === brandInfo.business_id; });
-            var list_1 = filteredEntityList || [];
+            var list_1 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false) || [];
             setList(list_1);
-            if (list_1.length) {
-                setValue('entityInfo', list_1[0], { shouldValidate: true });
+            if (filteredEntityList.length) {
+                setValue('entityInfo', filteredEntityList[0], { shouldValidate: true });
+                setValue('licenseNumber', '');
+                setValue('legalName', '');
+                handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
             }
             else {
                 setValue('merchantInfo', undefined);
@@ -104,13 +117,19 @@ var EntityList = function (_a) {
             return '';
         return ((_a = countryList.find(function (country) { return country.iso2.toLocaleLowerCase() === entity.country.toLocaleLowerCase(); })) === null || _a === void 0 ? void 0 : _a.logo) || '';
     };
-    var onSelectItem = function (brand) {
-        selectedEntityControl.field.onChange(brand);
+    var onSelectItem = function (entity) {
+        selectedEntityControl.field.onChange(entity);
+        if (entity.id === ADD_ENTITY) {
+            setValue('merchantInfo', undefined);
+            handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(true);
+        }
+        else
+            handleAddEntity === null || handleAddEntity === void 0 ? void 0 : handleAddEntity(false);
         onCloseEntityList();
     };
     var selectedEntity = selectedEntityControl.field.value;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('select_entity_label'), onClick: !!anchorEl ? onCloseEntityList : onOpenEntityList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('select_entity_placeholder'), value: getLegalName(getValues('entityInfo')) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { space: 140, list: list, onSelectItem: onSelectItem, renderItem: function (entity) {
-                            return (_jsxs(_Fragment, { children: [_jsxs(EntityContainer, { children: [_jsx(EntityCountryFlag, { src: getCountryFlag(entity) }), _jsx(EntityNameText, __assign({ isSelected: getEntityId(entity) === getEntityId(selectedEntity) }, { children: t(getLegalName(entity)) }))] }), getEntityId(entity) === getEntityId(selectedEntity) && _jsx(CheckIcon, {})] }));
+                            return (_jsxs(_Fragment, { children: [_jsxs(EntityContainer, { children: [(entity === null || entity === void 0 ? void 0 : entity.country) && _jsx(EntityCountryFlag, { src: getCountryFlag(entity) }), _jsx(EntityNameText, __assign({ isSelected: getEntityId(entity) === getEntityId(selectedEntity) }, { children: t(getLegalName(entity)) }))] }), getEntityId(entity) === getEntityId(selectedEntity) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 };
 export default React.memo(EntityList);

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

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

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

@@ -0,0 +1,36 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH, LICENSE_NUMBER_MAX_LENGTH, LICENSE_NUMBER_MIN_LENGTH } from '../../../../constants';
+import { removeAllOtherThanCharsAndNumber, isSA } from '../../../../utils';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import Input from '../../../shared/Input';
+import { useAppSelector } from '../../../../hooks';
+import { settingsSelector } from '../../../../app/settings';
+var LicenseNumber = function () {
+    var _a;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var licenseNumberControl = useController({ control: control, name: 'licenseNumber' });
+    var settingsData = useAppSelector(settingsSelector).data;
+    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var handleFLNumberChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllOtherThanCharsAndNumber(target.value);
+        licenseNumberControl.field.onChange(value);
+    };
+    var clearLicenseNumber = function () {
+        licenseNumberControl.field.onChange('');
+    };
+    var licenseNumberValue = licenseNumberControl.field.value;
+    var error = (_a = licenseNumberControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var length = !isSACountry ? KW_MAX_LICENSE_LENGTH : LICENSE_NUMBER_MAX_LENGTH;
+    var minLength = !isSACountry ? KW_MIN_LICENSE_LENGTH : LICENSE_NUMBER_MIN_LENGTH;
+    var label = 'license_number';
+    var showCheckIcon = (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) >= minLength;
+    return (_jsx(ScreenContainer, { children: _jsx(Input, { label: t(label), required: true, onChange: handleFLNumberChange, inputProps: { maxLength: length }, value: licenseNumberValue || '', endAdornment: showCheckIcon ? _jsx(CheckIcon, {}) : licenseNumberValue && _jsx(ClearIcon, { onClick: clearLicenseNumber }), placeholder: t('license_number_hint'), warningType: 'alert', warningMessage: error && t(error, { length: minLength }) }) }));
+};
+export default React.memo(LicenseNumber);

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

@@ -34,6 +34,8 @@ 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'
 }); });
@@ -45,11 +47,12 @@ 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(null), anchorEl = _e[0], setAnchorEl = _e[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 _f = useFormContext(), control = _f.control, watch = _f.watch, setValue = _f.setValue, getValues = _f.getValues;
-    var _g = useAppSelector(connectExpressSelector), data = _g.data, merchantLoading = _g.merchantLoading;
+    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');
@@ -62,6 +65,16 @@ var MerchantList = React.forwardRef(function (_a, ref) {
             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)
@@ -71,7 +84,7 @@ var MerchantList = React.forwardRef(function (_a, ref) {
         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)
+        if (!id || id === ADD_ENTITY)
             return;
         if (entityId && id && entityId !== id) {
             setValue('merchantInfo', undefined);

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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const AuthenticationListValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+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>>;
@@ -12,3 +12,16 @@ export declare const AuthenticationListValidationSchema: () => yup.ObjectSchema<
     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>>;
+    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>>;
+    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>>;
+    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,8 +1,33 @@
 import * as yup from 'yup';
-export var AuthenticationListValidationSchema = function () {
-    return yup.object().shape({
-        brandInfo: yup.object().required('auth_brand_required'),
-        entityInfo: yup.object().required('auth_entity_required'),
-        merchantInfo: yup.object().required('auth_merchant_required')
-    });
-};
+import { LICENSE_NUMBER_MIN_LENGTH, REGEX_LEGAL_NAME } from '../../../../constants';
+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'),
+    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' });
+        }
+    })
+        .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' });
+        }
+    })
+        .required('')
+});

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

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

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

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

package/build/features/connectExpress/screens/BusinessCountry/BusinessCountry.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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        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]) {

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

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

package/build/features/connectExpress/screens/CivilIDMissed/CivilID.d.ts

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

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

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

package/build/features/connectExpress/screens/CollectBusinessInfo/BrandName.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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        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]) {

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

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

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

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

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

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