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

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

@@ -117,7 +117,7 @@ export interface EntityLicense extends License {
     id: string;
 }
 export interface EntityLicenseAuth extends EntityLicense {
-    id: string;
+    business_id: string;
     country: string;
 }
 export interface Activity {
@@ -296,6 +296,7 @@ export declare type BrandInfo = {
         };
     };
     id: string;
+    business_id: string;
     name: {
         ar: string;
         en: string;

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

@@ -147,4 +147,6 @@ export declare type AuthenticationListFormValues = {
     brandInfo?: BrandInfo;
     entityInfo?: EntityLicenseAuth;
     merchantInfo?: AuthMerchantInfo;
+    licenseNumber?: string;
+    legalName?: string;
 };

package/build/api/entity.d.ts

@@ -120,6 +120,18 @@ export declare type MerchantListBody = {
     create_if_not_present: boolean;
     platforms?: Array<string>;
 };
+export declare type CreateEntityBody = {
+    business_id: string;
+    entity: {
+        legal_name: {
+            en: string;
+            ar: string;
+        };
+        license_number: string;
+        country: string;
+        is_licensed?: boolean;
+    };
+};
 declare const entityService: {
     createEntityInfo: ({ id, ...data }: EntityInfoBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     updateEntityInfo: ({ id, ...data }: EntityInfoBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
@@ -138,5 +150,6 @@ declare const entityService: {
     getEntityListUsingIndividualId: (individualId: string) => Promise<any>;
     getMerchantListUsingEntityId: (data: MerchantListBody) => Promise<any>;
     getTerminalListUsingMerchantId: (merchantId: string) => Promise<any>;
+    createEntity: (data: CreateEntityBody) => Promise<any>;
 };
 export { entityService };

package/build/api/entity.js

@@ -122,6 +122,13 @@ var getTerminalListUsingMerchantId = function (merchantId) {
         }
     });
 };
+var createEntity = function (data) {
+    return httpClient({
+        method: 'post',
+        url: "".concat(ENDPOINT_PATHS.ENTITY),
+        data: data
+    });
+};
 var entityService = {
     createEntityInfo: createEntityInfo,
     updateEntityInfo: updateEntityInfo,
@@ -139,6 +146,7 @@ var entityService = {
     removeEntityActivities: removeEntityActivities,
     getEntityListUsingIndividualId: getEntityListUsingIndividualId,
     getMerchantListUsingEntityId: getMerchantListUsingEntityId,
-    getTerminalListUsingMerchantId: getTerminalListUsingMerchantId
+    getTerminalListUsingMerchantId: getTerminalListUsingMerchantId,
+    createEntity: createEntity
 };
 export { entityService };

package/build/api/index.d.ts

@@ -3,7 +3,7 @@ import { ValidateOperatorBody, ConfirmBody } from './operator';
 import { CreateAuthBody, VerifyAuthBody, CreatePasswordBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, VerifyAuthExpressOTPBody, ConfigBody } from './auth';
 import { UpdateLeadBody, LeadVerifyBody, CreateLeadBody, LeadOTPVerifyBody, LeadIdentityUpdateBody, ExpressLeadVerifyBody } from './lead';
 import { CheckEmailBody, CheckBrandBody } from './availabilityServices';
-import { EntityInfoBody, EntityBankUpdateBody, BankDocumentInfo, UpdateEntityBody, UpdateEntityActivityBody, UpdateEntityCapitalBody, UpdateEntityAOAFileBody, RemoveEntityActivity, MerchantListBody } from './entity';
+import { EntityInfoBody, EntityBankUpdateBody, BankDocumentInfo, UpdateEntityBody, UpdateEntityActivityBody, UpdateEntityCapitalBody, UpdateEntityAOAFileBody, RemoveEntityActivity, MerchantListBody, CreateEntityBody } from './entity';
 import { CreateAccountBody, ExpressCreateAccountBody } from './account';
 import { DataElementBody } from './data';
 import { BrandListBody, UpdateBrandBody, UpdateIndividualBody, GetIndividualListBody, UpdateIndividualWithTypeBody, UpdateMultipleIndividualBody } from './individual';
@@ -75,6 +75,7 @@ declare const API: {
         getEntityListUsingIndividualId: (individualId: string) => Promise<any>;
         getMerchantListUsingEntityId: (data: MerchantListBody) => Promise<any>;
         getTerminalListUsingMerchantId: (merchantId: string) => Promise<any>;
+        createEntity: (data: CreateEntityBody) => Promise<any>;
     };
     availabilityServices: {
         checkEmail: (data: CheckEmailBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
@@ -175,6 +176,6 @@ declare const API: {
         getInitialData: (body: InitBody) => Promise<any>;
     };
 };
-export type { ValidateOperatorBody, CreateAuthBody, ExpressCreateAccountBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, UpdateBoardBody, UpdateBrandBody, DataElementBody, UploadFileBody, UpdateEntityBody, DocumentUpdateBody, DocumentInfo, VerifyAuthExpressOTPBody, UpdateIndividualBody, UpdateEntityActivityBody, UpdateEntityCapitalBody, BankDocumentInfo, GetUserListBody, GetIndividualListBody, RequestEmailBody, DocumentBody, UpdateEntityAOAFileBody, InitBody, RemoveBrandActivity, RemoveEntityActivity, UpdateIndividualWithTypeBody, UpdateMultipleIndividualBody, ExpressLeadVerifyBody, ConfirmBody, ConfigBody, MerchantListBody };
+export type { ValidateOperatorBody, CreateAuthBody, ExpressCreateAccountBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, UpdateBoardBody, UpdateBrandBody, DataElementBody, UploadFileBody, UpdateEntityBody, DocumentUpdateBody, DocumentInfo, VerifyAuthExpressOTPBody, UpdateIndividualBody, UpdateEntityActivityBody, UpdateEntityCapitalBody, BankDocumentInfo, GetUserListBody, GetIndividualListBody, RequestEmailBody, DocumentBody, UpdateEntityAOAFileBody, InitBody, RemoveBrandActivity, RemoveEntityActivity, UpdateIndividualWithTypeBody, UpdateMultipleIndividualBody, ExpressLeadVerifyBody, ConfirmBody, ConfigBody, MerchantListBody, CreateEntityBody };
 export { setAxiosGlobalHeaders, removeAxiosGlobalHeaders, axiosInstance, getAxiosHeaders };
 export default API;

package/build/constants/app.d.ts

@@ -254,3 +254,17 @@ export declare type FileInfo = {
     error: string;
     deleteStatus: DeleteFileStatus;
 };
+export declare const ADD_ENTITY = "add_entity";
+export declare const ADD_NEW_ENTITY: {
+    id: string;
+    business_id: string;
+    country: string;
+    legal_name: {
+        ar: string;
+        en: string;
+    };
+    license: {
+        number: string;
+    };
+    type: string;
+};

package/build/constants/app.js

@@ -870,3 +870,17 @@ export var DeleteFileStatus;
     DeleteFileStatus["ERROR"] = "error";
     DeleteFileStatus["SUCCESS"] = "success";
 })(DeleteFileStatus || (DeleteFileStatus = {}));
+export var ADD_ENTITY = 'add_entity';
+export var ADD_NEW_ENTITY = {
+    id: ADD_ENTITY,
+    business_id: '',
+    country: '',
+    legal_name: {
+        ar: ADD_ENTITY,
+        en: ADD_ENTITY
+    },
+    license: {
+        number: ''
+    },
+    type: ''
+};

package/build/constants/validation.d.ts

@@ -5,6 +5,8 @@ export declare const VAT_ID_LENGTH = 15;
 export declare const MAX_IBAN_VALUE = 34;
 export declare const FL_NUMBER_MAX_LENGTH = 20;
 export declare const CR_NUMBER_MAX_LENGTH = 20;
+export declare const LICENSE_NUMBER_MAX_LENGTH = 20;
+export declare const LICENSE_NUMBER_MIN_LENGTH = 5;
 export declare const FL_NUMBER_ENTITY_LENGTH = 50;
 export declare const FL_MIN_LICENSE_LENGTH = 5;
 export declare const CR_MIN_LICENSE_LENGTH = 5;
@@ -21,6 +23,7 @@ export declare const REGEX_BENEFICIARY_NAME: RegExp;
 export declare const REGEX_ALPHANUMERIC: RegExp;
 export declare const REGEX_BRAND_NAME: RegExp;
 export declare const EMAIL_MAX_LENGTH = 50;
+export declare const REGEX_LEGAL_NAME: RegExp;
 export declare const LINKEDIN_URL: RegExp;
 export declare const SOCIAL_USERNAME: RegExp;
 export declare const DIGITS_ONLY: RegExp;

package/build/constants/validation.js

@@ -5,6 +5,8 @@ export var VAT_ID_LENGTH = 15;
 export var MAX_IBAN_VALUE = 34;
 export var FL_NUMBER_MAX_LENGTH = 20;
 export var CR_NUMBER_MAX_LENGTH = 20;
+export var LICENSE_NUMBER_MAX_LENGTH = 20;
+export var LICENSE_NUMBER_MIN_LENGTH = 5;
 export var FL_NUMBER_ENTITY_LENGTH = 50;
 export var FL_MIN_LICENSE_LENGTH = 5;
 export var CR_MIN_LICENSE_LENGTH = 5;
@@ -21,6 +23,7 @@ export var REGEX_BENEFICIARY_NAME = /^([\u0600-\u065F\u066A-\u06EF\u06FA-\u06FFa
 export var REGEX_ALPHANUMERIC = /^[a-zA-Z0-9!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/? ]*$/g;
 export var REGEX_BRAND_NAME = /^(([a-zA-Z0-9])+\s)*[a-zA-Z0-9]+$/;
 export var EMAIL_MAX_LENGTH = 50;
+export var REGEX_LEGAL_NAME = /^([a-zA-Z0-9\s!@#$%^&*()_+-=,.<>?/|\\:;"'~`[\]{}]*)$/;
 export var LINKEDIN_URL = /[a-zA-Z0-9-\/:._]+$/;
 export var SOCIAL_USERNAME = /^[A-Za-z-0-9\d._]{3,}$/;
 export var DIGITS_ONLY = /^\d+$/;

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

@@ -92,6 +92,10 @@ export declare const createAccountAsync: import("@reduxjs/toolkit").AsyncThunk<{
     boardData: any;
     account: any;
 } | undefined, void, {}>;
+export declare const createEntity: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    formData: AuthenticationListFormValues;
+}, AuthenticationListFormValues, {}>;
 interface verifyPACIAsyncParams {
     onSuccess: () => void;
 }
@@ -141,11 +145,12 @@ export declare const connectSlice: import("@reduxjs/toolkit").Slice<ConnectExpre
     resetNIDScreen: (state: ConnectExpressState) => void;
     setDefaultCountryCode: (state: ConnectExpressState, action: ActionState<CountryCode>) => void;
     resetCivilScreen: (state: ConnectExpressState) => void;
+    resetAuthenticationScreen: (state: ConnectExpressState) => void;
     resetOTPValue: (state: ConnectExpressState) => void;
     resetStore: (state: ConnectExpressState) => void;
     resetIndividualScreen: (state: ConnectExpressState) => void;
 }, "connectExpress/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, storeIsStartFromBusinessCountry: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setIsLeadIdPassed: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetMobileScreen: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, resetOTPValue: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetNIDScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetCivilScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setLeadId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setShowBoard: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetIndividualScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setDefaultCountryCode: import("@reduxjs/toolkit").ActionCreatorWithPayload<CountryCode, string>, storeIsStartFromBusinessCountry: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, resetAuthenticationScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<ConnectExpressState, import("redux").AnyAction>;
 export default _default;
 export declare const connectExpressSelector: (state: RootState) => ConnectExpressState;

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

@@ -59,7 +59,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handleNextScreenStep, handleCurrentActiveScreen, handleOpen, handleSetCountryByIso2, onCloseComplete, storeAuthId } from '../../../app/settings';
 import { FlowsTypes, AuthForType, BusinessType, LicenseType } from '../../../@types';
 import API from '../../../api';
-import { CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
+import { ADD_NEW_ENTITY, CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHER_FL_LICENSE, SCOPE_AUTH } from '../../../constants';
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, capitalizeTheFirstLetterOfEachWord, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA, isKW, isOtherThanKWOrSA } from '../../../utils';
 export var updateBusinessCountryAsync = createAsyncThunk('connectExpress/updateBusinessCountryAsync', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
@@ -885,6 +885,33 @@ export var createAccountAsync = createAsyncThunk('connectExpress/createAccountAs
         }
     });
 }); });
