Merge branch 'main' into test/temp-nightly

Author: tommasini

.agents/skills/component-view-test/SKILL.md

@@ -56,6 +56,7 @@ tests/component-view/
 ├── mocks.ts              ← Engine + native mocks (import this first, always)
 ├── render.tsx            ← renderComponentViewScreen, renderScreenWithRoutes
 ├── stateFixture.ts       ← StateFixtureBuilder (createStateFixture)
+├── api-mocking/          ← HTTP API mocks (nock) — extensible, one file per feature
 ├── presets/              ← initialState<Feature>() builders — one file per feature area
 └── renderers/            ← render<Feature>View() functions — one file per feature area
 ```

.agents/skills/component-view-test/references/navigation-mocking.md

@@ -134,102 +134,62 @@ Route names live in `app/constants/navigation/Routes.ts`.
 
 ## External Service / API Mocking
 
-Some views call external services **directly** (not through Engine controllers) — e.g. a `getTrendingTokens()` function imported from a package, or a `fetch()` call to an external API. These cannot be driven through Redux state overrides.
+Some views call **external HTTP APIs** (e.g. `fetch()` to a REST endpoint). Those requests cannot be driven through Redux state. The framework provides an **api-mocking** layer using [nock](https://github.com/nock/nock) so tests intercept HTTP at the network level **without** using `jest.mock` on service modules (which would violate the “only Engine and allowed native mocks” rule).
 
-### Current pattern — jest.mock on the service module
+### Preferred pattern — nock (api-mocking folder)
 
-When a view calls an external service function directly, mock the module in a dedicated file under `tests/component-view/mocks/` and expose setup/clear helpers:
+All HTTP API mocks for component view tests live under `tests/component-view/api-mocking/`. Each feature has one file (e.g. `trending.ts`) that exports:
 
-```typescript
-// tests/component-view/mocks/myFeatureApiMocks.ts
-import { getMyFeatureData } from '@metamask/some-package';
-
-export const getMyFeatureDataMock = getMyFeatureData as jest.Mock;
+- Mock response data (e.g. `mockTrendingTokensData`)
+- A **setup** function (e.g. `setupTrendingApiFetchMock(responseData?, customReply?)`) that uses nock to intercept the endpoint
+- A **clear** function (e.g. `clearTrendingApiMocks()`) to call in `afterEach`
 
-export const mockFeatureData = [
-  { id: 'item-1', name: 'Token A', price: '100.00', change24h: 5.2 },
-  { id: 'item-2', name: 'Token B', price: '200.00', change24h: -1.8 },
-];
+Shared nock lifecycle helpers (`clearAllNockMocks`, `disableNetConnect`, `teardownNock`) are in `api-mocking/nockHelpers.ts`. To **add a new API mock** for another view, add a file `api-mocking/<feature>.ts` following the pattern in `api-mocking/trending.ts` (mock data, `setupXxxApiMock`, `clearXxxApiMocks` using `nockHelpers`), and call setup/clear in the view test’s `beforeEach`/`afterEach`.
 
-export const setupMyFeatureApiMock = (data = mockFeatureData) => {
-  getMyFeatureDataMock.mockImplementation(async () => data);
-};
-
-export const clearMyFeatureApiMocks = () => {
-  jest.clearAllMocks();
-};
-```
-
-In the test file, declare the `jest.mock` at module scope and use `beforeEach`/`afterEach` for lifecycle:
+**Example (trending):**
 
 ```typescript
-// NOTE: antipattern — only Engine and native modules should be mocked in view tests.
-// This is a temporary workaround for service functions called directly from components,
-// not through Engine. Track removal in the linked issue.
-// eslint-disable-next-line no-restricted-syntax
-jest.mock('@metamask/some-package', () => {
-  const actual = jest.requireActual('@metamask/some-package');
-  return { ...actual, getMyFeatureData: jest.fn().mockResolvedValue([]) };
-});
-
 import {
-  setupMyFeatureApiMock,
-  clearMyFeatureApiMocks,
-  mockFeatureData,
-  getMyFeatureDataMock,
-} from '../../../../tests/component-view/mocks/myFeatureApiMocks';
-
-describe('MyFeatureView', () => {
-  beforeEach(() => {
-    setupMyFeatureApiMock(mockFeatureData);
-  });
-
-  afterEach(() => {
-    clearMyFeatureApiMocks();
-  });
-
-  it('shows token list after data loads from the external service', async () => {
-    const { findByText } = renderMyFeatureWithRoutes();
+  setupTrendingApiFetchMock,
+  clearTrendingApiMocks,
+  mockTrendingTokensData,
+  mockBnbChainToken,
+} from '../../../../tests/component-view/api-mocking/trending';
+
+beforeEach(() => {
+  setupTrendingApiFetchMock(mockTrendingTokensData);
+});
+afterEach(() => {
+  clearTrendingApiMocks();
+});
 
-    expect(await findByText('Token A')).toBeOnTheScreen();
+it('user sees trending tokens section with mocked data', async () => {
+  const { findByText, queryByTestId } = renderTrendingViewWithRoutes();
+  await waitFor(async () => {
+    expect(await findByText('Ethereum')).toBeOnTheScreen();
   });
+  // assert rows with assertTrendingTokenRowsVisibility(...)
+});
 
-  it('shows only filtered results when a specific param is passed', async () => {
-    getMyFeatureDataMock.mockImplementation(async (params) => {
-      if (params?.chainId === 'eip155:56') return [mockBnbData];
-      return mockFeatureData;
-    });
-
-    const { findByText } = renderMyFeatureWithRoutes();
-    // ... interact to trigger the filter, then assert
+it('displays only BNB tokens when BNB Chain network filter is selected', async () => {
+  setupTrendingApiFetchMock(mockTrendingTokensData, (uri) => {
+    const url = new URL(uri, 'https://token.api.cx.metamask.io');
+    const chainIdsParam = url.searchParams.get('chainIds') ?? '';
+    const chainIds = chainIdsParam.split(',').map((s) => s.trim());
+    if (chainIds.length === 1 && chainIds[0] === 'eip155:56') {
+      return mockBnbChainToken;
+    }
+    return mockTrendingTokensData;
   });
+  const { getByTestId, findByText, queryByTestId } =
+    renderTrendingViewWithRoutes();
+  // ... navigate to full view, open network filter, select BNB Chain
+  // assert visible: [BNB], missing: [ETH, BTC, UNI]
 });
 ```
 
-> ⚠️ **This is a known antipattern.** The golden rule is that only Engine and allowed native modules should be mocked in `*.view.test.*` files. Mocking a service module directly bypasses the ESLint guard (note the `eslint-disable` comment). Always link to a tracking issue and plan to migrate to a proper solution.
-
-### Future pattern — Mock Service Worker (MSW)
-
-> 📌 **Placeholder — no example exists yet in this codebase.**
+### Fallback — jest.mock on the service module (antipattern)
 
-For views that call HTTP endpoints directly (via `fetch`), the intended approach is [Mock Service Worker (msw)](https://mswjs.io/), which intercepts requests at the network level without needing `jest.mock`. This keeps tests closer to real behavior and avoids the module-mock antipattern.
+When a view calls an external **function** (not `fetch`) from a package and that function cannot be replaced by nock (e.g. no HTTP), you may mock the module in a file under `tests/component-view/mocks/` and use setup/clear helpers. This requires an `eslint-disable` and is a **known antipattern**; prefer moving the integration to an HTTP API and using api-mocking, or drive data through Engine/Redux when possible.
 
-When the first MSW-based view test is written, document the setup here:
-
-```typescript
-// TODO: Add MSW setup example once the first test using it is merged.
-// Expected shape:
-//
-// import { setupServer } from 'msw/node';
-// import { http, HttpResponse } from 'msw';
-//
-// const server = setupServer(
-//   http.get('https://api.example.com/tokens', () =>
-//     HttpResponse.json(mockTokensData),
-//   ),
-// );
-//
-// beforeAll(() => server.listen());
-// afterEach(() => server.resetHandlers());
-// afterAll(() => server.close());
-```
+> ⚠️ Only Engine and allowed native modules should be mocked in `*.view.test.*` files. Mocking a service module directly bypasses the ESLint guard. Always link to a tracking issue and plan to migrate to nock (api-mocking) or Engine/Redux.

.agents/skills/component-view-test/references/reference.md

@@ -203,6 +203,7 @@ yarn eslint <path/to/test.tsx>
 | Engine + native mocks          | `tests/component-view/mocks.ts`                                |
 | render, renderScreenWithRoutes | `tests/component-view/render.tsx`                              |
 | StateFixtureBuilder            | `tests/component-view/stateFixture.ts`                         |
+| HTTP API mocks (nock)          | `tests/component-view/api-mocking/` (per-feature)              |
 | Feature renderers (per view)   | `tests/component-view/renderers/` (e.g. bridge, wallet)        |
 | Feature presets (per view)     | `tests/component-view/presets/` (e.g. bridge, wallet)          |
 | DeepPartial type               | `app/util/test/renderWithProvider`                             |

.agents/skills/component-view-test/references/writing-tests.md

@@ -12,6 +12,7 @@ Before writing any test, read:
 - Any existing `*.view.test.tsx` for the same component
 - The relevant preset(s) in `tests/component-view/presets/`
 - The relevant renderer(s) in `tests/component-view/renderers/`
+- If the view calls an external HTTP API: `tests/component-view/api-mocking/` and any existing `api-mocking/<feature>.ts` for that API (see navigation-mocking.md, External Service / API Mocking)
 
 ---
 

.github/workflows/build.yml

@@ -13,6 +13,11 @@ on:
         required: false
         type: boolean
         default: false
+      ref:
+        description: 'Git ref to checkout when skip_version_bump is true. Defaults to the triggering event ref.'
+        required: false
+        type: string
+        default: ''
   workflow_dispatch:
     inputs:
       build_name:
@@ -99,6 +104,7 @@ jobs:
   setup-dependencies:
     name: Setup Dependencies (${{ matrix.platform }})
     needs: [prepare]
+    if: ${{ always() && !failure() && !cancelled() }}
     strategy:
       matrix:
         platform: ${{ inputs.platform == 'both' && fromJSON('["android", "ios"]') || fromJSON(format('["{0}"]', inputs.platform)) }}
@@ -140,7 +146,13 @@ jobs:
           submodules: recursive
 
       - uses: actions/checkout@v4
-        if: ${{ inputs.skip_version_bump }}
+        if: ${{ inputs.skip_version_bump && inputs.ref != '' }}
+        with:
+          ref: ${{ inputs.ref }}
+          submodules: recursive
+
+      - uses: actions/checkout@v4
+        if: ${{ inputs.skip_version_bump && inputs.ref == '' }}
         with:
           submodules: recursive
 

.github/workflows/nightly-build.yml

@@ -2,41 +2,170 @@ name: Nightly Build
 
 # Triggered by every push to chore/temp-nightly (which nightly-temp-branch-sync.yml
 # force-pushes daily at 4 AM UTC to match main).
+# Temporarily now this is pointing to test/temp-nightly instead of chore/temp-nightly.
 #
-# [skip ci] commits (e.g. version bumps pushed by Bitrise's bump_version_code job via
-# update-latest-build-version.yml) are automatically skipped by GitHub Actions, so
-# this workflow will NOT double-trigger on those commits.
-#
-# skip_version_bump=true is passed to build.yml because Bitrise already owns the
-# version bump for chore/temp-nightly during the parallel transition period.
-# When Bitrise is deprecated, remove skip_version_bump: true and the version bump
-# will be handled by build.yml as normal.
+# [skip ci] commits (e.g. version bumps pushed via update-latest-build-version.yml)
+# are automatically skipped by GitHub Actions, so this workflow will NOT
+# double-trigger on those commits.
 
 on:
   push:
     branches:
-      - chore/temp-nightly
+      - test/temp-nightly
   workflow_dispatch:
 
+# contents: write required by build.yml update-build-version job (version bump commit push)
 permissions:
-  contents: read
+  contents: write
   id-token: write
 
 jobs:
+  bump-version:
+    name: Bump build version
+    uses: ./.github/workflows/update-latest-build-version.yml
+    permissions:
+      contents: write
+      id-token: write
+    with:
+      base-branch: ${{ github.ref_name }}
+    secrets: inherit
+
   build-exp:
     name: Nightly exp build (main-exp)
+    needs: [bump-version]
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-exp
       platform: both
       skip_version_bump: true
+      ref: ${{ needs.bump-version.outputs.commit-hash }}
     secrets: inherit
 
   build-rc:
     name: Nightly RC build (main-rc)
+    needs: [bump-version]
     uses: ./.github/workflows/build.yml
     with:
       build_name: main-rc
       platform: both
       skip_version_bump: true
+      ref: ${{ needs.bump-version.outputs.commit-hash }}
     secrets: inherit
+
+  upload-exp-testflight:
+    name: Upload exp to TestFlight
+    needs: [build-exp]
+    runs-on: ghcr.io/cirruslabs/macos-runner:sequoia-xl
+    environment: apple
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Ruby (iOS)
+        uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb #v1
+        with:
+          ruby-version: '3.2.9'
+          working-directory: ios
+          bundler-cache: true
+
+      - name: Download iOS build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-main-exp
+
+      - name: Find IPA path
+        id: ipa
+        run: |
+          IPA=$(find . -name '*.ipa' -type f | head -1)
+          if [ -z "$IPA" ]; then
+            echo "::error::No .ipa file found in artifact"
+            exit 1
+          fi
+          case "$IPA" in /*) ABS="$IPA" ;; *) ABS="$PWD/$IPA" ;; esac
+          echo "path=$ABS" >> "$GITHUB_OUTPUT"
+
+      - name: Setup App Store Connect API Key
+        run: |
+          bash scripts/setup-app-store-connect-api-key.sh \
+            "$APP_STORE_CONNECT_API_KEY_ISSUER_ID" \
+            "$APP_STORE_CONNECT_API_KEY_KEY_ID" \
+            "$APP_STORE_CONNECT_API_KEY_KEY_CONTENT"
+        env:
+          APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
+          APP_STORE_CONNECT_API_KEY_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_CONTENT }}
+
+      - name: Upload to TestFlight
+        run: |
+          bash scripts/upload-to-testflight.sh \
+            "github_actions_main-exp" \
+            "${{ github.ref_name }}" \
+            "${{ steps.ipa.outputs.path }}" \
+            "MetaMask BETA & Release Candidates"
+
+      - name: Cleanup API Key
+        if: always()
+        run: |
+          rm -f ios/AuthKey.p8
+          echo "🧹 Cleaned up API key file"
+
+  upload-rc-testflight:
+    name: Upload RC to TestFlight
+    needs: [build-rc]
+    runs-on: ghcr.io/cirruslabs/macos-runner:sequoia-xl
+    environment: apple
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Ruby (iOS)
+        uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb #v1
+        with:
+          ruby-version: '3.2.9'
+          working-directory: ios
+          bundler-cache: true
+
+      - name: Download iOS build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ios-main-rc
+
+      - name: Find IPA path
+        id: ipa
+        run: |
+          IPA=$(find . -name '*.ipa' -type f | head -1)
+          if [ -z "$IPA" ]; then
+            echo "::error::No .ipa file found in artifact"
+            exit 1
+          fi
+          case "$IPA" in /*) ABS="$IPA" ;; *) ABS="$PWD/$IPA" ;; esac
+          echo "path=$ABS" >> "$GITHUB_OUTPUT"
+
+      - name: Setup App Store Connect API Key
+        run: |
+          bash scripts/setup-app-store-connect-api-key.sh \
+            "$APP_STORE_CONNECT_API_KEY_ISSUER_ID" \
+            "$APP_STORE_CONNECT_API_KEY_KEY_ID" \
+            "$APP_STORE_CONNECT_API_KEY_KEY_CONTENT"
+        env:
+          APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+          APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }}
+          APP_STORE_CONNECT_API_KEY_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_CONTENT }}
+
+      - name: Upload to TestFlight
+        run: |
+          bash scripts/upload-to-testflight.sh \
+            "github_actions_main-rc" \
+            "${{ github.ref_name }}" \
+            "${{ steps.ipa.outputs.path }}" \
+            "MetaMask BETA & Release Candidates"
+
+      - name: Cleanup API Key
+        if: always()
+        run: |
+          rm -f ios/AuthKey.p8
+          echo "🧹 Cleaned up API key file"

.github/workflows/push-eas-update.yml

@@ -277,7 +277,9 @@ jobs:
       EXPO_PROJECT_ID: ${{ secrets.EXPO_PROJECT_ID }}
       EXPO_CHANNEL: ${{ vars.EXPO_CHANNEL }}
       GIT_BRANCH: ${{ github.ref_name }}
-      RAMP_INTERNAL_BUILD: 'false'
+      RAMP_DEV_BUILD: ${{ secrets.RAMP_DEV_BUILD || 'false' }}
+      RAMP_INTERNAL_BUILD: ${{ secrets.RAMP_INTERNAL_BUILD || 'false' }}
+      RAMPS_ENVIRONMENT: ${{ secrets.RAMPS_ENVIRONMENT || 'production' }}
       MM_MUSD_CONVERSION_FLOW_ENABLED: 'false'
       MM_NETWORK_UI_REDESIGN_ENABLED: 'false'
       MM_NOTIFICATIONS_UI_ENABLED: 'true'