Merge branch 'main' into chore/bump-assets-controller-v-7-0-0

Author: salimtb

.ai-pr-analyzer/config.yaml

@@ -21,7 +21,6 @@ critical:
     - android/settings.gradle
     - android/gradle.properties
     - android/app/build.gradle
-    - bitrise.yml
     - builds.yml
     - .github/workflows/ci.yml
     - .github/workflows/build.yml

.detoxrc.js

@@ -100,15 +100,6 @@ module.exports = {
       forceAdbInstall: true,
       gpuMode: 'swiftshader_indirect',
     },
-    'android.bitrise.emulator': {
-      type: 'android.emulator',
-      device: {
-        avdName: 'emulator',
-      },
-      // optimized for Bitrise CI runners
-      bootArgs: '-verbose -show-kernel -no-audio -netdelay none -no-snapshot -wipe-data -gpu auto -no-window -no-boot-anim -read-only',
-      forceAdbInstall: true,
-    }
   },
   apps: {
     'ios.debug': {

.gitattributes

@@ -1,3 +1,6 @@
 # Windows files should use crlf line endings
 # https://help.github.com/articles/dealing-with-line-endings/
 *.bat text eol=crlf
+
+# Shell scripts must keep LF so they run in WSL on Windows.
+*.sh text eol=lf

.github/CODEOWNERS

@@ -26,7 +26,6 @@ app/components/hooks/useMetrics/                            @MetaMask/mobile-pla
 app/selectors/featureFlagController/*                       @MetaMask/mobile-platform
 app/selectors/featureFlagController/minimumAppVersion/      @MetaMask/mobile-platform
 app/store/migrations/                                       @MetaMask/mobile-platform
-bitrise.yml                                                 @MetaMask/mobile-platform
 ios/Podfile.lock                                            @MetaMask/mobile-platform
 app/components/Views/BrowserTab/BrowserTab.tsx              @MetaMask/mobile-platform
 app/components/Nav/NavigationProvider                       @MetaMask/mobile-platform
@@ -146,12 +145,16 @@ app/core/Engine/controllers/bridge-controller            @MetaMask/swaps-enginee
 app/core/Engine/controllers/bridge-status-controller     @MetaMask/swaps-engineers
 
 # Notifications Team
-app/components/Views/Notifications @MetaMask/notifications
-app/components/Views/Settings/NotificationsSettings @MetaMask/notifications
-**/Notifications/** @MetaMask/notifications
-**/Notification/** @MetaMask/notifications
-**/notifications/** @MetaMask/notifications
-**/notification/** @MetaMask/notifications
+**/*Braze*/ @MetaMask/engagement
+**/*Braze* @MetaMask/engagement
+**/*braze*/ @MetaMask/engagement
+**/*braze* @MetaMask/engagement
+app/components/Views/Notifications @MetaMask/engagement
+app/components/Views/Settings/NotificationsSettings @MetaMask/engagement
+**/Notifications/** @MetaMask/engagement
+**/Notification/** @MetaMask/engagement
+**/notifications/** @MetaMask/engagement
+**/notification/** @MetaMask/engagement
 
 # LavaMoat Team
 ses.cjs                              @MetaMask/supply-chain
@@ -206,7 +209,7 @@ app/components/Views/Homepage/Sections/Perpetuals/ @MetaMask/perps
 # Social & AI Team
 app/components/Views/SocialLeaderboard/                              @MetaMask/social-ai
 app/components/UI/MarketInsights/                                    @MetaMask/social-ai
-app/components/Views/Homepage/Sections/WhatsHappening/               @MetaMask/social-ai
+app/components/UI/WhatsHappening/                                    @MetaMask/social-ai
 app/components/Views/Homepage/Sections/TopTraders/                   @MetaMask/social-ai
 app/core/Engine/controllers/social-controller-init*                  @MetaMask/social-ai
 app/core/Engine/controllers/social-service-init*                     @MetaMask/social-ai

.github/actions/setup-e2e-env/action.yml

@@ -91,6 +91,17 @@ inputs:
     description: 'Runner provider forwarded from the caller workflow chain. When set to "namespace", toolchain-install steps short-circuit if the pinned version is already on the image. Default "current" preserves byte-identical behaviour on existing GitHub-hosted / Cirrus runners.'
     required: false
     default: 'current'
+  js-retry-timeout-minutes:
+    description: >-
+      Per-attempt timeout (minutes) for Corepack and yarn install retry steps.
+      Namespace E2E matrix jobs often need more headroom (INFRA-3596).
+    required: false
+    default: '15'
+  pod-install-timeout-minutes:
+    description: >-
+      Per-attempt timeout (minutes) for the CocoaPods install retry step (iOS only).
+    required: false
+    default: '15'
 
 runs:
   using: 'composite'
@@ -161,9 +172,9 @@ runs:
         sudo chown -R "$(id -u):$(id -g)" "$CACHE_PATH" /opt/android-sdk/.temp
       shell: bash
 
-    # Restore exact system image from cache
+    # Restore exact system image from cache (GitHub only — Namespace uses nscloud-cache-action in callers)
     - name: Restore Android system image from cache
-      if: ${{ inputs.platform == 'android' && inputs.setup-simulator == 'true' }}
+      if: ${{ inputs.platform == 'android' && inputs.setup-simulator == 'true' && inputs.runner_provider != 'namespace' }}
       id: android-system-image-cache
       uses: actions/cache/restore@v4
       with:
@@ -215,6 +226,7 @@ runs:
         ${{
           inputs.platform == 'android' &&
           inputs.setup-simulator == 'true' &&
+          inputs.runner_provider != 'namespace' &&
           steps.android-system-image-cache.outputs.cache-hit != 'true' &&
           github.event_name != 'pull_request' &&
           github.event_name != 'pull_request_target' &&
@@ -289,12 +301,13 @@ runs:
       id: corepack
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
       with:
-        timeout_minutes: 15
+        timeout_minutes: ${{ fromJSON(inputs.js-retry-timeout-minutes) }}
         max_attempts: 3
         retry_wait_seconds: 30
         command: ${{ steps.get-corepack-command.outputs.COREPACK_COMMAND }}
 
     - name: Restore Yarn cache
+      if: ${{ inputs.runner_provider != 'namespace' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -309,7 +322,7 @@ runs:
       id: yarn-install
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
       with:
-        timeout_minutes: 15
+        timeout_minutes: ${{ fromJSON(inputs.js-retry-timeout-minutes) }}
         max_attempts: 3
         retry_wait_seconds: 30
         on_retry_command: echo "⚠️ yarn install failed — likely a transient network issue on the self-hosted runner. Retrying..."
@@ -342,7 +355,7 @@ runs:
       shell: bash
 
     - name: Restore Bundler cache
-      if: ${{ inputs.platform == 'ios' }}
+      if: ${{ inputs.platform == 'ios' && inputs.runner_provider != 'namespace' }}
       uses: actions/cache@v4
       with:
         path: ios/vendor/bundle
@@ -399,7 +412,7 @@ runs:
       shell: bash
 
     - name: Restore CocoaPods specs cache
-      if: ${{ inputs.platform == 'ios' }}
+      if: ${{ inputs.platform == 'ios' && inputs.runner_provider != 'namespace' }}
       id: cocoapods-specs-cache
       uses: actions/cache@v4
       with:
@@ -413,7 +426,7 @@ runs:
       if: ${{ inputs.platform == 'ios'}}
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
       with:
-        timeout_minutes: 15
+        timeout_minutes: ${{ fromJSON(inputs.pod-install-timeout-minutes) }}
         max_attempts: 3
         retry_wait_seconds: 60
         on_retry_command: |

.github/rules/filter-rules.yml

@@ -44,7 +44,6 @@ config_files: &config_files
 # CI/GITHUB FILES — overridden by e2e_related_workflows below
 ci_files: &ci_files
   - '.github/**'
-  - 'bitrise.yml' 
 
 # ALL IGNORABLE FILES - safe to skip E2E
 e2e_ignorable: