@tap-payments/auth-jsconnect 2.11.16-development → 2.11.17-development

package/build/constants/app.js

@@ -993,7 +993,7 @@ export var TERMINAL_SCREENS_NAVIGATION = [
     },
     {
         name: CONNECT_FLOWS.terminal.noTerminalLinked,
-        next: CONNECT_FLOWS.terminal.terminalLinkNew,
+        next: CONNECT_FLOWS.terminal.posDeviceList,
         prev: CONNECT_FLOWS.terminal.board,
         order: 2
     },
@@ -1006,13 +1006,13 @@ export var TERMINAL_SCREENS_NAVIGATION = [
     {
         name: CONNECT_FLOWS.terminal.posDeviceList,
         next: CONNECT_FLOWS.terminal.terminalLinkNew,
-        prev: CONNECT_FLOWS.terminal.terminalDeviceList,
+        prev: [CONNECT_FLOWS.terminal.terminalDeviceList, CONNECT_FLOWS.terminal.noTerminalLinked],
         order: 3
     },
     {
         name: CONNECT_FLOWS.terminal.terminalLinkNew,
         next: CONNECT_FLOWS.terminal.terminalLinkedSuccess,
-        prev: [CONNECT_FLOWS.terminal.noTerminalLinked, CONNECT_FLOWS.terminal.posDeviceList],
+        prev: CONNECT_FLOWS.terminal.posDeviceList,
         order: 3
     },
     {

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

@@ -9,32 +9,77 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
-import Button from '../../../../components/Button';
-import Loader from '../../../../components/Loader';
 import { ICONS_NAMES } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
-import { linkNewTerminal, retrieveBoardDetails, retrieveBoardStatus, terminalSelector } from '../../../app/terminal/terminalStore';
+import { retrieveBoardDetails, retrieveBoardStatus, retrievePOSDevices, terminalSelector } from '../../../app/terminal/terminalStore';
 import { DescriptionTypography, DeviceImage, NoTerminalDeviceLinkedContainer, TitleTypography } from './styles';
+import Button from '../../../../features/shared/Button';
 var NoTerminalDeviceLinked = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), loading = _a.loading, data = _a.data;
+    var _a = useAppSelector(terminalSelector), posDevicesLoading = _a.posDevicesLoading, data = _a.data;
     var _b = data.responseData || {}, boardFlows = _b.boardFlows, authData = _b.authData, boardData = _b.boardData;
-    var handleOnClickNewTerminalLink = function () {
-        dispatch(linkNewTerminal())
-            .unwrap()
-            .then(function (_a) {
-            var nextScreen = _a.nextScreen;
-            dispatch(handleNextScreenStep(nextScreen));
-        })
-            .catch(function () { });
-    };
+    var handleOnClickNewTerminalLink = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var err_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4, dispatch(retrievePOSDevices()).unwrap()];
+                case 1:
+                    _a.sent();
+                    dispatch(handleNextScreenStep());
+                    return [3, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    console.log('Error while retrieving pos devices list error', err_1);
+                    return [3, 3];
+                case 3: return [2];
+            }
+        });
+    }); };
     var handleOnBack = function () {
         if ((boardFlows === null || boardFlows === void 0 ? void 0 : boardFlows.length) > 0) {
             dispatch(handlePrevScreenStep());
@@ -53,6 +98,6 @@ var NoTerminalDeviceLinked = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ sx: { ml: 2.5, mr: 2.5 }, minHeight: 280, justifyContent: 'space-between' }, { children: [_jsxs(NoTerminalDeviceLinkedContainer, { children: [_jsx(DeviceImage, { src: ICONS_NAMES.terminal_device }), _jsx(TitleTypography, { children: t('terminal_no_terminal_linked') }), _jsx(DescriptionTypography, { children: t('terminal_no_terminal_linked_description') })] }), _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({ sx: { ml: 2.5, mr: 2.5 }, minHeight: 280, justifyContent: 'space-between' }, { children: [_jsxs(NoTerminalDeviceLinkedContainer, { children: [_jsx(DeviceImage, { src: ICONS_NAMES.terminal_device }), _jsx(TitleTypography, { children: t('terminal_no_terminal_linked') }), _jsx(DescriptionTypography, { children: t('terminal_no_terminal_linked_description') })] }), _jsx(Button, __assign({ sx: { mt: 0, ml: 0, mr: 0 }, loading: posDevicesLoading, onBackClicked: handleOnBack, onClick: handleOnClickNewTerminalLink, isAr: isAr }, { children: t('terminal_link_terminal') }))] })));
 };
 export default React.memo(NoTerminalDeviceLinked);

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

@@ -18,13 +18,14 @@ import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/sett
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Button from '../../../../components/Button';
 import Warning from '../../../../components/Warning';
+import { CONNECT_FLOWS } from '../../../../constants';
 import { clearError, linkNewTerminal, storeSelectedPOS, terminalSelector } from '../../../app/terminal/terminalStore';
 import { Header, Container, POSDeviceList } from '../shared';
 var POSDeviceListPage = 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 _c = responseData || {}, posDevices = _c.posDevices, terminalData = _c.terminalData;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -40,7 +41,9 @@ var POSDeviceListPage = function () {
             .catch(function () { });
     };
     var handleOnBack = function () {
-        dispatch(handlePrevScreenStep());
+        var _a;
+        var screen = ((_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;
+        dispatch(handlePrevScreenStep(screen));
     };
     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') })) }))] })));
 };

package/package.json

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