cleanup 1

rainbow-me · Nov 10, 2023 · 94163fa · 94163fa
1 parent c50e504
commit 94163fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/components/qrcode-scanner/QRCodeScanner.tsx b/src/components/qrcode-scanner/QRCodeScanner.tsx
@@ -1,18 +1,17 @@
 import lang from 'i18n-js';
 import React from 'react';
-import { Camera } from 'react-native-vision-camera';
+import { Camera, CodeScanner } from 'react-native-vision-camera';
 import Animated from 'react-native-reanimated';
 import { ErrorText } from '../text';
 import QRCodeScannerNeedsAuthorization from './QRCodeScannerNeedsAuthorization';
 import { deviceUtils } from '@/utils';
 import { Box, Cover, Rows, Row } from '@/design-system';
 import { CameraMaskSvg } from '../svg/CameraMaskSvg';
 import { IS_ANDROID } from '@/env';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { getSoftMenuBarHeight } from 'react-native-extra-dimensions-android';
 
-// Display.getRealMetrics
-
 const deviceWidth = deviceUtils.dimensions.width;
 const deviceHeight = deviceUtils.dimensions.height;
 
@@ -21,9 +20,9 @@ const androidSoftMenuHeight = getSoftMenuBarHeight();
 interface QRCodeScannerProps {
   flashEnabled?: boolean;
   isActive: boolean;
-  codeScanner: any;
+  codeScanner: CodeScanner;
   hasPermission: boolean;
-  requestPermission: any;
+  requestPermission: () => Promise<boolean>;
 }
 
 export const QRCodeScanner: React.FC<QRCodeScannerProps> = ({
@@ -64,7 +63,7 @@ export const QRCodeScanner: React.FC<QRCodeScannerProps> = ({
               audio={false}
               video={false}
               photo={false}
-              // onError={() => setCameraState(CameraState.Error)}
+              onError={() => requestPermission}
             />
           </Box>
           <Rows>

diff --git a/src/screens/QRScannerScreen.tsx b/src/screens/QRScannerScreen.tsx
@@ -27,13 +27,13 @@ import { usePagerPosition } from '@/navigation/ScrollPositionContext';
 import styled from '@/styled-thing';
 import { position } from '@/styles';
 import { useTheme } from '@/theme';
-import { useFocusEffect, useIsFocused } from '@react-navigation/native';
+import { useIsFocused } from '@react-navigation/native';
 import { useIsForeground } from '@/hooks/useIsForeground';
 import {
   useCameraPermission,
   useCodeScanner,
 } from 'react-native-vision-camera';
-import { addActionAfterClosingSheet } from '@/navigation/Navigation';
+import { IS_ANDROID, IS_IOS } from '@/env';
 
 const Background = styled(View)({
   backgroundColor: 'black',
@@ -71,7 +71,7 @@ export default function QRScannerScreen() {
   const isActive = isFocused && isForeground && hasPermission;
   const navigation = useNavigation();
 
-  const [flashEnabled, setFlashEnabled] = React.useState(false);
+  const [flashEnabled, setFlashEnabled] = useState(false);
 
   const hideCamera = useCallback(() => {
     setFlashEnabled(false);
@@ -111,7 +111,6 @@ export default function QRScannerScreen() {
   const handleCloseScanner = useCallback(() => {
     setFlashEnabled(false);
     setCameraActive(false);
-    console.log('rannnnnnnn caslkdl;asdjf;ja');
     setTimeout(() => {
       navigate(Routes.WALLET_SCREEN);
     }, 0);
@@ -206,7 +205,7 @@ export default function QRScannerScreen() {
           <ScannerContainer>
             <Background />
             <CameraDimmer cameraVisible={true}>
-              {android && (
+              {IS_ANDROID && (
                 <ScannerHeader>
                   <EmulatorPasteUriButton />
                 </ScannerHeader>
@@ -221,7 +220,7 @@ export default function QRScannerScreen() {
                 />
               )}
             </CameraDimmer>
-            {ios && (
+            {IS_IOS && (
               <ScannerHeader>
                 <EmulatorPasteUriButton />
               </ScannerHeader>