Merge pull request #770 from dorianvp/bump_rn_0.74.0

Bump react-native to 0.74.0

.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+**/.xcode.env.local
 
 # Exclude compiled libs
 android/app/src/main/jniLibs
@@ -76,7 +77,7 @@ buck-out/
 *.jsbundle
 
 # CocoaPods
-/ios/Pods/
+**/Pods/
 /ios/Podfile.lock
 
 # e2e test logs

Gemfile

@@ -6,5 +6,4 @@ ruby ">= 2.6.10"
 # Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
 # bound in the template on Cocoapods with next React Native release.
 gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
-gem 'xcodeproj', '< 1.26.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

__mocks__/react-native-vision-camera.js

@@ -0,0 +1,21 @@
+// Simple mock for Camera
+export const Camera = () => null;
+
+// Mock that returns a mocked camera object
+export const useCameraDevice = jest.fn(() => ({
+  id: 'mocked-camera',
+  name: 'Mock Camera',
+  position: 'back',
+}));
+
+// Mock that returns permission status and a request function
+export const useCameraPermission = jest.fn(() => ({
+  hasPermission: true,
+  requestPermission: jest.fn(),
+}));
+
+// Mock that provides a mocked scanner function
+export const useCodeScanner = jest.fn(() => ({
+  codeTypes: ['qr', 'ean-13'],
+  onCodeScanned: jest.fn(),
+}));

__tests__/__snapshots__/Scanner.snapshot.tsx.snap

@@ -8,7 +8,5 @@ exports[`Component Scanner - test Scanner - snapshot 1`] = `
       "width": "100%",
     }
   }
->
-  <mockQRCodeScanner />
-</RCTSafeAreaView>
+/>
 `;

android/app/build.gradle

@@ -109,7 +109,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 218 // Real
         versionName "zingo-1.11.0" // Real
-        missingDimensionStrategy 'react-native-camera', 'general'
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -225,7 +224,6 @@ android.applicationVariants.configureEach { variant ->
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
-    implementation("com.facebook.react:flipper-integration")
 
     androidTestImplementation('com.wix:detox:20.27.2')
     implementation 'androidx.appcompat:appcompat:1.7.0'
@@ -258,7 +256,8 @@ dependencies {
     implementation "androidx.work:work-rxjava2:$work_version"
 
     // optional - GCMNetworkManager support
-    implementation "androidx.work:work-gcm:$work_version"
+    // GCM is deprecated
+    //implementation "androidx.work:work-gcm:$work_version"
 
     // optional - Test helpers
     androidTestImplementation "androidx.work:work-testing:$work_version"

android/app/src/debug/AndroidManifest.xml

@@ -2,6 +2,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.CAMERA"
+        tools:ignore="PermissionImpliesUnsupportedChromeOsHardware" />
 
     <application 
         android:usesCleartextTraffic="false"

android/app/src/main/java/org/ZingoLabs/Zingo/MainApplication.kt

@@ -1,6 +1,7 @@
 package org.ZingoLabs.Zingo
 
 import android.app.Application
+import android.content.Context
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
@@ -10,39 +11,39 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
-import android.content.Context
 import java.lang.ref.WeakReference
 
 class MainApplication : Application(), ReactApplication {
 
     override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-              add(RPCPackage())
+            object : DefaultReactNativeHost(this) {
+                override fun getPackages(): List<ReactPackage> =
+                        PackageList(this).packages.apply {
+                            // Packages that cannot be autolinked yet can be added manually here,
+                            // for example:
+                            // add(MyReactNativePackage())
+                            add(RPCPackage())
+                        }
+
+                override fun getJSMainModuleName(): String = "index"
+
+                override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+                override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+                override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
             }
-
-        override fun getJSMainModuleName(): String = "index"
-
-        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
-
+
     override val reactHost: ReactHost
-        get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
- 
+        get() = getDefaultReactHost(applicationContext, reactNativeHost)
+
     override fun onCreate() {
         super.onCreate()
         context = WeakReference(applicationContext)
 
-
         SoLoader.init(this, false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
+            // If you opted-in for the New Architecture, we load the native entry point for this
+            // app.
             load()
         }
     }
@@ -58,4 +59,3 @@ class MainApplication : Application(), ReactApplication {
         }
     }
 }
-

android/build.gradle

@@ -6,8 +6,8 @@ buildscript {
         minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
-        ndkVersion = "24.0.8215888"
-        kotlinVersion = '1.8.22'
+        ndkVersion = "26.1.10909125"
+        kotlinVersion = "1.9.22"
     }
     repositories {
         google()
@@ -16,7 +16,7 @@ buildscript {
     dependencies {
       classpath('com.android.tools.build:gradle:8.3.2')
       classpath("com.facebook.react:react-native-gradle-plugin")
-      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin"
+      classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -31,18 +31,4 @@ allprojects {
      maven { url 'https://www.jitpack.io' }
    }
  }
-
-// this is not the best solution, but while the libraries have no namespace...
-// https://discuss.gradle.org/t/namespace-not-specified-for-agp-8-0-0/45850/5
-
-//subprojects {
-//   afterEvaluate { project ->
-//       if (project.hasProperty('android')) {
-//           project.android {
-//               if (namespace == null) {
-//                   namespace project.group
-//               }
-//           }
-//       }
-//   }
-//}
+

android/gradle.properties

@@ -44,3 +44,5 @@ hermesEnabled=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+
+VisionCamera_enableCodeScanner=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Fri Jan 24 19:05:10 MST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -181,7 +181,11 @@ APP_ARGS=`save "$@"`
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if "%ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,12 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

app/LoadedApp/LoadedApp.tsx

@@ -1191,7 +1191,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
           },
           { text: translate('cancel') as string, style: 'cancel' },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     } else if (item === MenuItemEnum.TipZingoLabs) {
       const { translate } = this.state;
@@ -1209,7 +1209,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
             style: 'cancel',
           },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     } else if (item === MenuItemEnum.AddressBook) {
       this.setState({

app/LoadingApp/LoadingApp.tsx

@@ -720,7 +720,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
             onPress: () => reject(),
           },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     });
   };
