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

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

@@ -1,78 +1,56 @@
 import * as yup from 'yup';
 import { BusinessType } from '../../../../@types';
-import { KW_MIN_LICENSE_LENGTH, CR_MIN_LICENSE_LENGTH, FL_MIN_LICENSE_LENGTH, UNIFIED_NUMBER_MIN_LENGTH } from '../../../../constants';
-export var EntityNameValidationSchema = function () {
+import { KW_MIN_LICENSE_LENGTH, UNIFIED_NUMBER_MIN_LENGTH } from '../../../../constants';
+export var EntityNameValidationSchema = function (noneEditable) {
     return yup.object().shape({
-        legalName: yup
-            .string()
-            .required('')
-            .test({
-            test: function (value) {
-                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                if (length === 0)
-                    return true;
-                return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
-            }
-        }),
+        legalName: noneEditable['legal_name.en'] && noneEditable['legal_name.ar']
+            ? yup.string().optional()
+            : yup
+                .string()
+                .required('')
+                .test({
+                test: function (value) {
+                    var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                    if (length === 0)
+                        return true;
+                    return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
+                }
+            }),
         licenseType: yup.string().optional(),
-        entityType: yup.string().required('entity_type_required'),
-        licenseNumber: yup
-            .string()
-            .test({
-            test: function (value) {
-                var type = this.parent.licenseType;
-                var isCR = type === BusinessType.CR;
-                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                if (length === 0)
-                    return true;
-                if (isCR) {
-                    return length >= CR_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_max_length' });
+        entityType: noneEditable['type'] ? yup.string().optional() : yup.string().required('entity_type_required'),
+        licenseNumber: yup.string().optional(),
+        unifiedNumber: noneEditable['license.additional_info']
+            ? yup.string().optional()
+            : yup.string().when('licenseType', function (licenseType) {
+                var isCR = licenseType === BusinessType.CR;
+                if (!isCR) {
+                    return yup.string().optional();
                 }
-                return length >= FL_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'fl_max_length' });
-            }
-        })
-            .required(''),
-        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'),
+                return yup
+                    .string()
+                    .required('')
+                    .test({
+                    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: noneEditable['license.issuing_date'] ? yup.string().optional() : yup.string().required('choose_any_issuing_date'),
         expiryDate: yup.string().optional(),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });
 };
-export var EntityNameKWValidationSchema = function () {
+export var EntityNameKWValidationSchema = function (noneEditable) {
     return yup.object().shape({
-        legalName: yup
-            .string()
-            .required('')
-            .test({
-            test: function (value) {
-                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                if (length === 0)
-                    return true;
-                return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
-            }
-        }),
-        licenseType: yup.string().optional(),
-        entityType: yup.string().required('entity_type_required'),
-        licenseNumber: yup
-            .string()
-            .when('licenseType', function (licenseType) {
-            var isCR = licenseType === BusinessType.CR;
-            if (!isCR) {
-                return yup.string().optional();
-            }
-            return yup
+        legalName: noneEditable['legal_name.en'] && noneEditable['legal_name.ar']
+            ? yup.string().optional()
+            : yup
                 .string()
                 .required('')
                 .test({
@@ -80,37 +58,44 @@ export var EntityNameKWValidationSchema = function () {
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                     if (length === 0)
                         return true;
-                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
+                    return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
+                }
+            }),
+        licenseType: yup.string().optional(),
+        entityType: noneEditable['type'] ? yup.string().optional() : yup.string().required('entity_type_required'),
+        licenseNumber: noneEditable['license.number']
+            ? yup.string().optional()
+            : yup
+                .string()
+                .when('licenseType', function (licenseType) {
+                var isCR = licenseType === BusinessType.CR;
+                if (!isCR) {
+                    return yup.string().optional();
                 }
-            });
-        })
-            .required(''),
-        issuingDate: yup.string().required('choose_any_issuing_date'),
-        expiryDate: yup.string().required('choose_any_expiry_date'),
+                return yup
+                    .string()
+                    .required('')
+                    .test({
+                    test: function (value) {
+                        var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                        if (length === 0)
+                            return true;
+                        return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: 'cr_kw_max_length' });
+                    }
+                });
+            })
+                .required(''),
+        issuingDate: noneEditable['license.issuing_date'] ? yup.string().optional() : yup.string().required('choose_any_issuing_date'),
+        expiryDate: noneEditable['license.expiry_date'] ? yup.string().optional() : yup.string().required('choose_any_expiry_date'),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });
 };
-export var EntityNameOtherCountryValidationSchema = function () {
+export var EntityNameOtherCountryValidationSchema = function (noneEditable) {
     return yup.object().shape({
-        legalName: yup
-            .string()
-            .required('')
-            .test({
-            test: function (value) {
-                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
-                if (length === 0)
-                    return true;
-                return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
-            }
-        }),
-        licenseType: yup.string().optional(),
-        entityType: yup.string().required('entity_type_required'),
-        licenseNumber: yup
-            .string()
-            .when('licenseType', function (licenseType) {
-            var isCR = licenseType === BusinessType.CR;
-            return yup
+        legalName: noneEditable['legal_name.en'] && noneEditable['legal_name.ar']
+            ? yup.string().optional()
+            : yup
                 .string()
                 .required('')
                 .test({
@@ -118,13 +103,32 @@ export var EntityNameOtherCountryValidationSchema = function () {
                     var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
                     if (length === 0)
                         return true;
-                    return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: isCR ? 'cr_kw_max_length' : 'fl_max_length' });
+                    return length >= 3 ? true : this.createError({ message: 'enter_legal_name_min_three_chars' });
                 }
-            });
-        })
-            .required(''),
-        issuingDate: yup.string().required('choose_any_issuing_date'),
-        expiryDate: yup.string().required('choose_any_expiry_date'),
+            }),
+        licenseType: yup.string().optional(),
+        entityType: noneEditable['type'] ? yup.string().optional() : yup.string().required('entity_type_required'),
+        licenseNumber: noneEditable['license.number']
+            ? yup.string().optional()
+            : yup
+                .string()
+                .when('licenseType', function (licenseType) {
+                var isCR = licenseType === BusinessType.CR;
+                return yup
+                    .string()
+                    .required('')
+                    .test({
+                    test: function (value) {
+                        var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                        if (length === 0)
+                            return true;
+                        return length >= KW_MIN_LICENSE_LENGTH ? true : this.createError({ message: isCR ? 'cr_kw_max_length' : 'fl_max_length' });
+                    }
+                });
+            })
+                .required(''),
+        issuingDate: noneEditable['license.issuing_date'] ? yup.string().optional() : yup.string().required('choose_any_issuing_date'),
+        expiryDate: noneEditable['license.expiry_date'] ? yup.string().optional() : yup.string().required('choose_any_expiry_date'),
         certificateId: yup.array().optional(),
         articleId: yup.string().optional()
     });

