Merge branch 'main' into feature/about-screen-feature-flags

Author: sleepytanya

.github/workflows/build-rc-auto.yml

@@ -4,6 +4,10 @@
 # It runs on every commit pushed to a release branch, but only when the release PR
 # has the 'auto-rc-builds' label.
 #
+# Rolling builds: when a new run starts for the same release branch, any queued or
+# in-progress run of this workflow for that branch is cancelled (same behavior as
+# Bitrise “Rolling builds” / “Abort running builds” for one branch + one workflow).
+#
 # Builds are triggered via the Runway OTA/build pipeline (runway-ota-build-core.yml):
 # - iOS runs first and performs the version bump.
 # - Android runs after, skipping the version bump (already done by iOS).
@@ -16,6 +20,10 @@ on:
     branches:
       - 'release/*'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
   pull-requests: write

.github/workflows/build.yml

@@ -396,6 +396,8 @@ jobs:
       # Build with retry logic. Timeouts: 55min per attempt, 115min total for step, 120min job
       - name: Build ${{ matrix.platform }}
         timeout-minutes: 115
+        env:
+          GIT_BRANCH: ${{ inputs.source_branch || github.ref_name }}
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
         with:
           timeout_minutes: 55

.github/workflows/slack-rc-notification.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.source_branch }}
-          fetch-depth: 1
+          fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'

.yarn/patches/@braze-react-native-sdk-npm-19.1.0-076-reactmoduleinfo.patch

@@ -7,6 +7,27 @@
 #   "None of the following functions can be called with the arguments supplied:
 #    public constructor ReactModuleInfo(...hasConstants...) / (...without...)"
 # This patch adds the missing `hasConstants = true` argument.
+#
+# Braze lists Robolectric, JUnit, and androidx.test as debugImplementation. That leaks them
+# into every consumer's debug runtime; Robolectric pulls espresso-idling-resource 3.7.x and
+# breaks Detox (UiControllerImpl.eventInjector). Braze still compiles src/debug/kotlin into
+# the debug variant, so those deps must stay on the compile classpath: use debugCompileOnly
+# (compile-only for the library; not published to consumers' runtime classpaths).
+diff --git a/android/build.gradle b/android/build.gradle
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -69,8 +69,8 @@ dependencies {
+   testImplementation "org.mockito:mockito-inline:5.2.0"
+   testImplementation("org.jetbrains.kotlin:kotlin-reflect")
+ 
+-  debugImplementation 'androidx.test:core-ktx:1.7.0'
+-  debugImplementation "junit:junit:4.13.2"
+-  debugImplementation "org.robolectric:robolectric:4.16"
++  debugCompileOnly 'androidx.test:core-ktx:1.7.0'
++  debugCompileOnly "junit:junit:4.13.2"
++  debugCompileOnly "org.robolectric:robolectric:4.16"
+ 
+   def wrapper_braze_sdk_version = "41.1.1"
 diff --git a/android/src/main/java/com/braze/reactbridge/BrazeReactBridgePackage.kt b/android/src/main/java/com/braze/reactbridge/BrazeReactBridgePackage.kt
 --- a/android/src/main/java/com/braze/reactbridge/BrazeReactBridgePackage.kt
 +++ b/android/src/main/java/com/braze/reactbridge/BrazeReactBridgePackage.kt

android/app/build.gradle

@@ -418,11 +418,17 @@ dependencies {
     } else {
         implementation jscFlavor
     }
+    // Detox's AAR still reflects Espresso UiControllerImpl.eventInjector, but its POM pulls
+    // espresso-* 3.6.x where that field was removed. Exclude Espresso from Detox and pin 3.5.1.
     androidTestImplementation('com.wix:detox:+') {
-         exclude module: "protobuf-lite"
-     }
-    androidTestImplementation ('androidx.test.espresso:espresso-contrib:3.4.0')
-
+        exclude module: 'protobuf-lite'
+        exclude group: 'androidx.test.espresso', module: 'espresso-core'
+        exclude group: 'androidx.test.espresso', module: 'espresso-web'
+        exclude group: 'androidx.test.espresso', module: 'espresso-contrib'
+    }
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
     // Add these dependencies for androidTest
     androidTestImplementation "com.google.guava:guava:31.1-android"
     androidTestImplementation "org.ow2.asm:asm:9.4"