+export var createEntity = createAsyncThunk('connectExpress/createEntity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, brandInfo, legalName, licenseNumber, body, data;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
+                brandInfo = params.brandInfo, legalName = params.legalName, licenseNumber = params.licenseNumber;
+                body = {
+                    business_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.business_id) || '',
+                    entity: {
+                        legal_name: {
+                            en: legalName || '',
+                            ar: legalName || ''
+                        },
+                        license_number: licenseNumber || '',
+                        country: (_a = settings.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2,
+                        is_licensed: undefined
+                    }
+                };
+                return [4, API.entityService.createEntity(body)];
+            case 1:
+                data = _b.sent();
+                return [2, { data: data, formData: params }];
+        }
+    });
+}); });
 export var updateLeadIndividualAsync = createAsyncThunk('connectExpress/updateLeadIndividualAsync', function (_a, thunkApi) {
     var formData = _a.formData, originalFormData = _a.originalFormData;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -1107,6 +1134,9 @@ export var connectSlice = createSlice({
         resetCivilScreen: function (state) {
             state.data.civilIdData = __assign(__assign({}, state.data.civilIdData), initialState.data.civilIdData);
         },
+        resetAuthenticationScreen: function (state) {
+            state.data.authenticationData = __assign(__assign({}, state.data.authenticationData), initialState.data.authenticationData);
+        },
         resetOTPValue: function (state) {
             state.data.otpData.otp = '';
         },
@@ -1412,11 +1442,10 @@ export var connectSlice = createSlice({
             state.error = null;
             state.loading = false;
             var _a = action.payload, brandList = _a.brandList, entityList = _a.entityList;
+            var eList = __spreadArray(__spreadArray([], entityList, true), [ADD_NEW_ENTITY], false);
             if (brandList === null || brandList === void 0 ? void 0 : brandList.length)
                 state.data.authenticationData.brandInfo = brandList[0];
-            if (entityList === null || entityList === void 0 ? void 0 : entityList.length)
-                state.data.authenticationData.entityInfo = entityList[0];
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { authenticationData: { brandList: brandList, entityList: entityList } });
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { authenticationData: { brandList: brandList, entityList: eList } });
         })
             .addCase(retrieveAuthenticationListAsync.pending, function (state) {
             state.loading = true;
@@ -1551,9 +1580,31 @@ export var connectSlice = createSlice({
             .addCase(updateBusinessCountryAsync.fulfilled, function (state) {
             state.loading = false;
             state.error = null;
+        })
+            .addCase(createEntity.pending, function (state) {
+            state.loading = true;
+            state.error = null;
+        })
+            .addCase(createEntity.rejected, function (state, action) {
+            state.loading = false;
+            state.error = action.error.message;
+        })
+            .addCase(createEntity.fulfilled, function (state, action) {
+            var _a;
+            state.loading = false;
+            state.error = null;
+            var data = action.payload.data;
+            var authenticationData = ((_a = state.data.responseData) === null || _a === void 0 ? void 0 : _a.authenticationData) || {};
+            var entityList = (authenticationData || {}).entityList;
+            if (data === null || data === void 0 ? void 0 : data.entity) {
+                var entity = __assign(__assign({}, data.entity), { business_id: data === null || data === void 0 ? void 0 : data.business_id });
+                var list = __spreadArray([entity], entityList, true);
+                state.data.authenticationData.entityInfo = list[0];
+                state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, authenticationData), { entityList: list }) });
+            }
         });
     }
 });
