updated tests and linting

Signed-off-by: wadeking98 <[email protected]>
openwallet-foundation · Dec 12, 2023 · 456d7f7 · 456d7f7
1 parent 7db948c
commit 456d7f7
Show file tree

Hide file tree

Showing 12 changed files with 178 additions and 38 deletions.
diff --git a/packages/legacy/core/App/components/misc/NewQRView.tsx b/packages/legacy/core/App/components/misc/NewQRView.tsx
@@ -4,10 +4,10 @@ import { StackScreenProps } from '@react-navigation/stack'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Vibration, View, StyleSheet, Text, ScrollView, useWindowDimensions } from 'react-native'
-import { BarCodeReadEvent, RNCamera } from 'react-native-camera'
 import { TouchableOpacity } from 'react-native-gesture-handler'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Icon from 'react-native-vector-icons/MaterialIcons'
+import { Camera, Code, useCameraDevice, useCodeScanner } from 'react-native-vision-camera'
 
 import { useStore } from '../../contexts/store'
 import { useTheme } from '../../contexts/theme'
@@ -21,7 +21,6 @@ import LoadingIndicator from '../animated/LoadingIndicator'
 import QRRenderer from './QRRenderer'
 import QRScannerTorch from './QRScannerTorch'
 import ScanTab from './ScanTab'
-import { Camera, Code, useCameraDevice, useCodeScanner } from 'react-native-vision-camera'
 
 type ConnectProps = StackScreenProps<ConnectStackParams>
 
@@ -221,8 +220,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
             </View>
           </View>
         </ScrollView>
-      )
-      }
+      )}
 
       <View style={styles.tabContainer}>
         <ScanTab
@@ -238,7 +236,7 @@ const NewQRView: React.FC<Props> = ({ defaultToConnect, handleCodeScan, error, e
           active={!firstTabActive}
         />
       </View>
-    </SafeAreaView >
+    </SafeAreaView>
   )
 }
 

diff --git a/packages/legacy/core/App/components/misc/QRScanner.tsx b/packages/legacy/core/App/components/misc/QRScanner.tsx
@@ -1,9 +1,9 @@
 import { useNavigation } from '@react-navigation/core'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { View, Modal, Vibration, Pressable, StyleSheet, Text, PermissionsAndroid } from 'react-native'
-import { BarCodeReadEvent, RNCamera } from 'react-native-camera'
+import { View, Modal, Vibration, Pressable, StyleSheet, Text } from 'react-native'
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
+import { Camera, Code, useCameraDevice, useCodeScanner } from 'react-native-vision-camera'
 
 import { hitSlop } from '../../constants'
 import { useConfiguration } from '../../contexts/configuration'
@@ -15,8 +15,6 @@ import InfoBox, { InfoBoxType } from '../misc/InfoBox'
 
 import QRScannerTorch from './QRScannerTorch'
 
