@tap-payments/auth-jsconnect 2.11.6-development → 2.11.6-sandbox

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_POS_DEFAULT_INFO, SELECTED_TERMINAL_DEFAULT_INFO, TERMINAL_PUSH_NOTIFICATION_DURATION, TERMINAL_PUSH_NOTIFICATION_FAILED, TERMINAL_STEP_NAMES } from '../../../constants';
+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 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.retrieveTerminalList([merchant_id])];
+                    return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
                 case 2:
                     terminalData = _d.sent();
-                    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;
+                    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;
                     return [2, {
                             data: data,
                             token: token,
@@ -135,28 +135,27 @@ export var verifyTokenOTP = createAsyncThunk('terminal/verifyOtp', function (par
                     thunkApi.dispatch(handlePublicKey(publicKey));
                 if (countryIso2)
                     thunkApi.dispatch(handleSetCountryByIso2(countryIso2));
-                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
+                return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
             case 2:
                 terminalData = _g.sent();
-                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;
+                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;
                 (_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, _b, selectedPOS, responseData, _c, language, businessCountry, scope, authData, payload, data;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var _a, terminal, _b, language, businessCountry, scope, terminalId, payload, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                _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;
+                _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;
                 payload = {
                     user_credentail: {
-                        merchant: {
-                            id: authData === null || authData === void 0 ? void 0 : authData.merchant_id
-                        },
-                        device: { id: selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.id }
+                        terminal: {
+                            id: terminalId
+                        }
                     },
                     country: businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2,
                     scope: scope,
@@ -168,12 +167,12 @@ export var linkNewTerminal = createAsyncThunk('terminal/linkNewTerminal', functi
                 };
                 return [4, API.authService.createAuth(payload)];
             case 1:
-                data = _d.sent();
+                data = _c.sent();
                 return [2, { data: data, nextScreen: CONNECT_FLOWS.terminal.terminalLinkNew }];
         }
     });
 }); });
-export var retrievePOSDevices = createAsyncThunk('terminal/retrievePOSDevices', 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) {
@@ -181,7 +180,7 @@ export var retrievePOSDevices = createAsyncThunk('terminal/retrievePOSDevices',
             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.retrievePOSDevices([merchant_id])];
+                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
             case 1:
                 data = _b.sent();
                 return [2, { data: data }];
@@ -248,17 +247,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, terminal_device, merchant, payload, data;
+    var terminal, _a, id, terminalInfo, merchant, payload, data;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
                 terminal = thunkApi.getState().terminal;
-                _a = terminal.data.terminalInfo.selectedTerminal, id = _a.id, terminal_device = _a.terminal_device, merchant = _a.merchant;
+                _a = terminal.data.terminalInfo.selectedTerminalDevice, id = _a.id, terminalInfo = _a.terminal, merchant = _a.merchant;
                 payload = {
                     deviceId: id,
                     initiator: 'connect',
                     terminal: {
-                        id: terminal_device.id
+                        id: (terminalInfo === null || terminalInfo === void 0 ? void 0 : terminalInfo.id) || ''
                     },
                     merchant: {
                         id: (merchant === null || merchant === void 0 ? void 0 : merchant.id) || ''
@@ -272,21 +271,18 @@ 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, posId, _c, id, terminal_device, _d, businessCountry, language, scope, payload, data;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var _a, _b, terminalId, deviceId, _c, businessCountry, language, scope, payload, data;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _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;
+                _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;
                 payload = {
                     user_credentail: {
                         terminal: {
-                            id: id,
+                            id: terminalId,
                             terminal_device: {
-                                id: terminal_device.id
+                                id: deviceId
                             }
-                        },
-                        device: {
-                            id: posId
                         }
                     },
                     country: businessCountry === null || businessCountry === void 0 ? void 0 : businessCountry.iso2,
@@ -299,7 +295,7 @@ export var linkTerminalDevice = createAsyncThunk('terminal/linkTerminalDevice',
                 };
                 return [4, API.authService.createAuth(payload)];
             case 1:
-                data = _e.sent();
+                data = _d.sent();
                 return [2, { data: data }];
         }
     });
@@ -346,7 +342,7 @@ export var retrieveBoardStatus = createAsyncThunk('terminal/retrieveBoardStatus'
         });
     });
 });
-export var retrieveTerminalList = createAsyncThunk('terminal/retrieveTerminalList', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+export var retrieveTerminalDeviceList = createAsyncThunk('terminal/retrieveTerminalDeviceList', function (_, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var terminal, merchant_id, data;
     var _a;
     return __generator(this, function (_b) {
@@ -354,7 +350,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.retrieveTerminalDeviceList([merchant_id])];
             case 1:
                 data = _b.sent();
                 return [2, { data: data }];
@@ -438,7 +434,7 @@ var initialState = {
     error: null,
     loading: false,
     customLoading: false,
-    posDevicesLoading: false,
+    terminalListLoading: false,
     data: {
         flowName: FlowsTypes.TERMINAL,
         verify: {
@@ -448,8 +444,8 @@ var initialState = {
             otp: ''
         },
         terminalInfo: {
-            selectedTerminal: SELECTED_TERMINAL_DEFAULT_INFO,
-            selectedPOS: SELECTED_POS_DEFAULT_INFO
+            selectedTerminalDevice: SELECTED_TERMINAL_DEVICE_DEFAULT_INFO,
+            selectedTerminal: SELECTED_TERMINAL_DEFAULT_INFO
         }
     }
 };
@@ -469,12 +465,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 });
         }
@@ -536,32 +532,32 @@ export var terminalSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(retrievePOSDevices.fulfilled, function (state, action) {
+            .addCase(retrieveTerminalList.fulfilled, function (state, action) {
             var _a, _b;
-            state.posDevicesLoading = false;
+            state.terminalListLoading = 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.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 : [] });
+                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 : [] });
         })
-            .addCase(retrievePOSDevices.rejected, function (state, action) {
-            state.posDevicesLoading = false;
+            .addCase(retrieveTerminalList.rejected, function (state, action) {
+            state.terminalListLoading = false;
             state.error = action.error.message;
         })
-            .addCase(retrievePOSDevices.pending, function (state) {
-            state.posDevicesLoading = true;
+            .addCase(retrieveTerminalList.pending, function (state) {
+            state.terminalListLoading = true;
             state.error = null;
         })
-            .addCase(retrieveTerminalList.pending, function (state) {
+            .addCase(retrieveTerminalDeviceList.pending, function (state) {
             state.error = null;
         })
-            .addCase(retrieveTerminalList.fulfilled, function (state, action) {
+            .addCase(retrieveTerminalDeviceList.fulfilled, function (state, action) {
             state.error = null;
             var data = action.payload.data;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { terminalData: data });
         })
-            .addCase(retrieveTerminalList.rejected, function (state, action) {
+            .addCase(retrieveTerminalDeviceList.rejected, function (state, action) {
             state.error = action.error.message;
         })
             .addCase(pushNotificationLinkNewTerminal.pending, function (state) {
@@ -675,6 +671,6 @@ export var terminalSlice = createSlice({
         });
     }
 });
-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 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 default terminalSlice.reducer;
 export var terminalSelector = function (state) { return state.terminal; };

package/build/features/featuresScreens.js

@@ -146,7 +146,7 @@ import TerminalOperatorErrorPage from './terminal/screens/OperatorError';
 import TerminalVerifyPage from './terminal/screens/Verify';
 import NoTerminalDeviceLinkedPage from './terminal/screens/NoTerminalDeviceLinked';
 import TerminalDeviceListPage from './terminal/screens/TerminalDeviceList';
-import POSDeviceListPage from '../features/terminal/screens/POSDeviceListPage';
+import TerminalListPage from './terminal/screens/TerminalListPage';
 import LinkNewTerminalPage from './terminal/screens/LinkNewTerminal';
 import LinkedTerminalInfoPage from './terminal/screens/LinkedTerminalInfo';
 import UnlinkedTerminalInfoPage from './terminal/screens/UnlinkedTerminalInfo';
@@ -744,8 +744,8 @@ export var terminalFeatureScreens = [
         element: LinkNewTerminalPage
     },
     {
-        name: CONNECT_FLOWS.terminal.posDeviceList,
-        element: POSDeviceListPage
+        name: CONNECT_FLOWS.terminal.terminalList,
+        element: TerminalListPage
     },
     {
         name: CONNECT_FLOWS.terminal.linkedTerminalInfo,

package/build/features/terminal/Terminal.js

@@ -41,7 +41,7 @@ var Terminal = memo(function (_a) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _d = useAppSelector(settingsSelector), data = _d.data, error = _d.error, settingLoading = _d.loading;
-    var _e = useAppSelector(terminalSelector), customLoading = _e.customLoading, terminalError = _e.error, loading = _e.loading, posDevicesLoading = _e.posDevicesLoading;
+    var _e = useAppSelector(terminalSelector), customLoading = _e.customLoading, terminalError = _e.error, loading = _e.loading, terminalListLoading = _e.terminalListLoading;
     useAppConfig(__assign(__assign({ navigation: TERMINAL_SCREENS_NAVIGATION }, props), { disableSettingFetching: props.mode === 'content' ? false : !!verifyToken || !!configToken }));
     useErrorListener(terminalError || error);
     useStepStartedListener();
@@ -77,7 +77,7 @@ var Terminal = memo(function (_a) {
         });
     }, []);
     var initialLoading = verifyToken && props.mode !== 'content' ? settingLoading : settingLoading || customLoading;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading || posDevicesLoading ? 'none' : 'auto', isTapOrigin: isTapOrigin, animationDirection: animationDirection, open: open, error: error, loading: initialLoading, loaderColor: loaderColor, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: terminalFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ mode: props.mode, open: open, isTapOrigin: isTapOrigin, loading: initialLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading || terminalListLoading ? 'none' : 'auto', isTapOrigin: isTapOrigin, animationDirection: animationDirection, open: open, error: error, loading: initialLoading, loaderColor: loaderColor, breakpoint: 'sm', screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: isMaturityExpress, type: props.mode === 'content' ? 'CONTENT' : undefined, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: appConfig.features }, { children: _jsx(FeatureContainer, __assign({ mode: props.mode, isMaturityExpress: isMaturityExpress }, { children: terminalFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

package/build/features/terminal/screens/LinkNewTerminal/LinkNewTerminal.js

@@ -27,15 +27,17 @@ var LinkNewTerminal = function () {
     var _a, _b, _c, _d;
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(terminalSelector).data, terminal_device = _e.terminalInfo.selectedTerminal.terminal_device, responseData = _e.responseData;
-    var _f = React.useState(false), isReady = _f[0], setIsReady = _f[1];
-    var _g = React.useState(false), success = _g[0], setSuccess = _g[1];
-    var _h = React.useState(false), failed = _h[0], setFailed = _h[1];
-    var _j = responseData || {}, terminalData = _j.terminalData, linkNewTerminalData = _j.linkNewTerminalData;
+    var data = useAppSelector(terminalSelector).data;
+    var _e = React.useState(false), isReady = _e[0], setIsReady = _e[1];
+    var _f = React.useState(false), success = _f[0], setSuccess = _f[1];
+    var _g = React.useState(false), failed = _g[0], setFailed = _g[1];
+    var terminalInfo = data.terminalInfo, responseData = data.responseData;
+    var _h = responseData || {}, terminalData = _h.terminalData, linkNewTerminalData = _h.linkNewTerminalData;
+    var terminal_devices = (terminalData || {}).terminal_devices;
     var qrCode = "data:image/png;base64,".concat((_a = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.linking) === null || _a === void 0 ? void 0 : _a.qr);
     var code = (_b = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.linking) === null || _b === void 0 ? void 0 : _b.code;
     var expiry = TERMINAL_PUSH_NOTIFICATION_DURATION;
-    var deviceName = ((_d = (_c = terminal_device === null || terminal_device === void 0 ? void 0 : terminal_device.model) === null || _c === void 0 ? void 0 : _c.name[0]) === null || _d === void 0 ? void 0 : _d.text) || '';
+    var deviceName = ((_d = (_c = terminalInfo.selectedTerminalDevice.model) === null || _c === void 0 ? void 0 : _c.name[0]) === null || _d === void 0 ? void 0 : _d.text) || '';
     var newTerminal = true;
     React.useEffect(function () {
         if (linkNewTerminalData && !isReady) {
@@ -59,8 +61,7 @@ var LinkNewTerminal = function () {
         };
     }, [isReady]);
     var handleOnBack = function () {
-        var _a;
-        var previousScreen = ((_a = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _a === void 0 ? void 0 : _a.length) ? CONNECT_FLOWS.terminal.posDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
+        var previousScreen = (terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.length) ? CONNECT_FLOWS.terminal.terminalList : CONNECT_FLOWS.terminal.noTerminalLinked;
         dispatch(handlePrevScreenStep(previousScreen));
     };
     return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsx(PushNotification, __assign({ error: t('terminal_request_denied', { device: deviceName }), failed: failed, success: success, expiryInSeconds: expiry }, { children: _jsxs(LinkNewTerminalContainer, { children: [_jsx(LinkTerminalText, { children: t('terminal_link_terminal') }), _jsx(QRCodeDescription, { children: t('terminal_qr_code_description') }), _jsx(QRCodeImage, { src: qrCode }), code && (_jsxs(_Fragment, { children: [_jsx(LinkTerminalText, { children: t('terminal_or_use_code') }), _jsx(CodeDescription, { children: formatCode(code) })] }))] }) })), _jsx(Box, __assign({ sx: { ml: 2.5, mr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: handleOnBack, variant: 'text' }, { children: t('back') })) }))] })));

package/build/features/terminal/screens/LinkedSuccess/LinkedSuccess.js

@@ -15,21 +15,22 @@ import { useTranslation } from 'react-i18next';
 import Box from '@mui/material/Box';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
-import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, terminalSelector } from '../../../app/terminal/terminalStore';
+import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalDeviceList, terminalSelector } from '../../../app/terminal/terminalStore';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import Button from '../../../shared/Button';
-import { SuccessContainerStyled } from '../shared';
+import { getTerminalName, SuccessContainerStyled } from '../shared';
 import { CONNECT_FLOWS } from '../../../../constants';
 var LinkedSuccess = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), error = _a.error, loading = _a.loading, _b = _a.data, selectedPOS = _b.terminalInfo.selectedPOS, responseData = _b.responseData;
+    var _a = useAppSelector(terminalSelector), error = _a.error, loading = _a.loading, _b = _a.data, selectedTerminal = _b.terminalInfo.selectedTerminal, responseData = _b.responseData;
     var _c = responseData || {}, boardData = _c.boardData, authData = _c.authData;
+    var deviceName = getTerminalName(selectedTerminal);
     var handleGoToBoard = function () {
         var board_id = (boardData || {}).id;
         var _a = (authData === null || authData === void 0 ? void 0 : authData.recipient) || {}, id = _a.id, type = _a.type;
-        dispatch(retrieveTerminalList());
+        dispatch(retrieveTerminalDeviceList());
         dispatch(retrieveBoardStatus({ boardId: board_id }))
             .unwrap()
             .then(function () {
@@ -45,6 +46,6 @@ var LinkedSuccess = function () {
     var handleOnBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsxs(SuccessContainerStyled, { children: [_jsx(SuccessScreen, { sx: { minHeight: 'unset', ml: 2.5, mr: 2.5 }, title: t('terminal_linked_success', { device: selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.display_name }), successTitle: t('terminal_go_to_board'), loading: loading, error: error || '' }), _jsx(Box, __assign({ sx: { width: '100%' } }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, onBackClicked: handleOnBack, onClick: handleGoToBoard, isAr: isAr }, { children: t('terminal_go_to_board') })) }))] }));
+    return (_jsxs(SuccessContainerStyled, { children: [_jsx(SuccessScreen, { sx: { minHeight: 'unset', ml: 2.5, mr: 2.5 }, title: t('terminal_linked_success', { device: deviceName }), successTitle: t('terminal_go_to_board'), loading: loading, error: error || '' }), _jsx(Box, __assign({ sx: { width: '100%' } }, { children: _jsx(Button, __assign({ loading: loading, disableBack: true, onBackClicked: handleOnBack, onClick: handleGoToBoard, isAr: isAr }, { children: t('terminal_go_to_board') })) }))] }));
 };
 export default React.memo(LinkedSuccess);

package/build/features/terminal/screens/LinkedTerminalInfo/LinkedTerminalInfo.js

@@ -23,17 +23,17 @@ import Button from '../../../shared/Button';
 import { clearError, terminalSelector, unlinkTerminalDevice } from '../../../app/terminal/terminalStore';
 import { Container, getId, getIdLabel, getPairedWith, LinkWithText } from '../shared';
 var LinkedTerminalInfo = function () {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g;
     var t = useTranslation().t;
-    var _b = useTheme(), spacing = _b.spacing, palette = _b.palette;
+    var _h = useTheme(), spacing = _h.spacing, palette = _h.palette;
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
-    var _c = useAppSelector(terminalSelector), error = _c.error, selectedTerminal = _c.data.terminalInfo.selectedTerminal, loading = _c.loading;
-    var terminal_device = selectedTerminal.terminal_device, linked = selectedTerminal.linked, device = selectedTerminal.device;
-    var _d = (terminal_device.model || {}).image_url, image_url = _d === void 0 ? ICONS_NAMES.device_image : _d;
-    var deviceName = (device === null || device === void 0 ? void 0 : device.display_name) || '';
-    var deviceImage = (device === null || device === void 0 ? void 0 : device.logo) || ICONS_NAMES.platform_image;
-    var deviceId = (device === null || device === void 0 ? void 0 : device.reference) || (device === null || device === void 0 ? void 0 : device.id) || '';
+    var _j = useAppSelector(terminalSelector), error = _j.error, selectedTerminalDevice = _j.data.terminalInfo.selectedTerminalDevice, loading = _j.loading;
+    var model = selectedTerminalDevice.model, linked = selectedTerminalDevice.linked, display_name = selectedTerminalDevice.display_name, terminal = selectedTerminalDevice.terminal, platform = selectedTerminalDevice.platform;
+    var _k = (model || {}).image_url, image_url = _k === void 0 ? ICONS_NAMES.device_image : _k;
+    var deviceName = (_b = (_a = terminal === null || terminal === void 0 ? void 0 : terminal.device) === null || _a === void 0 ? void 0 : _a.display_name) !== null && _b !== void 0 ? _b : (_c = terminal === null || terminal === void 0 ? void 0 : terminal.name) === null || _c === void 0 ? void 0 : _c.en;
+    var deviceImage = (_e = (_d = platform === null || platform === void 0 ? void 0 : platform.brand) === null || _d === void 0 ? void 0 : _d.logo) !== null && _e !== void 0 ? _e : ICONS_NAMES.platform_image;
+    var deviceId = (_g = (_f = terminal === null || terminal === void 0 ? void 0 : terminal.device) === null || _f === void 0 ? void 0 : _f.id) !== null && _g !== void 0 ? _g : terminal === null || terminal === void 0 ? void 0 : terminal.legacy_id;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -50,6 +50,6 @@ var LinkedTerminalInfo = function () {
     var handleOnBack = function () {
         dispatch(handlePrevScreenStep(CONNECT_FLOWS.terminal.terminalDeviceList));
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 224, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(DeviceCard, { badge: true, image: image_url, name: ((_a = selectedTerminal.terminal_device) === null || _a === void 0 ? void 0 : _a.display_name) || '', deviceId: getId(selectedTerminal), deviceIdLabel: getIdLabel(selectedTerminal), pairedWith: getPairedWith(selectedTerminal), isLinked: linked }), _jsx(LinkWithText, { children: t('terminal_linked_with') }), _jsx(DeviceCard, { sx: { minHeight: spacing(10), borderRadius: spacing(1), background: palette.components.deviceCard.deviceInfoBackground }, image: deviceImage, name: deviceName, deviceId: deviceId, isLinked: linked })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Button, __assign({ loading: loading, onBackClicked: handleOnBack, onClick: handleOnNext, isAr: isAr }, { children: t('terminal_unlink') }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 224, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(DeviceCard, { badge: true, image: image_url, name: display_name, deviceId: getId(selectedTerminalDevice), deviceIdLabel: getIdLabel(selectedTerminalDevice), pairedWith: getPairedWith(selectedTerminalDevice), isLinked: linked }), _jsx(LinkWithText, { children: t('terminal_linked_with') }), _jsx(DeviceCard, { sx: { minHeight: spacing(10), borderRadius: spacing(1), background: palette.components.deviceCard.deviceInfoBackground }, image: deviceImage || '', name: deviceName || '', deviceId: deviceId !== null && deviceId !== void 0 ? deviceId : '', isLinked: linked })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Button, __assign({ loading: loading, onBackClicked: handleOnBack, onClick: handleOnNext, isAr: isAr }, { children: t('terminal_unlink') }))] })));
 };
 export default React.memo(LinkedTerminalInfo);

package/build/features/terminal/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -27,6 +27,6 @@ var SuccessWithFlowButtons = function () {
     var onClose = function () {
         dispatch(onCloseCompleteTerminal());
     };
-    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: boardFlows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: board_status, terminalStepName: ((_a = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _a === void 0 ? void 0 : _a.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked }));
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, loading: loading, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, individuals: individuals, flows: boardFlows || [], onClose: isScopeAuthentication ? onClose : undefined, recipient: recipient, status: board_status, terminalStepName: ((_a = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _a === void 0 ? void 0 : _a.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/terminal/screens/TerminalDeviceList/DeviceList.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { TerminalInfo } from '../../../../@types';
+import { TerminalDeviceInfo } from '../../../../@types';
 interface DeviceListProps {
-    devices: TerminalInfo[];
+    devices: TerminalDeviceInfo[];
     loading?: boolean;
-    onClick: (device: TerminalInfo) => void;
+    onClick: (device: TerminalDeviceInfo) => void;
 }
 declare const _default: React.MemoExoticComponent<({ devices, onClick, loading }: DeviceListProps) => JSX.Element>;
 export default _default;

package/build/features/terminal/screens/TerminalDeviceList/DeviceList.js

@@ -14,7 +14,7 @@ var DeviceList = function (_a) {
     };
     return (_jsx(DeviceListContainer, { children: devices.map(function (device, index) {
             var _a;
-            return (_jsx(DeviceCard, { onClick: function () { return handleOnClick(device); }, loading: device.id === (selected === null || selected === void 0 ? void 0 : selected.id) && loading, image: (_a = device.terminal_device.model.image_url) !== null && _a !== void 0 ? _a : defaultImage, name: device.terminal_device.display_name, deviceId: getId(device), pairedWith: getPairedWith(device), deviceIdLabel: getIdLabel(device), isLinked: device.linked, arrow: true, badge: true }, index));
+            return (_jsx(DeviceCard, { onClick: function () { return handleOnClick(device); }, loading: device.id === (selected === null || selected === void 0 ? void 0 : selected.id) && loading, image: (_a = device.model.image_url) !== null && _a !== void 0 ? _a : defaultImage, name: device.display_name, deviceId: getId(device), pairedWith: getPairedWith(device), deviceIdLabel: getIdLabel(device), isLinked: device.linked, arrow: true, badge: true }, index));
         }) }));
 };
 export default memo(DeviceList);

package/build/features/terminal/screens/TerminalDeviceList/TerminalDeviceList.js

@@ -56,27 +56,27 @@ import Button from '../../../../components/Button';
 import Loader from '../../../../components/Loader';
 import Warning from '../../../../components/Warning';
 import Box from '@mui/material/Box';
-import { clearError, resetTerminalLinkResponse, retrieveBoardDetails, retrieveBoardStatus, retrievePOSDevices, storeSelectedTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
+import { clearError, resetTerminalLinkResponse, retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, storeSelectedTerminalDevice, terminalSelector } from '../../../app/terminal/terminalStore';
 import { Header, Container, TextTypography } from '../shared';
 import DeviceList from './DeviceList';
 var TerminalDeviceList = function () {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading, posDevicesLoading = _a.posDevicesLoading, error = _a.error;
+    var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading, terminalListLoading = _a.terminalListLoading, error = _a.error;
     var _b = React.useState(false), newLinkClicked = _b[0], setNewLinkClicked = _b[1];
-    var _c = data.responseData || {}, boardFlows = _c.boardFlows, authData = _c.authData, boardData = _c.boardData, terminalData = _c.terminalData, posDevices = _c.posDevices;
-    var list = (terminalData || {}).list;
+    var _c = data.responseData || {}, boardFlows = _c.boardFlows, authData = _c.authData, boardData = _c.boardData, terminalData = _c.terminalData, terminalList = _c.terminalList;
+    var terminal_devices = (terminalData || {}).terminal_devices;
     var _d = React.useMemo(function () {
-        var linked = list === null || list === void 0 ? void 0 : list.filter(function (d) { return d.linked; });
-        var unLinked = list === null || list === void 0 ? void 0 : list.filter(function (d) { return !d.linked; });
+        var linked = terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.filter(function (d) { return d.linked; });
+        var unLinked = terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.filter(function (d) { return !d.linked; });
         return { linkedDevices: linked, unLinkedDevices: unLinked };
-    }, [list]), linkedDevices = _d.linkedDevices, unLinkedDevices = _d.unLinkedDevices;
+    }, [terminal_devices]), linkedDevices = _d.linkedDevices, unLinkedDevices = _d.unLinkedDevices;
     var handleOnClickNewTerminalLink = function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     setNewLinkClicked(true);
-                    return [4, retrievePOSDevicesAsync(CONNECT_FLOWS.terminal.posDeviceList)];
+                    return [4, retrieveTerminalListAsync(CONNECT_FLOWS.terminal.terminalList)];
                 case 1:
                     _a.sent();
                     return [2];
@@ -88,19 +88,19 @@ var TerminalDeviceList = function () {
             dispatch(clearError());
         dispatch(resetTerminalLinkResponse());
     }, []);
-    var retrievePOSDevicesAsync = function (nextScreen) { return __awaiter(void 0, void 0, void 0, function () {
+    var retrieveTerminalListAsync = function (nextScreen) { return __awaiter(void 0, void 0, void 0, function () {
         var err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (posDevices === null || posDevices === void 0 ? void 0 : posDevices.length) {
+                    if (terminalList === null || terminalList === void 0 ? void 0 : terminalList.length) {
                         dispatch(handleNextScreenStep(nextScreen));
                         return [2];
                     }
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4, dispatch(retrievePOSDevices()).unwrap()];
+                    return [4, dispatch(retrieveTerminalList()).unwrap()];
                 case 2:
                     _a.sent();
                     dispatch(handleNextScreenStep(nextScreen));
@@ -114,7 +114,7 @@ var TerminalDeviceList = function () {
         });
     }); };
     var handleOnClickLinkedTerminal = function (terminal) {
-        dispatch(storeSelectedTerminal(terminal));
+        dispatch(storeSelectedTerminalDevice(terminal));
         dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.linkedTerminalInfo));
     };
     var handleOnClickUnlinkedTerminal = function (terminal) { return __awaiter(void 0, void 0, void 0, function () {
@@ -122,8 +122,8 @@ var TerminalDeviceList = function () {
             switch (_a.label) {
                 case 0:
                     setNewLinkClicked(false);
-                    dispatch(storeSelectedTerminal(terminal));
-                    return [4, retrievePOSDevicesAsync(CONNECT_FLOWS.terminal.unlinkedTerminalInfo)];
+                    dispatch(storeSelectedTerminalDevice(terminal));
+                    return [4, retrieveTerminalListAsync(CONNECT_FLOWS.terminal.unlinkedTerminalInfo)];
                 case 1:
                     _a.sent();
                     return [2];
@@ -148,6 +148,6 @@ var TerminalDeviceList = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(Header, { onLinkClick: handleOnClickNewTerminalLink, loading: posDevicesLoading && newLinkClicked }), _jsx(DeviceList, { devices: linkedDevices, onClick: handleOnClickLinkedTerminal }), !!(unLinkedDevices === null || unLinkedDevices === void 0 ? void 0 : unLinkedDevices.length) && !!(linkedDevices === null || linkedDevices === void 0 ? void 0 : linkedDevices.length) && _jsx(TextTypography, __assign({ sx: { pt: 1, pb: 1 } }, { children: t('terminal_unlinked') })), _jsx(DeviceList, { loading: posDevicesLoading && !newLinkClicked, devices: unLinkedDevices, onClick: handleOnClickUnlinkedTerminal })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Box, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') })) }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(Header, { onLinkClick: handleOnClickNewTerminalLink, loading: terminalListLoading && newLinkClicked }), _jsx(DeviceList, { devices: linkedDevices, onClick: handleOnClickLinkedTerminal }), !!(unLinkedDevices === null || unLinkedDevices === void 0 ? void 0 : unLinkedDevices.length) && !!(linkedDevices === null || linkedDevices === void 0 ? void 0 : linkedDevices.length) && _jsx(TextTypography, __assign({ sx: { pt: 1, pb: 1 } }, { children: t('terminal_unlinked') })), _jsx(DeviceList, { loading: terminalListLoading && !newLinkClicked, devices: unLinkedDevices, onClick: handleOnClickUnlinkedTerminal })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Box, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') })) }))] })));
 };
 export default React.memo(TerminalDeviceList);