-export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode, storeIsStartFromBusinessCountry = _a.storeIsStartFromBusinessCountry;
+export var clearError = (_a = connectSlice.actions, _a.clearError), stopLoader = _a.stopLoader, setIsLeadIdPassed = _a.setIsLeadIdPassed, resetMobileScreen = _a.resetMobileScreen, resetOTPValue = _a.resetOTPValue, resetNIDScreen = _a.resetNIDScreen, resetCivilScreen = _a.resetCivilScreen, resetStore = _a.resetStore, setError = _a.setError, setLeadId = _a.setLeadId, setShowBoard = _a.setShowBoard, resetIndividualScreen = _a.resetIndividualScreen, setDefaultCountryCode = _a.setDefaultCountryCode, storeIsStartFromBusinessCountry = _a.storeIsStartFromBusinessCountry, resetAuthenticationScreen = _a.resetAuthenticationScreen;
 export default connectSlice.reducer;
 export var connectExpressSelector = function (state) { return state.connectExpress; };

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 _f = ((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}, brandList = _f.brandList, entityList = _f.entityList;
+    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, { list: 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/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

@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { CountryCode, EntityLicenseAuth } from '../../../../@types';
+import { CountryCode } from '../../../../@types';
 interface EntityListProps {
     show: boolean;
-    list: Array<EntityLicenseAuth>;
     countryList: Array<CountryCode>;
     onListOpen?: () => void;
     onListClose?: () => void;
+    handleAddEntity?: (flag: boolean) => void;
 }
-declare const _default: React.MemoExoticComponent<({ show, list, countryList, ...rest }: EntityListProps) => 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,13 +20,22 @@ 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';
 import { useFormContext, useController } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useLanguage } from '../../../../hooks';
+import { useAppSelector, useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -35,6 +44,8 @@ import Text from '../../../../components/Text';
 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'
@@ -51,13 +62,34 @@ var EntityNameText = styled(Text, { shouldForwardProp: function (prop) { return
     return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
 });
 var EntityList = function (_a) {
-    var show = _a.show, list = _a.list, countryList = _a.countryList, rest = __rest(_a, ["show", "list", "countryList"]);
-    var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
+    var _b, _c;
+    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;
     var isAr = useLanguage().isAr;
-    var control = useFormContext().control;
+    var _f = useFormContext(), control = _f.control, watch = _f.watch, setValue = _f.setValue, getValues = _f.getValues;
+    var data = useAppSelector(connectExpressSelector).data;
+    var brandInfo = watch('brandInfo');
+    var entityList = ((_c = (_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) === null || _c === void 0 ? void 0 : _c.entityList) || [];
     var selectedEntityControl = useController({ control: control, name: 'entityInfo' });
-    var selectedEntity = selectedEntityControl.field.value;
+    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 = __spreadArray(__spreadArray([], filteredEntityList, true), [entityList[entityList.length - 1]], false) || [];
+            setList(list_1);
+            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);
+                setValue('entityInfo', undefined);
+            }
+        }
+    }, [entityList, brandInfo]);
     var onOpenEntityList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);