package/build/features/featuresScreens.js

@@ -13,6 +13,7 @@ import ConnectOTPScreen from './connect/screens/OTP';
 import ThankYouScreen from './connect/screens/ThankYou';
 import OperatorError from './connect/screens/OperatorError';
 import CollectMobileOwnership from './connect/screens/MobileOwnership';
+import OTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import ConnectExpressBusinessCountry from './connectExpress/screens/BusinessCountry/BusinessCountry';
 import ConnectExpressMobileScreen from './connectExpress/screens/Mobile';
 import ConnectExpressNIDScreen from './connectExpress/screens/NID';
@@ -37,6 +38,7 @@ import ConnectExpressAuthMerchantScreen from './connectExpress/screens/AuthMerch
 import ConnectExpressAuthAccountCreatedLoaderScreen from './connectExpress/screens/AccountCreatedLoader';
 import ConnectExpressOperatorError from './connectExpress/screens/OperatorError';
 import ConnectExpressCollectMobileOwnership from './connectExpress/screens/MobileOwnership';
+import ConnectExpressOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import AuthBusinessCountry from './auth/screens/BusinessCountry/BusinessCountry';
 import AuthSwitchScreen from './auth/screens/AuthSwitch';
 import AuthMobileScreen from './auth/screens/Mobile';
