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

package/build/features/connectExpress/screens/CollectBusinessInfo/validation.js

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, BRAND_NAME_MAX_LENGTH } from '../../../../constants';
+import { KW_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, BRAND_NAME_MAX_LENGTH, UNIFIED_NUMBER_MIN_LENGTH } from '../../../../constants';
 import { BusinessType } from '../../../../@types';
 var objectElements = {
     legal_name: yup.object().shape({
@@ -7,7 +7,7 @@ var objectElements = {
         en: yup.string()
     }),
     license: yup.object().shape({
-        number: yup.string()
+        number: yup.string().nullable()
     }),
     type: yup.string()
 };
@@ -94,22 +94,40 @@ export var BusinessDataSchema = function (isLeadIdPassed) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             selectedLicense: yup.object().shape(objectElements).required(''),
-            licenseNumber: yup
-                .string()
-                .test({
+            unifiedNumber: yup.string().test({
+                name: 'unifiedNumber',
+                message: '',
                 test: function (value) {
+                    var _a;
                     var selectedLicense = this.parent.selectedLicense;
-                    var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                    var isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                        return false;
+                    if (isFL || length >= UNIFIED_NUMBER_MIN_LENGTH)
+                        return true;
                     if (length === 0)
+                        return this.createError({ message: '' });
+                    return this.createError({ message: 'unified_number_required' });
+                }
+            }),
+            licenseNumber: yup.string().test({
+                name: 'licenseNumber',
+                message: '',
+                test: function (value) {
+                    var _a;
+                    var selectedLicense = this.parent.selectedLicense;
+                    var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                        return false;
+                    if (isCR || length >= FL_MIN_LICENSE_LENGTH)
                         return true;
-                    if (isCR) {
-                        return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
-                    }
-                    return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                    if (length === 0)
+                        return this.createError({ message: '' });
+                    return this.createError({ message: 'fl_max_length' });
                 }
-            })
-                .required(''),
+            }),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond')
         });
     }
@@ -127,22 +145,40 @@ export var BusinessDataSchema = function (isLeadIdPassed) {
         })
             .required('enter_brand_name_english_chars_numbers_space'),
         selectedLicense: yup.object().shape(objectElements).required(''),
-        licenseNumber: yup
-            .string()
-            .test({
+        unifiedNumber: yup.string().test({
+            name: 'unifiedNumber',
+            message: '',
             test: function (value) {
+                var _a;
                 var selectedLicense = this.parent.selectedLicense;
-                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                var isFL = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.FL;
                 var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                    return false;
+                if (isFL || length >= UNIFIED_NUMBER_MIN_LENGTH)
+                    return true;
                 if (length === 0)
+                    return this.createError({ message: '' });
+                return this.createError({ message: 'unified_number_required' });
+            }
+        }),
+        licenseNumber: yup.string().test({
+            name: 'licenseNumber',
+            message: '',
+            test: function (value) {
+                var _a;
+                var selectedLicense = this.parent.selectedLicense;
+                var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (!((_a = selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === null || _a === void 0 ? void 0 : _a.length))
+                    return false;
+                if (isCR || length >= FL_MIN_LICENSE_LENGTH)
                     return true;
-                if (isCR) {
-                    return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
-                }
-                return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
+                if (length === 0)
+                    return this.createError({ message: '' });
+                return this.createError({ message: 'fl_max_length' });
             }
         })
-            .required('')
     });
 };
 export var KWBusinessDataSchema = function (isLeadIdPassed) {

package/build/features/entity/screens/EntityName/EntityName.js

@@ -155,8 +155,9 @@ var EntityName = function (_a) {
     }, [methods.formState.isValid]);
     var disabled = !methods.formState.isValid || uploading || uploadingArticle;
     var showLicenseNumber = isKWCountry ? isCR : true;
