Fix rn76 issues (#43)

novalabsxyz · Nov 6, 2024 · 6ccd22a · 6ccd22a
1 parent f525487
commit 6ccd22a
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 291 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,17 +1,9 @@
 PODS:
   - boost (1.84.0)
   - DoubleConversion (1.1.6)
-  - EXBarCodeScanner (14.0.1):
-    - EXImageLoader
-    - ExpoModulesCore
-    - ZXingObjC/OneD
-    - ZXingObjC/PDF417
   - EXConstants (17.0.2):
     - ExpoModulesCore
-  - EXImageLoader (5.0.0):
-    - ExpoModulesCore
-    - React-Core
-  - Expo (52.0.0-preview.7):
+  - Expo (52.0.0-preview.21):
     - ExpoModulesCore
   - ExpoAsset (11.0.0):
     - ExpoModulesCore
@@ -21,7 +13,7 @@ PODS:
     - ZXingObjC/PDF417
   - ExpoFileSystem (18.0.0):
     - ExpoModulesCore
-  - ExpoFont (13.0.0):
+  - ExpoFont (13.0.1):
     - ExpoModulesCore
   - ExpoHaptics (14.0.0):
     - ExpoModulesCore
@@ -31,7 +23,7 @@ PODS:
     - ExpoModulesCore
   - ExpoLocation (18.0.1):
     - ExpoModulesCore
-  - ExpoModulesCore (2.0.0-preview.5):
+  - ExpoModulesCore (2.0.0-preview.9):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1983,9 +1975,7 @@ PODS:
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
   - Expo (from `../node_modules/expo`)
   - ExpoAsset (from `../node_modules/expo-asset/ios`)
   - ExpoCamera (from `../node_modules/expo-camera/ios`)
@@ -2098,12 +2088,8 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
-  EXBarCodeScanner:
-    :path: "../node_modules/expo-barcode-scanner/ios"
   EXConstants:
     :path: "../node_modules/expo-constants/ios"
-  EXImageLoader:
-    :path: "../node_modules/expo-image-loader/ios"
   Expo:
     :path: "../node_modules/expo"
   ExpoAsset:
@@ -2293,19 +2279,17 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: 1dca942403ed9342f98334bf4c3621f011aa7946
   DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
-  EXBarCodeScanner: 98bfb848dc71d57a51b8d9ab8e2cd98b95cc2ae7
   EXConstants: 33cb635065c7c1fe09a0fce5c8ddde8a0a2860c4
-  EXImageLoader: 759063a65ab016b836f73972d3bb25404888713d
-  Expo: fb9ed49d3130b7091ee223798b5090864deb7fa8
+  Expo: a784a8844b44319205fd47d7381b26a072b31854
   ExpoAsset: 9de2f325e8c97a4c6c2bc85e507ae7f0809c91aa
   ExpoCamera: 2e143e08e9b21d473df866f8d5476e7198b721d1
   ExpoFileSystem: d8b51caca86749a132c8ffde46be9a175e46b819
-  ExpoFont: 2fb6d98e0a5352bebcaa568d6bfbba0e0f2e0097
+  ExpoFont: 7522d869d84ee2ee8093ee997fef5b86f85d856b
   ExpoHaptics: e636188d1d5f7ccb79f3c1bfab47aaf5a1768c73
   ExpoKeepAwake: 783e68647b969b210a786047c3daa7b753dcac1f
   ExpoLocalAuthentication: fb519b5d39df0cc216e43fef3cc8e2db1930a01e
   ExpoLocation: ac6a2c6605acfb9b70f765ea32d561dab51d481b
-  ExpoModulesCore: c8f57f80aff1195c74e78e69e7d6902d91807783
+  ExpoModulesCore: bd0747596285533477365a0232260750b81a2c1b
   ExpoSecureStore: 06c3192d58ed167f619af3d53797c055f5ada785
   EXSplashScreen: 461da413241fdf16b41576f45ef34bb9ca208702
   FBLazyVector: 7075bb12898bc3998fd60f4b7ca422496cc2cdf7
@@ -2400,4 +2384,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b6abf9a9a17dae5db324848d1c572732257f1144
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.0
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx && tsc",
     "prettier": "prettier --write *.ts*",
     "start": "react-native start",
     "test": "jest",
@@ -75,8 +75,7 @@
     "compare-versions": "^3.6.0",
     "date-fns": "^2.16.1",
     "deprecated-react-native-prop-types": "^2.3.0",
-    "expo": "52.0.0-preview.7",
-    "expo-barcode-scanner": "~14.0.1",
+    "expo": "52.0.0-preview.21",
     "expo-camera": "~16.0.3",
     "expo-haptics": "~14.0.0",
     "expo-local-authentication": "~15.0.1",

diff --git a/src/components/BlurBox.tsx b/src/components/BlurBox.tsx
@@ -1,11 +1,11 @@
 import { createBox } from '@shopify/restyle'
-import { BlurView, BlurViewProperties } from '@react-native-community/blur'
+import { BlurView, BlurViewProps } from '@react-native-community/blur'
 
 import { Theme } from '../theme/theme'
 
 const BlurBox = createBox<
   Theme,
-  BlurViewProperties & {
+  BlurViewProps & {
     children?: React.ReactNode
   }
 >(BlurView)

diff --git a/src/features/hotspots/setup/HotspotSetupExternalScreen.tsx b/src/features/hotspots/setup/HotspotSetupExternalScreen.tsx
@@ -2,9 +2,8 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { RouteProp, useNavigation, useRoute } from '@react-navigation/native'
 import { useTranslation } from 'react-i18next'
 import Icon from '@assets/images/placeholder.svg'
-import { BarCodeScanner, BarCodeScannerResult } from 'expo-barcode-scanner'
-import { Camera } from 'expo-camera'
-import { useDebouncedCallback } from 'use-debounce/lib'
+import { BarcodeScanningResult, Camera, CameraView } from 'expo-camera'
+import { useDebouncedCallback } from 'use-debounce'
 import Toast from 'react-native-simple-toast'
 import { StyleSheet, Linking, ScrollView } from 'react-native'
 import Clipboard from '@react-native-clipboard/clipboard'
@@ -35,7 +34,7 @@ const HotspotSetupExternalScreen = () => {
   const [hasPermission, setHasPermission] = useState<boolean>()
 
   useEffect(() => {
-    BarCodeScanner.requestPermissionsAsync().then(({ status }) =>
+    Camera.requestCameraPermissionsAsync().then(({ status }) =>
       setHasPermission(status === 'granted'),
     )
   }, [])
@@ -55,7 +54,7 @@ const HotspotSetupExternalScreen = () => {
   )
 
   const handleBarCodeScanned = useDebouncedCallback(
-    (result: BarCodeScannerResult) => {
+    (result: BarcodeScanningResult) => {
       try {
         handleBarCode(result, 'add_gateway', {
           hotspotType: params.hotspotType,
@@ -220,11 +219,11 @@ const HotspotSetupExternalScreen = () => {
               aspectRatio={1}
               backgroundColor="primaryText"
             >
-              <Camera
-                barCodeScannerSettings={{
-                  barCodeTypes: [BarCodeScanner.Constants.BarCodeType.qr],
+              <CameraView
+                barcodeScannerSettings={{
+                  barcodeTypes: ['qr'],
                 }}
-                onBarCodeScanned={handleBarCodeScanned.callback}
+                onBarcodeScanned={handleBarCodeScanned.callback}
                 ratio="1:1"
                 style={StyleSheet.absoluteFill}
               />

diff --git a/src/providers/AppLinkProvider.tsx b/src/providers/AppLinkProvider.tsx
@@ -8,7 +8,7 @@ import React, {
 } from 'react'
 import { Linking } from 'react-native'
 import queryString from 'query-string'
-import { BarCodeScannerResult } from 'expo-barcode-scanner'
+import { BarcodeScanningResult } from 'expo-camera'
 import { useSelector } from 'react-redux'
 import {
   parseWalletLinkToken,
@@ -183,7 +183,7 @@ const useAppLink = () => {
 
   const handleBarCode = useCallback(
     (
-      { data }: BarCodeScannerResult,
+      { data }: BarcodeScanningResult,
       scanType: AppLinkCategoryType,
       opts?: Record<string, string>,
     ) => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,24 +1,11 @@
 {
   "extends": "@react-native/typescript-config/tsconfig.json",
   "compilerOptions": {
-    "target": "esnext",
-    "module": "commonjs",
-    "lib": ["es2019"],
-    "allowJs": true,
-    "jsx": "react-native",
-    "noEmit": true,
-    "isolatedModules": true,
-    "strict": true,
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
     "baseUrl": ".",
     "paths": {
       "@assets": ["./src/assets"],
       "@helium/crypto": ["./node_modules/@helium/crypto-react-native"]
-    },
-    "resolveJsonModule": true,
-    "skipLibCheck": true
+    }
   },
   "exclude": [
     "node_modules",