@@ -58,6 +60,7 @@ import AuthEmailSentScreen from './auth/screens/EmailSent';
 import AuthMigratingDataScreen from './auth/screens/MigratingData';
 import AuthOperatorError from './auth/screens/OperatorError';
 import AuthPasscodeScreen from './auth/screens/Passcode';
+import AuthOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import CustomersPage from './business/screens/Customers';
 import IDBODPage from './business/screens/IDBOD';
 import BusinessVerifyPage from './business/screens/Verify';
@@ -73,6 +76,7 @@ import BusVerifyPACIScreen from './business/screens/VerifyPACI';
 import BrandVerifyScreen from './business/screens/BrandDetails';
 import BusinessOperatorError from './business/screens/OperatorError';
 import BusinessCollectMobileOwnership from './business/screens/MobileOwnership';
+import BusinessOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import PasswordVerifyPage from './password/screens/Verify';
 import CreatePasswordPage from './password/screens/CreatePassword';
 import PasswordDataLoadingPage from './password/screens/PrepareDataLoading';
@@ -81,6 +85,7 @@ import SuccessPasswordPage from './password/screens/Success';
 import PasswordSuccessWithFlowPage from './password/screens/SuccessWithFlowButtons';
 import PasswordResetPasswordSuccessPage from './password/screens/ResetPasswordSuccess';
 import PasswordOperatorError from './password/screens/OperatorError';
+import PasswordOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import IndividualVerifyPage from './individual/screens/Verify';
 import IndividualPhoneInfoPage from './individual/screens/IndividualPhoneInfo';
 import IndividualListPage from './individual/screens/IndividualList';
@@ -91,6 +96,7 @@ import IndividualSuccessWithFlowPage from './individual/screens/SuccessWithFlowB
 import IndividualResetPasswordSuccessPage from './individual/screens/ResetPasswordSuccess';
 import IndividualDataLoadingPage from './individual/screens/PrepareDataLoading';
 import IndividualOperatorError from './individual/screens/OperatorError';
+import IndividualOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BankVerifyPage from './bank/screens/Verify';
 import BankDetailsPage from './bank/screens/BankDetails';
 import BankSuccessPage from './bank/screens/Success';
@@ -98,6 +104,7 @@ import BankSuccessWithFlowPage from './bank/screens/SuccessWithFlowButtons';
 import BankResetPasswordSuccessPage from './bank/screens/ResetPasswordSuccess';
 import BankDataLoadingPage from './bank/screens/PrepareDataLoading';
 import BankOperatorError from './bank/screens/OperatorError';
+import BankOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import TaxVerifyPage from './tax/screens/Verify';
 import TaxDetailsPage from './tax/screens/TaxDetails';
 import TaxSuccessPage from './tax/screens/Success';
@@ -105,6 +112,7 @@ import TaxSuccessWithFlowPage from './tax/screens/SuccessWithFlowButtons';
 import TaxResetPasswordSuccessPage from './tax/screens/ResetPasswordSuccess';
 import TaxDataLoadingPage from './tax/screens/PrepareDataLoading';
 import TaxOperatorError from './tax/screens/OperatorError';
+import TaxOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import SignInMobilePage from './signIn/screens/Mobile';
 import SignInEmailPage from './signIn/screens/Email';
 import SignInOTPPage from './signIn/screens/OTP';
@@ -118,6 +126,7 @@ import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
 import EntityDataLoadingPage from './entity/screens/PrepareDataLoading';
 import EntityOperatorError from './entity/screens/OperatorError';
