Merge branch 'main' into tgolen-remove-rnvps-13

Author: tgolen

.github/scripts/validateActionsAndWorkflows.sh

@@ -7,7 +7,7 @@ title 'Validating the Github Actions and workflows using the json schemas provid
 function downloadSchema {
   [[ $1 = 'github-action.json' ]] && SCHEMA_NAME='GitHub Action' || SCHEMA_NAME='GitHub Workflow'
   info "Downloading $SCHEMA_NAME schema..."
-  if curl "https://json.schemastore.org/$1" --output "./tempSchemas/$1" --silent; then
+  if curl "https://raw.githubusercontent.com/SchemaStore/schemastore/refs/heads/master/src/schemas/json/$1" --output "./tempSchemas/$1" --silent; then
     success "Successfully downloaded $SCHEMA_NAME schema!"
   else
     error "Failed downloading $SCHEMA_NAME schema"

.github/workflows/lint-changed.yml

@@ -17,19 +17,47 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
+      - name: Count commits between merge base and HEAD
+        id: count
+        run: |
+          # Compare the base commit and HEAD to get the count of commits after base
+          # up to and including HEAD. Add 2 to this total when fetching history. 
+          #
+          # When opening a PR, GitHub will create a merge commit that squashes
+          # your changes for use in the workflow. So your history locally
+          # may look like
+          #          o---o---o---B - development
+          #         /
+          # ---o---1---C---o---o---A - main
+          # Note that the `1` is the merge-base of development and main. The
+          # number of commits after `1` upto and including `A` is 4.
+          # In the workflow, GitHub squashs development, so it becomes:
+          # ---o---1---C---o---o---A - main
+          #                         \--M - PR branch
+          # Where `M`` is the new squashed commit. To fetch enough history to
+          # include the merge base, we need to fetch `M`, `A` through `C` and
+          # `1` for total of 4+2=6 commits. The +2 commits accounts for the
+          # base `1` and merge commit `M`.
+          RAW_COUNT="$(gh api "repos/$REPO/compare/${BASE}...main" | jq -r '.total_commits')"
+          ADJUSTED_COUNT=$((RAW_COUNT + 2))
+          echo "count=$ADJUSTED_COUNT" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          BASE: ${{ github.event.pull_request.base.sha }}
+          REPO: ${{ github.repository }}
+          
       - name: Checkout
         # v4
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          fetch-depth: ${{ fromJSON(steps.count.outputs.count) }}
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
         with:
           IS_DESKTOP_BUILD: true
-      
+ 
       - name: Run ESLint to check for deprecation warnings
         run: |
-          # This will just fetch the latest commit from main
-          git fetch origin main --no-tags --depth=1
-
           # shellcheck disable=SC2046
           npm run lint-changed

.github/workflows/remote-build-android.yml

@@ -35,11 +35,11 @@ jobs:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
       - name: RNEF Remote Build - Android
-        uses: callstackincubator/android@c6ac9e01bf15271b4f7c24c88b37e884a26b04d6
+        uses: callstackincubator/android@2f67a7003e5ed1bb4e483619ab582fabff25677d
         env:
           IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
         with:
           variant: ${{ matrix.variant }}
           github-token: ${{ github.token }}
-          rnef-build-extra-params: '-PreactNativeArchitectures=arm64-v8a,x86_64'
+          rnef-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
           comment-bot: false

.github/workflows/remote-build-ios.yml

@@ -37,7 +37,7 @@ jobs:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
       - name: RNEF Remote Build - iOS
-        uses: callstackincubator/ios@172a7f01cd8b19fdb5da9a984637d468eb6e0fad
+        uses: callstackincubator/ios@78ed46313dac4ed09cb5cc73b9b1b9193d59d863
         env:
           IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
         with:

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009015907
-        versionName "9.1.59-7"
+        versionCode 1009016003
+        versionName "9.1.60-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -0,0 +1,34 @@
+package com.expensify.chat;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+
+import androidx.annotation.NonNull;
+
+public class AppStateTrackerModule extends ReactContextBaseJavaModule {
+    private final ReactApplicationContext reactContext;
+
+    public AppStateTrackerModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    @NonNull
+    public String getName() {
+        return "AppStateTracker";
+    }
+
+    @ReactMethod
+    public void getApplicationState(Promise promise) {
+        MainApplication applicationContext = (MainApplication) this.reactContext.getApplicationContext();
+        WritableMap params = Arguments.createMap();
+        params.putString("currentState", applicationContext.getCurrentState());
+        params.putString("prevState", applicationContext.getPrevState());
+        promise.resolve(params);
+    }
+}

android/app/src/main/java/com/expensify/chat/AppStateTrackerModule.java

@@ -23,6 +23,7 @@ public List<NativeModule> createNativeModules(
 
         modules.add(new StartupTimer(reactContext));
         modules.add(new ShareActionHandlerModule(reactContext));
+        modules.add(new AppStateTrackerModule(reactContext));
 
         return modules;
     }

android/app/src/main/java/com/expensify/chat/ExpensifyAppPackage.java

@@ -1,10 +1,14 @@
 package com.expensify.chat
 
+import android.app.Activity
 import com.facebook.react.common.assets.ReactFontManager
 
 import android.app.ActivityManager
+import android.app.ActivityManager.RunningAppProcessInfo
+import android.content.Context
 import android.content.res.Configuration
 import android.database.CursorWindow
+import android.os.Bundle
 import android.os.Process
 import androidx.multidex.MultiDexApplication
 import com.expensify.chat.bootsplash.BootSplashPackage
@@ -27,6 +31,11 @@ import expo.modules.ApplicationLifecycleDispatcher
 import expo.modules.ReactNativeHostWrapper
 
 class MainApplication : MultiDexApplication(), ReactApplication {
+    var currentState: String = "active"
+        private set
+    var prevState: String = "inactive"
+        private set
+
     override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
         override fun getUseDeveloperSupport() = BuildConfig.DEBUG
 
@@ -64,6 +73,30 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             return
         }
 
+        registerActivityLifecycleCallbacks(object: ActivityLifecycleCallbacks {
+            override fun onActivityStarted(p0: Activity) {
+                prevState = currentState
+                currentState = "active"
+            }
+
+            override fun onActivityStopped(p0: Activity) {
+                val isOnForeground = isAppOnForeground()
+                prevState = currentState
+                currentState = if (isOnForeground) "active" else "background"
+            }
+
+            override fun onActivityDestroyed(p0: Activity) {
+                val isOnForeground = isAppOnForeground()
+                prevState = currentState
+                currentState = if (isOnForeground) "active" else "background"
+            }
+
+            override fun onActivityCreated(p0: Activity, p1: Bundle?) {}
+            override fun onActivityResumed(p0: Activity) {}
+            override fun onActivityPaused(p0: Activity) {}
+            override fun onActivitySaveInstanceState(p0: Activity, p1: Bundle) {}
+        })
+
         SoLoader.init(this, OpenSourceMergedSoMapping)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
@@ -106,4 +139,22 @@ class MainApplication : MultiDexApplication(), ReactApplication {
             it.pid == pid && it.processName.endsWith(":onfido_process")
         }
     }
+
+    /**
+     * Checks if the application is currently running in the foreground.
+     * https://stackoverflow.com/a/8490088/8398300
+     */
+    private fun isAppOnForeground(): Boolean {
+        val activityManager = applicationContext.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val appProcesses = activityManager.runningAppProcesses ?: return false
+        val packageName: String = applicationContext.getPackageName()
+        for (appProcess in appProcesses) {
+            if (appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
+                appProcess.processName == packageName
+            ) {
+                return true
+            }
+        }
+        return false
+    }
 }

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

@@ -114,9 +114,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 {from: 'web/favicon-unread.png'},
                 {from: 'web/og-preview-image.png'},
                 {from: 'web/apple-touch-icon.png'},
+                {from: 'web/robots.txt'},
                 {from: 'assets/images/expensify-app-icon.svg'},
                 {from: 'web/manifest.json'},
-                {from: 'web/thirdPartyScripts.js'},
                 {from: 'assets/css', to: 'css'},
                 {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'assets/sounds', to: 'sounds'},