@tap-payments/auth-jsconnect 2.6.24-test → 2.6.26-test

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

@@ -1,4 +1,4 @@
-import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, Occupation, SaleChannel, Segment, SourceOfIncome, TeamSize, City, EntityLicense, EntityLicenseAuth, AuthMerchantInfo, AuthTerminalInfo } from './app';
+import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, Occupation, SaleChannel, Segment, SourceOfIncome, TeamSize, City, EntityLicense, EntityLicenseAuth, AuthMerchantInfo } from './app';
 export declare type MobileFormValues = {
     mobile: string;
     countryCode: CountryCode;
@@ -147,5 +147,4 @@ export declare type AuthenticationListFormValues = {
     brandInfo?: BrandInfo;
     entityInfo?: EntityLicenseAuth;
     merchantInfo?: AuthMerchantInfo;
-    terminalInfo?: AuthTerminalInfo;
 };

package/build/api/index.d.ts

@@ -20,7 +20,7 @@ declare const API: {
     };
     operatorService: {
         validateOperator: (body: ValidateOperatorBody) => Promise<any>;
-        updateOperator: ({ id, ...data }: UpdateOperatorBody) => Promise<any>;
+        updateOperator: (data: UpdateOperatorBody) => Promise<any>;
     };
     countryService: {
         getCountries: (disableCountries?: boolean | undefined) => Promise<any> | {

package/build/api/operator.d.ts

@@ -7,13 +7,15 @@ export declare type ValidateOperatorBody = {
     connect_pkey?: string;
 };
 export declare type UpdateOperatorBody = {
-    id: string;
     post_url: string;
     authentication_id: string;
     bi: string;
+    brand_id: string;
+    merchant_id: string;
+    entity_id: string;
 };
 declare const operatorService: {
     validateOperator: (body: ValidateOperatorBody) => Promise<any>;
-    updateOperator: ({ id, ...data }: UpdateOperatorBody) => Promise<any>;
+    updateOperator: (data: UpdateOperatorBody) => Promise<any>;
 };
 export { operatorService };

package/build/api/operator.js

@@ -34,17 +34,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { ENDPOINT_PATHS } from '../constants';
 import { httpClient } from './axios';
 var validateOperator = function (body) { return __awaiter(void 0, void 0, void 0, function () {
@@ -70,11 +59,10 @@ var validateOperator = function (body) { return __awaiter(void 0, void 0, void 0
         }
     });
 }); };
-var updateOperator = function (_a) {
-    var id = _a.id, data = __rest(_a, ["id"]);
+var updateOperator = function (data) {
     return httpClient({
-        method: 'put',
-        url: "".concat(ENDPOINT_PATHS.OPERATOR, "/").concat(id),
+        method: 'post',
+        url: "".concat(ENDPOINT_PATHS.CONNECT, "/confirm"),
         data: data
     });
 };

package/build/app/settings.d.ts

@@ -9,7 +9,11 @@ interface SettingParams {
     onVerifyConfigTokenSuccess?: (data: ConfigExpressTokenParams) => Promise<void>;
 }
 export declare const fetchAppSettingsSync: import("@reduxjs/toolkit").AsyncThunk<any, SettingParams, {}>;
-export declare const onCloseComplete: import("@reduxjs/toolkit").AsyncThunk<void, string, {}>;
+export declare const onCloseComplete: import("@reduxjs/toolkit").AsyncThunk<void, {
+    merchantId: string;
+    brandId: string;
+    entityId: string;
+}, {}>;
 export interface SettingsData {
     skin: ThemeMode;
     language: LanguageMode;

package/build/app/settings.js

@@ -145,30 +145,29 @@ export var fetchAppSettingsSync = createAsyncThunk('fetchAppSettingsSync', funct
         }
     });
 }); });
-export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', function (merchantId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, appConfig, authId, postURL, redirectUrl, bi, list, id, body, data, urlQueryStart;
-    var _b, _c, _d, _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+export var onCloseComplete = createAsyncThunk('settings/onCloseComplete', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, _a, appConfig, authId, postURL, redirectUrl, bi, merchantId, brandId, entityId, body, data, urlQueryStart;
+    var _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 _a = settings.data, appConfig = _a.appConfig, authId = _a.authId;
                 postURL = appConfig.postURL, redirectUrl = appConfig.redirectUrl;
                 bi = settings.data.deviceInfo.browser.browser_id;
-                return [4, API.entityService.getTerminalListUsingMerchantId(merchantId)];
-            case 1:
-                list = (_f.sent()).list;
-                id = ((_c = (_b = list === null || list === void 0 ? void 0 : list[0]) === null || _b === void 0 ? void 0 : _b.operator) === null || _c === void 0 ? void 0 : _c.id) || '';
+                merchantId = params.merchantId, brandId = params.brandId, entityId = params.entityId;
                 body = {
-                    id: id,
                     post_url: postURL || '',
                     authentication_id: authId || '',
-                    bi: bi
+                    bi: bi,
+                    brand_id: brandId || '',
+                    merchant_id: merchantId || '',
+                    entity_id: entityId || ''
                 };
                 return [4, API.operatorService.updateOperator(body)];
-            case 2:
-                data = _f.sent();
-                (_e = (_d = settings.data.appConfig).onStepCompleted) === null || _e === void 0 ? void 0 : _e.call(_d, settings.data.activeScreen.name, data);
+            case 1:
+                data = _d.sent();
+                (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, data);
                 if (authId) {
                     if (settings.data.appConfig.mode === 'popup') {
                         settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });

package/build/features/app/bank/bankStore.js

@@ -311,14 +311,13 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBankSuccess', funct
     });
 }); });
 export var onCloseCompleteBank = createAsyncThunk('bank/onCloseCompleteBank', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var bank, id;
-    var _a;
+    var bank, _a, merchant, brand, entity;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 bank = thunkApi.getState().bank;
-                id = (((_a = bank.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = bank.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _b.sent();
                 return [2];

package/build/features/app/brand/brandStore.js

@@ -553,14 +553,13 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardBrandSuccess', func
     });
 }); });
 export var onCloseCompleteBrand = createAsyncThunk('brand/onCloseCompleteBrand', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var brand, id;
-    var _a;
+    var brand, _a, merchant, brandRes, entity;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 brand = thunkApi.getState().brand;
-                id = (((_a = brand.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = brand.data.verify.responseBody || {}, merchant = _a.merchant, brandRes = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brandRes === null || brandRes === void 0 ? void 0 : brandRes.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _b.sent();
                 return [2];

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

@@ -25,7 +25,6 @@ export declare const retrieveAuthenticationListAsync: import("@reduxjs/toolkit")
     individualId: string;
 }, {}>;
 export declare const getMerchantListAsync: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
-export declare const getTerminalListAsync: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
 export declare const createMobileAuthAsync: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: MobileFormValues;

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

@@ -224,17 +224,6 @@ export var getMerchantListAsync = createAsyncThunk('connectExpress/getMerchantLi
         }
     });
 }); });
-export var getTerminalListAsync = createAsyncThunk('connectExpress/getTerminalListAsync', function (merchantId) { return __awaiter(void 0, void 0, void 0, function () {
-    var list;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, API.entityService.getTerminalListUsingMerchantId(merchantId)];
-            case 1:
-                list = (_a.sent()).list;
-                return [2, list || []];
-        }
-    });
-}); });
 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;
@@ -539,9 +528,9 @@ export var verifyNIDOtpAsync = createAsyncThunk('connectExpress/verifyNIDOtpAsyn
 }); });
 export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, settings, connectExpress, authData, _b, scope, redirectUrl, authConfigData, isScopeAuthentication, bi, isDataHasOperator, expiry, interval, maxCalls, count, data, isSuccess, authId, urlQueryStart, _c, brandList, entityList, stepName, needToCollectMoreInfo, creatingAccount;
