@tap-payments/auth-jsconnect 2.11.0-sandbox → 2.11.0

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

@@ -13,19 +13,20 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { memo } from 'react';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppSelector, useAppDispatch } from '../../../../hooks';
-import { SCOPE_AUTH } from '../../../../constants';
+import { CONNECT_FLOWS, SCOPE_AUTH } from '../../../../constants';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 import { onCloseCompleteTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
 var SuccessWithFlowButtons = function () {
+    var _a;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading;
+    var _b = useAppSelector(terminalSelector), data = _b.data, loading = _b.loading;
     var settingsData = useAppSelector(settingsSelector).data;
     var isScopeAuthentication = settingsData.appConfig.scope === SCOPE_AUTH;
-    var _b = data.responseData || {}, boardFlows = _b.boardFlows, boardData = _b.boardData;
-    var _c = boardData || {}, entity = _c.entity, brand = _c.brand, bank = _c.bank_account, merchant = _c.merchant, user = _c.user, business = _c.business, board_id = _c.board_id, board_info_id = _c.board_info_id, name = _c.name, individuals = _c.individuals, recipient = _c.recipient, board_status = _c.board_status;
+    var _c = data.responseData || {}, boardFlows = _c.boardFlows, boardData = _c.boardData, terminalData = _c.terminalData;
+    var _d = boardData || {}, entity = _d.entity, brand = _d.brand, bank = _d.bank_account, merchant = _d.merchant, user = _d.user, business = _d.business, board_id = _d.board_id, board_info_id = _d.board_info_id, name = _d.name, individuals = _d.individuals, recipient = _d.recipient, board_status = _d.board_status;
     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 }));
+    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 }));
 };
 export default memo(SuccessWithFlowButtons);

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

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

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

@@ -13,8 +13,8 @@ var DeviceList = function (_a) {
         onClick(device);
     };
     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.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));
+            var _a, _b, _c, _d, _e;
+            return (_jsx(DeviceCard, { onClick: function () { return handleOnClick(device); }, loading: device.id === (selected === null || selected === void 0 ? void 0 : selected.id) && loading, image: (_c = (_b = (_a = device.terminal_device) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b.image_url) !== null && _c !== void 0 ? _c : defaultImage, name: (_e = (_d = device.terminal_device) === null || _d === void 0 ? void 0 : _d.display_name) !== null && _e !== void 0 ? _e : '', 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

@@ -54,46 +54,56 @@ import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/sett
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Button from '../../../../components/Button';
 import Loader from '../../../../components/Loader';
-import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, storeSelectedTerminalDevice, terminalSelector } from '../../../app/terminal/terminalStore';
+import Warning from '../../../../components/Warning';
+import Box from '@mui/material/Box';
+import { clearError, resetTerminalLinkResponse, retrieveBoardDetails, retrieveBoardStatus, retrievePOSDevices, storeSelectedTerminal, 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, terminalListLoading = _a.terminalListLoading;
+    var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading, posDevicesLoading = _a.posDevicesLoading, 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, terminalList = _c.terminalList;
-    var terminal_devices = (terminalData || {}).terminal_devices;
+    var _c = data.responseData || {}, boardFlows = _c.boardFlows, authData = _c.authData, boardData = _c.boardData, terminalData = _c.terminalData, posDevices = _c.posDevices;
+    var list = (terminalData || {}).list;
     var _d = React.useMemo(function () {
-        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; });
+        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; });
         return { linkedDevices: linked, unLinkedDevices: unLinked };
-    }, [terminal_devices]), linkedDevices = _d.linkedDevices, unLinkedDevices = _d.unLinkedDevices;
+    }, [list]), 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, retrieveTerminalListAsync()];
+                    return [4, retrievePOSDevicesAsync(CONNECT_FLOWS.terminal.posDeviceList)];
                 case 1:
                     _a.sent();
