@tap-payments/auth-jsconnect 2.11.19-development → 2.11.21-development

package/build/components/DeviceCard/DeviceCard.d.ts

@@ -12,7 +12,8 @@ export interface DeviceCardProps extends CardProps {
     loading?: boolean;
     arrow?: boolean;
     endAdornment?: React.ReactNode;
+    titleSx?: React.CSSProperties;
 }
-export declare const DeviceCard: ({ image, name, deviceId, deviceIdLabel, isLinked, pairedWith, onClick, badge, border, arrow, loading, endAdornment, ...rest }: DeviceCardProps) => JSX.Element;
-declare const _default: React.MemoExoticComponent<({ image, name, deviceId, deviceIdLabel, isLinked, pairedWith, onClick, badge, border, arrow, loading, endAdornment, ...rest }: DeviceCardProps) => JSX.Element>;
+export declare const DeviceCard: ({ image, name, deviceId, deviceIdLabel, isLinked, pairedWith, onClick, badge, border, arrow, loading, endAdornment, titleSx, ...rest }: DeviceCardProps) => JSX.Element;
+declare const _default: React.MemoExoticComponent<({ image, name, deviceId, deviceIdLabel, isLinked, pairedWith, onClick, badge, border, arrow, loading, endAdornment, titleSx, ...rest }: DeviceCardProps) => JSX.Element>;
 export default _default;

package/build/components/DeviceCard/DeviceCard.js

@@ -86,7 +86,7 @@ var ArrowIcon = styled(ArrowForwardIosIcon)(function (_a) {
     })));
 });
 export var DeviceCard = function (_a) {
-    var image = _a.image, name = _a.name, deviceId = _a.deviceId, deviceIdLabel = _a.deviceIdLabel, isLinked = _a.isLinked, pairedWith = _a.pairedWith, onClick = _a.onClick, badge = _a.badge, border = _a.border, arrow = _a.arrow, loading = _a.loading, endAdornment = _a.endAdornment, rest = __rest(_a, ["image", "name", "deviceId", "deviceIdLabel", "isLinked", "pairedWith", "onClick", "badge", "border", "arrow", "loading", "endAdornment"]);
+    var image = _a.image, name = _a.name, deviceId = _a.deviceId, deviceIdLabel = _a.deviceIdLabel, isLinked = _a.isLinked, pairedWith = _a.pairedWith, onClick = _a.onClick, badge = _a.badge, border = _a.border, arrow = _a.arrow, loading = _a.loading, endAdornment = _a.endAdornment, titleSx = _a.titleSx, rest = __rest(_a, ["image", "name", "deviceId", "deviceIdLabel", "isLinked", "pairedWith", "onClick", "badge", "border", "arrow", "loading", "endAdornment", "titleSx"]);
     var t = useTranslation().t;
     var _b = useTheme(), typography = _b.typography, palette = _b.palette;
     var getEndComponent = function () {
@@ -97,6 +97,6 @@ export var DeviceCard = function (_a) {
         if (arrow)
             return _jsx(ArrowIcon, {});
     };
-    return (_jsxs(DeviceCardContainer, __assign({ onClick: onClick, sx: { cursor: onClick ? 'pointer' : 'default' }, showBorder: border }, rest, { children: [_jsxs(DeviceDetails, { children: [image && _jsx(DeviceImage, { src: image, alt: 'Device' }), _jsxs(DeviceInfo, { children: [_jsx(TruncatedTooltipText, { text: name, style: __assign(__assign({}, typography.subtitle1), { color: palette.components.deviceCard.title, fontWeight: typography.fontWeightBold }) }), _jsxs(DeviceIdInfo, { children: [pairedWith && (_jsxs("span", { children: [t('terminal_paired_with'), ": ", _jsx(DeviceIdBold, { children: pairedWith })] })), _jsxs("span", { children: [t(deviceIdLabel !== null && deviceIdLabel !== void 0 ? deviceIdLabel : 'terminal_device_id'), ": ", _jsx(DeviceIdBold, { children: deviceId })] })] })] })] }), badge && _jsx(Badge, __assign({ active: isLinked }, { children: isLinked ? t('terminal_linked') : t('terminal_unlinked') })), _jsx(Box, __assign({ display: 'flex', alignItems: 'center' }, { children: getEndComponent() }))] })));
+    return (_jsxs(DeviceCardContainer, __assign({ onClick: onClick, sx: { cursor: onClick ? 'pointer' : 'default' }, showBorder: border }, rest, { children: [_jsxs(DeviceDetails, { children: [image && _jsx(DeviceImage, { src: image, alt: 'Device' }), _jsxs(DeviceInfo, { children: [_jsx(TruncatedTooltipText, { text: name, style: __assign(__assign(__assign({}, typography.subtitle1), { color: palette.components.deviceCard.title, fontWeight: typography.fontWeightBold }), titleSx) }), _jsxs(DeviceIdInfo, { children: [pairedWith && (_jsxs("span", { children: [t('terminal_paired_with'), ": ", _jsx(DeviceIdBold, { children: pairedWith })] })), _jsxs("span", { children: [t(deviceIdLabel !== null && deviceIdLabel !== void 0 ? deviceIdLabel : 'terminal_device_id'), ": ", _jsx(DeviceIdBold, { children: deviceId })] })] })] })] }), badge && _jsx(Badge, __assign({ active: isLinked }, { children: isLinked ? t('terminal_linked') : t('terminal_unlinked') })), _jsx(Box, __assign({ display: 'flex', alignItems: 'center' }, { children: getEndComponent() }))] })));
 };
 export default memo(DeviceCard);

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

@@ -51,11 +51,11 @@ import { handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../
 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 API from '../../../api';
-import { isAuthenticationVerificationFailed, isNetworkError, isTimeoutError, retrieveIndividualData, sleep } from '../../../utils';
+import { isAuthenticationVerificationFailed, isNetworkError, isNoDataFoundError, isTimeoutError, retrieveIndividualData, sleep } from '../../../utils';
 export var verifyToken = createAsyncThunk('terminal/verifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, data, _b, step_name, merchant_id, config, country_code, publicKey, terminalData, nextScreen;
+        var payload, data, _b, step_name, merchant_id, config, country_code, publicKey, nextScreen, terminalData, err_1;
         var _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
@@ -79,16 +79,28 @@ 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])];
+                    nextScreen = CONNECT_FLOWS.terminal.terminalDeviceList;
+                    terminalData = undefined;
+                    _d.label = 2;
                 case 2:
+                    _d.trys.push([2, 4, , 5]);
+                    return [4, API.terminalService.retrieveTerminalList([merchant_id])];
+                case 3:
                     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;
-                    return [2, {
-                            data: data,
-                            token: token,
-                            terminalData: terminalData,
-                            nextScreen: nextScreen
-                        }];
+                    return [3, 5];
+                case 4:
+                    err_1 = _d.sent();
+                    if (!isNoDataFoundError(err_1 === null || err_1 === void 0 ? void 0 : err_1.message))
+                        throw new Error(err_1);
+                    nextScreen = CONNECT_FLOWS.terminal.noTerminalLinked;
+                    return [3, 5];
+                case 5: return [2, {
+                        data: data,
+                        token: token,
+                        terminalData: terminalData,
+                        nextScreen: nextScreen
+                    }];
             }
         });
     });
@@ -111,7 +123,7 @@ export var resendOTP = createAsyncThunk('terminal/resendOTP', function (params,
     });
 }); });
 export var verifyTokenOTP = createAsyncThunk('terminal/verifyOtp', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, terminal, settings, authData, payload, data, _b, config, country_code, merchant_id, publicKey, countryIso2, terminalData, nextScreen;
+    var _a, terminal, settings, authData, payload, data, _b, config, country_code, merchant_id, publicKey, countryIso2, nextScreen, terminalData, err_2;
     var _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -135,10 +147,23 @@ 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])];
+                nextScreen = CONNECT_FLOWS.terminal.terminalDeviceList;
+                terminalData = undefined;
+                _g.label = 2;
             case 2:
+                _g.trys.push([2, 4, , 5]);
+                return [4, API.terminalService.retrieveTerminalList([merchant_id])];
+            case 3:
                 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;
+                return [3, 5];
+            case 4:
+                err_2 = _g.sent();
+                if (!isNoDataFoundError(err_2 === null || err_2 === void 0 ? void 0 : err_2.message))
+                    throw new Error(err_2);
+                nextScreen = CONNECT_FLOWS.terminal.noTerminalLinked;
+                return [3, 5];
+            case 5:
                 (_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 }];
         }

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

@@ -59,7 +59,7 @@ var NoTerminalDeviceLinked = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(terminalSelector), posDevicesLoading = _a.posDevicesLoading, data = _a.data;
+    var _a = useAppSelector(terminalSelector), posDevicesLoading = _a.posDevicesLoading, data = _a.data, loading = _a.loading, error = _a.error;
     var _b = data.responseData || {}, boardFlows = _b.boardFlows, authData = _b.authData, boardData = _b.boardData;
     var handleOnClickNewTerminalLink = function () { return __awaiter(void 0, void 0, void 0, function () {
         var err_1;
@@ -98,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: { mt: 0, ml: 0, mr: 0 }, loading: posDevicesLoading, onBackClicked: handleOnBack, onClick: handleOnClickNewTerminalLink, isAr: isAr }, { children: t('terminal_link_terminal') }))] })));
+    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({ error: error !== null && error !== void 0 ? error : '', sx: { mt: 0, ml: 0, mr: 0 }, loading: posDevicesLoading || loading, onBackClicked: handleOnBack, onClick: handleOnClickNewTerminalLink, isAr: isAr }, { children: t('terminal_link_terminal') }))] })));
 };
 export default React.memo(NoTerminalDeviceLinked);

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

@@ -7,10 +7,12 @@ 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;
@@ -23,6 +25,6 @@ var POSDeviceList = function (_a) {
         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' }, onClick: function () { return onClick(device); }, name: device.display_name, deviceId: device.reference, deviceIdLabel: 'terminal_device_id', endAdornment: getEndComponent(device) }, index)); }) }) })] }));
+    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/utils/error.d.ts

@@ -3,3 +3,4 @@ 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

@@ -13,3 +13,6 @@ export var isInternalServerError = function (error) {
 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/package.json

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