Merge branch 'main' into refactor/remove-connect-muted-platform

Author: pasyukevich

.github/workflows/deployBlocker.yml

@@ -9,6 +9,7 @@ jobs:
   updateChecklist:
     if: github.event.label.name == 'DeployBlockerCash'
     uses: ./.github/workflows/createDeployChecklist.yml
+    secrets: inherit
 
   deployBlocker:
     if: github.event.label.name == 'DeployBlockerCash'

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009019300
-        versionName "9.1.93-0"
+        versionCode 1009019303
+        versionName "9.1.93-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

@@ -155,6 +155,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+                android:name="com.plaid.internal.link.LinkActivity"
+                android:launchMode="singleTask"
+                tools:replace="android:launchMode"/>
+
         <meta-data
             android:name="com.urbanairship.reactnative.AIRSHIP_EXTENDER"
             android:value="com.expensify.chat.customairshipextender.CustomAirshipExtender" />

android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,28 @@
+package com.expensify.chat
+
+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.expensify.chat.MainActivity
+
+/**
+ * Checks whether the app was relaunched from the app icon in app drawer, not from recent apps.
+ */
+class AppStateTrackerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
+    reactContext
+) {
+    override fun getName(): String = "AppStateTracker"
+
+    @ReactMethod
+    fun getWasAppRelaunchedFromIcon(promise: Promise) {
+        val activity = currentActivity
+        if (activity is MainActivity) {
+            promise.resolve(activity.wasAppRelaunchedFromIcon)
+            activity.wasAppRelaunchedFromIcon = false
+        } else {
+            promise.resolve(false)
+        }
+    }
+}

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

@@ -25,6 +25,8 @@ class MainActivity : ReactActivity() {
      */
     override fun getMainComponentName() = "NewExpensify"
 
+    var wasAppRelaunchedFromIcon: Boolean = false
+
     /**
      * Returns the instance of the [ReactActivityDelegate]. Here we use a util class [ ] which allows you to easily enable Fabric and Concurrent React
      * (aka React 18) with two boolean flags.
@@ -62,6 +64,13 @@ class MainActivity : ReactActivity() {
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
+
+        if (intent.hasCategory(Intent.CATEGORY_LAUNCHER)
+              && intent.getAction() != null
+              && intent.getAction().equals(Intent.ACTION_MAIN)) {
+             wasAppRelaunchedFromIcon = true
+        }
+
         setIntent(intent) // Must store the new intent unless getIntent() will return the old one
         handleIntent(intent)
     }
@@ -108,6 +117,6 @@ class MainActivity : ReactActivity() {
 
     override fun onStart() {
         super.onStart()
-        RNPerformance.getInstance().mark("appCreationEnd", false);
+        RNPerformance.getInstance().mark("appCreationEnd", false)
     }
 }

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

@@ -1,14 +1,10 @@
 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
@@ -31,15 +27,10 @@ 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
 
-        override fun getPackages(): List<ReactPackage>  = 
+        override fun getPackages(): List<ReactPackage>  =
             PackageList(this).packages.apply {
             // Packages that cannot be autolinked yet can be added manually here, for example:
             // add(MyReactNativePackage());
@@ -73,30 +64,6 @@ 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.
@@ -139,22 +106,4 @@ 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/MainActivity.kt

@@ -55,7 +55,6 @@ if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop')
     defaultPluginsForWebpack.push([
         '@fullstory/babel-plugin-annotate-react',
         {
-            'react-native-web': true,
             native: true,
         },
     ]);

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

@@ -0,0 +1,74 @@
+---
+title: Merge Expenses
+description: Learn how to merge two expenses to eliminate duplicates and simplify your reports.
+keywords: [New Expensify, merge expenses, duplicate expenses, SmartScan, manual merge, combine expenses]
+---
+
+<div id="new-expensify" markdown="1">
+
+Merging expenses helps you quickly resolve duplicates when automatic SmartScan merges don’t catch everything. This guide walks you through manually merging two expenses from the expense view or Reports page.
+
+# Merge expenses
+
+You can merge two expenses if at least one is a cash expense. You cannot merge two card expenses. Merging is only available for editable expenses (such as those that are unsubmitted or awaiting first-level approval).
+
+## Merging from an individual expense
+
+1. In the left-hand menu, select **Reports > Expenses**
+2. Tap the expense you'd like to merge from.
+3. Tap the **More** button, then select **Merge**.
+4. Choose another eligible expense to merge with. 
+   - You can only select one.
+   - Expenses are sorted by date (newest first).
+   - If there are no eligible matches, you'll see:  
+     *"You don’t have any expenses that can be merged with this one. [Learn more](#eligible-expenses)."*
+5. If only one expense has a receipt, it’s selected automatically. If both do, you’ll be asked to choose.
+6. Select the details you want to keep from each expense—like merchant name, amount, or category.
+7. Tap **Continue**, then **Confirm** to complete the merge.
+
+## Eligible expenses for merging
+
+To merge two expenses, they must meet all of the following:
+
+- **By type**:
+  - You can merge a cash expense with another cash expense, or a cash expense with a card expense.
+  - You cannot merge two card expenses.
+
+- **By permission**:
+  - **Submitters** can merge their own expenses (including unreported and in-progress ones).
+  - **Approvers and Admins** can merge expenses on the same report 
+
+- **By status**:
+  - Both expenses must be editable. That includes unreported expenses, or ones on a Draft or Processing report that hasn’t yet been approved.
+
+## What happens when you merge?
+
+- One expense is kept, and the details you choose will be used for the final version.
+- The other expense is **merged into the final one** and no longer shown separately.
+- If one expense is a card transaction, it will always be the one that’s kept.
+- If both are cash expenses, the one you started the merge from will be kept.
+
+# FAQ
+
+## Can I merge two card expenses?
+
+No. Only one card expense can be part of a merge. You can merge:
+- Two cash expenses
+- One cash and one card expense
+
+## What happens to the other expense?
+
+It’s merged into the final expense and no longer appears separately. Its details are combined based on what you selected.
+
+## What if the expenses have the same details?
+
+If there are no differences to resolve, the system automatically keeps the shared values without prompting you.
+
+## Why don’t I see the Merge option?
+
+Check these conditions:
+- You must have permission to edit both expenses.
+- At least one expense must be a cash transaction.
+- The expenses must be editable (not submitted or fully approved).
+
+</div>