-import { Camera, Code, useCameraDevice, useCameraPermission, useCodeScanner } from 'react-native-vision-camera'
-
 interface Props {
   handleCodeScan: (value: string) => Promise<void>
   error?: QrCodeScanError | null
@@ -32,7 +30,6 @@ const QRScanner: React.FC<Props> = ({ handleCodeScan, error, enableCameraOnError
   const { t } = useTranslation()
   const invalidQrCodes = new Set<string>()
   const { ColorPallet, TextTheme } = useTheme()
-  const { hasPermission, requestPermission } = useCameraPermission()
   const device = useCameraDevice('back')
 
   const styles = StyleSheet.create({

diff --git a/packages/legacy/core/App/screens/Scan.tsx b/packages/legacy/core/App/screens/Scan.tsx
@@ -1,5 +1,3 @@
-import type { BarCodeReadEvent } from 'react-native-camera'
-
 import { useAgent } from '@aries-framework/react-hooks'
 import { StackScreenProps } from '@react-navigation/stack'
 import React, { useState, useEffect } from 'react'
@@ -106,7 +104,11 @@ const Scan: React.FC<ScanProps> = ({ navigation, route }) => {
     }
   }
 
-  const permissionFlow = async (method: PermissionContract, permission: Permission, rationale?: Rationale): Promise<boolean> => {
+  const permissionFlow = async (
+    method: PermissionContract,
+    permission: Permission,
+    rationale?: Rationale
+  ): Promise<boolean> => {
     try {
       const permissionResult = await method(permission, rationale)
       if (permissionResult === RESULTS.GRANTED) {

diff --git a/packages/legacy/core/__mocks__/custom/react-native-camera.ts b/packages/legacy/core/__mocks__/custom/react-native-camera.ts
@@ -1,33 +1,24 @@
 import React from 'react';
 
 const Constants = {
-    Aspect: {},
-    BarCodeType: {},
-    Type: {},
-    CaptureMode: {},
-    CaptureTarget: {},
-    CaptureQuality: {},
-    Orientation: {},
-    FlashMode: {
-        on:'on',
-        off:'off',
-        torch:'torch',
-        auto: 'auto'
-    },
-    TorchMode: {}
-  };
+  device: {},
+  torch: {
+    on: 'on',
+    off: 'off',
+    auto: 'auto',
+  },
+  isActive: false,
+  codeScanner: {}
+};
 
-class RNCamera extends React.Component {
+class Camera extends React.Component {
   static Constants = Constants
   render() {
     return null;
   }
 }
 
-interface BarCodeReadEvent {
-    data: string;
-}
-RNCamera.Constants = Constants
-
-export { RNCamera };
-export type { BarCodeReadEvent };
+Camera.Constants = Constants
+const useCameraDevice = jest.fn();
+const useCodeScanner = jest.fn();
+export { Camera, useCameraDevice, useCodeScanner };
diff --git a/packages/legacy/core/__tests__/components/NewQRView.test.tsx b/packages/legacy/core/__tests__/components/NewQRView.test.tsx
@@ -17,7 +17,7 @@ jest.mock('@react-navigation/native', () => {
   return require('../../__mocks__/custom/@react-navigation/native')
 })
 
-jest.mock('react-native-camera', () => {
+jest.mock('react-native-vision-camera', () => {
   return require('../../__mocks__/custom/react-native-camera')
 })
 

diff --git a/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/NewQRView.test.tsx.snap
@@ -16,6 +16,143 @@ exports[`NewQRView Component Renders correctly on first tab 1`] = `
     }
   }
 >
+  <View
+    style={
+      Object {
+        "alignItems": "center",
+        "flex": 1,
+        "width": "100%",
+      }
+    }
+  >
+    <View
+      style={
+        Object {
+          "alignItems": "center",
+          "flexDirection": "row",
+          "marginTop": 20,
+          "paddingHorizontal": 20,
+        }
+      }
+    >
+      <Text
+        style={
+          Array [
+            Object {
+              "color": "#FFFFFF",
+              "fontSize": 18,
+              "fontWeight": "normal",
+            },
+            Object {
+              "color": "#FFFFFF",
+            },
+          ]
+        }
+      >
+        Scan.WillScanAutomatically
+      </Text>
+    </View>
+    <View
+      style={
+        Object {
+          "alignItems": "center",
+          "flex": 1,
+          "justifyContent": "center",
+          "width": "100%",
+        }
+      }
+    >
+      <View
+        style={
+          Object {
+            "borderColor": "#FFFFFF",
+            "borderRadius": 24,
+            "borderWidth": 2,
+            "height": 250,
+            "width": 250,
+          }
+        }
+      />
+    </View>
+    <View
+      accessibilityLabel="Scan.Torch"
+      accessibilityRole="button"
+      accessibilityState={
+        Object {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": undefined,
+          "expanded": undefined,
+          "selected": undefined,
+        }
+      }
+      accessibilityValue={
+        Object {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
+      }
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      hitSlop={
+        Object {
+          "bottom": 44,
+          "left": 44,
+          "right": 44,
+          "top": 44,
+        }
+      }
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
+      style={
+        Object {
+          "alignItems": "center",
+          "backgroundColor": undefined,
+          "borderColor": "#FFFFFF",
+          "borderRadius": 24,
+          "borderWidth": 1,
+          "height": 24,
+          "justifyContent": "center",
+          "marginBottom": 50,
+          "opacity": 1,
+          "width": 24,
+        }
+      }
+      testID="com.ariesbifold:id/ScanTorch"
+    >
+      <Text
+        allowFontScaling={false}
+        selectable={false}
+        style={
+          Array [
+            Object {
+              "color": "#FFFFFF",
+              "fontSize": 24,
+            },
+            Object {
+              "alignItems": "center",
+            },
+            Object {
+              "fontFamily": "Material Icons",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
+            },
+            Object {},
+          ]
+        }
+      >
+        
+      </Text>
+    </View>
+  </View>
   <View
     style={
       Object {

diff --git a/packages/legacy/core/__tests__/screens/ContactDetails.test.tsx b/packages/legacy/core/__tests__/screens/ContactDetails.test.tsx
@@ -23,6 +23,9 @@ jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
 jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
 jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))
 jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
+jest.mock('react-native-vision-camera', () => {
+  return require('../../__mocks__/custom/react-native-camera')
+})
 jest.mock('react-native-device-info', () => {
   return {
     getVersion: () => 1,

diff --git a/packages/legacy/core/__tests__/screens/NameWallet.test.tsx b/packages/legacy/core/__tests__/screens/NameWallet.test.tsx
@@ -19,6 +19,9 @@ jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
 jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
 jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))
 jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
+jest.mock('react-native-vision-camera', () => {
+  return require('../../__mocks__/custom/react-native-camera')
+})
 
 jest.mock('react-native-device-info', () => {
   return {

diff --git a/packages/legacy/core/__tests__/screens/ProofRequestDetails.test.tsx b/packages/legacy/core/__tests__/screens/ProofRequestDetails.test.tsx
@@ -25,6 +25,9 @@ jest.mock('react-native-fs', () => ({}))
 jest.mock('@react-navigation/native', () => {
   return require('../../__mocks__/custom/@react-navigation/native')
 })
+jest.mock('react-native-vision-camera', () => {
+  return require('../../__mocks__/custom/react-native-camera')
+})
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 jest.mock('react-native-localize', () => { })
 jest.mock('react-native-device-info', () => () => jest.fn())

diff --git a/packages/legacy/core/__tests__/screens/ProofRequesting.test.tsx b/packages/legacy/core/__tests__/screens/ProofRequesting.test.tsx
@@ -44,6 +44,9 @@ jest.mock('@hyperledger/aries-bifold-verifier',() => {
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 jest.mock('react-native-localize', () => {})
 jest.mock('react-native-device-info', () => () => jest.fn())
+jest.mock('react-native-vision-camera', () => {
+  return require('../../__mocks__/custom/react-native-camera')
+})
 
 jest.useFakeTimers({ legacyFakeTimers: true })
 jest.spyOn(global, 'setTimeout')

diff --git a/packages/legacy/core/__tests__/screens/Scan.test.tsx b/packages/legacy/core/__tests__/screens/Scan.test.tsx
@@ -12,7 +12,7 @@ jest.mock('@react-navigation/native', () => {
   return require('../../__mocks__/custom/@react-navigation/native')
 })
 
-jest.mock('react-native-camera', () => {
+jest.mock('react-native-vision-camera', () => {
   return require('../../__mocks__/custom/react-native-camera')
 })
 jest.mock('../../App/contexts/configuration', () => ({

diff --git a/packages/legacy/core/__tests__/screens/Settings.test.tsx b/packages/legacy/core/__tests__/screens/Settings.test.tsx
@@ -20,6 +20,9 @@ jest.mock('@hyperledger/anoncreds-react-native', () => ({}))
 jest.mock('@hyperledger/aries-askar-react-native', () => ({}))
 jest.mock('@hyperledger/indy-vdr-react-native', () => ({}))
 jest.mock('react-native-permissions', () => require('react-native-permissions/mock'))
+jest.mock('react-native-vision-camera', () => {
+  return require('../../__mocks__/custom/react-native-camera')
+})
 
 jest.mock('react-native-device-info', () => {
   return {