package/build/features/terminal/screens/{POSDeviceListPage/POSDeviceListPage.js → TerminalListPage/TerminalListPage.js}

@@ -18,19 +18,19 @@ import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/sett
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Button from '../../../../components/Button';
 import Warning from '../../../../components/Warning';
-import { clearError, linkNewTerminal, storeSelectedPOS, terminalSelector } from '../../../app/terminal/terminalStore';
-import { Header, Container, POSDeviceList } from '../shared';
-var POSDeviceListPage = function () {
+import { clearError, linkNewTerminal, storeSelectedTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
+import { Header, Container, TerminalList } from '../shared';
+var TerminalListPage = function () {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), _b = _a.data, selectedPOS = _b.terminalInfo.selectedPOS, responseData = _b.responseData, loading = _a.loading, error = _a.error;
-    var posDevices = (responseData || {}).posDevices;
+    var _a = useAppSelector(terminalSelector), _b = _a.data, selectedTerminal = _b.terminalInfo.selectedTerminal, responseData = _b.responseData, loading = _a.loading, error = _a.error;
+    var terminalList = (responseData || {}).terminalList;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, []);
-    var handleOnSelectPOS = function (pos) {
-        dispatch(storeSelectedPOS(pos));
+    var handleOnSelectTerminal = function (terminal) {
+        dispatch(storeSelectedTerminal(terminal));
         dispatch(linkNewTerminal())
             .unwrap()
             .then(function (_a) {
@@ -42,6 +42,6 @@ var POSDeviceListPage = function () {
     var handleOnBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(Header, { title: 'terminal_select_device', sx: { pb: 0 } }), _jsx(POSDeviceList, { select: false, loading: loading, selectedPOS: selectedPOS, posDevices: posDevices, onClick: handleOnSelectPOS })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Box, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: t('back') })) }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: [_jsx(Header, { title: 'terminal_select_device', sx: { pb: 0 } }), _jsx(TerminalList, { select: false, loading: loading, selectedTerminal: selectedTerminal, list: terminalList, onClick: handleOnSelectTerminal })] })), error && _jsx(Warning, __assign({ sx: { mt: 2 } }, { children: t(error) })), _jsx(Box, __assign({ sx: { pl: 2.5, pr: 2.5 } }, { children: _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: t('back') })) }))] })));
 };
-export default React.memo(POSDeviceListPage);
+export default React.memo(TerminalListPage);

package/build/features/terminal/screens/TerminalListPage/index.d.ts

@@ -0,0 +1,2 @@
+import TerminalListPage from './TerminalListPage';
+export default TerminalListPage;

package/build/features/terminal/screens/TerminalListPage/index.js

@@ -0,0 +1,2 @@
+import TerminalListPage from './TerminalListPage';
+export default TerminalListPage;

package/build/features/terminal/screens/UnlinkedSuccess/UnlinkedSuccess.js

@@ -16,21 +16,23 @@ import Box from '@mui/material/Box';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { CONNECT_FLOWS } from '../../../../constants';
 import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
-import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, terminalSelector } from '../../../app/terminal/terminalStore';
+import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalDeviceList, terminalSelector } from '../../../app/terminal/terminalStore';
 import SuccessScreen from '../../../shared/SuccessScreen';
 import Button from '../../../shared/Button';
 import { SuccessContainerStyled } from '../shared';
 var UnlinkedSuccess = function () {
+    var _a, _b, _c;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), error = _a.error, loading = _a.loading, _b = _a.data, device = _b.terminalInfo.selectedTerminal.device, responseData = _b.responseData;
-    var _c = responseData || {}, boardData = _c.boardData, authData = _c.authData;
-    var deviceName = device === null || device === void 0 ? void 0 : device.display_name;
+    var _d = useAppSelector(terminalSelector), error = _d.error, loading = _d.loading, _e = _d.data, selectedTerminalDevice = _e.terminalInfo.selectedTerminalDevice, responseData = _e.responseData;
+    var _f = responseData || {}, boardData = _f.boardData, authData = _f.authData;
+    var terminal = (selectedTerminalDevice || {}).terminal;
+    var deviceName = (_b = (_a = terminal === null || terminal === void 0 ? void 0 : terminal.device) === null || _a === void 0 ? void 0 : _a.display_name) !== null && _b !== void 0 ? _b : (_c = terminal === null || terminal === void 0 ? void 0 : terminal.name) === null || _c === void 0 ? void 0 : _c.en;
     var handleGoToBoard = function () {
         var board_id = (boardData || {}).id;
         var _a = (authData === null || authData === void 0 ? void 0 : authData.recipient) || {}, id = _a.id, type = _a.type;
-        dispatch(retrieveTerminalList());
+        dispatch(retrieveTerminalDeviceList());
         dispatch(retrieveBoardStatus({ boardId: board_id }))
             .unwrap()
             .then(function () {