@@ -72,7 +104,7 @@ var EntityList = function (_a) {
         var _a, _b;
         if (!entity)
             return '';
-        return (isAr ? (_a = entity.legal_name) === null || _a === void 0 ? void 0 : _a.ar : (_b = entity.legal_name) === null || _b === void 0 ? void 0 : _b.en) || '';
+        return (isAr ? t((_a = entity.legal_name) === null || _a === void 0 ? void 0 : _a.ar) : t((_b = entity.legal_name) === null || _b === void 0 ? void 0 : _b.en)) || '';
     };
     var getEntityId = function (entity) {
         if (!entity)
@@ -85,12 +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();
     };
-    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: t(getLegalName(selectedEntity)) }), _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, {})] }));
+    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: [(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,15 +47,16 @@ 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;
-    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');
-    var brandInfo = watch('brandInfo');
+    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 () {
@@ -63,26 +66,39 @@ var MerchantList = React.forwardRef(function (_a, ref) {
         }
     }, [merchantList]);
     React.useEffect(function () {
-        var _a, _b;
+        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 brandId = (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) > 0 ? (_b = merchantList[0]) === null || _b === void 0 ? void 0 : _b.brand_id : '';
         var id = (entityInfo || {}).id;
-        if (!id)
+        if (!id || id === ADD_ENTITY)
             return;
-        if ((entityId && id && entityId !== id) || (brandId && brandInfoId && brandId !== brandInfoId)) {
+        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, brandInfo]);
+    }, [entityInfo, merchantList]);
     var onOpenMerchantSelect = function (event) {
         if (readOnly)
             return;
@@ -103,7 +119,7 @@ var MerchantList = React.forwardRef(function (_a, ref) {
             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(merchantValue) || '', 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 (_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 })] }));
                         } }) }))] })) })));
 });

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/shared/Button/Button.js

@@ -94,10 +94,14 @@ export default function CustomButton(_a) {
             setBtnLoading(false);
     }, [loading, error]);
     React.useEffect(function () {
-        if (!loading)
-            setTimeout(function () {
-                setBtnLoading(false);
-            }, 1000);
+        if (loading)
+            return;
+        var timeout = setTimeout(function () {
+            setBtnLoading(false);
+        }, 1000);
+        return function () {
+            clearTimeout(timeout);
+        };
     }, [loading]);
     React.useEffect(function () {
         setBtnLoading(false);

package/package.json

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