-                    dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.terminalList));
                     return [2];
             }
         });
     }); };
-    var retrieveTerminalListAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+        dispatch(resetTerminalLinkResponse());
+    }, []);
+    var retrievePOSDevicesAsync = 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 (!!(terminalList === null || terminalList === void 0 ? void 0 : terminalList.length)) return [3, 4];
+                    if (posDevices === null || posDevices === void 0 ? void 0 : posDevices.length) {
+                        dispatch(handleNextScreenStep(nextScreen));
+                        return [2];
+                    }
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4, dispatch(retrieveTerminalList())];
+                    return [4, dispatch(retrievePOSDevices()).unwrap()];
                 case 2:
                     _a.sent();
+                    dispatch(handleNextScreenStep(nextScreen));
                     return [3, 4];
                 case 3:
                     err_1 = _a.sent();
@@ -104,7 +114,7 @@ var TerminalDeviceList = function () {
         });
     }); };
     var handleOnClickLinkedTerminal = function (terminal) {
-        dispatch(storeSelectedTerminalDevice(terminal));
+        dispatch(storeSelectedTerminal(terminal));
         dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.linkedTerminalInfo));
     };
     var handleOnClickUnlinkedTerminal = function (terminal) { return __awaiter(void 0, void 0, void 0, function () {
@@ -112,11 +122,10 @@ var TerminalDeviceList = function () {
             switch (_a.label) {
                 case 0:
                     setNewLinkClicked(false);
-                    dispatch(storeSelectedTerminalDevice(terminal));
-                    return [4, retrieveTerminalListAsync()];
+                    dispatch(storeSelectedTerminal(terminal));
+                    return [4, retrievePOSDevicesAsync(CONNECT_FLOWS.terminal.unlinkedTerminalInfo)];
                 case 1:
                     _a.sent();
-                    dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.unlinkedTerminalInfo));
                     return [2];
             }
         });
@@ -139,6 +148,6 @@ var TerminalDeviceList = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { 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 })] }), _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: 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') })) }))] })));
 };
 export default React.memo(TerminalDeviceList);

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