+import EntityOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BrandVerifyPage from './brand/screens/Verify';
 import BrandInfoPage from './brand/screens/BrandInfo';
 import BrandSegmentPage from './brand/screens/BrandSegmentInfo';
@@ -127,11 +136,13 @@ import BrandSuccessWithFlowPage from './brand/screens/SuccessWithFlowButtons';
 import BrandResetPasswordSuccessPage from './brand/screens/ResetPasswordSuccess';
 import BrandDataLoadingPage from './brand/screens/PrepareDataLoading';
 import BrandOperatorError from './brand/screens/OperatorError';
+import BrandOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import BoardVerifyPage from './board/screens/Verify';
 import BoardSuccessWithFlowPage from './board/screens/SuccessWithFlowButtons';
 import BoardResetPasswordSuccessPage from './board/screens/ResetPasswordSuccess';
 import BoardDataLoadingPage from './board/screens/PrepareDataLoading';
 import BoardOperatorError from './board/screens/OperatorError';
+import BoardOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 import KycLoadingPage from './kyc/screens/Loading';
 import KycTokenErrorPage from './kyc/screens/TokenError';
 import KycAlreadySubmittedPage from './kyc/screens/AlreadySubmitted';
@@ -146,7 +157,7 @@ import TerminalOperatorErrorPage from './terminal/screens/OperatorError';
 import TerminalVerifyPage from './terminal/screens/Verify';
 import NoTerminalDeviceLinkedPage from './terminal/screens/NoTerminalDeviceLinked';
 import TerminalDeviceListPage from './terminal/screens/TerminalDeviceList';
-import TerminalListPage from './terminal/screens/TerminalListPage';
+import POSDeviceListPage from '../features/terminal/screens/POSDeviceListPage';
 import LinkNewTerminalPage from './terminal/screens/LinkNewTerminal';
 import LinkedTerminalInfoPage from './terminal/screens/LinkedTerminalInfo';
 import UnlinkedTerminalInfoPage from './terminal/screens/UnlinkedTerminalInfo';
@@ -154,6 +165,7 @@ import LinkedSuccessPage from './terminal/screens/LinkedSuccess';
 import UnlinkedSuccessPage from './terminal/screens/UnlinkedSuccess';
 import TerminalBoardPage from './terminal/screens/SuccessWithFlowButtons';
 import TerminalResetPasswordSuccessPage from './terminal/screens/ResetPasswordSuccess';