+    var showExpiryDate = isSACountry ? !isCR : true;
     var showUnifiedNumber = isSACountry ? isCR : false;
     var disableBack = settingsData.appConfig.mode === 'content';
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(LegalName, { readOnly: readOnly['legalName'] || (noneEditable['legal_name.en'] && noneEditable['legal_name.ar']), isVerified: isLegalNameVerified }) })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl }, { children: _jsx(EntityTypeList, { readOnly: readOnly['entityType'] || noneEditable['type'], onListOpen: function () { return handleEntityOpenClose(true); }, onListClose: function () { return handleEntityOpenClose(false); }, isVerified: isEntityTypeVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseNumber, { show: showLicenseNumber, readOnly: readOnly['licenseNumber'] || noneEditable['license.number'], isVerified: isLicenseNumberVerified }), _jsx(UnifiedNumber, { show: showUnifiedNumber, readOnly: readOnly['unifiedNumber'] || noneEditable['license.additional_info'], isVerified: isUnifiedNumberVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !entityTypeAnchorEl }, { children: _jsx(IssuingDate, { onDateClicked: handleIssueDateOpenClose, readOnly: readOnly['issuingDate'] || noneEditable['license.issuing_date'], isVerified: isIssuingDateVerified }) })), _jsx(Collapse, __assign({ in: !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(ExpiryDate, { onDateClicked: handleExpiryDateOpenClose, readOnly: readOnly['expiryDate'] || noneEditable['license.expiry_date'], isVerified: isExpiryDateVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseCertificate, { defaultFiles: defaultCertificateFiles, show: isSACountry ? false : !isKWCountry || isCR, readOnly: readOnly['certificateId'] || noneEditable['documents'] }), _jsx(Article, { defaultFile: defaultArticleFile, show: !isSACountry, readOnly: readOnly['articleId'] || noneEditable['AOA_file_id'], isVerified: isArticleIdVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(LegalName, { readOnly: readOnly['legalName'] || (noneEditable['legal_name.en'] && noneEditable['legal_name.ar']), isVerified: isLegalNameVerified }) })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl }, { children: _jsx(EntityTypeList, { readOnly: readOnly['entityType'] || noneEditable['type'], onListOpen: function () { return handleEntityOpenClose(true); }, onListClose: function () { return handleEntityOpenClose(false); }, isVerified: isEntityTypeVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(UnifiedNumber, { show: showUnifiedNumber, readOnly: readOnly['unifiedNumber'] || noneEditable['license.additional_info'], isVerified: isUnifiedNumberVerified }), _jsx(LicenseNumber, { show: showLicenseNumber, readOnly: readOnly['licenseNumber'] || noneEditable['license.number'], isVerified: isLicenseNumberVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !entityTypeAnchorEl }, { children: _jsx(IssuingDate, { onDateClicked: handleIssueDateOpenClose, readOnly: readOnly['issuingDate'] || noneEditable['license.issuing_date'], isVerified: isIssuingDateVerified }) })), _jsx(Collapse, __assign({ in: !issueAnchorEl && !entityTypeAnchorEl && showExpiryDate }, { children: _jsx(ExpiryDate, { onDateClicked: handleExpiryDateOpenClose, readOnly: readOnly['expiryDate'] || noneEditable['license.expiry_date'], isVerified: isExpiryDateVerified }) })), _jsxs(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: [_jsx(LicenseCertificate, { defaultFiles: defaultCertificateFiles, show: isSACountry ? false : !isKWCountry || isCR, readOnly: readOnly['certificateId'] || noneEditable['documents'] }), _jsx(Article, { defaultFile: defaultArticleFile, show: !isSACountry, readOnly: readOnly['articleId'] || noneEditable['AOA_file_id'], isVerified: isArticleIdVerified })] })), _jsx(Collapse, __assign({ in: !expiryAnchorEl && !issueAnchorEl && !entityTypeAnchorEl }, { children: _jsx(Button, __assign({ disableBack: disableBack, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default EntityName;

package/build/features/entity/screens/EntityName/UnifiedNumber.js

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
+import { removeAllCharsFromNumber } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -31,7 +31,7 @@ var UnifiedNumber = function (_a) {
         var target = _a.target;
         if (bckError)
             dispatch(clearError());
-        var value = removeAllOtherThanCharsAndNumber(target.value);
+        var value = removeAllCharsFromNumber(target.value);
         unifiedNumberControl.field.onChange(value);
     };
     var unifiedNumberControl = useController({ control: control, name: 'unifiedNumber' });

package/build/features/entity/screens/EntityName/validation.d.ts

@@ -6,7 +6,7 @@ export declare const EntityNameValidationSchema: () => yup.ObjectSchema<import("
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     unifiedNumber: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     issuingDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    expiryDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    expiryDate: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -16,7 +16,7 @@ export declare const EntityNameValidationSchema: () => yup.ObjectSchema<import("
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     unifiedNumber: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     issuingDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    expiryDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    expiryDate: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
@@ -26,7 +26,7 @@ export declare const EntityNameValidationSchema: () => yup.ObjectSchema<import("
     licenseNumber: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     unifiedNumber: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     issuingDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
-    expiryDate: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+    expiryDate: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     certificateId: yup.ArraySchema<yup.AnySchema<any, any, any>, import("yup/lib/types").AnyObject, any[] | undefined, any[] | undefined>;
     articleId: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>>;

package/build/features/entity/screens/EntityName/validation.js

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 import { BusinessType } from '../../../../@types';
-import { KW_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH } from '../../../../constants';
+import { KW_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, UNIFIED_NUMBER_MIN_LENGTH } from '../../../../constants';
 export var EntityNameValidationSchema = function () {
     return yup.object().shape({
         legalName: yup
@@ -32,9 +32,20 @@ export var EntityNameValidationSchema = function () {
             }
         })
             .required(''),
-        unifiedNumber: yup.string().optional(),
+        unifiedNumber: yup.string().test({
+            name: 'unifiedNumber',
+            message: '',
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length >= UNIFIED_NUMBER_MIN_LENGTH)
+                    return true;
+                if (length === 0)
+                    return this.createError({ message: '' });
+                return this.createError({ message: 'unified_number_required' });
+            }
+        }),
         issuingDate: yup.string().required('choose_any_issuing_date'),
-        expiryDate: yup.string().required('choose_any_expiry_date'),
+        expiryDate: yup.string().optional(),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });

package/build/features/shared/Button/FlowsButtons.d.ts

@@ -19,6 +19,7 @@ export interface DataProps {
     emailUrl: string;
     brandName?: string;
     isAuthorizedUser?: boolean;
+    terminalStepName?: string;
 }
 export interface EmailProvidersButtonsProps extends ButtonProps {
     buttons: ButtonItemProps[];

package/build/features/shared/Button/FlowsButtons.js

@@ -177,7 +177,7 @@ export default function FlowsButtons(_a) {
         });
         if (flowName === item.name && !isResetPassword(item.name, item.status)) {
             var isOtherThanSAOrKWCountry = !isKWOrSA(settingsData.businessCountry.iso2);
-            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser, isOtherThanSAOrKWCountry)));
+            dispatch(handleCurrentActiveScreen(getScreenNameBasedOnFlow(item.name, isAuthorizedUser, isOtherThanSAOrKWCountry, data.terminalStepName)));
             return;
         }
         if (typeof settingsData.appConfig.onBoardButtonClick === 'function') {

package/build/features/shared/SuccessFlowButtons/SuccessFlowButtons.d.ts

@@ -19,6 +19,7 @@ interface SuccessFlowButtonsProps {
     onClose?: () => void;
     loading?: boolean;
     status: 'complete' | 'incomplete';
+    terminalStepName?: string;
 }
-declare const _default: React.MemoExoticComponent<({ brand, entity, business, merchant, bank, user, flows, boardInfoId, boardId, flowName, individuals, recipient, onClose, loading, status }: SuccessFlowButtonsProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ brand, entity, business, merchant, bank, user, flows, boardInfoId, boardId, flowName, individuals, recipient, onClose, loading, status, terminalStepName }: SuccessFlowButtonsProps) => JSX.Element>;
 export default _default;

package/build/features/shared/SuccessFlowButtons/SuccessFlowButtons.js

@@ -45,7 +45,7 @@ var ButtonGroupStyled = styled(Box)(function (_a) {
 });
 var SuccessFlowButtons = function (_a) {
     var _b, _c, _d;
-    var brand = _a.brand, entity = _a.entity, business = _a.business, merchant = _a.merchant, bank = _a.bank, user = _a.user, flows = _a.flows, boardInfoId = _a.boardInfoId, boardId = _a.boardId, flowName = _a.flowName, individuals = _a.individuals, recipient = _a.recipient, onClose = _a.onClose, loading = _a.loading, status = _a.status;
+    var brand = _a.brand, entity = _a.entity, business = _a.business, merchant = _a.merchant, bank = _a.bank, user = _a.user, flows = _a.flows, boardInfoId = _a.boardInfoId, boardId = _a.boardId, flowName = _a.flowName, individuals = _a.individuals, recipient = _a.recipient, onClose = _a.onClose, loading = _a.loading, status = _a.status, terminalStepName = _a.terminalStepName;
     var _e = useState([]), buttons = _e[0], setButtons = _e[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -127,7 +127,8 @@ var SuccessFlowButtons = function (_a) {
                         email: email || '',
                         emailUrl: url,
                         brandName: shortenBrand(brandName),
-                        isAuthorizedUser: is_authorized
+                        isAuthorizedUser: is_authorized,
+                        terminalStepName: terminalStepName
                     } }) })] }));
 };
 export default memo(SuccessFlowButtons);

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