-    var _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _d, _e;
+    return __generator(this, function (_f) {
+        switch (_f.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connectExpress = _a.connectExpress;
                 authData = (connectExpress.data.responseData || {}).authData;
@@ -553,7 +542,7 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 interval = 3;
                 maxCalls = Math.floor(expiry / interval);
                 count = 1;
-                _e.label = 1;
+                _f.label = 1;
             case 1:
                 if (!(count <= maxCalls)) return [3, 9];
                 if (thunkApi.signal.aborted) {
@@ -561,8 +550,8 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 }
                 return [4, API.authService.getVerifyExpressAuth(authData === null || authData === void 0 ? void 0 : authData.auth_token)];
             case 2:
-                data = _e.sent();
-                isSuccess = ((_d = data.status) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'success';
+                data = _f.sent();
+                isSuccess = ((_e = (_d = data.auth) === null || _d === void 0 ? void 0 : _d.status) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'success';
                 if (!isSuccess) return [3, 6];
                 authId = data.auth.id;
                 thunkApi.dispatch(storeAuthId(authId));
@@ -581,15 +570,15 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 if (!(isScopeAuthentication && !data.new_user && isDataHasOperator)) return [3, 4];
                 return [4, thunkApi.dispatch(retrieveAuthenticationListAsync({ individualId: data.individual_id })).unwrap()];
             case 3:
-                _c = _e.sent(), brandList = _c.brandList, entityList = _c.entityList;
+                _c = _f.sent(), brandList = _c.brandList, entityList = _c.entityList;
                 if (brandList.length && entityList.length) {
                     sleep(100).then(function () { return thunkApi.dispatch(handleNextScreenStep('CONNECT_EXPRESS_AUTHENTICATION_LIST_STEP')); });
                     return [2, data];
                 }
-                _e.label = 4;
+                _f.label = 4;
             case 4: return [4, thunkApi.dispatch(getLeadByIdAsync(data.lead.id)).unwrap()];
             case 5:
-                _e.sent();
+                _f.sent();
                 stepName = data.step_name;
                 needToCollectMoreInfo = stepName === 'collect_info';
                 creatingAccount = stepName === 'create_account';
@@ -602,8 +591,8 @@ export var verifyPACIAsync = createAsyncThunk('connectExpress/verifyPACIAsync',
                 return [2, data];
             case 6: return [4, sleep(interval * 1000)];
             case 7:
-                _e.sent();
-                _e.label = 8;
+                _f.sent();
+                _f.label = 8;
             case 8:
                 count++;
                 return [3, 1];
@@ -957,12 +946,12 @@ export var updateLeadBusinessDataAsync = createAsyncThunk('updateLeadBusinessDat
     });
 });
 export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOperatorInfoAsync', function (_a, thunkApi) {
-    var terminalInfo = _a.terminalInfo;
+    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;
-        var _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
+        var _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     _b = thunkApi.getState(), connectExpress = _b.connectExpress, settings = _b.settings;
                     responseData = connectExpress.data.responseData;
@@ -970,15 +959,17 @@ export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOper
                     bi = settings.data.deviceInfo.browser.browser_id;
                     authId = (_e = (_d = responseData === null || responseData === void 0 ? void 0 : responseData.authData) === null || _d === void 0 ? void 0 : _d.auth) === null || _e === void 0 ? void 0 : _e.id;
                     body = {
-                        id: ((_f = terminalInfo === null || terminalInfo === void 0 ? void 0 : terminalInfo.operator) === null || _f === void 0 ? void 0 : _f.id) || '',
                         post_url: postURL || '',
                         authentication_id: authId,
-                        bi: bi
+                        bi: bi,
+                        brand_id: (brandInfo === null || brandInfo === void 0 ? void 0 : brandInfo.id) || '',
+                        merchant_id: (merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.id) || '',
+                        entity_id: (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) || ''
                     };
                     return [4, API.operatorService.updateOperator(body)];
                 case 1:
-                    data = _j.sent();
-                    (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, data);
+                    data = _h.sent();
+                    (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, data);
                     if (authId) {
                         if (settings.data.appConfig.mode === 'popup') {
                             settings.data.appConfig.onFlowCompleted({ auth_id: authId, bi: bi });
@@ -996,14 +987,14 @@ export var updateOperatorInfoAsync = createAsyncThunk('connectExpress/updateOper
     });
 });
 export var onCloseCompleteAsync = createAsyncThunk('connectExpress/onCloseCompleteAsync', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var connectExpress, id;
-    var _a, _b;
+    var connectExpress, _a, merchant, brand, entity;
+    var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
                 connectExpress = thunkApi.getState().connectExpress;
-                id = (((_b = (_a = connectExpress.data.responseData) === null || _a === void 0 ? void 0 : _a.boardData) === null || _b === void 0 ? void 0 : _b.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = ((_b = connectExpress.data.responseData) === null || _b === void 0 ? void 0 : _b.boardData) || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _c.sent();
                 return [2];
@@ -1052,8 +1043,7 @@ var initialState = {
         authenticationData: {
             brandInfo: undefined,
             entityInfo: undefined,
-            merchantInfo: undefined,
-            terminalInfo: undefined
+            merchantInfo: undefined
         }
     }
 };
@@ -1495,24 +1485,6 @@ export var connectSlice = createSlice({
             .addCase(getMerchantListAsync.rejected, function (state, action) {
             state.merchantLoading = false;
             state.error = action.error.message;
-        })
-            .addCase(getTerminalListAsync.pending, function (state) {
-            state.terminalLoading = true;
-            state.error = null;
-        })
-            .addCase(getTerminalListAsync.fulfilled, function (state, action) {
-            state.terminalLoading = false;
-            state.error = null;
-            var data = state.data.responseData;
-            var terminalList = action.payload;
-            if (terminalList === null || terminalList === void 0 ? void 0 : terminalList.length) {
-                state.data.authenticationData.terminalInfo = terminalList[0];
-            }
-            state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { terminalList: terminalList }) });
-        })
-            .addCase(getTerminalListAsync.rejected, function (state, action) {
-            state.terminalLoading = false;
-            state.error = action.error.message;
         })
             .addCase(updateOperatorInfoAsync.pending, function (state) {
             state.loading = true;

package/build/features/app/entity/entityStore.js

@@ -456,14 +456,13 @@ export var updateBoardSuccess = createAsyncThunk('updateBoardEntitySuccess', fun
     });
 }); });
 export var onCloseCompleteEntity = createAsyncThunk('entity/onCloseCompleteEntity', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var entity, id;
-    var _a;
+    var entity, _a, merchant, brand, entityRes;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 entity = thunkApi.getState().entity;
-                id = (((_a = entity.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = entity.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entityRes = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entityRes === null || entityRes === void 0 ? void 0 : entityRes.id }))];
             case 1:
                 _b.sent();
                 return [2];

package/build/features/app/individual/individualStore.js

@@ -827,14 +827,13 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
     });
 }); });
 export var onCloseCompleteIndividual = createAsyncThunk('individual/onCloseCompleteIndividual', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var individual, id;
-    var _a;
+    var individual, _a, merchant, brand, entity;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 individual = thunkApi.getState().individual;
-                id = (((_a = individual.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = individual.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _b.sent();
                 return [2];

package/build/features/app/password/passwordStore.js

@@ -357,14 +357,13 @@ export var retrieveBoardResetPasswordSuccess = createAsyncThunk('retrieveBoardRe
     });
 }); });
 export var onCloseCompletePassword = createAsyncThunk('password/onCloseCompletePassword', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var password, id;
-    var _a;
+    var password, _a, merchant, brand, entity;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 password = thunkApi.getState().password;
-                id = (((_a = password.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = password.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _b.sent();
                 return [2];

package/build/features/app/tax/taxStore.js

@@ -279,14 +279,13 @@ export var updateLeadSuccess = createAsyncThunk('taxUpdateLeadSuccess', function
     });
 }); });
 export var onCloseCompleteTax = createAsyncThunk('password/onCloseCompleteTax', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var tax, id;
-    var _a;
+    var tax, _a, merchant, brand, entity;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 tax = thunkApi.getState().tax;
-                id = (((_a = tax.data.verify.responseBody) === null || _a === void 0 ? void 0 : _a.merchant) || {}).id;
-                return [4, thunkApi.dispatch(onCloseComplete(id))];
+                _a = tax.data.verify.responseBody || {}, merchant = _a.merchant, brand = _a.brand, entity = _a.entity;
+                return [4, thunkApi.dispatch(onCloseComplete({ merchantId: merchant === null || merchant === void 0 ? void 0 : merchant.id, brandId: brand === null || brand === void 0 ? void 0 : brand.id, entityId: entity === null || entity === void 0 ? void 0 : entity.id }))];
             case 1:
                 _b.sent();
                 return [2];

package/build/features/board/screens/Verify/Verify.js

@@ -46,9 +46,9 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b;
+    var _b, _c;
     var dispatch = useAppDispatch();
-    var _c = useAppSelector(boardSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var _d = useAppSelector(boardSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -56,8 +56,8 @@ var VerifyNumber = function (_a) {
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _d = React.useState(false), resendLoading = _d[0], setResendLoading = _d[1];
-    var phone = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by.sent_to;
+    var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
+    var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
             dispatch(clearError());

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

@@ -28,19 +28,17 @@ import { AuthenticationListValidationSchema } from './validation';
 import BrandList from './BrandList';
 import EntityList from './EntityList';
 import MerchantList from './MerchantList';
-import TerminalList from './TerminalList';
 var ListType;
 (function (ListType) {
     ListType["BrandList"] = "BrandList";
     ListType["EntityList"] = "EntityList";
     ListType["MerchantList"] = "MerchantList";
-    ListType["TerminalList"] = "TerminalList";
 })(ListType || (ListType = {}));
 var AuthenticationList = function (_a) {
     var _b;
     var settingsData = useAppSelector(settingsSelector).data;
     var _c = useAppSelector(connectExpressSelector), data = _c.data, loading = _c.loading, error = _c.error, merchantLoading = _c.merchantLoading, terminalLoading = _c.terminalLoading;
-    var _d = data.authenticationData, brandInfo = _d.brandInfo, entityInfo = _d.entityInfo, merchantInfo = _d.merchantInfo, terminalInfo = _d.terminalInfo;
+    var _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 otpData = data.otpData;
@@ -57,8 +55,7 @@ var AuthenticationList = function (_a) {
         defaultValues: {
             brandInfo: brandInfo,
             entityInfo: entityInfo,
-            merchantInfo: merchantInfo,
-            terminalInfo: terminalInfo
+            merchantInfo: merchantInfo
         },
         mode: 'onChange'
     });
@@ -78,10 +75,6 @@ var AuthenticationList = function (_a) {
         if (merchantInfo && !methods.getValues('merchantInfo'))
             methods.setValue('merchantInfo', merchantInfo, { shouldValidate: true });
     }, [merchantInfo]);
-    React.useEffect(function () {
-        if (terminalInfo && !methods.getValues('terminalInfo'))
-            methods.setValue('terminalInfo', terminalInfo, { shouldValidate: true });
-    }, [terminalInfo]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -95,7 +88,6 @@ var AuthenticationList = function (_a) {
     var isBrandList = listActive === ListType.BrandList;
     var isEntityList = listActive === ListType.EntityList;
     var isMerchantList = listActive === ListType.MerchantList;
-    var isTerminalList = listActive === ListType.TerminalList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !isEntityList && !isMerchantList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EntityList, { list: entityList || [], countryList: settingsData.countries || [], show: !isBrandList && !isMerchantList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.EntityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(MerchantList, { show: !isBrandList && !isEntityList && !isTerminalList, onListOpen: function () { return handleMenuClick(ListType.MerchantList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TerminalList, { show: !isBrandList && !isEntityList && !isMerchantList, onListOpen: function () { return handleMenuClick(ListType.TerminalList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { list: brandList || [], show: !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') })) }))] })) })) }));
 };
 export default React.memo(AuthenticationList);

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

@@ -48,11 +48,11 @@ var MerchantList = React.forwardRef(function (_a, ref) {
     var _e = React.useState(null), anchorEl = _e[0], setAnchorEl = _e[1];
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _f = useFormContext(), control = _f.control, getValues = _f.getValues, setValue = _f.setValue;
+    var _f = useFormContext(), control = _f.control, watch = _f.watch, setValue = _f.setValue;
     var _g = useAppSelector(connectExpressSelector), data = _g.data, merchantLoading = _g.merchantLoading;
     var merchantList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).merchantList;
     var merchantInfoControl = useController({ control: control, name: 'merchantInfo' });
-    var entityInfo = getValues('entityInfo');
+    var entityInfo = watch('entityInfo');
     var merchantValue = merchantInfoControl.field.value;
     var error = (_c = merchantInfoControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
     React.useEffect(function () {
@@ -63,16 +63,23 @@ var MerchantList = React.forwardRef(function (_a, ref) {
     }, [merchantList]);
     React.useEffect(function () {
         var _a;
+        if (!entityInfo)
+            return;
+        if (merchantLoading)
+            return;
         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)
             return;
-        if (entityId !== id) {
+        if (entityId && id && entityId !== id) {
             setValue('merchantInfo', undefined);
-            setValue('terminalInfo', undefined);
+            dispatch(getMerchantListAsync(id));
+            return;
+        }
+        if (!(merchantList === null || merchantList === void 0 ? void 0 : merchantList.length)) {
             dispatch(getMerchantListAsync(id));
         }
-    }, [entityInfo]);
+    }, [entityInfo, merchantList]);
     var onOpenMerchantSelect = function (event) {
         if (readOnly)
             return;
@@ -93,7 +100,7 @@ var MerchantList = React.forwardRef(function (_a, ref) {
             return '';
         return merchant.display_name;
     };
-    return (_jsx(Collapse, __assign({ in: show }, { 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(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 (_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

@@ -3,15 +3,12 @@ export declare const AuthenticationListValidationSchema: () => yup.ObjectSchema<
     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>>;
-    terminalInfo: 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>>;
-    terminalInfo: 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>>;
-    terminalInfo: 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/AuthenticationList/validation.js

@@ -3,7 +3,6 @@ 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'),
-        terminalInfo: yup.object().required('auth_terminal_required')
+        merchantInfo: yup.object().required('auth_merchant_required')
     });
 };

package/build/hooks/useAppConfig.js

@@ -30,7 +30,9 @@ export var useAppConfig = function (_a) {
     var dispatch = useAppDispatch();
     var data = useAppSelector(settingsSelector).data;
     var setAppConfig = function () {
-        dispatch(handleSetAppConfig(__assign({ appInfo: appInfo, publicKey: publicKey }, rest)));
+        if (!disableSettingFetching) {
+            dispatch(handleSetAppConfig(__assign({ appInfo: appInfo, publicKey: publicKey }, rest)));
+        }
         dispatch(handleActiveFlowScreens(navigation));
     };
     var checkDomain = function () {

package/package.json

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

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

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

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

@@ -1,101 +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, useLanguage } 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 { getTerminalListAsync, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
-import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
-import CheckIcon from '../../../shared/CheckIcon';
-var TerminalContainer = styled(Box)(function () { return ({
-    display: 'flex'
-}); });
-var TerminalNameText = 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 TerminalList = 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 t = useTranslation().t;
-    var dispatch = useAppDispatch();
-    var isAr = useLanguage().isAr;
-    var _f = useFormContext(), control = _f.control, getValues = _f.getValues, setValue = _f.setValue;
-    var _g = useAppSelector(connectExpressSelector), data = _g.data, terminalLoading = _g.terminalLoading;
-    var terminalList = (((_b = data.responseData) === null || _b === void 0 ? void 0 : _b.authenticationData) || {}).terminalList;
-    var terminalInfoControl = useController({ control: control, name: 'terminalInfo' });
-    var merchantInfo = getValues('merchantInfo');
-    var terminalValue = terminalInfoControl.field.value;
-    var error = (_c = terminalInfoControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
-    React.useEffect(function () {
-        if ((terminalList === null || terminalList === void 0 ? void 0 : terminalList.length) > 0) {
-            var list_1 = __spreadArray([], terminalList, true);
-            setList(list_1);
-        }
-    }, [terminalList]);
-    React.useEffect(function () {
-        var _a, _b;
-        var merchantId = (terminalList === null || terminalList === void 0 ? void 0 : terminalList.length) > 0 ? (_b = (_a = terminalList[0]) === null || _a === void 0 ? void 0 : _a.merchant) === null || _b === void 0 ? void 0 : _b.id : '';
-        var id = (merchantInfo || {}).id;
-        if (!id)
-            return;
-        if (merchantId !== id) {
-            setValue('terminalInfo', undefined);
-            dispatch(getTerminalListAsync(id));
-        }
-    }, [merchantInfo]);
-    var onOpenTerminalSelect = function (event) {
-        if (readOnly)
-            return;
-        setAnchorEl(event.currentTarget);
-        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
-    };
-    var onCloseTerminalSelect = function () {
-        setAnchorEl(null);
-        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
-        setList(terminalList);
-    };
-    var onSelectItem = function (terminal) {
-        onCloseTerminalSelect();
-        terminalInfoControl.field.onChange(terminal);
-    };
-    var getName = function (terminal) {
-        var _a, _b, _c;
-        if (!terminal)
-            return '';
-        return isAr ? ((_a = terminal.name) === null || _a === void 0 ? void 0 : _a.ar) || ((_b = terminal.name) === null || _b === void 0 ? void 0 : _b.en) : (_c = terminal.name) === null || _c === void 0 ? void 0 : _c.en;
-    };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('select_terminal_label'), readOnly: readOnly, placeholder: t('select_terminal_placeholder'), value: getName(terminalValue) || '', warningMessage: error && t(error), onClick: terminalLoading ? undefined : !!anchorEl ? function () { return onCloseTerminalSelect(); } : onOpenTerminalSelect, endAdornment: terminalLoading ? (_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(TerminalContainer, { children: _jsx(TerminalNameText, __assign({ isSelected: item.id === (terminalValue === null || terminalValue === void 0 ? void 0 : terminalValue.id) }, { children: getName(item) })) }), item.id === (terminalValue === null || terminalValue === void 0 ? void 0 : terminalValue.id) && _jsx(CheckIcon, { isVerified: isVerified })] }));
-                        } }) }))] })) })));
-});
-export default React.memo(TerminalList);