@@ -16,23 +16,21 @@ 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, retrieveTerminalDeviceList, terminalSelector } from '../../../app/terminal/terminalStore';
+import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, 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 _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 _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 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(retrieveTerminalDeviceList());
+        dispatch(retrieveTerminalList());
         dispatch(retrieveBoardStatus({ boardId: board_id }))
             .unwrap()
             .then(function () {

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

@@ -21,12 +21,12 @@ import { ScreenContainer } from '../../../shared/Containers';
 import DeviceCard from '../../../../components/DeviceCard';
 import OTPTimer from '../../../../components/OTPTimer';
 import Collapse from '../../../../components/Collapse';
-import { clearError, linkTerminalDevice, pushNotificationLinkNewTerminal, storeSelectedTerminal, terminalSelector } from '../../../app/terminal/terminalStore';
+import { clearError, linkTerminalDevice, pushNotificationLinkNewTerminal, storeSelectedPOS, terminalSelector } from '../../../app/terminal/terminalStore';
 import PushNotification from '../../../shared/PushNotification';
 import Button from '../../../shared/Button';
 import { Container, getId, getIdLabel, LinkWithText } from '../shared';
 import { SendRequestContainer } from './styles';
-import { TerminalList } from '../shared';
+import { POSDeviceList } from '../shared';
 var UnlinkedTerminalInfo = function () {
     var t = useTranslation().t;
     var typography = useTheme().typography;
@@ -37,10 +37,11 @@ var UnlinkedTerminalInfo = function () {
     var _c = React.useState(false), success = _c[0], setSuccess = _c[1];
     var _d = React.useState(false), failed = _d[0], setFailed = _d[1];
     var _e = useAppSelector(terminalSelector), data = _e.data, error = _e.error;
-    var _f = data.terminalInfo, selectedTerminalDevice = _f.selectedTerminalDevice, selectedTerminal = _f.selectedTerminal, responseData = data.responseData;
-    var _g = responseData || {}, linkTerminalDeviceData = _g.linkTerminalDeviceData, terminalList = _g.terminalList;
-    var model = selectedTerminalDevice.model, linked = selectedTerminalDevice.linked, display_name = selectedTerminalDevice.display_name;
-    var _h = (model || {}).image_url, image_url = _h === void 0 ? ICONS_NAMES.device_image : _h;
+    var _f = data.terminalInfo, selectedTerminal = _f.selectedTerminal, selectedPOS = _f.selectedPOS, responseData = data.responseData;
+    var _g = responseData || {}, linkTerminalDeviceData = _g.linkTerminalDeviceData, posDevices = _g.posDevices;
+    var terminal_device = selectedTerminal.terminal_device, linked = selectedTerminal.linked;
+    var _h = ((terminal_device === null || terminal_device === void 0 ? void 0 : terminal_device.model) || {}).image_url, image_url = _h === void 0 ? ICONS_NAMES.device_image : _h;
+    var displayName = (terminal_device === null || terminal_device === void 0 ? void 0 : terminal_device.display_name) || '';
     var expiry = TERMINAL_PUSH_NOTIFICATION_DURATION;
     var newTerminal = false;
     React.useEffect(function () {
@@ -66,7 +67,7 @@ var UnlinkedTerminalInfo = function () {
     }, [isReady]);
     var getRequestSendDescription = function () {
         if (error)
-            return t('terminal_request_denied', { device: display_name });
+            return t('terminal_request_denied', { device: displayName });
         if (isRequestSent)
             return t('terminal_new_request_will_send');
         return t('terminal_request_will_send');
@@ -80,10 +81,10 @@ var UnlinkedTerminalInfo = function () {
             dispatch(clearError());
         dispatch(handlePrevScreenStep(CONNECT_FLOWS.terminal.terminalDeviceList));
     };
-    var handleOnSelectTerminal = function (terminal) {
+    var handleOnSelectPOS = function (pos) {
         if (error)
             dispatch(clearError());
-        dispatch(storeSelectedTerminal(terminal));
+        dispatch(storeSelectedPOS(pos));
     };
     var handleOnResendClick = function () {
         if (isReady)
@@ -92,7 +93,7 @@ var UnlinkedTerminalInfo = function () {
             setFailed(false);
         dispatch(linkTerminalDevice());
     };
-    var disabled = !(selectedTerminal === null || selectedTerminal === void 0 ? void 0 : selectedTerminal.id) || isRequestSent;
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 224, justifyContent: 'space-between' }, { children: [_jsx(PushNotification, __assign({ error: t('terminal_request_denied', { device: display_name }), failed: failed, success: success, expiryInSeconds: expiry }, { children: _jsxs(Container, { children: [_jsxs(Box, __assign({ sx: { ml: 2.5, mr: 2.5 } }, { children: [_jsx(LinkWithText, { children: "".concat(t('terminal_link'), " ").concat(display_name) }), _jsx(DeviceCard, { image: image_url, name: display_name, deviceId: getId(selectedTerminalDevice), deviceIdLabel: getIdLabel(selectedTerminalDevice), isLinked: linked }), _jsx(LinkWithText, { children: t('terminal_with') }), _jsx(TerminalList, { selectedTerminal: selectedTerminal, list: terminalList, onClick: handleOnSelectTerminal })] })), _jsxs(SendRequestContainer, __assign({ hasError: !!error, sx: __assign(__assign({}, typography.button_small), { fontWeight: typography.fontWeightRegular, mt: 2 }) }, { children: [getRequestSendDescription(), _jsx(Collapse, __assign({ in: isRequestSent && !error }, { children: _jsx(OTPTimer, { timeEndLabel: t('terminal_resend_request'), failed: failed, timeInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendClick }) }))] }))] }) })), _jsx(Button, __assign({ sx: { ml: 2.5, mr: 2.5, mt: 2 }, disabled: disabled, onBackClicked: handleOnBack, onClick: handleOnSendRequest, isAr: isAr }, { children: t('terminal_send_link_request') }))] })));
+    var disabled = !(selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.id) || isRequestSent;
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 224, justifyContent: 'space-between' }, { children: [_jsx(PushNotification, __assign({ error: t('terminal_request_denied', { device: displayName }), failed: failed, success: success, expiryInSeconds: expiry }, { children: _jsxs(Container, { children: [_jsxs(Box, __assign({ sx: { ml: 2.5, mr: 2.5 } }, { children: [_jsx(LinkWithText, { children: "".concat(t('terminal_link'), " ").concat(displayName) }), _jsx(DeviceCard, { image: image_url, name: displayName, deviceId: getId(selectedTerminal), deviceIdLabel: getIdLabel(selectedTerminal), isLinked: linked }), _jsx(LinkWithText, { children: t('terminal_with') }), _jsx(POSDeviceList, { selectedPOS: selectedPOS, posDevices: posDevices, onClick: handleOnSelectPOS })] })), _jsxs(SendRequestContainer, __assign({ hasError: !!error, sx: __assign(__assign({}, typography.button_small), { fontWeight: typography.fontWeightRegular, mt: 2 }) }, { children: [getRequestSendDescription(), _jsx(Collapse, __assign({ in: isRequestSent && !error }, { children: _jsx(OTPTimer, { timeEndLabel: t('terminal_resend_request'), failed: failed, timeInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendClick }) }))] }))] }) })), _jsx(Button, __assign({ sx: { ml: 2.5, mr: 2.5, mt: 2 }, disabled: disabled, onBackClicked: handleOnBack, onClick: handleOnSendRequest, isAr: isAr }, { children: t('terminal_send_link_request') }))] })));
 };
 export default React.memo(UnlinkedTerminalInfo);

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

