merge main

Author: tommasini

.agents/skills/e2e-test/SKILL.md

@@ -3,7 +3,8 @@ name: e2e-test
 description:
   Add and fix Detox E2E tests (smoke and regression) for MetaMask Mobile using
   withFixtures, Page Objects, and tests/framework. Use when creating a new spec,
-  fixing a failing E2E test, or adding page objects and selectors.
+  fixing a failing E2E test, adding page objects and selectors, or adding
+  MetaMetrics analytics expectations (analyticsExpectations).
 ---
 
 # E2E Test Builder — Skill
@@ -44,6 +45,10 @@ Task → What do you need?
 │  → Open references/mocking.md (testSpecificMock, setupRemoteFeatureFlagsMock, setupMockRequest)
 │  → When writing the spec: open references/writing-tests.md
 │
+├─ MetaMetrics / Segment analytics assertions (`analyticsExpectations` on `withFixtures`)
+│  → Open [tests/docs/analytics-e2e.md](../../../tests/docs/analytics-e2e.md) (config shape, teardown order, presets under `tests/helpers/analytics/expectations/`, `runAnalyticsExpectations`)
+│  → When wiring a spec: still follow references/writing-tests.md for `withFixtures` usage
+│
 └─ Run tests, debug failures, or self-review
    → Open references/running-tests.md (build check, detox commands, common failures, retry patterns)
 ```
@@ -84,9 +89,10 @@ Step 5 → Iterate (fix → lint → run) until green
 
 Documentation is split by **action**. Open only the reference that matches what you are doing.
 
-| Action                                        | File                                                       | When to open it                                                                                   |
-| --------------------------------------------- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| **Writing or updating a spec**                | [references/writing-tests.md](references/writing-tests.md) | New spec file, spec structure, FixtureBuilder patterns, smoke/regression templates.               |
-| **Page Objects and selectors**                | [references/page-objects.md](references/page-objects.md)   | Create or update POM classes, selector/testId conventions, Matchers/Gestures/Assertions API.      |
-| **API and feature flag mocking**              | [references/mocking.md](references/mocking.md)             | testSpecificMock, setupRemoteFeatureFlagsMock, setupMockRequest, shared mock files.               |
-| **Running tests, debugging, fixing failures** | [references/running-tests.md](references/running-tests.md) | Build check, detox run commands, lint/tsc, common failures table, retry patterns, iteration loop. |
+| Action                                        | File                                                                | When to open it                                                                                                    |
+| --------------------------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| **Writing or updating a spec**                | [references/writing-tests.md](references/writing-tests.md)          | New spec file, spec structure, FixtureBuilder patterns, smoke/regression templates.                                |
+| **Page Objects and selectors**                | [references/page-objects.md](references/page-objects.md)            | Create or update POM classes, selector/testId conventions, Matchers/Gestures/Assertions API.                       |
+| **API and feature flag mocking**              | [references/mocking.md](references/mocking.md)                      | testSpecificMock, setupRemoteFeatureFlagsMock, setupMockRequest, shared mock files.                                |
+| **MetaMetrics / analytics expectations**      | [tests/docs/analytics-e2e.md](../../../tests/docs/analytics-e2e.md) | `analyticsExpectations` on `withFixtures`, declarative checks, presets in `tests/helpers/analytics/expectations/`. |
+| **Running tests, debugging, fixing failures** | [references/running-tests.md](references/running-tests.md)          | Build check, detox run commands, lint/tsc, common failures table, retry patterns, iteration loop.                  |

.github/CODEOWNERS

@@ -168,6 +168,8 @@ app/components/UI/Perps/             @MetaMask/perps
 app/components/UI/WalletAction/*perps* @MetaMask/perps
 app/core/Engine/controllers/perps-controller @MetaMask/perps
 app/core/Engine/messengers/perps-controller-messenger @MetaMask/perps
+app/core/Engine/controllers/compliance/ @MetaMask/perps
+app/core/Engine/messengers/compliance/ @MetaMask/perps
 app/core/DeeplinkManager/Handlers/handlePerpsUrl.ts         @MetaMask/perps
 app/core/AgenticService/             @MetaMask/perps
 **/Perps/**                          @MetaMask/perps

.github/actions/smart-e2e-selection/action.yml

@@ -30,9 +30,13 @@ inputs:
     required: false
     default: 'false'
   base-ref:
-    description: 'Base branch ref (must be main for analysis to run)'
+    description: 'Base branch ref (must be main or release/* for analysis to run)'
     required: false
     default: ''
+  is-draft:
+    description: 'Whether the PR is a draft'
+    required: false
+    default: 'false'
 
 outputs:
   ai_e2e_test_tags:
@@ -80,14 +84,14 @@ runs:
         git sparse-checkout disable
         git checkout HEAD -- .
 
-    - name: Fetch main branch for comparison
+    - name: Fetch base branch for comparison
       if: steps.check-skip-label.outputs.SKIP != 'true'
       shell: bash
       run: |
         # Unshallow the repository first (if it's shallow)
         git fetch --unshallow 2>/dev/null || true
-        # Fetch main branch for diff comparison
-        git fetch origin main 2>/dev/null || true
+        # Fetch the base branch for diff comparison (main or release/*)
+        git fetch origin "${{ inputs.base-ref || 'main' }}" 2>/dev/null || true
 
     - name: Setup Node.js
       if: steps.check-skip-label.outputs.SKIP != 'true'
@@ -131,6 +135,7 @@ runs:
         GITHUB_REPOSITORY: ${{ inputs.repository }}
         GITHUB_RUN_ID: ${{ github.run_id }}
         BASE_REF: ${{ inputs.base-ref }}
+        IS_DRAFT: ${{ inputs.is-draft }}
       run: |
         echo "ai_e2e_test_tags=[\"ALL\"]" >> "$GITHUB_OUTPUT"
         echo "ai_confidence=0" >> "$GITHUB_OUTPUT"
@@ -142,14 +147,17 @@ runs:
         if [[ "$EVENT_NAME" != "pull_request" ]]; then
           SHOULD_SKIP=true
           SKIP_REASON="only runs on PRs"
-        elif [[ "$BASE_REF" != "main" ]]; then
-          SHOULD_SKIP=true
-          SKIP_REASON="base branch is not main (base: $BASE_REF)"
         elif [[ -n "${{ steps.check-skip-label.outputs.SKIP }}" ]] && [[ "${{ steps.check-skip-label.outputs.SKIP }}" == "true" ]]; then
           SHOULD_SKIP=true
           SKIP_REASON="skip-smart-e2e-selection label found"
           FORCE_RUN=true
           echo "ai_confidence=100" >> "$GITHUB_OUTPUT"
+        elif [[ "$IS_DRAFT" == "true" ]]; then
+          SHOULD_SKIP=true
+          SKIP_REASON="draft PR"
+        elif [[ "$BASE_REF" != "main" && "$BASE_REF" != release/* ]]; then
+          SHOULD_SKIP=true
+          SKIP_REASON="base branch is not main or a release branch (base: $BASE_REF)"
         fi
 
         # Export skip status, reason, and force run flag for downstream jobs
@@ -245,7 +253,7 @@ runs:
         fi
 
     - name: Apply risk label to PR
-      if: inputs.pr-number != '' && inputs.github-token != ''
+      if: inputs.pr-number != '' && inputs.github-token != '' && inputs.is-draft != 'true' && (inputs.base-ref == 'main' || startsWith(inputs.base-ref, 'release/'))
       shell: bash
       env:
         GH_TOKEN: ${{ inputs.github-token }}

.github/scripts/e2e-smart-selection.mjs

@@ -11,6 +11,7 @@ const env = {
   PR_NUMBER: process.env.PR_NUMBER || '',
   GITHUB_OUTPUT: process.env.GITHUB_OUTPUT || '',
   GITHUB_STEP_SUMMARY: process.env.GITHUB_STEP_SUMMARY || '',
+  BASE_REF: process.env.BASE_REF || 'main',
 };
 
 const PR_COMMENT_FILE = 'pr_comment.md';
@@ -77,9 +78,11 @@ async function main() {
       return;
     }
 
-    // Build command - always uses origin/main as base (job only runs on PRs targeting main)
-    const baseCmd = `node -r esbuild-register tests/tools/e2e-ai-analyzer --mode select-tags --pr ${env.PR_NUMBER}`;
-    console.log(`🎯 Analyzing PR against origin/main`);
+    // Build command - uses GitHub API (PR number) for changed files list; -b ensures
+    // file diffs are computed against the correct base branch (main or release/*)
+    const baseBranch = `origin/${env.BASE_REF}`;
+    const baseCmd = `node -r esbuild-register tests/tools/e2e-ai-analyzer --mode select-tags --pr ${env.PR_NUMBER} -b ${baseBranch}`;
+    console.log(`🎯 Analyzing PR #${env.PR_NUMBER} against base branch: ${baseBranch}`);
 
     try {
       execSync(baseCmd, {

.github/workflows/ci.yml

@@ -465,6 +465,7 @@ jobs:
           repository: ${{ github.repository }}
           post-comment: 'true'
           base-ref: ${{ github.event.pull_request.base.ref }}
+          is-draft: ${{ github.event.pull_request.draft }}
 
   # Main E2E tests
 

.github/workflows/nightly-build.yml

@@ -197,6 +197,8 @@ jobs:
 
       - name: Upload to TestFlight
         run: |
+          # Group arg is required as positional placeholder for the 5th arg (distribute_external=false).
+          # With distribute_external=false the build is uploaded but NOT distributed to external testers.
           bash scripts/upload-to-testflight.sh \
             "github_actions_main-rc" \
             "${{ github.ref_name }}" \

.yarn/patches/@metamask-assets-controllers-npm-100.2.1-4f7a0c8320.patch

@@ -0,0 +1,82 @@
+/**
+ * Manual mock for @metamask/compliance-controller.
+ *
+ * The npm package is published but dist/ artifacts may not yet be available.
+ * This mock provides the public API surface needed for tests and TypeScript
+ * compilation within the mobile repo.
+ */
+
+export class ComplianceService {
+  readonly name = 'ComplianceService';
+}
+
+export class ComplianceController {
+  readonly name = 'ComplianceController';
+  state: Record<string, unknown>;
+
+  constructor(args: Record<string, unknown>) {
+    this.state = (args.state ?? {}) as Record<string, unknown>;
+  }
+
+  async init(): Promise<void> {
+    // noop
+  }
+
+  async checkWalletCompliance(
+    address: string,
+  ): Promise<{ address: string; blocked: boolean; checkedAt: string }> {
+    return { address, blocked: false, checkedAt: new Date().toISOString() };
+  }
+
+  async checkWalletsCompliance(
+    addresses: string[],
+  ): Promise<{ address: string; blocked: boolean; checkedAt: string }[]> {
+    return addresses.map((a) => ({
+      address: a,
+      blocked: false,
+      checkedAt: new Date().toISOString(),
+    }));
+  }
+
+  async updateBlockedWallets(): Promise<{
+    addresses: string[];
+    sources: { ofac: number; remote: number };
+    lastUpdated: string;
+    fetchedAt: string;
+  }> {
+    return {
+      addresses: [],
+      sources: { ofac: 0, remote: 0 },
+      lastUpdated: new Date().toISOString(),
+      fetchedAt: new Date().toISOString(),
+    };
+  }
+
+  clearComplianceState(): void {
+    // noop
+  }
+}
+
+export function getDefaultComplianceControllerState() {
+  return {
+    walletComplianceStatusMap: {},
+    blockedWallets: null,
+    blockedWalletsLastFetched: 0,
+    lastCheckedAt: null,
+  };
+}
+
+export function selectIsWalletBlocked(address: string) {
+  return (state: {
+    blockedWallets?: { addresses: string[] } | null;
+    walletComplianceStatusMap?: Record<
+      string,
+      { blocked: boolean } | undefined
+    >;
+  }): boolean => {
+    if (state.blockedWallets?.addresses.includes(address)) {
+      return true;
+    }
+    return state.walletComplianceStatusMap?.[address]?.blocked ?? false;
+  };
+}