@@ -1243,7 +1243,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
           },
           { text: this.props.translate('cancel') as string, style: 'cancel' },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     }
   };

app/LoadingApp/components/StartMenu.tsx

@@ -352,7 +352,7 @@ const StartMenu: React.FunctionComponent<StartMenuProps> = ({
                       },
                       { text: translate('cancel') as string, style: 'cancel' },
                     ],
-                    { cancelable: false, userInterfaceStyle: 'light' },
+                    { cancelable: false },
                   );
                 } else {
                   createNewWallet();

app/createAlert.ts

@@ -34,7 +34,7 @@ export const createAlert = async (
             },
             { text: translate('cancel') as string, style: 'cancel' },
           ],
-          { cancelable: false, userInterfaceStyle: 'light' },
+          { cancelable: false },
         );
       } else {
         // no email button

app/recoveryWalletInfo.ts

@@ -1,7 +1,7 @@
 import * as Keychain from 'react-native-keychain';
 import { GlobalConst, WalletType } from './AppState';
 
-const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.Options => {
+const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.BaseOptions => {
   return {
     service: GlobalConst.serviceKeyChain,
     accessControl: Keychain.ACCESS_CONTROL.BIOMETRY_CURRENT_SET_OR_DEVICE_PASSCODE, // for both
@@ -11,8 +11,8 @@ const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.Options =>
     // with biometrics in the device -> SECURE HARDWARE
     securityLevel: biometrics ? Keychain.SECURITY_LEVEL.SECURE_HARDWARE : Keychain.SECURITY_LEVEL.SECURE_SOFTWARE,
     // with biometrics in the device -> RSA
-    storage: biometrics ? Keychain.STORAGE_TYPE.RSA : Keychain.STORAGE_TYPE.AES,
-  } as Keychain.Options;
+    storage: biometrics ? Keychain.STORAGE_TYPE.RSA : Keychain.STORAGE_TYPE.AES_GCM,
+  } as Keychain.BaseOptions;
 };
 
 export const saveRecoveryWalletInfo = async (keys: WalletType): Promise<void> => {

components/AddressBook/components/AbSummaryLine.tsx

@@ -79,7 +79,7 @@ const AbSummaryLine: React.FunctionComponent<AbSummaryLineProps> = ({
         },
         { text: translate('cancel') as string, style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

components/Components/PriceFetcher.tsx

@@ -80,7 +80,7 @@ const PriceFetcher: React.FunctionComponent<PriceFetcherProps> = ({ setZecPrice,
         { text: translate('send.fetch-button') as string, onPress: () => onPressFetch() },
         { text: translate('cancel') as string, style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };