From f7b3056360f0912e4d590b4949cc399f781f6143 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Tue, 14 May 2024 19:02:08 -0400 Subject: [PATCH] FIX: Use existing file --- blue_modules/environment.ts | 5 +++-- components/Context/LargeScreenProvider.tsx | 8 +++----- screen/send/Broadcast.tsx | 5 +++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/blue_modules/environment.ts b/blue_modules/environment.ts index c6e5db789..1b6f6fd32 100644 --- a/blue_modules/environment.ts +++ b/blue_modules/environment.ts @@ -1,6 +1,7 @@ import { isTablet, getDeviceType } from 'react-native-device-info'; const isDesktop: boolean = getDeviceType() === 'Desktop'; +const isHandset: boolean = getDeviceType() === 'Handset'; +const isTabletDevice: boolean = isTablet(); -export const isHandset: boolean = getDeviceType() === 'Handset'; -export { isDesktop, isTablet }; +export { isDesktop, isTabletDevice, isHandset }; diff --git a/components/Context/LargeScreenProvider.tsx b/components/Context/LargeScreenProvider.tsx index 5bab2d89d..a831f4e09 100644 --- a/components/Context/LargeScreenProvider.tsx +++ b/components/Context/LargeScreenProvider.tsx @@ -1,7 +1,6 @@ import React, { createContext, useState, useEffect, useMemo, ReactNode } from 'react'; import { Dimensions } from 'react-native'; -import { isTablet } from 'react-native-device-info'; -import { isDesktop } from '../../blue_modules/environment'; +import { isDesktop, isTabletDevice } from '../../blue_modules/environment'; interface ILargeScreenContext { isLargeScreen: boolean; @@ -30,11 +29,10 @@ export const LargeScreenProvider: React.FC = ({ childr }, [windowWidth]); const isLargeScreen: boolean = useMemo(() => { - const isRunningOnTablet = isTablet(); const halfScreenWidth = windowWidth >= screenWidth / 2; - const condition = (isRunningOnTablet && halfScreenWidth) || isDesktop; + const condition = (isTabletDevice && halfScreenWidth) || isDesktop; console.debug( - `LargeScreenProvider.isLargeScreen: width: ${windowWidth}, Screen width: ${screenWidth}, Is tablet: ${isTablet()}, Is large screen: ${condition}, isDesktkop: ${isDesktop}`, + `LargeScreenProvider.isLargeScreen: width: ${windowWidth}, Screen width: ${screenWidth}, Is tablet: ${isTabletDevice}, Is large screen: ${condition}, isDesktkop: ${isDesktop}`, ); return condition; }, [windowWidth, screenWidth]); diff --git a/screen/send/Broadcast.tsx b/screen/send/Broadcast.tsx index 33d5358f0..774b6cc1c 100644 --- a/screen/send/Broadcast.tsx +++ b/screen/send/Broadcast.tsx @@ -21,7 +21,7 @@ import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/h import SafeArea from '../../components/SafeArea'; import presentAlert from '../../components/Alert'; import { scanQrHelper } from '../../helpers/scan-qr'; -import { isTablet } from 'react-native-device-info'; +import { isTabletDevice } from '../../blue_modules/environment'; const BROADCAST_RESULT = Object.freeze({ none: 'Input transaction hex', @@ -34,6 +34,7 @@ interface SuccessScreenProps { tx: string; } + const Broadcast: React.FC = () => { const { name } = useRoute(); const { navigate } = useNavigation(); @@ -117,7 +118,7 @@ const Broadcast: React.FC = () => { return ( - + {BROADCAST_RESULT.success !== broadcastResult && (