app/component-library/components-temp/HeaderRoot/HeaderRoot.test.tsx

@@ -9,10 +9,6 @@ import { IconName } from '@metamask/design-system-react-native';
 // Internal dependencies.
 import HeaderRoot from './HeaderRoot';
 
-jest.mock('react-native-safe-area-context', () => ({
-  useSafeAreaInsets: () => ({ top: 44, bottom: 34, left: 0, right: 0 }),
-}));
-
 const CONTAINER_TEST_ID = 'header-root-container';
 const LEFT_CHILDREN_TEST_ID = 'header-root-left-children';
 const END_ACCESSORY_TEST_ID = 'header-root-end-accessory';
@@ -250,7 +246,7 @@ describe('HeaderRoot', () => {
       expect(container.props.style).toEqual(
         expect.arrayContaining([
           expect.anything(),
-          expect.objectContaining({ marginTop: 44 }),
+          expect.objectContaining({ marginTop: expect.any(Number) }),
         ]),
       );
     });

app/component-library/components-temp/HeaderStandardAnimated/HeaderStandardAnimated.test.tsx

@@ -18,10 +18,6 @@ jest.mock('react-native-reanimated', () => {
   return Reanimated;
 });
 
-jest.mock('react-native-safe-area-context', () => ({
-  useSafeAreaInsets: () => ({ top: 44, bottom: 34, left: 0, right: 0 }),
-}));
-
 const CONTAINER_TEST_ID = 'header-standard-animated-container';
 const TITLE_TEST_ID = 'header-standard-animated-title';
 const SUBTITLE_TEST_ID = 'header-standard-animated-subtitle';

app/component-library/components-temp/MultichainAccounts/MultichainAddWalletActions/MultichainAddWalletActions.tsx

@@ -1,6 +1,6 @@
 // Third party dependencies.
 import React, { Fragment, useCallback, useMemo } from 'react';
-import { SafeAreaView } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
 
 // External dependencies.
@@ -85,7 +85,7 @@ const MultichainAddWalletActions = ({
   );
 
   return (
-    <SafeAreaView>
+    <SafeAreaView edges={['bottom']}>
       <Fragment>
         {actionConfigs.map(
           (config) =>

app/component-library/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/BottomSheetDialog.test.tsx

@@ -21,20 +21,6 @@ jest.mock('react-native', () => {
   };
 });
 
-jest.mock('react-native-safe-area-context', () => {
-  // using disting digits for mock rects to make sure they are not mixed up
-  const inset = { top: 1, right: 2, bottom: 3, left: 4 };
-  const frame = { width: 5, height: 6, x: 7, y: 8 };
-  return {
-    SafeAreaProvider: jest.fn().mockImplementation(({ children }) => children),
-    SafeAreaConsumer: jest
-      .fn()
-      .mockImplementation(({ children }) => children(inset)),
-    useSafeAreaInsets: jest.fn().mockImplementation(() => inset),
-    useSafeAreaFrame: jest.fn().mockImplementation(() => frame),
-  };
-});
-
 jest.mock('@react-navigation/native', () => {
   const actualNav = jest.requireActual('@react-navigation/native');
   return {

app/component-library/components/Toast/Toast.test.tsx

@@ -25,10 +25,6 @@ jest.mock('react-native-reanimated', () => ({
 }));
 
 // Mock safe area context
-jest.mock('react-native-safe-area-context', () => ({
-  useSafeAreaInsets: () => ({ bottom: 0, top: 0, left: 0, right: 0 }),
-}));
-
 describe('Toast', () => {
   let toastRef: React.RefObject<ToastRef>;