@tap-payments/auth-jsconnect 2.11.4-development → 2.11.5-development

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

@@ -3,13 +3,6 @@ declare type Name = {
 };
 export interface TerminalDeviceInfo {
     id: string;
-    status: string;
-    object?: string;
-    live_mode: boolean;
-    api_version?: string;
-    feature_version?: string;
-    serial_number: string;
-    linked: boolean;
     display_name: string;
     model: {
         id: string;
@@ -27,39 +20,7 @@ export interface TerminalDeviceInfo {
         image: string;
         image_url: string;
     };
-    merchant?: {
-        id: string;
-        brand: {
-            id: string;
-            name: {
-                text: string;
-                lang: string;
-            }[];
-            logo: string;
-        };
-    };
-    terminal?: {
-        id: string;
-        legacy_id: string;
-        name: Name;
-        device: {
-            id: string;
-            created: string;
-            display_name: string;
-        };
-    };
-    platform?: {
-        id: string;
-        segment: string;
-        brand?: {
-            id: string;
-            name: {
-                text: string;
-                lang: string;
-            }[];
-            logo: string;
-        };
-    };
+    serial_number: string;
 }
 export interface TerminalInfo {
     acceptance_status?: string;
@@ -71,11 +32,22 @@ export interface TerminalInfo {
     };
     brand?: {
         id: string;
+        logo?: string;
+    };
+    billingplatform?: {
+        id: string;
     };
     charges?: {
         status: string;
         status_message: string;
     };
+    device?: {
+        id: string;
+        created: string;
+        display_name: string;
+        reference: string;
+        logo?: string;
+    };
     feature_version?: string;
     id: string;
     legacy_id: string;
@@ -89,7 +61,7 @@ export interface TerminalInfo {
     platform?: {
         brand: {
             id: string;
-            logo: string;
+            logo?: string;
             name: {
                 text: string;
                 lang: string;
@@ -107,10 +79,26 @@ export interface TerminalInfo {
     wallet?: {
         id: string;
     };
-    device?: {
+    linked: boolean;
+    terminal_device: TerminalDeviceInfo;
+}
+export interface POSInfo {
+    id: string;
+    object: string;
+    live_mode: boolean;
+    reference: string;
+    display_name: string;
+    merchant: {
         id: string;
-        created: string;
-        display_name: string;
+        legacy_id: string;
+        brand: {
+            id: string;
+            name: {
+                lang: string;
+                text: string;
+            }[];
+            logo: string;
+        };
     };
 }
 export {};

package/build/api/auth.d.ts

@@ -18,12 +18,18 @@ export declare type CivilID = {
     country_code: string;
 };
 export declare type TerminalCredential = {
-    terminal: {
+    terminal?: {
         id: string;
         terminal_device?: {
             id: string;
         };
     };
+    merchant?: {
+        id: string;
+    };
+    device: {
+        id: string;
+    };
 };
 export declare type CreateAuthBody = {
     country: string;

package/build/api/index.d.ts

@@ -166,9 +166,9 @@ declare const API: {
         getInitialData: (body: InitBody) => Promise<any>;
     };
     terminalService: {
-        retrieveTerminalDeviceList: (merchants: string[]) => Promise<any>;
         unlinkTerminalDevice: ({ deviceId, ...payload }: UnlinkTerminalDeviceProps) => Promise<any>;
-        retrieveTerminalList: (merchantIds: string[]) => Promise<any>;
+        retrieveTerminalList: (merchants: string[], getTerminalDevice?: boolean) => Promise<any>;
+        retrievePOSDevices: (merchants: string[]) => 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, CreateEntityBody, CreateNafathAuthBody, GetUserListSegmentBody, CreateKYCAuthBody, GenerateAuthLinkNewTerminalProps, UnlinkTerminalDeviceProps, LinkTerminalDeviceProps };

package/build/api/terminal.d.ts

@@ -21,8 +21,8 @@ export interface LinkTerminalDeviceProps {
     action: string;
 }
 declare const terminalService: {
-    retrieveTerminalDeviceList: (merchants: string[]) => Promise<any>;
     unlinkTerminalDevice: ({ deviceId, ...payload }: UnlinkTerminalDeviceProps) => Promise<any>;
-    retrieveTerminalList: (merchantIds: string[]) => Promise<any>;
+    retrieveTerminalList: (merchants: string[], getTerminalDevice?: boolean) => Promise<any>;
+    retrievePOSDevices: (merchants: string[]) => Promise<any>;
 };
 export { terminalService };

package/build/api/terminal.js

@@ -1,3 +1,14 @@
+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 __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)
@@ -11,21 +22,20 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { ENDPOINT_PATHS } from '../constants';
 import { httpClient } from './axios';
-var retrieveTerminalDeviceList = function (merchants) {
+var retrieveTerminalList = function (merchants, getTerminalDevice) {
+    if (getTerminalDevice === void 0) { getTerminalDevice = true; }
     return httpClient({
         method: 'post',
-        url: "".concat(ENDPOINT_PATHS.TERMINAL, "/device/list"),
-        data: {
-            merchants: merchants
-        }
-    }).catch(function () { });
+        url: "".concat(ENDPOINT_PATHS.TERMINAL, "/list"),
+        data: __assign({ merchants: merchants }, (getTerminalDevice && { terminal_device: true }))
+    });
 };
-var retrieveTerminalList = function (merchantIds) {
+var retrievePOSDevices = function (merchants) {
     return httpClient({
         method: 'post',
-        url: "".concat(ENDPOINT_PATHS.TERMINAL, "/list"),
+        url: "".concat(ENDPOINT_PATHS.MERCHANT, "/pos/device/list"),
         data: {
-            merchant_id: merchantIds
+            merchants: merchants
         }
     });
 };
@@ -38,8 +48,8 @@ var unlinkTerminalDevice = function (_a) {
     });
 };
 var terminalService = {
-    retrieveTerminalDeviceList: retrieveTerminalDeviceList,
     unlinkTerminalDevice: unlinkTerminalDevice,
-    retrieveTerminalList: retrieveTerminalList
+    retrieveTerminalList: retrieveTerminalList,
+    retrievePOSDevices: retrievePOSDevices
 };
 export { terminalService };

package/build/components/DeviceCard/DeviceCard.js

@@ -98,6 +98,6 @@ export var DeviceCard = function (_a) {
         if (arrow)
             return _jsx(ArrowIcon, {});
     };
-    return (_jsxs(DeviceCardContainer, __assign({ onClick: onClick, sx: { cursor: onClick ? 'pointer' : 'default' }, showBorder: border }, rest, { children: [_jsxs(DeviceDetails, { children: [image && _jsx(DeviceImage, { src: image, alt: 'Device' }), _jsxs(DeviceInfo, { children: [_jsx(DeviceTitle, { children: name }), _jsxs(DeviceIdInfo, { children: [pairedWith && (_jsxs("span", { children: [t('terminal_paired_with'), ": ", _jsx(DeviceIdBold, { children: pairedWith })] })), _jsxs("span", { children: [t(deviceIdLabel !== null && deviceIdLabel !== void 0 ? deviceIdLabel : 'terminal_device_id'), ": ", _jsx(DeviceIdBold, { children: deviceId }), "`"] })] })] })] }), badge && _jsx(Badge, __assign({ active: isLinked }, { children: isLinked ? t('terminal_linked') : t('terminal_unlinked') })), _jsx(Box, __assign({ display: 'flex', alignItems: 'center' }, { children: getEndComponent() }))] })));
+    return (_jsxs(DeviceCardContainer, __assign({ onClick: onClick, sx: { cursor: onClick ? 'pointer' : 'default' }, showBorder: border }, rest, { children: [_jsxs(DeviceDetails, { children: [image && _jsx(DeviceImage, { src: image, alt: 'Device' }), _jsxs(DeviceInfo, { children: [_jsx(DeviceTitle, { children: name }), _jsxs(DeviceIdInfo, { children: [pairedWith && (_jsxs("span", { children: [t('terminal_paired_with'), ": ", _jsx(DeviceIdBold, { children: pairedWith })] })), _jsxs("span", { children: [t(deviceIdLabel !== null && deviceIdLabel !== void 0 ? deviceIdLabel : 'terminal_device_id'), ": ", _jsx(DeviceIdBold, { children: deviceId })] })] })] })] }), badge && _jsx(Badge, __assign({ active: isLinked }, { children: isLinked ? t('terminal_linked') : t('terminal_unlinked') })), _jsx(Box, __assign({ display: 'flex', alignItems: 'center' }, { children: getEndComponent() }))] })));
 };
 export default memo(DeviceCard);

package/build/constants/app.d.ts

@@ -1,4 +1,4 @@
-import { ScreenStepNavigation, BusinessType, TerminalInfo, TerminalDeviceInfo } from '../@types';
+import { ScreenStepNavigation, BusinessType, POSInfo, TerminalInfo } from '../@types';
 export declare const CONNECT_DEV_URL = "https://connect.dev.tap.company";
 export declare const CONNECT_PROD_URL = "https://connect.tap.company";
 export declare const CLIENT_ORIGIN: string;
@@ -325,6 +325,6 @@ interface CountryToCurrencyMapping {
     [countryCode: string]: string;
 }
 export declare const COUNTRY_TO_CURRENCY: CountryToCurrencyMapping;
-export declare const SELECTED_TERMINAL_DEVICE_DEFAULT_INFO: TerminalDeviceInfo;
 export declare const SELECTED_TERMINAL_DEFAULT_INFO: TerminalInfo;
+export declare const SELECTED_POS_DEFAULT_INFO: POSInfo;
 export {};

package/build/constants/app.js

@@ -999,12 +999,12 @@ export var TERMINAL_SCREENS_NAVIGATION = [
     },
     {
         name: CONNECT_FLOWS.terminal.terminalDeviceList,
-        next: [CONNECT_FLOWS.terminal.terminalList, CONNECT_FLOWS.terminal.linkedTerminalInfo, CONNECT_FLOWS.terminal.unlinkedTerminalInfo],
+        next: [CONNECT_FLOWS.terminal.posDeviceList, CONNECT_FLOWS.terminal.linkedTerminalInfo, CONNECT_FLOWS.terminal.unlinkedTerminalInfo],
         prev: CONNECT_FLOWS.terminal.board,
         order: 2
     },
     {
-        name: CONNECT_FLOWS.terminal.terminalList,
+        name: CONNECT_FLOWS.terminal.posDeviceList,
         next: CONNECT_FLOWS.terminal.terminalLinkNew,
         prev: CONNECT_FLOWS.terminal.terminalDeviceList,
         order: 3
@@ -1012,7 +1012,7 @@ export var TERMINAL_SCREENS_NAVIGATION = [
     {
         name: CONNECT_FLOWS.terminal.terminalLinkNew,
         next: CONNECT_FLOWS.terminal.terminalLinkedSuccess,
-        prev: [CONNECT_FLOWS.terminal.noTerminalLinked, CONNECT_FLOWS.terminal.terminalList],
+        prev: [CONNECT_FLOWS.terminal.noTerminalLinked, CONNECT_FLOWS.terminal.posDeviceList],
         order: 3
     },
     {
@@ -1337,31 +1337,42 @@ export var COUNTRY_TO_CURRENCY = {
     HK: 'HKD',
     SG: 'SGD'
 };
-export var SELECTED_TERMINAL_DEVICE_DEFAULT_INFO = {
+export var SELECTED_TERMINAL_DEFAULT_INFO = {
     id: '',
-    status: '',
     live_mode: false,
+    legacy_id: '',
     linked: false,
-    serial_number: '',
-    display_name: '',
-    model: {
-        live_mode: false,
-        status: '',
+    merchant: { id: '' },
+    name: { en: '' },
+    terminal_device: {
         id: '',
-        name: [],
-        image: '',
-        image_url: '',
-        model: '',
-        type: ''
+        display_name: '',
+        model: {
+            live_mode: false,
+            status: '',
+            id: '',
+            name: [],
+            image: '',
+            image_url: '',
+            model: '',
+            type: ''
+        },
+        serial_number: ''
     }
 };
-export var SELECTED_TERMINAL_DEFAULT_INFO = {
+export var SELECTED_POS_DEFAULT_INFO = {
     id: '',
-    legacy_id: '',
+    display_name: '',
+    live_mode: false,
     merchant: {
-        id: ''
+        id: '',
+        legacy_id: '',
+        brand: {
+            id: '',
+            logo: '',
+            name: []
+        }
     },
-    name: {
-        en: ''
-    }
+    object: '',
+    reference: ''
 };

package/build/constants/flows.d.ts

@@ -36,6 +36,6 @@ export declare const CONNECT_FLOWS: {
         terminalUnlinkedSuccess: string;
         board: string;
         resetPassword: string;
-        terminalList: string;
+        posDeviceList: string;
     };
 };

package/build/constants/flows.js

@@ -37,6 +37,6 @@ export var CONNECT_FLOWS = {
         terminalUnlinkedSuccess: 'TERMINAL_UNLINKED_SUCCESS_STEP',
         board: 'TERMINAL_BOARD_STEP',
         resetPassword: 'TERMINAL_RESET_PASSWORD',
-        terminalList: 'TERMINAL_LIST_STEP'
+        posDeviceList: 'TERMINAL_POS_DEVICE_LIST_STEP'
     }
 };

package/build/features/app/terminal/terminalStore.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { ActionState, FlowsTypes, OTPFormValues, SharedState, TerminalDeviceInfo, TerminalInfo } from '../../../@types';
+import { ActionState, FlowsTypes, OTPFormValues, POSInfo, SharedState, TerminalInfo } from '../../../@types';
 interface VerifyLeadTokenProps {
     token: string;
     isInternally?: boolean;
@@ -28,7 +28,7 @@ export declare const linkNewTerminal: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
     nextScreen: string;
 }, void, {}>;
-export declare const retrieveTerminalList: import("@reduxjs/toolkit").AsyncThunk<{
+export declare const retrievePOSDevices: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, void, {}>;
 interface pushNotificationLinkNewTerminalParams {
@@ -64,7 +64,7 @@ declare type RetrieveBoardStatusProps = {
 export declare const retrieveBoardStatus: import("@reduxjs/toolkit").AsyncThunk<{
     flows: any;
 }, RetrieveBoardStatusProps, {}>;
-export declare const retrieveTerminalDeviceList: import("@reduxjs/toolkit").AsyncThunk<{
+export declare const retrieveTerminalList: import("@reduxjs/toolkit").AsyncThunk<{
     data: any;
 }, void, {}>;
 export declare const updateDeviceLinkedSuccess: import("@reduxjs/toolkit").AsyncThunk<{
@@ -87,24 +87,24 @@ export interface TerminalData {
     verify: VerifyData;
     otpData: OTPFormValues;
     terminalInfo: {
-        selectedTerminalDevice: TerminalDeviceInfo;
         selectedTerminal: TerminalInfo;
+        selectedPOS: POSInfo;
     };
 }
 export interface TerminalDataState extends SharedState<TerminalData & ResponseData> {
     customLoading?: boolean;
-    terminalListLoading?: boolean;
+    posDevicesLoading?: boolean;
 }
 export declare const terminalSlice: import("@reduxjs/toolkit").Slice<TerminalDataState, {
     clearError: (state: TerminalDataState) => void;
     setError(state: TerminalDataState, action: ActionState<string>): void;
     stopLoader: (state: TerminalDataState) => void;
     resetOTPScreen: (state: TerminalDataState) => void;
-    storeSelectedTerminalDevice: (state: TerminalDataState, action: ActionState<TerminalDeviceInfo>) => void;
     storeSelectedTerminal: (state: TerminalDataState, action: ActionState<TerminalInfo>) => void;
+    storeSelectedPOS: (state: TerminalDataState, action: ActionState<POSInfo>) => void;
     resetTerminalLinkResponse: (state: TerminalDataState) => void;
 }, "terminal/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, storeSelectedTerminalDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<TerminalDeviceInfo, string>, storeSelectedTerminal: import("@reduxjs/toolkit").ActionCreatorWithPayload<TerminalInfo, string>, resetTerminalLinkResponse: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setError: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, storeSelectedTerminal: import("@reduxjs/toolkit").ActionCreatorWithPayload<TerminalInfo, string>, storeSelectedPOS: import("@reduxjs/toolkit").ActionCreatorWithPayload<POSInfo, string>, resetTerminalLinkResponse: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("redux").Reducer<TerminalDataState, import("redux").AnyAction>;
 export default _default;
 export declare const terminalSelector: (state: RootState) => TerminalDataState;

package/build/features/app/terminal/terminalStore.js

@@ -49,7 +49,7 @@ var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { FlowsTypes } from '../../../@types';
-import { CONNECT_FLOWS, NAFATH_PACI_TIMEOUT_DURATION, SELECTED_TERMINAL_DEFAULT_INFO, SELECTED_TERMINAL_DEVICE_DEFAULT_INFO, TERMINAL_PUSH_NOTIFICATION_DURATION, TERMINAL_PUSH_NOTIFICATION_FAILED, TERMINAL_STEP_NAMES } from '../../../constants';
+import { CONNECT_FLOWS, NAFATH_PACI_TIMEOUT_DURATION, SELECTED_POS_DEFAULT_INFO, SELECTED_TERMINAL_DEFAULT_INFO, TERMINAL_PUSH_NOTIFICATION_DURATION, TERMINAL_PUSH_NOTIFICATION_FAILED, TERMINAL_STEP_NAMES } from '../../../constants';
 import API from '../../../api';
 import { isNetworkError, isTimeoutError, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyToken = createAsyncThunk('terminal/verifyLeadToken', function (_a, thunkApi) {
@@ -79,10 +79,10 @@ export var verifyToken = createAsyncThunk('terminal/verifyLeadToken', function (
                     if (step_name === TERMINAL_STEP_NAMES.PHONE_AUTH) {
                         return [2, { data: data, token: token, nextScreen: CONNECT_FLOWS.terminal.verify }];
                     }
-                    return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
+                    return [4, API.terminalService.retrieveTerminalList([merchant_id])];
                 case 2:
                     terminalData = _d.sent();
-                    nextScreen = ((_c = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _c === void 0 ? void 0 : _c.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
+                    nextScreen = ((_c = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _c === void 0 ? void 0 : _c.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
                     return [2, {
                             data: data,
                             token: token,
@@ -135,27 +135,28 @@ export var verifyTokenOTP = createAsyncThunk('terminal/verifyOtp', function (par
                     thunkApi.dispatch(handlePublicKey(publicKey));
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
+                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
             case 2:
                 terminalData = _g.sent();
-                nextScreen = ((_d = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _d === void 0 ? void 0 : _d.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
+                nextScreen = ((_d = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _d === void 0 ? void 0 : _d.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
                 (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, { otp: params.otp });
                 return [2, { data: data, terminalData: terminalData, formData: params, nextScreen: nextScreen }];
         }
     });
 }); });
 export var linkNewTerminal = createAsyncThunk('terminal/linkNewTerminal', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, terminal, _b, language, businessCountry, scope, terminalId, payload, data;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _a, _b, selectedPOS, responseData, _c, language, businessCountry, scope, authData, payload, data;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _a = thunkApi.getState(), terminal = _a.terminal, _b = _a.settings.data, language = _b.language, businessCountry = _b.businessCountry, scope = _b.appConfig.scope;
-                terminalId = (terminal.data.terminalInfo.selectedTerminal || {}).id;
+                _a = thunkApi.getState(), _b = _a.terminal.data, selectedPOS = _b.terminalInfo.selectedPOS, responseData = _b.responseData, _c = _a.settings.data, language = _c.language, businessCountry = _c.businessCountry, scope = _c.appConfig.scope;
+                authData = (responseData || {}).authData;
                 payload = {
                     user_credentail: {
-                        terminal: {
-                            id: terminalId
-                        }
+                        merchant: {
+                            id: authData === null || authData === void 0 ? void 0 : authData.merchant_id
+                        },
+                        device: { id: selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.id }
                     },
                     country: businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2,
                     scope: scope,
@@ -167,12 +168,12 @@ export var linkNewTerminal = createAsyncThunk('terminal/linkNewTerminal', functi
                 };
                 return [4, API.authService.createAuth(payload)];
             case 1:
-                data = _c.sent();
+                data = _d.sent();
                 return [2, { data: data, nextScreen: CONNECT_FLOWS.terminal.terminalLinkNew }];
         }
     });
 }); });
-export var retrieveTerminalList = createAsyncThunk('terminal/retrieveTerminalList', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrievePOSDevices = createAsyncThunk('terminal/retrievePOSDevices', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var terminal, merchant_id, data;
     var _a;
     return __generator(this, function (_b) {
@@ -180,7 +181,7 @@ export var retrieveTerminalList = createAsyncThunk('terminal/retrieveTerminalLis
             case 0:
                 terminal = thunkApi.getState().terminal;
                 merchant_id = (((_a = terminal.data.responseData) === null || _a === void 0 ? void 0 : _a.authData) || {}).merchant_id;
-                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
+                return [4, API.terminalService.retrievePOSDevices([merchant_id])];
             case 1:
                 data = _b.sent();
                 return [2, { data: data }];
@@ -247,17 +248,17 @@ export var pushNotificationLinkNewTerminal = createAsyncThunk('terminal/pushNoti
     });
 });
 export var unlinkTerminalDevice = createAsyncThunk('terminal/unlinkTerminalDevice', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var terminal, _a, id, terminalInfo, merchant, payload, data;
+    var terminal, _a, id, terminal_device, merchant, payload, data;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 terminal = thunkApi.getState().terminal;
-                _a = terminal.data.terminalInfo.selectedTerminalDevice, id = _a.id, terminalInfo = _a.terminal, merchant = _a.merchant;
+                _a = terminal.data.terminalInfo.selectedTerminal, id = _a.id, terminal_device = _a.terminal_device, merchant = _a.merchant;
                 payload = {
                     deviceId: id,
                     initiator: 'connect',
                     terminal: {
-                        id: (terminalInfo === null || terminalInfo === void 0 ? void 0 : terminalInfo.id) || ''
+                        id: terminal_device.id
                     },
                     merchant: {
                         id: (merchant === null || merchant === void 0 ? void 0 : merchant.id) || ''
@@ -271,18 +272,21 @@ export var unlinkTerminalDevice = createAsyncThunk('terminal/unlinkTerminalDevic
     });
 }); });
 export var linkTerminalDevice = createAsyncThunk('terminal/linkTerminalDevice', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, terminalId, deviceId, _c, businessCountry, language, scope, payload, data;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var _a, _b, posId, _c, id, terminal_device, _d, businessCountry, language, scope, payload, data;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
-                _a = thunkApi.getState(), _b = _a.terminal.data.terminalInfo, terminalId = _b.selectedTerminal.id, deviceId = _b.selectedTerminalDevice.id, _c = _a.settings.data, businessCountry = _c.businessCountry, language = _c.language, scope = _c.appConfig.scope;
+                _a = thunkApi.getState(), _b = _a.terminal.data.terminalInfo, posId = _b.selectedPOS.id, _c = _b.selectedTerminal, id = _c.id, terminal_device = _c.terminal_device, _d = _a.settings.data, businessCountry = _d.businessCountry, language = _d.language, scope = _d.appConfig.scope;
                 payload = {
                     user_credentail: {
                         terminal: {
-                            id: terminalId,
+                            id: id,
                             terminal_device: {
-                                id: deviceId
+                                id: terminal_device.id
                             }
+                        },
+                        device: {
+                            id: posId
                         }
                     },
                     country: businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2,
@@ -295,7 +299,7 @@ export var linkTerminalDevice = createAsyncThunk('terminal/linkTerminalDevice',
                 };
                 return [4, API.authService.createAuth(payload)];
             case 1:
-                data = _d.sent();
+                data = _e.sent();
                 return [2, { data: data }];
         }
     });
@@ -342,7 +346,7 @@ export var retrieveBoardStatus = createAsyncThunk('terminal/retrieveBoardStatus'
         });
     });
 });
-export var retrieveTerminalDeviceList = createAsyncThunk('terminal/retrieveTerminalDeviceList', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveTerminalList = createAsyncThunk('terminal/retrieveTerminalList', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var terminal, merchant_id, data;
     var _a;
     return __generator(this, function (_b) {
@@ -350,7 +354,7 @@ export var retrieveTerminalDeviceList = createAsyncThunk('terminal/retrieveTermi
             case 0:
                 terminal = thunkApi.getState().terminal;
                 merchant_id = (((_a = terminal.data.responseData) === null || _a === void 0 ? void 0 : _a.authData) || {}).merchant_id;
-                return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
+                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
             case 1:
                 data = _b.sent();
                 return [2, { data: data }];
@@ -434,7 +438,7 @@ var initialState = {
     error: null,
     loading: false,
     customLoading: false,
-    terminalListLoading: false,
+    posDevicesLoading: false,
     data: {
         flowName: FlowsTypes.TERMINAL,
         verify: {
@@ -444,8 +448,8 @@ var initialState = {
             otp: ''
         },
         terminalInfo: {
-            selectedTerminalDevice: SELECTED_TERMINAL_DEVICE_DEFAULT_INFO,
-            selectedTerminal: SELECTED_TERMINAL_DEFAULT_INFO
+            selectedTerminal: SELECTED_TERMINAL_DEFAULT_INFO,
+            selectedPOS: SELECTED_POS_DEFAULT_INFO
         }
     }
 };
@@ -465,12 +469,12 @@ export var terminalSlice = createSlice({
         resetOTPScreen: function (state) {
             state.data.otpData.otp = '';
         },
-        storeSelectedTerminalDevice: function (state, action) {
-            state.data.terminalInfo.selectedTerminalDevice = action.payload;
-        },
         storeSelectedTerminal: function (state, action) {
             state.data.terminalInfo.selectedTerminal = action.payload;
         },
+        storeSelectedPOS: function (state, action) {
+            state.data.terminalInfo.selectedPOS = action.payload;
+        },
         resetTerminalLinkResponse: function (state) {
             state.data.responseData = __assign(__assign({}, state.data.responseData), { linkTerminalDeviceData: undefined, pushNotificationLinkedNewTerminalData: undefined, linkNewTerminalData: undefined });
         }
@@ -532,32 +536,32 @@ export var terminalSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(retrieveTerminalList.fulfilled, function (state, action) {
+            .addCase(retrievePOSDevices.fulfilled, function (state, action) {
             var _a, _b;
-            state.terminalListLoading = false;
+            state.posDevicesLoading = false;
             state.error = null;
             var data = action.payload.data;
             if ((_a = data === null || data === void 0 ? void 0 : data.list) === null || _a === void 0 ? void 0 : _a.length)
-                state.data.terminalInfo.selectedTerminal = data.list[0];
-            state.data.responseData = __assign(__assign({}, state.data.responseData), { terminalList: (_b = data === null || data === void 0 ? void 0 : data.list) !== null && _b !== void 0 ? _b : [] });
+                state.data.terminalInfo.selectedPOS = data.list[0];
+            state.data.responseData = __assign(__assign({}, state.data.responseData), { posDevices: (_b = data === null || data === void 0 ? void 0 : data.list) !== null && _b !== void 0 ? _b : [] });
         })
-            .addCase(retrieveTerminalList.rejected, function (state, action) {
-            state.terminalListLoading = false;
+            .addCase(retrievePOSDevices.rejected, function (state, action) {
+            state.posDevicesLoading = false;
             state.error = action.error.message;
         })
-            .addCase(retrieveTerminalList.pending, function (state) {
-            state.terminalListLoading = true;
+            .addCase(retrievePOSDevices.pending, function (state) {
+            state.posDevicesLoading = true;
             state.error = null;
         })
-            .addCase(retrieveTerminalDeviceList.pending, function (state) {
+            .addCase(retrieveTerminalList.pending, function (state) {
             state.error = null;
         })
-            .addCase(retrieveTerminalDeviceList.fulfilled, function (state, action) {
+            .addCase(retrieveTerminalList.fulfilled, function (state, action) {
             state.error = null;
             var data = action.payload.data;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { terminalData: data });
         })
-            .addCase(retrieveTerminalDeviceList.rejected, function (state, action) {
+            .addCase(retrieveTerminalList.rejected, function (state, action) {
             state.error = action.error.message;
         })
             .addCase(pushNotificationLinkNewTerminal.pending, function (state) {
@@ -671,6 +675,6 @@ export var terminalSlice = createSlice({
         });
     }
 });
-export var clearError = (_a = terminalSlice.actions, _a.clearError), setError = _a.setError, stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, storeSelectedTerminalDevice = _a.storeSelectedTerminalDevice, storeSelectedTerminal = _a.storeSelectedTerminal, resetTerminalLinkResponse = _a.resetTerminalLinkResponse;
+export var clearError = (_a = terminalSlice.actions, _a.clearError), setError = _a.setError, stopLoader = _a.stopLoader, resetOTPScreen = _a.resetOTPScreen, storeSelectedTerminal = _a.storeSelectedTerminal, storeSelectedPOS = _a.storeSelectedPOS, resetTerminalLinkResponse = _a.resetTerminalLinkResponse;
 export default terminalSlice.reducer;
 export var terminalSelector = function (state) { return state.terminal; };