Merge branch 'main' into ts/androidReversePort

.github/actions/composite/setupNode/action.yml

@@ -1,6 +1,11 @@
 name: Set up Node
 description: Set up Node
 
+outputs:
+  cache-hit:
+    description: Was there a cache hit on the main node_modules?
+    value: ${{ steps.cache-node-modules.outputs.cache-hit }}
+
 runs:
   using: composite
   steps:

.github/workflows/failureNotifier.yml

@@ -88,7 +88,7 @@ jobs:
                     repo: context.repo.repo,
                     title: issueTitle,
                     body: issueBody,
-                    labels: [failureLabel, 'Daily'],
+                    labels: [failureLabel, 'Hourly'],
                     assignees: [prMerger]
                   });
                 }

.github/workflows/platformDeploy.yml

@@ -184,6 +184,7 @@ jobs:
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
       - name: Setup Node
+        id: setup-node
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Ruby
@@ -206,7 +207,7 @@ jobs:
 
       - name: Install cocoapods
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
-        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true'
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5

__mocks__/@react-native-community/netinfo.ts

@@ -2,12 +2,12 @@ import {NetInfoCellularGeneration, NetInfoStateType} from '@react-native-communi
 import type {addEventListener, configure, fetch, NetInfoState, refresh, useNetInfo} from '@react-native-community/netinfo';
 
 const defaultState: NetInfoState = {
-    type: NetInfoStateType.cellular,
+    type: NetInfoStateType?.cellular,
     isConnected: true,
     isInternetReachable: true,
     details: {
         isConnectionExpensive: true,
-        cellularGeneration: NetInfoCellularGeneration['3g'],
+        cellularGeneration: NetInfoCellularGeneration?.['3g'],
         carrier: 'T-Mobile',
     },
 };

__mocks__/react-native-onyx.ts

@@ -0,0 +1,43 @@
+/**
+ * We are disabling the lint rule that doesn't allow the usage of Onyx.connect outside libs
+ * because the intent of this file is to mock the usage of react-native-onyx so we will have to mock the connect function
+ */
+
+/* eslint-disable rulesdir/prefer-onyx-connect-in-libs */
+import type {ConnectOptions, OnyxKey} from 'react-native-onyx';
+import Onyx, {withOnyx} from 'react-native-onyx';
+
+let connectCallbackDelay = 0;
+function addDelayToConnectCallback(delay: number) {
+    connectCallbackDelay = delay;
+}
+
+type ReactNativeOnyxMock = {
+    addDelayToConnectCallback: (delay: number) => void;
+} & typeof Onyx;
+
+type ConnectionCallback<TKey extends OnyxKey> = NonNullable<ConnectOptions<TKey>['callback']>;
+type ConnectionCallbackParams<TKey extends OnyxKey> = Parameters<ConnectionCallback<TKey>>;
+
+const reactNativeOnyxMock: ReactNativeOnyxMock = {
+    ...Onyx,
+    connect: <TKey extends OnyxKey>(mapping: ConnectOptions<TKey>) => {
+        const callback = (...params: ConnectionCallbackParams<TKey>) => {
+            if (connectCallbackDelay > 0) {
+                setTimeout(() => {
+                    (mapping.callback as (...args: ConnectionCallbackParams<TKey>) => void)?.(...params);
+                }, connectCallbackDelay);
+            } else {
+                (mapping.callback as (...args: ConnectionCallbackParams<TKey>) => void)?.(...params);
+            }
+        };
+        return Onyx.connect({
+            ...mapping,
+            callback,
+        });
+    },
+    addDelayToConnectCallback,
+};
+
+export default reactNativeOnyxMock;
+export {withOnyx};

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044302
-        versionName "1.4.43-2"
+        versionCode 1001044318
+        versionName "1.4.43-18"
     }
 
     flavorDimensions "default"

android/app/src/main/java/com/expensify/chat/MainApplication.kt

@@ -1,7 +1,9 @@
 package com.expensify.chat
 
+import android.app.ActivityManager
 import android.content.res.Configuration
 import android.database.CursorWindow
+import android.os.Process
 import androidx.multidex.MultiDexApplication
 import com.expensify.chat.bootsplash.BootSplashPackage
 import com.facebook.react.PackageList
@@ -40,6 +42,10 @@ class MainApplication : MultiDexApplication(), ReactApplication {
     override fun onCreate() {
         super.onCreate()
 
+        if (isOnfidoProcess()) {
+            return
+        }
+
         SoLoader.init(this,  /* native exopackage */false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
@@ -73,4 +79,13 @@ class MainApplication : MultiDexApplication(), ReactApplication {
         super.onConfigurationChanged(newConfig)
         ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
     }
+
+    private fun isOnfidoProcess(): Boolean {
+        val pid = Process.myPid()
+        val manager = this.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+
+        return manager.runningAppProcesses.any {
+            it.pid == pid && it.processName.endsWith(":onfido_process")
+        }
+    }
 }

android/build.gradle

@@ -43,6 +43,13 @@ allprojects {
             def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
             force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
             force "com.facebook.react:hermes-engine:" + REACT_NATIVE_VERSION
+
+            eachDependency { dependency ->
+                if (dependency.requested.group == 'org.bouncycastle') {
+                    println dependency.requested.module
+                    dependency.useTarget 'org.bouncycastle:bcprov-jdk15to18:1.71'
+                }
+            }
         }
     }
     repositories {