Merge remote-tracking branch 'upstream/main' into 856520-fix-duplicate-disabled-tax-rate

Author: huult

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -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() }}

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,

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

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

android/app/build.gradle

@@ -37,9 +37,8 @@ if(settings.extensions.patchedArtifacts.buildFromSource) {
     }
 }
 
-apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
 expoAutolinking {
-    projectRoot = file(rootDir)
+    projectRoot = file('../')
+    searchPaths = ['node_modules']
     useExpoModules()
 }

android/settings.gradle

@@ -205,6 +205,7 @@
         "ecash",
         "ecconnrefused",
         "econn",
+        "EDDSA",
         "EDIFACT",
         "Egencia",
         "Electromedical",

assets/images/multifactorAuthentication/open-padlock-green.svg

@@ -31,6 +31,7 @@ Follow these steps to create a new workspace based on an existing one:
    - Taxes  
    - Workflows  
    - Rules  
+   - Merchant rules  
    - Distance Rates  
    - Per Diem  
    - Invoices

assets/images/simple-illustrations/simple-illustration__encryption-passkeys.svg

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.41.0</string>
+	<string>9.3.41.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>