Merge branch 'main' into PRED-865-filter-out-more-markets-events-from-the-feed

Author: caieu

.github/CODEOWNERS

@@ -206,7 +206,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

@@ -161,9 +161,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 +215,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' &&
@@ -295,6 +296,7 @@ runs:
         command: ${{ steps.get-corepack-command.outputs.COREPACK_COMMAND }}
 
     - name: Restore Yarn cache
+      if: ${{ inputs.runner_provider != 'namespace' }}
       uses: actions/cache@v4
       with:
         path: |
@@ -342,7 +344,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 +401,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:

.github/workflows/build-android-e2e.yml

@@ -64,13 +64,29 @@ jobs:
         if: ${{ inputs.runner_provider == 'namespace' }}
         uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
         with:
+          cache: |
+            gradle
+            maven
           path: |
             ~/.cache/yarn
             .metamask
             node_modules
             .yarn/cache
             ${{ env.GRADLE_USER_HOME }}/caches
             ${{ env.GRADLE_USER_HOME }}/wrapper
+            ${{ env.GRADLE_USER_HOME }}/apk-cache
+
+      - name: Configure Gradle remote build cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        run: |
+          mkdir -p "$GRADLE_USER_HOME/init.d"
+          REF="${GITHUB_REF_NAME}"
+          PUSH=true
+          if [[ "$REF" != "main" && "$REF" != release/* && "$REF" != stable/* ]]; then
+            PUSH=false
+          fi
+          nsc cache gradle setup --push="$PUSH" --init-gradle "$GRADLE_USER_HOME/init.d/namespace-cache.init.gradle"
+          echo "Gradle remote build cache configured (push=$PUSH) at $GRADLE_USER_HOME/init.d/namespace-cache.init.gradle"
 
       - name: Report source fingerprint
         run: |
@@ -102,6 +118,50 @@ jobs:
             exit 1
           fi
 
+      - name: Check Namespace E2E APK cache
+        id: namespace-apk-cache
+        if: ${{ inputs.runner_provider == 'namespace' && steps.force-builds.outputs.force != 'true' && inputs.source-fingerprint != '' }}
+        shell: bash
+        env:
+          APK_TARGET: ${{ steps.determine-target-paths.outputs.apk-target-path }}
+          TEST_APK_TARGET: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
+          ARTIFACT_NAME: ${{ steps.determine-target-paths.outputs.artifact_name }}
+          FINGERPRINT: ${{ inputs.source-fingerprint }}
+          CACHE_GENERATION: ${{ env.CACHE_GENERATION }}
+          GRADLE_FILES_HASH: ${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          REF_NAME: ${{ github.ref_name }}
+          BUILD_TYPE: ${{ inputs.build_type }}
+        run: |
+          MARKER="${GRADLE_USER_HOME}/apk-cache/.e2e-apk-cache-marker"
+          APK_CACHED="${GRADLE_USER_HOME}/apk-cache/${ARTIFACT_NAME}.apk"
+          TEST_APK_CACHED="${GRADLE_USER_HOME}/apk-cache/${ARTIFACT_NAME}-androidTest.apk"
+          EXPECTED="${REF_NAME}"$'\n'"${BUILD_TYPE}"$'\n'"${CACHE_GENERATION}"$'\n'"${FINGERPRINT}"$'\n'"${GRADLE_FILES_HASH}"
+          echo "--- Debug: APK cache marker diagnostics ---"
+          echo "MARKER=$MARKER"
+          echo "APK_CACHED=$APK_CACHED"
+          echo "TEST_APK_CACHED=$TEST_APK_CACHED"
+          echo "marker exists: $([[ -f "${MARKER}" ]] && echo yes || echo NO)"
+          echo "apk exists: $([[ -f "${APK_CACHED}" ]] && echo yes || echo NO)"
+          echo "test-apk exists: $([[ -f "${TEST_APK_CACHED}" ]] && echo yes || echo NO)"
+          ls -la "${GRADLE_USER_HOME}/apk-cache/" 2>&1 || echo "apk-cache dir not found"
+          if [[ -f "${MARKER}" ]]; then
+            echo "--- marker contents ---"
+            cat "${MARKER}"
+            echo "--- expected ---"
+            echo "${EXPECTED}"
+            echo "--- match: $([[ "$(<"${MARKER}")" == "${EXPECTED}" ]] && echo YES || echo NO) ---"
+          fi
+          if [[ -f "${MARKER}" ]] && [[ -f "${APK_CACHED}" ]] && [[ -f "${TEST_APK_CACHED}" ]] && [[ "$(<"${MARKER}")" == "${EXPECTED}" ]]; then
+            echo "cache-hit=true" >> "${GITHUB_OUTPUT}"
+            echo "Namespace APK cache hit — restoring APKs to build output dirs."
+            mkdir -p "${APK_TARGET}" "${TEST_APK_TARGET}"
+            cp "${APK_CACHED}" "${APK_TARGET}/"
+            cp "${TEST_APK_CACHED}" "${TEST_APK_TARGET}/"
+          else
+            echo "cache-hit=false" >> "${GITHUB_OUTPUT}"
+            echo "Namespace APK cache miss — full build required."
+          fi
+
       - name: Find reusable build from prior run
         id: find-reusable-build
         if: ${{ inputs.runner_provider != 'namespace' && steps.force-builds.outputs.force != 'true' && inputs.source-fingerprint != '' }}
@@ -167,7 +227,10 @@ jobs:
       - name: Compute native-build gate
         id: gate
         run: |
-          if [[ "${{ steps.find-reusable-build.outputs.found }}" == "true" \
+          if [[ "${{ steps.namespace-apk-cache.outputs.cache-hit }}" == "true" ]]; then
+            echo "needs-native-build=false" >> "$GITHUB_OUTPUT"
+            echo "Namespace APK cache hit; heavy Android setup + Gradle restore will be skipped."
+          elif [[ "${{ steps.find-reusable-build.outputs.found }}" == "true" \
              && "${{ steps.download-reusable-apk.outcome }}" == "success" \
              && "${{ steps.download-reusable-test-apk.outcome }}" == "success" ]]; then
             echo "needs-native-build=false" >> "$GITHUB_OUTPUT"
@@ -266,6 +329,14 @@ jobs:
           # sibling "Restore Gradle dependencies from branch cache" step above.
           key: gradle-main-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
+      - name: Configure Namespace Gradle remote cache
+        id: namespace-gradle-cache
+        if: ${{ inputs.runner_provider == 'namespace' && steps.gate.outputs.needs-native-build == 'true' }}
+        run: |
+          nsc cache gradle setup --init-gradle "$RUNNER_TEMP/namespace-gradle-init.gradle"
+          echo "init-script=$RUNNER_TEMP/namespace-gradle-init.gradle" >> "$GITHUB_OUTPUT"
+        shell: bash
+
       - name: Build Android E2E APKs
         if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
         run: |
@@ -283,6 +354,7 @@ jobs:
           IGNORE_BOXLOGS_DEVELOPMENT: true
           GITHUB_CI: 'true'
           CI: 'true'
+          GRADLE_INIT_SCRIPT: ${{ steps.namespace-gradle-cache.outputs.init-script }}
           NODE_OPTIONS: '--max-old-space-size=4096'
           # Limit Metro workers to prevent OOM (each worker uses ~3GB)
           METRO_MAX_WORKERS: '4'
@@ -315,6 +387,27 @@ jobs:
           MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
           MM_PREDICT_GTM_MODAL_ENABLED: 'false'
 
+      - name: Record Namespace E2E APK cache marker
+        if: ${{ inputs.runner_provider == 'namespace' && steps.gate.outputs.needs-native-build == 'true' && inputs.source-fingerprint != '' }}
+        shell: bash
+        env:
+          APK_SOURCE: ${{ steps.determine-target-paths.outputs.apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.apk
+          TEST_APK_SOURCE: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
+          ARTIFACT_NAME: ${{ steps.determine-target-paths.outputs.artifact_name }}
+          FINGERPRINT: ${{ inputs.source-fingerprint }}
+          CACHE_GENERATION: ${{ env.CACHE_GENERATION }}
+          GRADLE_FILES_HASH: ${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          REF_NAME: ${{ github.ref_name }}
+          BUILD_TYPE: ${{ inputs.build_type }}
+        run: |
+          CACHE_DIR="${GRADLE_USER_HOME}/apk-cache"
+          mkdir -p "${CACHE_DIR}"
+          cp "${APK_SOURCE}" "${CACHE_DIR}/${ARTIFACT_NAME}.apk"
+          cp "${TEST_APK_SOURCE}" "${CACHE_DIR}/${ARTIFACT_NAME}-androidTest.apk"
+          EXPECTED="${REF_NAME}"$'\n'"${BUILD_TYPE}"$'\n'"${CACHE_GENERATION}"$'\n'"${FINGERPRINT}"$'\n'"${GRADLE_FILES_HASH}"
+          printf '%s\n' "${EXPECTED}" > "${CACHE_DIR}/.e2e-apk-cache-marker"
+          echo "Namespace APK cache marker + APKs written to ${CACHE_DIR}."
+
       - name: Repack APK with JS updates using @expo/repack-app
         if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
         run: |

.github/workflows/build-ios-e2e.yml

@@ -78,6 +78,18 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v6
 
+      - name: Configure Namespace cache
+        if: ${{ inputs.runner_provider == 'namespace' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          cache: |
+            cocoapods
+            xcode
+          path: |
+            ~/.cache/yarn
+            .metamask
+            .yarn/cache
+
       - name: Check force-builds override
         id: force-builds
         uses: ./.github/actions/check-force-builds
@@ -145,7 +157,7 @@ jobs:
 
       - name: Restore Xcode derived data from branch cache
         id: xcode-restore-cache
-        if: ${{ steps.gate.outputs.needs-native-build == 'true' && inputs.runner_provider != 'namespace' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' }}
         # This action automatically updates the cache at the end of the workflow
         uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
         with:
@@ -155,9 +167,8 @@ jobs:
           key: ${{ runner.os }}-xcode-${{ github.ref_name }}-${{ env.XCODE_CACHE_VERSION }}-${{ hashFiles('ios/**/*.{h,m,mm,swift}', 'ios/**/Podfile.lock', 'yarn.lock') }}
 
       - name: Restore Xcode derived data from main cache
-        if: ${{ steps.gate.outputs.needs-native-build == 'true' && steps.xcode-restore-cache.outputs.cache-hit != 'true' && github.ref_name != 'main' && inputs.runner_provider != 'namespace' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' && steps.xcode-restore-cache.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
         id: xcode-restore-cache-main
-        # This will only restore the cache, not update it
         uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
         with:
           path: |
@@ -205,7 +216,7 @@ jobs:
         run: find ios -name "*.plist" -exec xattr -c {} \;
 
       - name: Restore .metamask folder
-        if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' }}
         id: restore-metamask
         uses: actions/cache@v4
         with:
@@ -258,7 +269,7 @@ jobs:
           YARN_ENABLE_GLOBAL_CACHE: 'true'
 
       - name: Restore .metamask folder (reuse-hit path)
-        if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+        if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build != 'true' }}
         id: restore-metamask-lean
         uses: actions/cache@v4
         with:

.github/workflows/ci.yml

@@ -96,10 +96,14 @@ jobs:
     outputs:
       fingerprint: ${{ steps.publish.outputs.fingerprint }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-      - uses: actions/setup-node@v4
+      # Use the default ref (refs/pull/N/merge on pull_request, github.sha otherwise) so the
+      # fingerprint is computed against the SAME working tree that `build-android-e2e.yml`,
+      # `build-ios-e2e.yml`, and `run-e2e-workflow.yml` check out and build/test against.
+      # Posting on `pull_request.head.sha` while fingerprinting the PR head tree would let
+      # two PRs with identical heads but different merges collide on the cache key — and the
+      # native build then runs against a different (merge) tree than the one we fingerprinted.
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
           cache: yarn
@@ -115,8 +119,11 @@ jobs:
         uses: ./.github/actions/post-build-source-hash
         with:
           github-token: ${{ github.token }}
-          # .head.sha = PR head (pull_request events); github.sha fallback = pushed/scheduled commit
-          # (push to main, merge_group, schedule) where no PR payload exists.
+          # Commit statuses must be posted on a real commit SHA (not the merge ref).
+          # `find-reusable-build` looks up the status via `run.head_sha` from
+          # `listWorkflowRuns`, which GitHub reports as the PR head SHA for pull_request
+          # events and as the pushed/scheduled commit SHA otherwise — so this is the same
+          # SHA the lookup queries against.
           target-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
   dedupe:
@@ -564,7 +571,8 @@ jobs:
         run: mkdir -p tests/results
       # The "10" in this command is the total number of shards. It must be kept
       # in sync with the length of matrix.shard
-      - run: yarn test:unit --shard=${{ matrix.shard }}/10 --forceExit --silent --coverageReporters=json --json --outputFile=tests/results/unit-test-results-${{ matrix.shard }}.json
+      # Namespace Linux: cap Jest workers to reduce cgroup OOM SIGKILL without tuning heap.
+      - run: yarn test:unit --shard=${{ matrix.shard }}/10${{ inputs.runner_provider == 'namespace' && ' --maxWorkers=50%' || '' }} --forceExit --silent --coverageReporters=json --json --outputFile=tests/results/unit-test-results-${{ matrix.shard }}.json
         env:
           NODE_OPTIONS: ${{ inputs.runner_provider == 'namespace' && '--max_old_space_size=12288' || '--max_old_space_size=20480' }}
       - name: Rename coverage report and extract test count for this shard

.github/workflows/release-branch-sync.yml

@@ -23,11 +23,11 @@ jobs:
         env:
           BRANCH: ${{ github.event.pull_request.head.ref }}
         run: |
-          if [[ "$BRANCH" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "Branch '$BRANCH' matches release/X.Y.Z format"
+          if [[ "$BRANCH" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            echo "Branch '$BRANCH' starts with release/X.Y.Z"
             echo "is-valid=true" >> "$GITHUB_OUTPUT"
           else
-            echo "Branch '$BRANCH' does not match release/X.Y.Z format. Skipping."
+            echo "Branch '$BRANCH' does not start with release/X.Y.Z. Skipping."
             echo "is-valid=false" >> "$GITHUB_OUTPUT"
           fi
 
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Sync release branches with stable
-        uses: metamask/github-tools/.github/actions/release-branch-sync@v1.2.0
+        uses: metamask/github-tools/.github/actions/release-branch-sync@v1
         with:
           merged-release-branch: ${{ github.event.pull_request.head.ref }}
           github-token: ${{ secrets.STABLE_SYNC_TOKEN }}

.github/workflows/run-e2e-workflow.yml

@@ -103,7 +103,36 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Configure Namespace cache (Android)
+        if: ${{ inputs.runner_provider == 'namespace' && inputs.platform == 'android' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          cache: |
+            gradle
+            maven
+          path: |
+            ~/.cache/yarn
+            .metamask
+            node_modules
+            .yarn/cache
+            /home/runner/_work/.gradle/caches
+            /home/runner/_work/.gradle/wrapper
+            /home/runner/_work/.gradle/apk-cache
+
+      - name: Configure Namespace cache (iOS)
+        if: ${{ inputs.runner_provider == 'namespace' && inputs.platform == 'ios' }}
+        uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
+        with:
+          cache: |
+            cocoapods
+          path: |
+            ~/.cache/yarn
+            .metamask
+            .yarn/cache
+            ~/Library/Detox
+
       - name: Restore .metamask folder
+        if: ${{ inputs.runner_provider != 'namespace' }}
         uses: actions/cache@v4
         with:
           path: .metamask