+import TerminalOTPVerifySecurityError from './shared/OTPVerifySecurityError';
 export var connectFeatureScreens = [
     {
         name: 'CONNECT_BUSINESS_COUNTRY_STEP',
@@ -210,6 +222,10 @@ export var connectFeatureScreens = [
     {
         name: 'CONNECT_MOBILE_OWNERSHIP',
         element: CollectMobileOwnership
+    },
+    {
+        name: 'CONNECT_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: OTPVerifySecurityError
     }
 ];
 export var connectExpressFeatureScreens = [
@@ -308,6 +324,10 @@ export var connectExpressFeatureScreens = [
     {
         name: 'COLLECT_MOBILE_OWNERSHIP',
         element: ConnectExpressCollectMobileOwnership
+    },
+    {
+        name: 'CONNECT_EXPRESS_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: ConnectExpressOTPVerifySecurityError
     }
 ];
 export var authFeatureScreens = [
@@ -394,6 +414,10 @@ export var authFeatureScreens = [
     {
         name: 'AUTH_OPERATOR_ERROR_STEP',
         element: AuthOperatorError
+    },
+    {
+        name: 'AUTH_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: AuthOTPVerifySecurityError
     }
 ];
 export var businessFeatureScreens = [
@@ -444,6 +468,10 @@ export var businessFeatureScreens = [
     {
         name: 'BUSINESS_MOBILE_OWNERSHIP',
         element: BusinessCollectMobileOwnership
+    },
+    {
+        name: 'BUSINESS_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BusinessOTPVerifySecurityError
     }
 ];
 export var passwordFeatureScreens = [
@@ -475,6 +503,10 @@ export var passwordFeatureScreens = [
     {
         name: 'PASSWORD_OPERATOR_ERROR_STEP',
         element: PasswordOperatorError
+    },
+    {
+        name: 'PASSWORD_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: PasswordOTPVerifySecurityError
     }
 ];
 export var individualFeatureScreens = [
@@ -514,6 +546,10 @@ export var individualFeatureScreens = [
     {
         name: 'INDIVIDUAL_OPERATOR_ERROR_STEP',
         element: IndividualOperatorError
+    },
+    {
+        name: 'INDIVIDUAL_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: IndividualOTPVerifySecurityError
     }
 ];
 export var bankFeatureScreens = [
@@ -541,6 +577,10 @@ export var bankFeatureScreens = [
     {
         name: 'BANK_OPERATOR_ERROR_STEP',
         element: BankOperatorError
+    },
+    {
+        name: 'BANK_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BankOTPVerifySecurityError
     }
 ];
 export var taxFeatureScreens = [
@@ -568,6 +608,10 @@ export var taxFeatureScreens = [
     {
         name: 'TAX_OPERATOR_ERROR_STEP',
         element: TaxOperatorError
+    },
+    {
+        name: 'TAX_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: TaxOTPVerifySecurityError
     }
 ];
 export var signInFeatureScreens = [
@@ -621,6 +665,10 @@ export var entityFeatureScreens = [
     {
         name: 'ENTITY_OPERATOR_ERROR_STEP',
         element: EntityOperatorError
+    },
+    {
+        name: 'ENTITY_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: EntityOTPVerifySecurityError
     }
 ];
 export var brandFeatureScreens = [
@@ -656,6 +704,10 @@ export var brandFeatureScreens = [
     {
         name: 'BRAND_OPERATOR_ERROR_STEP',
         element: BrandOperatorError
+    },
+    {
+        name: 'BRAND_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BrandOTPVerifySecurityError
     }
 ];
 export var boardFeatureScreens = [
@@ -678,6 +730,10 @@ export var boardFeatureScreens = [
     {
         name: 'BOARD_OPERATOR_ERROR_STEP',
         element: BoardOperatorError
+    },
+    {
+        name: 'BOARD_OTP_VERIFY_SECURITY_ERROR_STEP',
+        element: BoardOTPVerifySecurityError
     }
 ];
 export var kycFeatureScreens = [
@@ -744,8 +800,8 @@ export var terminalFeatureScreens = [
         element: LinkNewTerminalPage
     },
     {
-        name: CONNECT_FLOWS.terminal.terminalList,
-        element: TerminalListPage
+        name: CONNECT_FLOWS.terminal.posDeviceList,
+        element: POSDeviceListPage
     },
     {
         name: CONNECT_FLOWS.terminal.linkedTerminalInfo,
@@ -770,5 +826,9 @@ export var terminalFeatureScreens = [
     {
         name: CONNECT_FLOWS.terminal.resetPassword,
         element: TerminalResetPasswordSuccessPage
+    },
+    {
+        name: CONNECT_FLOWS.terminal.otpVerifySecurityError,
+        element: TerminalOTPVerifySecurityError
     }
 ];

package/build/features/shared/OTPVerifySecurityError/OTPVerifySecurityError.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import GenericError from '../../shared/GenericError';
+var OTPVerifySecurityError = function () {
+    var t = useTranslation().t;
+    return _jsx(GenericError, { error: t('something_went_wrong'), errorTitle: t('oops') });
+};
+export default React.memo(OTPVerifySecurityError);

package/build/features/shared/OTPVerifySecurityError/index.d.ts

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

package/build/features/shared/OTPVerifySecurityError/index.js

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

package/build/features/terminal/Terminal.js

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

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

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

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

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

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

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