@@ -16,8 +16,8 @@ export var QRCodeImage = styled(Icon)(function (_a) {
     var spacing = _a.theme.spacing;
     return ({
         margin: '0px auto',
-        width: spacing(21.875),
-        height: spacing(21.875),
+        width: spacing(31.25),
+        height: spacing(31.25),
         marginTop: spacing(2.5),
         marginBottom: spacing(2.5)
     });

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

@@ -17,9 +17,10 @@ import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
 import { useTheme } from '@mui/material';
 import { CONNECT_FLOWS, ICONS_NAMES } from '../../../../constants';
 import DeviceCard from '../../../../components/DeviceCard';
+import Warning from '../../../../components/Warning';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
-import { terminalSelector, unlinkTerminalDevice } from '../../../app/terminal/terminalStore';
+import { clearError, terminalSelector, unlinkTerminalDevice } from '../../../app/terminal/terminalStore';
 import { Container, getId, getIdLabel, getPairedWith, LinkWithText } from '../shared';
 var LinkedTerminalInfo = function () {
     var _a, _b, _c, _d, _e, _f, _g;
@@ -27,12 +28,16 @@ var LinkedTerminalInfo = function () {
     var _h = useTheme(), spacing = _h.spacing, palette = _h.palette;
     var dispatch = useAppDispatch();
     var isAr = useLanguage().isAr;
-    var _j = useAppSelector(terminalSelector), selectedTerminalDevice = _j.data.terminalInfo.selectedTerminalDevice, loading = _j.loading;
+    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());
+    }, []);
     var handleOnNext = function () {
         dispatch(unlinkTerminalDevice())
             .unwrap()
@@ -45,6 +50,6 @@ var LinkedTerminalInfo = function () {
     var handleOnBack = function () {
         dispatch(handlePrevScreenStep(CONNECT_FLOWS.terminal.terminalDeviceList));
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 224, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { 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 })] }), _jsx(Button, __assign({ sx: { ml: 0, mr: 0 }, 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/NoTerminalDeviceLinked/NoTerminalDeviceLinked.js

@@ -14,6 +14,8 @@ 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';
@@ -51,6 +53,6 @@ var NoTerminalDeviceLinked = function () {
         })
             .catch(function () { });
     };
-    return (_jsx(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') })] }) })));
+    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') }))] })));
 };
 export default React.memo(NoTerminalDeviceLinked);

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.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/TerminalDeviceList.js

@@ -54,13 +54,15 @@ 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, 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, terminalListLoading = _a.terminalListLoading;
+    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, terminalList = _c.terminalList;
     var terminal_devices = (terminalData || {}).terminal_devices;
@@ -74,26 +76,34 @@ var TerminalDeviceList = function () {
             switch (_a.label) {
                 case 0:
                     setNewLinkClicked(true);
-                    return [4, retrieveTerminalListAsync()];
+                    return [4, retrieveTerminalListAsync(CONNECT_FLOWS.terminal.terminalList)];
                 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 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 (!!(terminalList === null || terminalList === void 0 ? void 0 : terminalList.length)) return [3, 4];
+                    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(retrieveTerminalList())];
+                    return [4, dispatch(retrieveTerminalList()).unwrap()];
                 case 2:
                     _a.sent();
+                    dispatch(handleNextScreenStep(nextScreen));
                     return [3, 4];
                 case 3:
                     err_1 = _a.sent();
@@ -113,10 +123,9 @@ var TerminalDeviceList = function () {
                 case 0:
                     setNewLinkClicked(false);
                     dispatch(storeSelectedTerminalDevice(terminal));
-                    return [4, retrieveTerminalListAsync()];
+                    return [4, retrieveTerminalListAsync(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: 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/TerminalListPage/TerminalListPage.js

@@ -12,18 +12,23 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
+import Box from '@mui/material/Box';
 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 { 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, 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 handleOnSelectTerminal = function (terminal) {
         dispatch(storeSelectedTerminal(terminal));
         dispatch(linkNewTerminal())
@@ -37,6 +42,6 @@ var TerminalListPage = 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') }))] })));
+    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(TerminalListPage);

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

@@ -10,8 +10,8 @@ var TerminalList = function (_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j;
     var list = _a.list, onClick = _a.onClick, selectedTerminal = _a.selectedTerminal, _k = _a.select, select = _k === void 0 ? true : _k, loading = _a.loading;
     var t = useTranslation().t;
-    var platformImage = ((_d = (_c = (_b = list[0]) === null || _b === void 0 ? void 0 : _b.platform) === null || _c === void 0 ? void 0 : _c.brand) === null || _d === void 0 ? void 0 : _d.logo) || ICONS_NAMES.platform_image;
-    var platformName = (_j = (_h = (_g = (_f = (_e = list[0]) === null || _e === void 0 ? void 0 : _e.platform) === null || _f === void 0 ? void 0 : _f.brand) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.text;
+    var platformImage = ((_d = (_c = (_b = list === null || list === void 0 ? void 0 : list[0]) === null || _b === void 0 ? void 0 : _b.platform) === null || _c === void 0 ? void 0 : _c.brand) === null || _d === void 0 ? void 0 : _d.logo) || ICONS_NAMES.platform_image;
+    var platformName = (_j = (_h = (_g = (_f = (_e = list === null || list === void 0 ? void 0 : list[0]) === null || _e === void 0 ? void 0 : _e.platform) === null || _f === void 0 ? void 0 : _f.brand) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.text;
     var getEndComponent = function (terminal) {
         if (loading && (selectedTerminal === null || selectedTerminal === void 0 ? void 0 : selectedTerminal.id) === (terminal === null || terminal === void 0 ? void 0 : terminal.id))
             return _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 10, style: { height: 24, width: 24 }, toggleAnimation: !!loading });
@@ -20,6 +20,6 @@ var TerminalList = 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(TerminalListContainer, { children: list.map(function (terminal, index) { return (_jsx(ListItem, { sx: { minHeight: 'unset' }, onClick: function () { return onClick(terminal); }, name: getTerminalName(terminal), deviceId: getTerminalId(terminal), deviceIdLabel: getTerminalIdLabel(terminal), endAdornment: getEndComponent(terminal) }, 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(TerminalListContainer, { children: (list || []).map(function (terminal, index) { return (_jsx(ListItem, { sx: { minHeight: 'unset' }, onClick: function () { return onClick(terminal); }, name: getTerminalName(terminal), deviceId: getTerminalId(terminal), deviceIdLabel: getTerminalIdLabel(terminal), endAdornment: getEndComponent(terminal) }, index)); }) }) })] }));
 };
 export default memo(TerminalList);

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;

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 '';
 };

package/package.json

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