@@ -18,7 +18,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import { handleNextScreenStep } from '../../../../app/settings';
-import { deepCopy, maskPhone } from '../../../../utils';
+import { deepCopy, isAuthenticationVerificationFailed, maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -26,6 +26,7 @@ import { terminalSelector, clearError, resetOTPScreen, verifyTokenOTP } from '..
 import Button from '../../../shared/Button';
 import { OTPValidation } from './validation';
 import OTPInput from './OTPInput';
+import { CONNECT_FLOWS } from '../../../../constants';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -77,7 +78,10 @@ var VerifyNumber = function (_a) {
             var nextScreen = _a.nextScreen;
             dispatch(handleNextScreenStep(nextScreen));
         })
-            .catch(function () { });
+            .catch(function (err) {
+            if (isAuthenticationVerificationFailed(err === null || err === void 0 ? void 0 : err.message))
+                dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.otpVerifySecurityError));
+        });
     };
     var disabled = !methods.formState.isValid || !phone || resendLoading;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('ide_otp_waiting_title') : st('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, { children: t('next') }))] })) })) }));

package/build/features/terminal/screens/shared/POSDeviceList.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { POSInfo } from '../../../../@types';
+interface POSDeviceListProps {
+    selectedPOS: POSInfo;
+    posDevices: POSInfo[];
+    select?: boolean;
+    loading?: boolean;
+    onClick: (pos: POSInfo) => void;
+}
+declare const _default: React.MemoExoticComponent<({ posDevices, onClick, selectedPOS, select, loading }: POSDeviceListProps) => JSX.Element>;
+export default _default;

package/build/features/terminal/screens/shared/POSDeviceList.js

@@ -0,0 +1,30 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { ICONS_NAMES } from '../../../../constants';
+import Icon from '../../../../components/Icon';
+import Loader from '../../../../components/Loader';
+import { ListContainer, POSListContainer, TitleContainer, Image, Title, ScrollContainer, ListItem, StyledRadio, ArrowIcon } from './styles';
+import { useAppSelector } from '../../../../hooks';
+import { terminalSelector } from '../../../../features/app/terminal/terminalStore';
+import { useTheme } from '@mui/material/styles';
+var POSDeviceList = function (_a) {
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var posDevices = _a.posDevices, onClick = _a.onClick, selectedPOS = _a.selectedPOS, _m = _a.select, select = _m === void 0 ? true : _m, loading = _a.loading;
+    var t = useTranslation().t;
+    var typography = useTheme().typography;
+    var responseData = useAppSelector(terminalSelector).data.responseData;
+    var terminalData = (responseData || {}).terminalData;
+    var platformImage = ((_e = (_d = (_c = (_b = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.platform) === null || _d === void 0 ? void 0 : _d.brand) === null || _e === void 0 ? void 0 : _e.logo) || ICONS_NAMES.platform_image;
+    var platformName = (_l = (_k = (_j = (_h = (_g = (_f = terminalData === null || terminalData === void 0 ? void 0 : terminalData.list) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.platform) === null || _h === void 0 ? void 0 : _h.brand) === null || _j === void 0 ? void 0 : _j.name) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.text;
+    var getEndComponent = function (pos) {
+        if (loading && (selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.id) === (pos === null || pos === void 0 ? void 0 : pos.id))
+            return _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 10, style: { height: 24, width: 24 }, toggleAnimation: !!loading });
+        if (select)
+            return (_jsx(StyledRadio, { sx: { paddingInlineEnd: 0 }, disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, onChange: function () { return onClick(pos); }, checkedIcon: _jsx(Icon, { src: ICONS_NAMES.radio_checked }), checked: (selectedPOS === null || selectedPOS === void 0 ? void 0 : selectedPOS.id) === pos.id }));
+        if (!select)
+            return _jsx(ArrowIcon, {});
+    };
+    return (_jsxs(ListContainer, { children: [_jsxs(TitleContainer, { children: [_jsx(Image, { src: platformImage, alt: 'Device' }), _jsx(Title, { children: t('terminal_devices', { name: platformName }) })] }), _jsx(ScrollContainer, { children: _jsx(POSListContainer, { children: (posDevices || []).map(function (device, index) { return (_jsx(ListItem, { sx: { minHeight: 'unset' }, titleSx: { fontSize: typography.subtitle2.fontSize }, onClick: function () { return onClick(device); }, name: device.display_name, deviceId: device.reference, deviceIdLabel: 'terminal_device_id', endAdornment: getEndComponent(device) }, index)); }) }) })] }));
+};
+export default memo(POSDeviceList);

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

@@ -1,5 +1,5 @@
 import Header from './Header';
-import TerminalList from './TerminalList';
+import POSDeviceList from './POSDeviceList';
 export * from './styles';
 export * from './utils';
-export { Header, TerminalList };
+export { Header, POSDeviceList };

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

@@ -1,5 +1,5 @@
 import Header from './Header';
-import TerminalList from './TerminalList';
+import POSDeviceList from './POSDeviceList';
 export * from './styles';
 export * from './utils';
-export { Header, TerminalList };
+export { Header, POSDeviceList };

package/build/features/terminal/screens/shared/styles.d.ts

@@ -78,7 +78,7 @@ export declare const ScrollContainer: import("@emotion/styled").StyledComponent<
 } & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "key" | keyof import("react").HTMLAttributes<HTMLDivElement>> & {
     ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined;
 }, keyof import("@mui/material/OverridableComponent").CommonProps | ("left" | "right" | "border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "bottom" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "component" | "ref" | "sx"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-export declare const TerminalListContainer: import("@emotion/styled").StyledComponent<import("@mui/system").SystemProps<import("@mui/material/styles").Theme> & {
+export declare const POSListContainer: import("@emotion/styled").StyledComponent<import("@mui/system").SystemProps<import("@mui/material/styles").Theme> & {
     children?: import("react").ReactNode;
     component?: import("react").ElementType<any> | undefined;
     ref?: import("react").Ref<unknown> | undefined;

package/build/features/terminal/screens/shared/styles.js

@@ -60,7 +60,7 @@ export var ScrollContainer = styled(Box)(function (_a) {
         overflow: 'scroll'
     });
 });
-export var TerminalListContainer = styled(Box)(function (_a) {
+export var POSListContainer = styled(Box)(function (_a) {
     var spacing = _a.theme.spacing;
     return ({
         display: 'flex',

package/build/features/terminal/screens/shared/utils.d.ts

@@ -1,7 +1,7 @@
-import { TerminalDeviceInfo, TerminalInfo } from '../../../../@types';
-export declare const getPairedWith: (device: TerminalDeviceInfo) => string | undefined;
-export declare const getId: (device: TerminalDeviceInfo) => string;
-export declare const getIdLabel: (device: TerminalDeviceInfo) => "terminal_device_id" | "terminal_serial_number";
+import { TerminalInfo } from '../../../../@types';
+export declare const getPairedWith: (terminal: TerminalInfo | undefined) => string | undefined;
+export declare const getId: (terminal: TerminalInfo | undefined) => string;
+export declare const getIdLabel: (terminal: TerminalInfo | undefined) => "terminal_device_id" | "terminal_serial_number";
 export declare const getTerminalId: (terminal: TerminalInfo) => string;
 export declare const getTerminalName: (terminal: TerminalInfo) => string;
 export declare const getTerminalIdLabel: (terminal: TerminalInfo) => "terminal_device_id" | "terminal_id";

package/build/features/terminal/screens/shared/utils.js

@@ -1,14 +1,14 @@
-export var getPairedWith = function (device) {
-    var _a, _b, _c, _d;
-    return (_c = (_b = (_a = device === null || device === void 0 ? void 0 : device.terminal) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : (_d = device === null || device === void 0 ? void 0 : device.terminal) === null || _d === void 0 ? void 0 : _d.name.en;
+export var getPairedWith = function (terminal) {
+    var _a;
+    return (_a = terminal === null || terminal === void 0 ? void 0 : terminal.device) === null || _a === void 0 ? void 0 : _a.display_name;
 };
-export var getId = function (device) {
-    var _a, _b, _c;
-    return (_c = (_b = (_a = device === null || device === void 0 ? void 0 : device.terminal) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : device.serial_number;
+export var getId = function (terminal) {
+    var _a;
+    return ((terminal === null || terminal === void 0 ? void 0 : terminal.device) ? terminal.device.reference || terminal.device.id : (_a = terminal === null || terminal === void 0 ? void 0 : terminal.terminal_device) === null || _a === void 0 ? void 0 : _a.serial_number) || '';
 };
-export var getIdLabel = function (device) {
-    var _a, _b;
-    return ((_b = (_a = device === null || device === void 0 ? void 0 : device.terminal) === null || _a === void 0 ? void 0 : _a.device) === null || _b === void 0 ? void 0 : _b.id) ? 'terminal_device_id' : 'terminal_serial_number';
+export var getIdLabel = function (terminal) {
+    var _a;
+    return ((_a = terminal === null || terminal === void 0 ? void 0 : terminal.device) === null || _a === void 0 ? void 0 : _a.id) ? 'terminal_device_id' : 'terminal_serial_number';
 };
 export var getTerminalId = function (terminal) {
     var _a, _b;

package/build/utils/common.js

@@ -1,7 +1,7 @@
 import { axiosInstance } from '../api';
 import { ENDPOINT_PATHS, CONNECT_SANDBOX_URL, CONNECT_PROD_URL } from '../constants';
 import { objectHasValues } from './object';
-import { isSA } from './string';
+import { isDisasterRecoveryEnv, isSA } from './string';
 export var sleep = function (milliseconds) {
     if (milliseconds === void 0) { milliseconds = 1000; }
     return new Promise(function (resolve) { return setTimeout(resolve, milliseconds); });
@@ -13,12 +13,19 @@ export var dangerousMessage = function (message, callBack) {
     callBack === null || callBack === void 0 ? void 0 : callBack({ message: message });
 };
 export var setBaseUrl = function (publicKey, region) {
+    if (region === void 0) { region = ''; }
     var isProd = publicKey.includes('pk_live');
-    if (isProd) {
-        axiosInstance.defaults.baseURL = isSA(region) ? ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA : ENDPOINT_PATHS.PRODUCTION_BASE_URL;
+    var _a = region.split('-'), country = _a[0], envType = _a[1];
+    if (!isProd) {
+        axiosInstance.defaults.baseURL = ENDPOINT_PATHS.SANDBOX_BASE_URL;
         return;
     }
-    axiosInstance.defaults.baseURL = ENDPOINT_PATHS.SANDBOX_BASE_URL;
+    if (isSA(country)) {
+        axiosInstance.defaults.baseURL = isDisasterRecoveryEnv(envType) ? ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA_DR : ENDPOINT_PATHS.PRODUCTION_BASE_URL_SA;
+    }
+    else {
+        axiosInstance.defaults.baseURL = ENDPOINT_PATHS.PRODUCTION_BASE_URL;
+    }
 };
 export var updateLocationUrlWithCountry = function (countryIso2) {
     var country = countryIso2.toLowerCase();

package/build/utils/error.d.ts

@@ -1,3 +1,6 @@
 export declare const isNetworkError: (error: string | null) => boolean;
 export declare const isTokenExpired: (error: string | null) => boolean;
 export declare const isTimeoutError: (error: string | null) => boolean;
+export declare const isInternalServerError: (error: string | null) => boolean;
+export declare const isAuthenticationVerificationFailed: (error: string | null) => boolean;
+export declare const isNoDataFoundError: (error: string | null) => boolean;

package/build/utils/error.js

@@ -7,3 +7,12 @@ export var isTokenExpired = function (error) {
 export var isTimeoutError = function (error) {
     return (error || '').trim().toLowerCase().includes('timeout');
 };
+export var isInternalServerError = function (error) {
+    return ['internal_server_error'].includes((error || '').trim().toLowerCase());
+};
+export var isAuthenticationVerificationFailed = function (error) {
+    return ['failed to verify the auth'].includes((error || '').trim().toLowerCase());
+};
+export var isNoDataFoundError = function (error) {
+    return ['no data found'].includes((error || '').trim().toLowerCase());
+};

package/build/utils/string.d.ts

@@ -43,7 +43,7 @@ export declare const getRequestHeaders: (deviceInfo: DeviceInfo) => {
 };
 export declare const removeRequestHeaders: () => void;
 export declare const getBaseUrl: () => string;
-export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean) => string;
+export declare const getScreenNameBasedOnFlow: (flow: string, isAuthorizedUser?: boolean, isOtherThanSAOrKWCountry?: boolean, terminalStepName?: string) => string;
 export declare const getEighteenYearsAgo: () => string;
 export declare const isKW: (flag: string) => boolean;
 export declare const isSA: (flag: string | undefined) => boolean;
@@ -79,3 +79,4 @@ export declare const getCurrencyByCountryIso2: (countryCode?: string) => string;
 export declare const getMobileNumberLen: (initialLen: number, number: string) => number;
 export declare const getWebsiteLink: (isAr: boolean, countryCode: string, path: string) => string;
 export declare function formatCode(code: string, chunkSize?: number, delimiter?: string): string;
+export declare const isDisasterRecoveryEnv: (type?: string) => boolean;

package/build/utils/string.js

@@ -179,7 +179,7 @@ export var getBaseUrl = function () {
     }
     return ENDPOINT_PATHS.PRODUCTION_BASE_URL;
 };
-export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherThanSAOrKWCountry) {
+export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherThanSAOrKWCountry, terminalStepName) {
     if (flow === FlowsTypes.BANK) {
         return 'BANK_BANK_DETAILS_STEP';
     }
@@ -205,7 +205,7 @@ export var getScreenNameBasedOnFlow = function (flow, isAuthorizedUser, isOtherT
         return 'PASSWORD_CREATE_PASSWORD_STEP';
     }
     if (flow === FlowsTypes.TERMINAL) {
-        return CONNECT_FLOWS.terminal.terminalDeviceList;
+        return terminalStepName !== null && terminalStepName !== void 0 ? terminalStepName : CONNECT_FLOWS.terminal.terminalDeviceList;
     }
     return '';
 };
@@ -355,3 +355,4 @@ export function formatCode(code, chunkSize, delimiter) {
     if (delimiter === void 0) { delimiter = ' - '; }
     return ((_a = code.match(new RegExp(".{1,".concat(chunkSize, "}"), 'g'))) === null || _a === void 0 ? void 0 : _a.join(delimiter)) || code;
 }
+export var isDisasterRecoveryEnv = function (type) { return type === 'dr'; };

package/build/utils/validation.js

@@ -53,7 +53,7 @@ export var keepLettersAndSpace = function (str) {
     return str.replace(/[^a-zA-Z] /g, '');
 };
 export var isConnectTapDomain = function (domain) {
-    var regex = /^(https:\/\/)?connect(\.\w+)?\.tap\.company$/;
+    var regex = /^(https:\/\/)?connect((\.|-)\w+)?\.tap\.(company|com\.\w{2})$/;
     return regex.test(domain);
 };
 export var isTapDomain = function (domain) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.11.0-sandbox",
+	"version": "2.11.0",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",
@@ -21,7 +21,7 @@
 		"copy:files": "copyfiles -u 1 src/**/*.css build/",
 		"tsc:alias": "tsc-alias -p tsconfig.json",
 		"ts:build": "rm -rf build && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && yarn copy:files",
-		"push": "npm publish --access public --tag sandbox"
+		"push": "npm publish --access public"
 	},
 	"keywords": [],
 	"author": {
@@ -82,7 +82,7 @@
 		"@mui/icons-material": "^5.8.4",
 		"@mui/material": "^5.8.7",
 		"@reduxjs/toolkit": "^1.8.3",
-		"axios": "^0.27.2",
+		"axios": "^1.11.0",
 		"device-detector-js": "^3.0.3",
 		"i18next": "^21.8.14",
 		"i18next-browser-languagedetector": "^6.1.4",

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

@@ -1,42 +0,0 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import { ScreenContainer } from '../../../shared/Containers';
-import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import Button from '../../../../components/Button';
-import Warning from '../../../../components/Warning';
-import { 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, selectedTerminal = _b.terminalInfo.selectedTerminal, responseData = _b.responseData, loading = _a.loading, error = _a.error;
-    var terminalList = (responseData || {}).terminalList;
-    var handleOnSelectTerminal = function (terminal) {
-        dispatch(storeSelectedTerminal(terminal));
-        dispatch(linkNewTerminal())
-            .unwrap()
-            .then(function (_a) {
-            var nextScreen = _a.nextScreen;
-            dispatch(handleNextScreenStep(nextScreen));
-        })
-            .catch(function () { });
-    };
-    var handleOnBack = function () {
-        dispatch(handlePrevScreenStep());
-    };
-    return (_jsxs(ScreenContainer, __assign({ sx: { pl: 2.5, pr: 2.5 }, minHeight: 200, justifyContent: 'space-between' }, { children: [_jsxs(Container, { 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(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: t('back') }))] })));
-};
-export default React.memo(TerminalListPage);

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

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

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

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