Merge branch 'main' into predict/clob-v2-cleanup-core

* main: (21 commits)
  feat(predict): Add A/B Test Analytics Instrumentation: Bet Slip + Pay with Any Token (#29464)
  feat: Accounts Metrics (#29015)
  feat: Enable mUSD conversion flow for hardware wallet accounts (#29418)
  chore: QA and bug fixes from dry run apr 29 (#29519)
  test: remove toMatchSnapshot and removed snapshot files in unassigned code owners pt 3/3 (#29441)
  fix(card): initialize spending limit from saved allowance (#29517)
  perf(accessibility): fix iOS accessibility in Ramp components (#29126)
  test: e2e labels rename and shards update (#29431)
  test: fix missing mock (#29549)
  feat(rewards): add targeted Sentry capture for rewards auth errors (#29545)
  feat: track token_security_type_destination in metrics (#29381)
  fix(bridge): hide sponsored label on cross-chain bridge with insufficient balance (#29490)
  ci: fix scheduled e2e runs (#29539)
  chore: Bump `snaps-controllers` (#29486)
  chore: add buy/sell trade markers to trader position chart (#29478)
  fix(rewards): leaderboard split view (#29500)
  perf(accessibility): fix iOS accessibility in shared components for p… (#29119)
  ci: switch OTA hotfix release branch to `-ota` suffix convention (#29353)
  ci: fix `get-requirements.yml` checks for `pull_request` events (#29528)
  feat: added developer options button to clear dismissed mUSD conversion asset details CTAs (#29510)
  ...

Author: matallui

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

@@ -66,7 +66,7 @@ Do not read the full reference files until the decision tree or workflow sends y
 5. **Never use `TestHelpers.delay()`** — use `Assertions.*` which has auto-retry
 6. **Use `FixtureBuilder` for state** — do not set state through UI interactions
 7. **Selectors live in `*.testIds.ts`** (co-located) or `tests/selectors/` (legacy)
-8. **Tag correctly** — Use the tag that matches your feature and test type. Options include `SmokeE2E`, `SmokeTrade`, `SmokePredictions`, `SmokePerps`, `SmokeConfirmations`, `RegressionTrade`, `RegressionWallet`, etc. Check **`tests/tags.js`** for the full list and descriptions, and **existing specs in the same feature folder** to see which tag they use.
+8. **Tag correctly** — Use the tag that matches your feature and test type. Options include `SmokeE2E`, `SmokeSwap`, `SmokeStake`, `SmokeMoney`, `SmokePredictions`, `SmokePerps`, `SmokeConfirmations`, `RegressionTrade`, `RegressionWallet`, etc. Check **`tests/tags.js`** for the full list and descriptions, and **existing specs in the same feature folder** to see which tag they use.
 9. **Descriptive test names** — no 'should' prefix (e.g., `'opens market details'`)
 10. **Fix lint/tsc before running** — never run with known errors
 

.agents/skills/e2e-test/references/writing-tests.md

@@ -2,12 +2,12 @@
 
 ## Spec File Location
 
-| Test Type  | Directory                                   | Tag                                                                                    |
-| ---------- | ------------------------------------------- | -------------------------------------------------------------------------------------- |
-| Smoke      | `tests/smoke/<feature>/<name>.spec.ts`      | `SmokeE2E`, `SmokeTrade`, `SmokePredictions`, `SmokePerps`, `SmokeConfirmations`, etc. |
-| Regression | `tests/regression/<feature>/<name>.spec.ts` | `RegressionTrade`, `RegressionWallet`, etc.                                            |
+| Test Type  | Directory                                   | Tag                                                                                                               |
+| ---------- | ------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- |
+| Smoke      | `tests/smoke/<feature>/<name>.spec.ts`      | `SmokeE2E`, `SmokeSwap`, `SmokeStake`, `SmokeMoney`, `SmokePredictions`, `SmokePerps`, `SmokeConfirmations`, etc. |
+| Regression | `tests/regression/<feature>/<name>.spec.ts` | `RegressionTrade`, `RegressionWallet`, etc.                                                                       |
 
-Import tags from `tests/tags.ts`. Check **`tests/tags.js`** for the full list and descriptions. Use the same tag as **existing specs in that feature folder** (e.g. `tests/smoke/predict/` uses `SmokeTrade`).
+Import tags from `tests/tags.ts`. Check **`tests/tags.js`** for the full list and descriptions. Use the same tag as **existing specs in that feature folder** (e.g. `tests/smoke/swap/` uses `SmokeSwap`, `tests/smoke/stake/` uses `SmokeStake`, `tests/smoke/card/` and `tests/smoke/ramps/` use `SmokeMoney`).
 
 ## Minimal Smoke Spec
 

.github/guidelines/E2E_DECISION_TREE.md

@@ -11,7 +11,7 @@ flowchart TD
     GR -->|PR label: pr-not-ready-for-e2e| L2[No E2E]
     L2 -->|ignorable-only changes| NoBlock[No merge block]
     L2 -->|non-ignorable changes| Skip2[Merge blocked]
-    GR -->|PR ignorable-only changes| Ignorable[No E2E - merge not blocked]
+    GR -->|PR ignorable-only changes| Ignorable[No E2E]
     GR -->|PR has Android-only changes| Android[Android Build + Tests needed]
     GR -->|PR has iOS-only changes| iOS[iOS Build + Test needed]
     GR -->|PR other files changed| Both[Both Build + Tests needed]

.github/scripts/bump-ota-version-constants.sh

@@ -2,8 +2,10 @@
 # Updates OTA_VERSION in app/constants/ota.ts.
 #
 # With a semver second argument (OTA hotfix release workflow): sets OTA_VERSION to v<semver>
-# exactly as provided (e.g. 7.73.01 -> v7.73.01, 7.73.21 -> v7.73.21). No normalization is applied.
-# Two-digit patch AB means OTA hotfix: base patch A, iteration B.
+# exactly as provided (e.g. 7.75.2 -> v7.75.2). No normalization is applied.
+# The OTA hotfix branch is release/X.Y.Z-ota; the bare X.Y.Z is passed here. Runway always
+# increments the patch past any existing native tag on the same X.Y line, so v<X.Y.Z> is
+# unique (no collision with a native release tag).
 #
 # Without semver (local / legacy): increments in place — vX.XX.X -> v0, vN -> v(N+1), vA.B.C -> vA.B.(C+1)
 set -euo pipefail
@@ -30,8 +32,9 @@ fi
 
 new=""
 if [[ -n "$SEMVER" ]]; then
-  if ! [[ "$SEMVER" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Error: semver must be numeric X.Y.Z, got: ${SEMVER}" >&2
+  # Strict SemVer core: no leading zeros on numeric identifiers.
+  if ! [[ "$SEMVER" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+    echo "Error: semver must be strict SemVer X.Y.Z (no leading zeros), got: ${SEMVER}" >&2
     exit 1
   fi
   new="v${SEMVER}"

.github/scripts/e2e-report-fixture-validation.mjs

@@ -39,9 +39,6 @@ function buildComment(results) {
   }
 
   if (!results) {
-    if (VALIDATION_RESULT === 'success') {
-      return `✅ ${COMMENT_MARKER} — Passed**\n[View details](${RUN_URL})`;
-    }
     return null;
   }
 
@@ -66,11 +63,7 @@ function buildComment(results) {
     ].join('\n');
   }
 
-  if (valueMismatches > 0) {
-    return `✅ ${COMMENT_MARKER} — Schema is up to date**\n${valueMismatches} value mismatches detected (expected — fixture represents an existing user).\n[View details](${RUN_URL})`;
-  }
-
-  return `✅ ${COMMENT_MARKER} — No differences found**\nFixture is up to date. [View details](${RUN_URL})`;
+  return null;
 }
 
 function emitAnnotation(results) {
@@ -148,11 +141,16 @@ async function main() {
 
   // Post PR comment if this is a PR
   if (PR_NUMBER) {
+    // Always clean up any prior fixture-validation comments so passing runs
+    // remove stale "structural changes" comments from previous failures.
+    await deletePreviousComments();
+
     const comment = buildComment(results);
     if (comment) {
-      await deletePreviousComments();
       await postComment(comment);
       console.log(`Posted fixture validation comment on PR #${PR_NUMBER}`);
+    } else {
+      console.log(`No actionable fixture validation findings for PR #${PR_NUMBER} — skipping comment.`);
     }
   }
 }

.github/scripts/extract-semver.sh

@@ -2,21 +2,42 @@
 
 set -euo pipefail
 
+# Extracts semver from a release branch name and flags whether it's an OTA hotfix.
+#
+# Supported branch shapes:
+#   release/X.Y.Z       → semver=X.Y.Z, is_ota=false
+#   release/X.Y.Z-ota   → semver=X.Y.Z, is_ota=true
+#
+# The `-ota` suffix is the signal for an OTA hotfix. Runway always increments the
+# patch past any native tag on the same X.Y line, so the stripped semver is still
+# unique (e.g. native v7.75.1 → OTA branch release/7.75.2-ota; git tag v7.75.2 is
+# fresh). OTA_VERSION in app/constants/ota.ts is set to the stripped semver
+# (v7.75.2), and the production OTA tag uses the same v-prefixed string.
+
 ref_name="${GITHUB_REF#refs/heads/}"
 
-# Extract semver only for release/X.Y.Z
-if [[ "$ref_name" == release/* ]]; then
-  semver="${ref_name#release/}"
-else
-  echo "Error: Branch name must be release/X.Y.Z where X, Y, Z are numbers. Got: $ref_name" >&2
+if [[ "$ref_name" != release/* ]]; then
+  echo "Error: Branch name must be release/X.Y.Z or release/X.Y.Z-ota. Got: $ref_name" >&2
   exit 1
 fi
 
-# Validate semver format X.Y.Z where X, Y, Z are numbers
-if ! [[ "$semver" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-  echo "Error: Invalid semver in branch name: $ref_name (extracted: $semver; must be numeric X.Y.Z)" >&2
+tail="${ref_name#release/}"
+
+is_ota="false"
+if [[ "$tail" == *-ota ]]; then
+  is_ota="true"
+  semver="${tail%-ota}"
+else
+  semver="$tail"
+fi
+
+# Strict SemVer core: no leading zeros on numeric identifiers (0 alone is fine).
+if ! [[ "$semver" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+  echo "Error: Invalid semver in branch name: $ref_name (extracted: $semver; must be strict SemVer X.Y.Z with no leading zeros)" >&2
   exit 1
 fi
 
 echo "  semver-version: ${semver}"
+echo "  is-ota: ${is_ota}"
 echo "semver=${semver}" >> "$GITHUB_OUTPUT"
+echo "is_ota=${is_ota}" >> "$GITHUB_OUTPUT"

.github/scripts/run-update-release-changelog-mobile.sh

@@ -1,25 +1,19 @@
 #!/usr/bin/env bash
 # Invokes MetaMask github-tools update-release-changelog.sh with OTA version handling.
 #
-# OTA hotfix detection: a two-digit patch in the branch version (e.g. release/7.77.01).
-# auto-changelog rejects these as invalid SemVer (leading zeros are forbidden).
-#
-# This wrapper converts the Runway OTA version to a valid SemVer prerelease
-# for the changelog tool:
-#   Runway 7.77.01  → SemVer 7.77.0-ota.1
-#   Runway 7.77.21  → SemVer 7.77.2-ota.1
-#
-# The SemVer prerelease format stays in CHANGELOG.md permanently. auto-changelog
-# validates ALL version headers on every run, so non-SemVer versions like 7.77.01
-# would break all future changelog generation (not just OTA runs).
-#
-# The Runway version (7.77.01) is used only in branch names, OTA_VERSION, and PR titles.
-#
-# Mapping (two-digit patch AB):  X.Y.AB → X.Y.A-ota.B
-# Single-digit patches pass through unchanged.
+# Branch conventions:
+#   release/X.Y.Z       → native release/hotfix; passes through unchanged (tool derives
+#                         the version from package.json on the branch).
+#   release/X.Y.Z-ota   → OTA hotfix; the -ota suffix exists only on the branch name.
+#                         The changelog header and the production git tag both use the
+#                         bare X.Y.Z. package.json on the OTA branch still carries the
+#                         previous native version (OTA doesn't bump native), so we must
+#                         pass X.Y.Z explicitly to auto-changelog. Runway always advances
+#                         X.Y.Z past any existing native patch on the same X.Y line, so
+#                         the bare header never collides with a prior native entry.
 set -euo pipefail
 
-RELEASE_BRANCH="${1:?release branch (e.g. release/7.73.01)}"
+RELEASE_BRANCH="${1:?release branch (e.g. release/7.75.0 or release/7.75.2-ota)}"
 PLATFORM="${2:?platform (mobile|extension)}"
 REPO_URL="${3:?repository https URL}"
 PREV_REF="${4:-null}"
@@ -30,47 +24,24 @@ if [[ ! -f "$SCRIPT" ]]; then
   exit 1
 fi
 
-# Extract version from branch name
-if [[ "$RELEASE_BRANCH" =~ ^release/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+# Extract version and detect OTA suffix from branch name
+if [[ "$RELEASE_BRANCH" =~ ^release/([0-9]+\.[0-9]+\.[0-9]+)(-ota)?$ ]]; then
   RUNWAY_VERSION="${BASH_REMATCH[1]}"
+  OTA_SUFFIX="${BASH_REMATCH[2]}"
 else
-  echo "Error: branch does not match release/X.Y.Z: ${RELEASE_BRANCH}" >&2
+  echo "Error: branch does not match release/X.Y.Z or release/X.Y.Z-ota: ${RELEASE_BRANCH}" >&2
   exit 1
 fi
 
-PATCH="${RUNWAY_VERSION##*.}"
+if [[ -n "$OTA_SUFFIX" ]]; then
+  # OTA hotfix: pass the bare X.Y.Z as the explicit SemVer version because package.json
+  # on the OTA branch is still pinned to the prior native version.
+  echo "OTA hotfix detected: branch ${RELEASE_BRANCH} → changelog header ${RUNWAY_VERSION}, tag v${RUNWAY_VERSION}"
 
-if [[ ${#PATCH} -eq 2 ]]; then
-  # OTA hotfix: two-digit patch AB → X.Y.A-ota.B
-  BASE_PATCH="${PATCH:0:1}"
-  OTA_NUM="${PATCH:1:1}"
-  SEMVER_VERSION="${RUNWAY_VERSION%.*}.${BASE_PATCH}-ota.${OTA_NUM}"
-
-  echo "OTA hotfix detected: Runway ${RUNWAY_VERSION} → SemVer ${SEMVER_VERSION}"
-
-  # Pass real branch (arg 1) for git ops, valid SemVer (arg 6) for auto-changelog.
+  # Pass real branch (arg 1) for git ops, bare SemVer (arg 6) for auto-changelog.
   # Changelog branch (arg 5) left empty so the tool auto-derives it from the SemVer version.
-  "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF" "" "$SEMVER_VERSION"
-
-  # Fix comparison URLs on the changelog branch.
-  # auto-changelog generates tag refs like "v7.76.0-ota.1" but the actual git tag
-  # is "v7.76.01" (Runway format). Only URL tag refs carry the "v" prefix, so this
-  # sed does not touch version headers (which are bare "7.76.0-ota.1" without "v").
-  CL_BRANCH="release-changelog/${SEMVER_VERSION}"
-  git fetch origin "$CL_BRANCH" 2>/dev/null || true
-  if git rev-parse "origin/${CL_BRANCH}" >/dev/null 2>&1; then
-    git checkout "$CL_BRANCH"
-    if grep -q "v${SEMVER_VERSION}" CHANGELOG.md 2>/dev/null; then
-      sed -i "s|v${SEMVER_VERSION}|v${RUNWAY_VERSION}|g" CHANGELOG.md
-      if ! git diff --quiet CHANGELOG.md; then
-        git add CHANGELOG.md
-        git commit -m "fix: use Runway tag v${RUNWAY_VERSION} in changelog comparison URLs"
-        git push origin "$CL_BRANCH"
-        echo "Fixed changelog comparison URLs: v${SEMVER_VERSION} → v${RUNWAY_VERSION}"
-      fi
-    fi
-  fi
+  exec "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF" "" "$RUNWAY_VERSION"
 else
-  # Regular release or single-digit hotfix: pass through unchanged
+  # Native release or hotfix: pass through; the tool derives the version from package.json.
   exec "$SCRIPT" "$RELEASE_BRANCH" "$PLATFORM" "$REPO_URL" "$PREV_REF"
 fi

.github/workflows/auto-create-release-pr.yml

@@ -1,13 +1,15 @@
 name: Auto Create Release PR
 
-# When Runway creates release/X.Y.Z, this workflow calls create-release-pr.yml.
-# Semver convention for mobile hotfixes:
-# - X.Y.0 — regular release (no OTA_VERSION bump)
-# - X.Y.Z with a single-digit patch (e.g. 7.71.1, 7.71.2) — regular hotfix (no OTA_VERSION bump)
-# - X.Y.AB with a two-digit patch (e.g. 7.73.01, 7.73.21) — OTA hotfix; OTA_VERSION is v7.73.01.
-#   Two-digit patch AB → base patch A, OTA iteration B.
-#   CHANGELOG.md uses the SemVer prerelease format (e.g. 7.73.0-ota.1) permanently
-#   because auto-changelog validates all version headers as strict SemVer.
+# When Runway creates release/X.Y.Z (native) or release/X.Y.Z-ota (OTA hotfix),
+# this workflow calls create-release-pr.yml.
+# Semver / branch convention for mobile hotfixes:
+# - release/X.Y.0         — regular release (no OTA_VERSION bump).
+# - release/X.Y.Z (Z > 0) — native hotfix (no OTA_VERSION bump).
+# - release/X.Y.Z-ota     — OTA hotfix; OTA_VERSION is set to v<X.Y.Z>.
+#   Runway always increments Z past any existing native patch on the same X.Y
+#   line, so the production OTA tag v<X.Y.Z> never collides with a native tag.
+#   The `-ota` suffix is a branch-name convention ONLY: CHANGELOG.md header,
+#   OTA_VERSION, and the production git tag all use the bare X.Y.Z.
 
 on:
   create:
@@ -23,6 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       semver: ${{ steps.out.outputs.semver }}
+      is_ota: ${{ steps.out.outputs.is_ota }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -44,3 +47,4 @@ jobs:
       google-application-creds-base64: ${{ secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 }}
     with:
       semver-version: ${{ needs.extract.outputs.semver }}
+      is-ota: ${{ needs.extract.outputs.is_ota == 'true' }}

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

@@ -54,13 +54,16 @@ jobs:
           echo "Checking branch: $BRANCH_NAME"
           echo "branch-name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
 
-          # Validate branch matches release/x.y.z format (semantic versioning)
-          if [[ "$BRANCH_NAME" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          # Validate branch matches release/x.y.z or release/x.y.z-ota (OTA hotfix) format
+          if [[ "$BRANCH_NAME" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+(-ota)?$ ]]; then
             VERSION="${BRANCH_NAME#release/}"
+            # Strip `-ota` suffix: it is a branch-name convention only. Downstream consumers
+            # (build-announce display "RC X.Y.Z", test-plan artifact name) expect strict X.Y.Z.
+            VERSION="${VERSION%-ota}"
             echo "Valid release branch detected: $BRANCH_NAME (version: $VERSION)"
             echo "semver=$VERSION" >> "$GITHUB_OUTPUT"
           else
-            echo "Branch '$BRANCH_NAME' does not match release/x.y.z pattern. Skipping."
+            echo "Branch '$BRANCH_NAME' does not match release/x.y.z or release/x.y.z-ota pattern. Skipping."
             echo "semver=" >> "$GITHUB_OUTPUT"
             exit 1
           fi

.github/workflows/ci.yml

@@ -748,7 +748,7 @@ jobs:
   ios-tests-ready:
     name: 'iOS Tests Ready'
     runs-on: ubuntu-latest
-    if: ${{ needs.build-ios-apps.result == 'success' }}
+    if: ${{ !cancelled() && needs.build-ios-apps.result == 'success' }}
     needs: [build-ios-apps]
     steps:
       - name: iOS build complete