Merge remote-tracking branch 'origin/main' into claude-timerCountdownAccessibility

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

Author: MelvinBot

.github/actions/javascript/authorChecklist/index.js

@@ -126,7 +126,7 @@ jobs:
     name: Build and Publish React Native Artifacts
     runs-on: ${{ github.repository_owner == 'Expensify' && 'blacksmith-16vcpu-ubuntu-2404' || 'blacksmith-2vcpu-ubuntu-2404' }}
     needs: verifyPatches
-    if: needs.verifyPatches.outputs.build_targets != '' 
+    if: needs.verifyPatches.outputs.build_targets != ''
     strategy:
       # Disable fail-fast to prevent cancelling both jobs when only one needs to be stopped due to concurrency limits
       fail-fast: false
@@ -160,7 +160,7 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
-      
+
       - name: Determine new patched RN version
         id: getNewPatchedVersion
         run: echo "NEW_PATCHED_VERSION=$(./.github/scripts/getNewPatchedRNVersion.sh)" >> "$GITHUB_OUTPUT"
@@ -175,14 +175,26 @@ jobs:
           echo "Version: ${{ env.PATCHED_VERSION }}"
           echo "Patches hash: ${{ env.PATCHES_HASH }}"
           export ORG_GRADLE_PROJECT_reactNativeArchitectures="armeabi-v7a,arm64-v8a,x86,x86_64"
-          ./gradlew buildReactNativeArtifacts -PpatchedArtifacts.forceBuildFromSource=true -x lint -x test -x check
+
+          # Exclude ktfmt and test tasks from the included react-native build
+          EXCLUDE_TASKS=(
+            -x :react-native:packages:react-native:ReactAndroid:ktfmtCheck
+            -x :react-native:packages:react-native:ReactAndroid:ktfmtCheckMain
+            -x :react-native:packages:react-native:ReactAndroid:ktfmtCheckScripts
+            -x :react-native:packages:react-native:ReactAndroid:testDebugOptimizedUnitTest
+            -x :react-native:packages:react-native:ReactAndroid:testDebugUnitTest
+            -x :react-native:packages:react-native:ReactAndroid:testReleaseUnitTest
+          )
+
+          ./gradlew buildReactNativeArtifacts -PpatchedArtifacts.forceBuildFromSource=true -x lint -x test -x check "${EXCLUDE_TASKS[@]}"
           ./gradlew publishReactNativeArtifacts -PpatchedArtifacts.forceBuildFromSource=true
         env:
           GH_PUBLISH_ACTOR: ${{ github.actor }}
           GH_PUBLISH_TOKEN: ${{ github.token }}
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid }}
           PATCHED_VERSION: ${{ steps.getNewPatchedVersion.outputs.NEW_PATCHED_VERSION }}
           PATCHES_HASH: ${{ matrix.is_hybrid == 'true' && needs.verifyPatches.outputs.hybrid_app_patches_hash || needs.verifyPatches.outputs.standalone_patches_hash }}
+          CMAKE_VERSION: 3.31.6
 
       - name: Announce failed workflow in Slack
         if: ${{ failure() }}

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -160,6 +160,7 @@ modules/*/lib/
 
 # Playwright
 .playwright-output/
+.playwright-mcp/
 
 # cspell cache
 .cspellcache

.gitignore

@@ -54,7 +54,7 @@ For detailed setup instructions for each platform, see the following guides:
    ```sh
    Access to fetch at 'https://www.expensify.com/api/BeginSignIn' from origin 'http://localhost:8080' has been blocked by CORS policy
    ```
-   You probably have a misconfigured `.env` file - remove it (`rm .env`) and try again
+   You probably have a misconfigured `.env` file - remove it (`rm .env`) and try again.
 
 **Note:** Expensify engineers that will be testing with the API in your local dev environment please refer to [these additional instructions](https://stackoverflow.com/c/expensify/questions/7699/7700).
 

Mobile-Expensify

@@ -17,21 +17,20 @@ const {triggerTransitionEnd, addListener} = isJestEnv
           addListener: () => {},
       };
 
-const realOrMockedUseNavigation = isJestEnv ? realReactNavigation.useNavigation : {};
-const useNavigation = () => ({
-    ...realOrMockedUseNavigation,
-    navigate: isJestEnv ? jest.fn() : () => {},
-    getState: () => ({
-        routes: [],
-    }),
-    addListener,
-});
+const useNavigation = isJestEnv
+    ? realReactNavigation.useNavigation
+    : {
+          navigate: isJestEnv ? jest.fn() : () => {},
+          getState: () => ({
+              routes: [],
+          }),
+          addListener,
+      };
 
 type NativeNavigationMock = typeof ReactNavigation & {
     triggerTransitionEnd: () => void;
 };
 
-export * from '@react-navigation/core';
 const Link = isJestEnv ? realReactNavigation.Link : () => null;
 const LinkingContext = isJestEnv ? realReactNavigation.LinkingContext : () => null;
 const NavigationContainer = isJestEnv ? realReactNavigation.NavigationContainer : () => null;
@@ -46,14 +45,16 @@ const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => nu
 const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
 const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
 const usePreventRemove = isJestEnv ? jest.fn() : () => {};
+const useNavigationState = isJestEnv ? realReactNavigation.useNavigationState : () => {};
 
+export * from '@react-navigation/core';
 export {
     // Overridden modules
     useIsFocused,
     useTheme,
     useNavigation,
+    useNavigationState,
     useLocale,
-    triggerTransitionEnd,
 
     // Theme modules are left alone
     Link,
@@ -63,6 +64,7 @@ export {
     DarkTheme,
     DefaultTheme,
     ThemeProvider,
+    triggerTransitionEnd,
     useLinkBuilder,
     useLinkProps,
     useLinkTo,

README.md

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009034003
-        versionName "9.3.40-3"
+        versionCode 1009034103
+        versionName "9.3.41-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"

__mocks__/@react-navigation/native/index.ts

@@ -13,7 +13,6 @@ import com.expensify.chat.shortcutManagerModule.ShortcutManagerPackage
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
@@ -22,37 +21,27 @@ import com.facebook.react.modules.i18nmanager.I18nUtil
 import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 import expo.modules.ApplicationLifecycleDispatcher
-import expo.modules.ReactNativeHostWrapper
 import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 
 class MainApplication : MultiDexApplication(), ReactApplication {
     companion object {
         private const val APP_START_TIME_PREFERENCES = "AppStartTime"
     }
-    override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
-        override fun getUseDeveloperSupport() = BuildConfig.DEBUG
-
-        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(ShortcutManagerPackage())
-            add(BootSplashPackage())
-            add(ExpensifyAppPackage())
-            add(RNTextInputResetPackage())
-            add(NavBarManagerPackage())
-        }
-
-        override fun getJSMainModuleName() = ".expo/.virtual-metro-entry"
-
-        override val isNewArchEnabled: Boolean
-            get() = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean
-            get() = BuildConfig.IS_HERMES_ENABLED
-    })
-
-    override val reactHost: ReactHost
-        get() = getDefaultReactHost(applicationContext, reactNativeHost)
+    override val reactHost: ReactHost by lazy {
+        getDefaultReactHost(
+            context = applicationContext,
+            packageList =
+                PackageList(this).packages.apply {
+                    // Packages that cannot be autolinked yet can be added manually here, for example:
+                    // add(MyReactNativePackage())
+                    add(ShortcutManagerPackage())
+                    add(BootSplashPackage())
+                    add(ExpensifyAppPackage())
+                    add(RNTextInputResetPackage())
+                    add(NavBarManagerPackage())
+                },
+        )
+    }
 
     override fun onCreate() {
         super.onCreate()

android/app/build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME