From f244684c68ba9bfd622a8ef9b9d2518ce87385ef Mon Sep 17 00:00:00 2001
From: tommasini <46944231+tommasini@users.noreply.github.com>
Date: Fri, 8 May 2026 18:29:25 +0100
Subject: [PATCH 01/10] chore: add npmrc file with ignore-scripts. yes, and
offline configuration (#29882)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## **Description**
The .npmrc file configures npm's behavior for this project. Here's what
each line does:
ignore-scripts = true Prevents npm from automatically running lifecycle
scripts (like preinstall, postinstall, prepare, etc.) defined in
package.json of installed dependencies. This is a security measure — it
stops potentially malicious packages from executing arbitrary code
during installation. The tradeoff is that some packages that rely on
build scripts (like native modules) won't set themselves up
automatically, which is why this project uses yarn setup instead of a
plain install.
yes = false Disables automatic "yes" responses to prompts. This ensures
npm will actually pause and ask for confirmation on interactive prompts
rather than silently accepting defaults — useful to avoid unintended
actions during scripted environments.
offline = true Forces npm to only use the local cache and never hit the
network. If a package isn't already cached, the install fails rather
than fetching it. This is a reproducibility and security measure — it
ensures installs are deterministic and prevents supply-chain attacks
from packages being silently swapped on the registry.
## **Changelog**
CHANGELOG entry:
## **Related issues**
Fixes:
## **Manual testing steps**
```gherkin
Feature: my feature name
Scenario: user [verb for user action]
Given [describe expected initial app state]
When user [verb for user action]
Then [describe expected outcome]
```
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I've included tests if applicable
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [ ] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Adds a repo-wide `.npmrc` that changes dependency-install behavior
(disables lifecycle scripts and forces offline/cache-only installs),
which can break installs in CI/dev environments if assumptions differ.
>
> **Overview**
> Adds a committed `.npmrc` configuring npm to `ignore-scripts`, disable
auto-`yes`, and run in `offline` mode.
>
> Updates `.gitignore` to stop excluding `.npmrc`, so these npm defaults
are versioned and applied consistently across the project.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
d54246b136f6b64078bff4afcf490a1eeeebe4b3. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.gitignore | 3 +--
.npmrc | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 .npmrc
diff --git a/.gitignore b/.gitignore
index 8b8d9bb8a27..54545d96af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,8 +110,7 @@ licenseInfos.json
# wdio
wdio/reports/
-# Allows access to preview versions of @metamask/* packages for testing
-.npmrc
+
# browserstack autogenerated files
local.log
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..a64dff5c12b
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,3 @@
+ignore-scripts = true
+yes = false
+offline = true
\ No newline at end of file
From da19badabb97ec96e60c367b0ce97b8dda09cdb6 Mon Sep 17 00:00:00 2001
From: tommasini <46944231+tommasini@users.noreply.github.com>
Date: Fri, 8 May 2026 18:44:01 +0100
Subject: [PATCH 02/10] ci: reuse native E2E builds across commits and PRs
(#29247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## **Description**
Replaces the branch-keyed `cirruslabs/cache` reuse layer for native E2E
builds with a content-addressable cross-run lookup, driven by a
`build-source-hash` commit status that is computed once on a stable
runner.
### How it works
```mermaid
flowchart TD
A["post-build-source-hash
(ubuntu-latest, pinned to PR head SHA)
fingerprint = yarn fingerprint:generate"] -->|posts build-source-hash status
+ exposes as job output| B["Build iOS / Android job"]
B --> C{"check-force-builds
label OR [force-builds] in commit?"}
C -- yes --> H["Heavy native-build path
setup-e2e-env + Gradle/Xcode + compile"]
C -- no --> D["find-reusable-build
(GitHub Actions REST API)"]
D --> D1["Tier 1: same-branch runs"]
D1 -- miss --> D2["Tier 2: base-branch (main) runs"]
D2 -- miss --> D3["Tier 3: cross-PR runs
(event=pull_request, no branch filter)"]
D1 -- hit --> E["actions/download-artifact@v4
by run-id"]
D2 -- hit --> E
D3 -- hit --> E
D3 -- miss --> H
E --> F["Lean repack path
Node + yarn install + repack:{ios,android}"]
H --> I["Upload .app / release.apk / androidTest.apk"]
F --> I
I -.->|feeds future runs| D
```
The probe runs **before** any heavy setup. On a hit, iOS skips
Ruby/Bundler/CocoaPods/`pod install`; Android skips
`setup-e2e-env`/Gradle. Only the JS bundle is rebuilt and re-packed into
the cached native shell.
### Benefits vs the previous `cirruslabs/cache` layer
| | Before | After (this PR) |
|---|---|---|
| **Reuse keyspace** | `${ref_name}` baked into key → every PR isolated;
only `main → PR` fallback crossed branches | Content-addressable by
fingerprint; any PR can reuse any other PR's build |
| **When the lookup runs** | *After* `setup-e2e-env` (cache key needs
`node_modules` to compute fingerprint) | Before any heavy setup |
| **Fingerprint stability** | Recomputed per runner → drifts across
macOS / Linux build / Linux CI runners; shifts on every `main` push |
Computed once on `ubuntu-latest`, pinned to `pull_request.head.sha` |
| **iOS reuse-hit wall time** | ~6m setup + ~5m repack | ~30-60s setup +
~1-2m repack |
| **Android reuse-hit wall time** | ~5m23s | ~1-2m warm / ~2-3m
cold-cache |
| **Cold build (no reuse)** | ~20-25m | unchanged |
### What changed
- **`ci.yml`** — new `post-build-source-hash` job emits the canonical
fingerprint and exposes it as a job output consumed by both build jobs.
- **New composite actions** — `find-reusable-build` (3-tier scan),
`check-force-builds` (label + `[force-builds]` commit-message escape
hatch; reads commit message via REST API to survive shallow checkout),
`post-build-source-hash` (factored out for reuse).
- **`build-{ios,android}-e2e.yml`** — probe → gate → lean-repack vs
heavy-native paths. Lean paths skip the work `yarn build:repack:*`
doesn't need.
- **`setup-e2e-env`** — new `install-foundry` input (default `true`,
opt-out for build workflows where `yarn setup:github-ci` already runs
`install:foundryup`).
- **Repack throughput** — `METRO_MAX_WORKERS` bumped `2 → 6` on the lean
path (no Gradle/Xcode competing for RAM).
- **Removed** — branch- and main-scoped `cirruslabs/cache` for
`MetaMask.app` / `release.apk` / `release-androidTest.apk`. Gradle,
Xcode DerivedData, and `.metamask` caches kept (gated to the heavy
path).
### Safety
- Fingerprint job failure or forked PR (no `statuses: write`) → empty
`source-fingerprint` → all reuse steps skipped → fresh build runs. Never
"no build".
- The same `build-source-hash` status gates the OTA path in
`push-eas-update.yml`, so a JS-only OTA cannot ship after native code
changes.
- Full architecture, decision tables, and failure-mode catalog:
`docs/ci-build-reuse.md` (new in this PR).
## **Changelog**
CHANGELOG entry: null
## **Related issues**
Refs: Prior art in MetaMask extension —
https://github.com/MetaMask/metamask-extension/pull/41435
No issue: CI infrastructure improvement; no Jira ticket.
## **Manual testing steps**
```gherkin
Feature: Reusable native E2E builds on CI
Scenario: Fresh run populates the reuse pool
Given this branch has no prior completed CI run with a matching fingerprint
When CI runs on the latest commit
Then post-build-source-hash posts a build-source-hash commit status on the PR head SHA
And Build iOS E2E Apps runs setup-e2e-env and the full Xcode native compile
And Build Android E2E APKs runs setup-e2e-env and the full Gradle build
And both jobs upload artifacts named ${build_type}-${env}-MetaMask.app, ${build_type}-${env}-release.apk, and ${build_type}-${env}-release-androidTest.apk
Scenario: Empty commit reuses the prior native build (same-branch tier)
Given the branch has a prior successful run with non-expired artifacts
When an empty commit is pushed
Then post-build-source-hash computes and posts the same fingerprint as before
And find-reusable-build reports a hit via the same-branch tier
And Build iOS E2E Apps skips Ruby/Bundler/CocoaPods/Xcode setup and only runs yarn build:repack:ios
And Build Android E2E APKs skips setup-e2e-env and only runs yarn build:repack:android
And E2E tests run against the repacked artifacts
Scenario: Cross-PR reuse finds an unrelated PR with matching fingerprint
Given PR A on branch feature-a completed a fresh native build and uploaded artifacts
And PR B on branch feature-b touches only JS/tests/docs (no native-affecting files)
When PR B's CI runs
Then find-reusable-build misses the same-branch tier (feature-b runs)
And misses the base-branch tier (no recent main run with the matching fingerprint)
And matches PR A's run via the cross-PR tier (event=pull_request, no branch filter)
And PR B downloads PR A's artifacts by run-id and runs yarn build:repack:*
Scenario: force-builds label bypasses reuse
Given a PR that would otherwise hit the reuse path
When the force-builds label is added and CI re-runs
Then check-force-builds reports force=true
And find-reusable-build does not run
And both iOS and Android run a fresh native compile
And when the label is removed and CI re-runs, reuse resumes normally
Scenario: [force-builds] commit tag bypasses reuse under shallow checkout
Given a PR whose head commit message contains [force-builds]
When CI runs
Then check-force-builds reads the commit message via the GitHub REST API (not git show)
And reports force=true even with actions/checkout's default fetch-depth: 1
And both iOS and Android run a fresh native compile
Scenario: Fingerprint job failure degrades gracefully to fresh build
Given post-build-source-hash fails (e.g. broken fingerprint.config.js, transient yarn install error, or missing statuses: write on a fork)
When the build workflows run
Then inputs.source-fingerprint is empty
And every fingerprint-keyed step is skipped
And both iOS and Android run a fresh native compile
And no E2E build is blocked
Scenario: Metro transform cache persists across repack runs
Given a reuse hit on the repack path
When yarn build:repack:{ios,android} runs
Then Metro uses METRO_CACHE_DIR as its FileStore root
And the persisted transform cache is honored (no --reset-cache)
And the E2E build runs with updates disabled (no app.manifest generation)
```
## **Screenshots/Recordings**
### **Before**
N/A — CI-only change; no UI impact.
### **After**
N/A — CI-only change; no UI impact.
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [x] I've tested on Android
- [x] I've tested with a power user scenario
- [x] I've instrumented key operations with Sentry traces for production
performance metrics
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Changes CI build/reuse logic and caching paths for iOS/Android E2E
artifacts, which could cause unexpected stale/invalid artifacts or
missed rebuilds if the fingerprint/status or artifact lookup is wrong.
Scoped to CI/workflows, but failures can block or slow builds across
PRs.
>
> **Overview**
> Enables **cross-run, cross-PR reuse** of native E2E build artifacts by
introducing a canonical `@expo/fingerprint` published as a
`build-source-hash` commit status and using it to locate/download
matching artifacts from prior workflow runs.
>
> Build workflows now **gate between a full native build vs a lean
repack path**: they first check a `force-builds` override (PR label or
`[force-builds]` commit token), then attempt to find/download reusable
artifacts; on a hit they skip heavy setup (Gradle/Xcode) and only run
repack + lightweight dependency setup.
>
> CI wiring is updated to add the `post-build-source-hash` job and pass
`source-fingerprint` into iOS/Android build jobs (with added
`actions/statuses/pull-requests` read permissions), `setup-e2e-env`
gains an `install-foundry` toggle to avoid redundant installs, and
repack throughput is tuned (e.g., `METRO_MAX_WORKERS` increased on reuse
paths) with clearer guidance when repack detects a broken cached iOS
app.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
89e6bc59b84493e1bb5598e6c866a08979588db7. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.github/actions/check-force-builds/action.yml | 81 ++++++
.../actions/find-reusable-build/action.yml | 255 ++++++++++++++++++
.../actions/post-build-source-hash/action.yml | 71 +++++
.github/actions/setup-e2e-env/action.yml | 11 +
.github/workflows/build-android-e2e.yml | 226 ++++++++++------
.github/workflows/build-ios-e2e.yml | 194 +++++++++----
.github/workflows/ci.yml | 47 +++-
scripts/repack.js | 5 +-
8 files changed, 762 insertions(+), 128 deletions(-)
create mode 100644 .github/actions/check-force-builds/action.yml
create mode 100644 .github/actions/find-reusable-build/action.yml
create mode 100644 .github/actions/post-build-source-hash/action.yml
diff --git a/.github/actions/check-force-builds/action.yml b/.github/actions/check-force-builds/action.yml
new file mode 100644
index 00000000000..cead62e05db
--- /dev/null
+++ b/.github/actions/check-force-builds/action.yml
@@ -0,0 +1,81 @@
+name: 'Check force-builds override'
+description: >-
+ Detects whether the current workflow run should bypass native build reuse
+ (both the GHA cache and the cross-run artifact lookup) and always compile
+ fresh. The override is honored on `pull_request` events via a `force-builds`
+ label OR a `[force-builds]` token in the head commit message. It is
+ intentionally ignored on `merge_group` and `push` events so the merge queue
+ always uses hash-verified reuse.
+
+inputs:
+ github-token:
+ description: >-
+ GitHub token with `pull-requests: read` (for label lookup) and
+ `contents: read` (to fetch the head commit message via the REST API).
+ required: true
+ label-name:
+ description: 'PR label that, when present, forces fresh builds'
+ required: false
+ default: 'force-builds'
+ commit-tag:
+ description: 'Case-sensitive substring in the head commit message that forces fresh builds'
+ required: false
+ default: '[force-builds]'
+
+outputs:
+ force:
+ description: "'true' when fresh builds should be forced, otherwise 'false'"
+ value: ${{ steps.compute.outputs.force }}
+
+runs:
+ using: 'composite'
+ steps:
+ - name: Compute force-builds flag
+ id: compute
+ shell: bash
+ env:
+ GH_TOKEN: ${{ inputs.github-token }}
+ LABEL_NAME: ${{ inputs.label-name }}
+ COMMIT_TAG: ${{ inputs.commit-tag }}
+ EVENT_NAME: ${{ github.event_name }}
+ HEAD_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}
+ PR_NUMBER: ${{ github.event.pull_request.number }}
+ REPOSITORY: ${{ github.repository }}
+ run: |
+ FORCE="false"
+
+ if [[ "$EVENT_NAME" != "pull_request" ]]; then
+ echo "Event is $EVENT_NAME; force-builds override is ignored outside pull_request events."
+ echo "force=$FORCE" >> "$GITHUB_OUTPUT"
+ exit 0
+ fi
+
+ # Commit-message tag.
+ COMMIT_MESSAGE=""
+ if COMMIT_MESSAGE=$(gh api \
+ "repos/$REPOSITORY/commits/$HEAD_COMMIT_HASH" \
+ --jq '.commit.message' 2>/dev/null); then
+ if printf '%s' "$COMMIT_MESSAGE" \
+ | grep --fixed-strings --quiet "$COMMIT_TAG"; then
+ echo "-> force=true because '$COMMIT_TAG' was found in commit message of $HEAD_COMMIT_HASH"
+ FORCE="true"
+ fi
+ else
+ echo "::warning::Failed to fetch commit message for $HEAD_COMMIT_HASH via GitHub API; commit-tag force-builds check skipped for this run (the '$LABEL_NAME' label path still works)."
+ fi
+
+ # PR label
+ if [[ -n "$PR_NUMBER" ]]; then
+ if gh pr view "$PR_NUMBER" --repo "$REPOSITORY" \
+ --json labels --jq '.labels[].name' \
+ | grep --fixed-strings --line-regexp --quiet "$LABEL_NAME"; then
+ echo "-> force=true because '$LABEL_NAME' label is applied to PR #$PR_NUMBER"
+ FORCE="true"
+ fi
+ fi
+
+ if [[ "$FORCE" == "false" ]]; then
+ echo "No force-builds override active."
+ fi
+
+ echo "force=$FORCE" >> "$GITHUB_OUTPUT"
diff --git a/.github/actions/find-reusable-build/action.yml b/.github/actions/find-reusable-build/action.yml
new file mode 100644
index 00000000000..fe0b7095deb
--- /dev/null
+++ b/.github/actions/find-reusable-build/action.yml
@@ -0,0 +1,255 @@
+name: 'Find reusable build from prior run'
+description: >-
+ Searches recent workflow runs across three tiers (same branch, base branch,
+ then any open PR branch) for a run whose `build-source-hash` commit status
+ matches the current fingerprint AND whose required build artifacts are still
+ available. If a match is found, outputs the run id so a subsequent
+ `actions/download-artifact` step can pull the artifacts directly instead of
+ triggering a fresh native build.
+
+ The third (cross-PR) tier is required because GitHub's `listWorkflowRuns`
+ `branch` parameter filters against `head_branch` — the PR source branch for
+ `pull_request` events — so branch-scoped lookups can never discover other
+ PRs' runs. The cross-PR tier drops the branch filter and instead uses
+ `event: pull_request` to let the fingerprint itself act as the cross-PR
+ deduplication key.
+
+inputs:
+ fingerprint:
+ description: 'The @expo/fingerprint hash the candidate must match'
+ required: true
+ artifact-names:
+ description: 'JSON array of artifact names that must all be present on the candidate run'
+ required: true
+ github-token:
+ description: 'GitHub token with `actions: read` and `statuses: read` permissions'
+ required: true
+ workflow-file:
+ description: 'Workflow filename whose runs will be searched'
+ required: false
+ default: 'ci.yml'
+ base-branch:
+ description: 'Fallback branch when no same-branch match is found'
+ required: false
+ default: 'main'
+ status-context:
+ description: 'Commit status context that carries the fingerprint'
+ required: false
+ default: 'build-source-hash'
+ max-candidates-per-branch:
+ description: 'How many recent runs to inspect per branch-scoped tier (same-branch, base-branch)'
+ required: false
+ default: '10'
+ max-candidates-cross-pr:
+ description: >-
+ How many recent `pull_request`-event runs (across all branches) to inspect
+ in the cross-PR tier. The fingerprint filter is highly discriminating, so
+ the practical cost is one `getCombinedStatusForRef` call per candidate
+ until a match is found.
+ required: false
+ default: '30'
+
+outputs:
+ found:
+ description: "'true' when a reusable run was found"
+ value: ${{ steps.lookup.outputs.found }}
+ run-id:
+ description: 'Workflow run id that produced the reusable artifacts'
+ value: ${{ steps.lookup.outputs.run-id }}
+ source-sha:
+ description: 'Commit SHA of the reusable run'
+ value: ${{ steps.lookup.outputs.source-sha }}
+ source-branch:
+ description: 'Branch of the reusable run (same-branch or base-branch)'
+ value: ${{ steps.lookup.outputs.source-branch }}
+
+runs:
+ using: 'composite'
+ steps:
+ - name: Search prior runs for matching fingerprint
+ id: lookup
+ uses: actions/github-script@v7
+ continue-on-error: true
+ env:
+ TARGET_FINGERPRINT: ${{ inputs.fingerprint }}
+ ARTIFACT_NAMES_JSON: ${{ inputs.artifact-names }}
+ WORKFLOW_FILE: ${{ inputs.workflow-file }}
+ BASE_BRANCH: ${{ inputs.base-branch }}
+ STATUS_CONTEXT: ${{ inputs.status-context }}
+ MAX_CANDIDATES: ${{ inputs.max-candidates-per-branch }}
+ MAX_CANDIDATES_CROSS_PR: ${{ inputs.max-candidates-cross-pr }}
+ HEAD_BRANCH: ${{ github.head_ref || github.ref_name }}
+ HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+ CURRENT_RUN_ID: ${{ github.run_id }}
+ with:
+ github-token: ${{ inputs.github-token }}
+ script: |
+ const {
+ TARGET_FINGERPRINT,
+ ARTIFACT_NAMES_JSON,
+ WORKFLOW_FILE,
+ BASE_BRANCH,
+ STATUS_CONTEXT,
+ MAX_CANDIDATES,
+ MAX_CANDIDATES_CROSS_PR,
+ HEAD_BRANCH,
+ HEAD_SHA,
+ CURRENT_RUN_ID,
+ } = process.env;
+
+ const setNotFound = () => {
+ core.setOutput('found', 'false');
+ core.setOutput('run-id', '');
+ core.setOutput('source-sha', '');
+ core.setOutput('source-branch', '');
+ };
+
+ if (!TARGET_FINGERPRINT) {
+ core.warning('No fingerprint provided; skipping lookup');
+ setNotFound();
+ return;
+ }
+
+ let requiredArtifacts;
+ try {
+ requiredArtifacts = JSON.parse(ARTIFACT_NAMES_JSON);
+ } catch (err) {
+ core.warning(`Could not parse artifact-names input: ${err.message}`);
+ setNotFound();
+ return;
+ }
+ if (!Array.isArray(requiredArtifacts) || requiredArtifacts.length === 0) {
+ core.warning('artifact-names must be a non-empty JSON array');
+ setNotFound();
+ return;
+ }
+
+ const maxCandidates = Number(MAX_CANDIDATES) || 10;
+ const maxCandidatesCrossPr = Number(MAX_CANDIDATES_CROSS_PR) || 30;
+ const currentRunId = String(CURRENT_RUN_ID);
+
+ // Three-tier discovery:
+ // 1. same-branch — fastest path, catches retries and new commits
+ // on the current PR.
+ // 2. base-branch — catches post-merge CI runs on `main`. Only
+ // matches `push`-event runs (pull_request runs
+ // have head_branch=, not main).
+ // 3. cross-pr — searches recent `pull_request` runs across
+ // ALL source branches so two unrelated PRs with
+ // the same fingerprint can reuse each other's
+ // artifacts. This tier deliberately drops the
+ // `branch` filter; without it, branch-scoped
+ // lookups can never discover another PR's run
+ // (GitHub filters `branch` against head_branch,
+ // which is the PR source branch).
+ const tiers = [
+ {
+ label: `same-branch (branch=${HEAD_BRANCH})`,
+ params: { branch: HEAD_BRANCH, per_page: maxCandidates },
+ },
+ ];
+ if (BASE_BRANCH && BASE_BRANCH !== HEAD_BRANCH) {
+ tiers.push({
+ label: `base-branch (branch=${BASE_BRANCH})`,
+ params: { branch: BASE_BRANCH, per_page: maxCandidates },
+ });
+ }
+ tiers.push({
+ label: `cross-pr (event=pull_request, any branch, last ${maxCandidatesCrossPr} runs)`,
+ params: { event: 'pull_request', per_page: maxCandidatesCrossPr },
+ // Skip runs already visited by the same-branch tier to avoid
+ // wasting API calls on duplicates.
+ skipHeadBranch: HEAD_BRANCH,
+ });
+
+ async function getFingerprintForSha(sha) {
+ try {
+ const { data } = await github.rest.repos.getCombinedStatusForRef({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ ref: sha,
+ per_page: 100,
+ });
+ const status = data.statuses.find((s) => s.context === STATUS_CONTEXT);
+ return status ? status.description : null;
+ } catch (err) {
+ core.info(`getCombinedStatusForRef failed for ${sha}: ${err.message}`);
+ return null;
+ }
+ }
+
+ async function hasAllArtifacts(runId) {
+ try {
+ const artifacts = await github.paginate(
+ github.rest.actions.listWorkflowRunArtifacts,
+ {
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: runId,
+ per_page: 100,
+ },
+ );
+ const available = new Set(
+ artifacts
+ .filter((a) => !a.expired)
+ .map((a) => a.name),
+ );
+ const missing = requiredArtifacts.filter((n) => !available.has(n));
+ if (missing.length > 0) {
+ core.info(`Run ${runId} missing artifacts: ${missing.join(', ')}`);
+ return false;
+ }
+ return true;
+ } catch (err) {
+ core.info(`listWorkflowRunArtifacts failed for ${runId}: ${err.message}`);
+ return false;
+ }
+ }
+
+ const seenRunIds = new Set();
+ seenRunIds.add(currentRunId);
+
+ for (const tier of tiers) {
+ core.info(`Searching tier: ${tier.label}`);
+ let runs;
+ try {
+ const { data } = await github.rest.actions.listWorkflowRuns({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ workflow_id: WORKFLOW_FILE,
+ ...tier.params,
+ });
+ runs = data.workflow_runs || [];
+ } catch (err) {
+ core.warning(`listWorkflowRuns failed for tier "${tier.label}": ${err.message}`);
+ continue;
+ }
+
+ for (const run of runs) {
+ const runIdStr = String(run.id);
+ if (seenRunIds.has(runIdStr)) continue;
+ seenRunIds.add(runIdStr);
+
+ if (tier.skipHeadBranch && run.head_branch === tier.skipHeadBranch) continue;
+
+ if (run.status !== 'completed' && run.status !== 'in_progress') continue;
+
+ const fingerprint = await getFingerprintForSha(run.head_sha);
+ if (!fingerprint) continue;
+ if (fingerprint !== TARGET_FINGERPRINT) continue;
+
+ if (!(await hasAllArtifacts(run.id))) continue;
+
+ core.info(
+ `Match: tier="${tier.label}" run=${run.id} sha=${run.head_sha} branch=${run.head_branch} url=${run.html_url}`,
+ );
+ core.setOutput('found', 'true');
+ core.setOutput('run-id', runIdStr);
+ core.setOutput('source-sha', run.head_sha);
+ core.setOutput('source-branch', run.head_branch || '');
+ return;
+ }
+ }
+
+ core.info('No reusable build found across any tier');
+ setNotFound();
diff --git a/.github/actions/post-build-source-hash/action.yml b/.github/actions/post-build-source-hash/action.yml
new file mode 100644
index 00000000000..9d766767c5e
--- /dev/null
+++ b/.github/actions/post-build-source-hash/action.yml
@@ -0,0 +1,71 @@
+name: 'Post build-source-hash commit status'
+description: >-
+ Computes the @expo/fingerprint hash via `yarn fingerprint:generate` against
+ the CURRENTLY CHECKED-OUT workspace, then posts it as a `build-source-hash`
+ GitHub commit status on `target-sha`. This makes the fingerprint queryable
+ by future workflow runs so they can locate a prior run whose uploaded
+ native build artifacts match the current source.
+
+inputs:
+ github-token:
+ description: 'GitHub token with `statuses: write` permission'
+ required: true
+ target-sha:
+ description: >-
+ Commit SHA to post the `build-source-hash` status on. MUST match the
+ ref that was checked out before calling this action.
+ required: true
+ status-context:
+ description: 'GitHub commit status context name'
+ required: false
+ default: 'build-source-hash'
+
+outputs:
+ fingerprint:
+ description: 'The @expo/fingerprint hash that was posted'
+ value: ${{ steps.generate-fingerprint.outputs.fingerprint }}
+
+runs:
+ using: 'composite'
+ steps:
+ - name: Generate fingerprint
+ id: generate-fingerprint
+ shell: bash
+ run: |
+ FINGERPRINT=$(yarn fingerprint:generate)
+ echo "fingerprint=$FINGERPRINT" >> "$GITHUB_OUTPUT"
+ echo "Current fingerprint: ${FINGERPRINT}"
+
+ - name: Post commit status
+ uses: actions/github-script@v7
+ continue-on-error: true
+ env:
+ FINGERPRINT: ${{ steps.generate-fingerprint.outputs.fingerprint }}
+ STATUS_CONTEXT: ${{ inputs.status-context }}
+ TARGET_SHA: ${{ inputs.target-sha }}
+ RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+ with:
+ github-token: ${{ inputs.github-token }}
+ script: |
+ const { FINGERPRINT, STATUS_CONTEXT, TARGET_SHA, RUN_URL } = process.env;
+ if (!FINGERPRINT) {
+ core.setFailed('Fingerprint is empty; refusing to post status');
+ return;
+ }
+ if (!TARGET_SHA) {
+ core.setFailed(
+ 'target-sha input is empty; refusing to post status ' +
+ '(would silently post on the wrong commit).'
+ );
+ return;
+ }
+ await github.rest.repos.createCommitStatus({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ sha: TARGET_SHA,
+ state: 'success',
+ context: STATUS_CONTEXT,
+ description: FINGERPRINT.slice(0, 140),
+ target_url: RUN_URL,
+ });
+ core.info(`Posted ${STATUS_CONTEXT}=${FINGERPRINT} on ${TARGET_SHA}`);
diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml
index e84b7cdda72..5594b419c0f 100644
--- a/.github/actions/setup-e2e-env/action.yml
+++ b/.github/actions/setup-e2e-env/action.yml
@@ -69,6 +69,16 @@ inputs:
description: 'Whether to configure keystores for E2E tests'
required: false
default: 'true'
+ install-foundry:
+ description: >-
+ Whether to install Foundry (anvil/cast/forge) and add `node_modules/.bin`
+ to `$GITHUB_PATH`. Set to `'false'` when the caller already runs
+ `yarn setup:github-ci` afterwards (which itself runs `install:foundryup`
+ via `installFoundryTask`), to avoid the redundant install step. Test
+ runner workflows that go straight to Detox/seeder without an intervening
+ `yarn setup:github-ci` MUST keep this enabled (default).
+ required: false
+ default: 'true'
keystore-role-to-assume:
description: 'AWS IAM role to assume for keystore configuration'
required: false
@@ -302,6 +312,7 @@ runs:
YARN_ENABLE_GLOBAL_CACHE: 'true'
- name: Install Foundry
+ if: ${{ inputs.install-foundry == 'true' }}
shell: bash
run: |
echo "Installing Foundry via yarn install:foundryup (matches local dev and tests/seeder)..."
diff --git a/.github/workflows/build-android-e2e.yml b/.github/workflows/build-android-e2e.yml
index f812b2317fd..2afc01d7fd5 100644
--- a/.github/workflows/build-android-e2e.yml
+++ b/.github/workflows/build-android-e2e.yml
@@ -25,6 +25,15 @@ on:
required: false
default: 'qa'
type: string
+ source-fingerprint:
+ description: >-
+ Canonical @expo/fingerprint hash for this commit, computed once in
+ the `post-build-source-hash` job. Used for cache keys and cross-run
+ artifact lookups. When empty (e.g. forked PR where the hash job is
+ skipped), the build compiles fresh with no cache reuse.
+ required: false
+ default: ''
+ type: string
runner_provider:
description: Runner provider forwarded from the caller
required: false
@@ -50,6 +59,12 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v6
+ - name: Check force-builds override
+ id: force-builds
+ uses: ./.github/actions/check-force-builds
+ with:
+ github-token: ${{ github.token }}
+
- name: Configure Namespace cache
if: ${{ inputs.runner_provider == 'namespace' }}
uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0 # v1
@@ -62,40 +77,15 @@ jobs:
${{ env.GRADLE_USER_HOME }}/caches
${{ env.GRADLE_USER_HOME }}/wrapper
- - name: Restore .metamask folder (Foundry download cache for install:foundryup)
- if: ${{ inputs.runner_provider != 'namespace' }}
- uses: actions/cache@v4
- with:
- path: .metamask
- key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
-
- - name: Setup Android Build Environment
- timeout-minutes: 15
- uses: ./.github/actions/setup-e2e-env
- with:
- platform: android
- setup-simulator: false
- configure-keystores: true
- android-api-level: 36
- target: ${{ inputs.keystore_target }} # qa for taget=main and flask for target=flask
-
- - name: Setup project dependencies with retry
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
- with:
- timeout_minutes: 10
- max_attempts: 3
- retry_wait_seconds: 30
- command: |
- echo "🚀 Setting up project..."
- yarn setup:github-ci --no-build-ios
-
- # Generate fingerprint AFTER setup but BEFORE any build modifications (the fingerprint now is fake we do not want the cached apk)
- - name: Generate current fingerprint
- id: generate-fingerprint
+ - name: Report source fingerprint
run: |
- FINGERPRINT=$(yarn fingerprint:generate)
- echo "fingerprint=$FINGERPRINT" >> "$GITHUB_OUTPUT"
- echo "Current fingerprint: ${FINGERPRINT}"
+ if [[ -z "$SOURCE_FINGERPRINT" ]]; then
+ echo "::warning::No source-fingerprint provided (likely a forked PR); artifact reuse disabled."
+ else
+ echo "Source fingerprint: $SOURCE_FINGERPRINT"
+ fi
+ env:
+ SOURCE_FINGERPRINT: ${{ inputs.source-fingerprint }}
- name: Determine target paths and Artifact Names
id: determine-target-paths
@@ -117,15 +107,17 @@ jobs:
exit 1
fi
- # TEMPORARY: `${{ github.run_id }}` makes every key unique per workflow
- # run so we always get a fresh build during the RN 0.81 upgrade — the
- # `yarn fingerprint:generate` heuristic doesn't track every native input
- # being changed (yarn patches, MainApplication, Podfile shims, etc.) so
- # the branch cache can serve a stale .apk and only the JS gets repacked.
- # Remove the trailing `-${{ github.run_id }}` from each `key:` below
- # once the upgrade is settled and fingerprint covers the touched paths.
+ - 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 != '' }}
+ uses: ./.github/actions/find-reusable-build
+ with:
+ fingerprint: ${{ inputs.source-fingerprint }}
+ artifact-names: '["${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk","${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk"]'
+ github-token: ${{ github.token }}
+
- name: Restore APKs matching fingerprint from branch cache
- if: ${{ inputs.runner_provider != 'namespace' }}
+ if: ${{ inputs.runner_provider != 'namespace' && steps.force-builds.outputs.force != 'true' && steps.find-reusable-build.outputs.found != 'true' }}
id: apk-cache-restore
# This action automatically updates the cache at the end of the workflow
uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
@@ -133,16 +125,10 @@ jobs:
path: |
${{ steps.determine-target-paths.outputs.apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.apk
${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
- # Include Gradle properties in key to force rebuild when properties change
- # Keep the `hashFiles` call for Gradle config in-sync with these steps:
- # - "Restore APKs matching fingerprint from branch cache"
- # - "Restore APKs matching fingerprint from main cache"
- # - "Restore Gradle dependencies from branch cache"
- # - "Restore Gradle dependencies from main cache"
- key: android-apk-${{ github.ref_name }}-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-${{ github.run_id }}
+ key: android-apk-${{ github.ref_name }}-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
- name: Restore APKs matching fingerprint from main cache
- if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+ if: ${{ inputs.runner_provider != 'namespace' && steps.force-builds.outputs.force != 'true' && steps.find-reusable-build.outputs.found != 'true' && steps.apk-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
id: apk-cache-restore-main
# This will only restore the cache, not update it
uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
@@ -150,53 +136,143 @@ jobs:
path: |
${{ steps.determine-target-paths.outputs.apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}.apk
${{ steps.determine-target-paths.outputs.test-apk-target-path }}/${{ steps.determine-target-paths.outputs.artifact_name }}-androidTest.apk
- # Include Gradle properties in key to force rebuild when properties change
- # Keep the `hashFiles` call for Gradle config in-sync with these steps:
- # - "Restore APKs matching fingerprint from branch cache"
- # - "Restore APKs matching fingerprint from main cache"
- # - "Restore Gradle dependencies from branch cache"
- # - "Restore Gradle dependencies from main cache"
- key: android-apk-main-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-${{ github.run_id }}
+ key: android-apk-main-${{ inputs.build_type }}-${{ env.CACHE_GENERATION }}-${{ inputs.source-fingerprint }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+ - name: Download reusable APK from prior run
+ id: download-reusable-apk
+ if: ${{ steps.find-reusable-build.outputs.found == 'true' }}
+ continue-on-error: true
+ uses: actions/download-artifact@v4
+ with:
+ name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release.apk
+ path: ${{ steps.determine-target-paths.outputs.apk-target-path }}
+ github-token: ${{ github.token }}
+ repository: ${{ github.repository }}
+ run-id: ${{ steps.find-reusable-build.outputs.run-id }}
+
+ - name: Download reusable androidTest APK from prior run
+ id: download-reusable-test-apk
+ if: ${{ steps.find-reusable-build.outputs.found == 'true' }}
+ continue-on-error: true
+ uses: actions/download-artifact@v4
+ with:
+ name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-release-androidTest.apk
+ path: ${{ steps.determine-target-paths.outputs.test-apk-target-path }}
+ github-token: ${{ github.token }}
+ repository: ${{ github.repository }}
+ run-id: ${{ steps.find-reusable-build.outputs.run-id }}
+
+ - name: Log reused Android build source
+ if: ${{ steps.download-reusable-apk.outcome == 'success' && steps.download-reusable-test-apk.outcome == 'success' }}
+ run: |
+ echo "Reusing Android build from run ${{ steps.find-reusable-build.outputs.run-id }}"
+ echo "Source SHA: ${{ steps.find-reusable-build.outputs.source-sha }}"
+ echo "Source branch: ${{ steps.find-reusable-build.outputs.source-branch }}"
+ shell: bash
+
+ - name: Compute native-build gate
+ id: gate
+ run: |
+ if [[ "${{ 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"
+ echo "Reuse path active (cross-run artifact download succeeded); heavy Android setup + Gradle restore will be skipped."
+ elif [[ "${{ steps.apk-cache-restore.outputs.cache-hit }}" == "true" \
+ || "${{ steps.apk-cache-restore-main.outputs.cache-hit }}" == "true" ]]; then
+ echo "needs-native-build=false" >> "$GITHUB_OUTPUT"
+ echo "APK cache hit; heavy Android setup + Gradle restore will be skipped."
+ else
+ if [[ "${{ steps.find-reusable-build.outputs.found }}" == "true" ]]; then
+ echo "::warning::Reusable run was found but artifact download failed (apk=${{ steps.download-reusable-apk.outcome }}, test-apk=${{ steps.download-reusable-test-apk.outcome }}); falling back to fresh native build."
+ fi
+ echo "needs-native-build=true" >> "$GITHUB_OUTPUT"
+ echo "No reuse path; full native build + setup will run."
+ fi
+ shell: bash
+
+ - name: Setup Android Build Environment
+ timeout-minutes: 15
+ uses: ./.github/actions/setup-e2e-env
+ with:
+ platform: android
+ setup-simulator: false
+ configure-keystores: true
+ install-foundry: false
+ target: ${{ inputs.keystore_target }} # qa for target=main, flask for target=flask
+
+ # The Namespace cache action above already includes `.metamask`, so the
+ # dedicated actions/cache restore is only needed on non-Namespace runners.
+ - name: Restore .metamask folder
+ if: ${{ inputs.runner_provider != 'namespace' }}
+ id: restore-metamask
+ uses: actions/cache@v4
+ with:
+ path: .metamask
+ key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
+
+ - name: Setup project dependencies with retry (native-build path)
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
+ uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 30
+ command: |
+ echo "🚀 Setting up project..."
+ yarn setup:github-ci --no-build-ios
+
+ - name: Setup project dependencies with retry (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 30
+ command: |
+ echo "📦 Setting up project (lightweight, skips jetify)..."
+ yarn setup:github-ci --no-build-ios --no-build-android
+
+ # -------------------------------------------------------------------------
+ # Gradle caches + native build — only on the full native-build path.
+ # -------------------------------------------------------------------------
+ # Skipped on Namespace runners because the Namespace cache action above
+ # already handles `${GRADLE_USER_HOME}/caches` and `wrapper` — running
+ # cirruslabs/cache on top of it would be redundant work and a redundant
+ # save at end of run.
- name: Restore Gradle dependencies from branch cache
id: gradle-cache-restore
# This action automatically updates the cache at the end of the workflow
uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
- if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' }}
+ if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' }}
env:
GRADLE_CACHE_VERSION: 1
with:
path: |
~/_work/.gradle/caches
~/_work/.gradle/wrapper
- # Include Gradle properties in key to force rebuild when properties change
- # Keep the `hashFiles` call for Gradle config in-sync with these steps:
- # - "Restore APKs matching fingerprint from branch cache"
- # - "Restore APKs matching fingerprint from main cache"
- # - "Restore Gradle dependencies from branch cache"
- # - "Restore Gradle dependencies from main cache"
- key: gradle-${{ github.ref_name }}-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-${{ github.run_id }}
+ # Include Gradle properties in key to force rebuild when properties change.
+ # Keep the `hashFiles` call for Gradle config in-sync with the
+ # sibling "Restore Gradle dependencies from main cache" step below.
+ key: gradle-${{ github.ref_name }}-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
- name: Restore Gradle dependencies from main cache
# This will only restore the cache, not update it
uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
- if: ${{ inputs.runner_provider != 'namespace' && steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+ if: ${{ inputs.runner_provider != 'namespace' && steps.gate.outputs.needs-native-build == 'true' && steps.gradle-cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
env:
GRADLE_CACHE_VERSION: 1
with:
path: |
~/_work/.gradle/caches
~/_work/.gradle/wrapper
- # Include Gradle properties in key to force rebuild when properties change
- # Keep the `hashFiles` call for Gradle config in-sync with these steps:
- # - "Restore APKs matching fingerprint from branch cache"
- # - "Restore APKs matching fingerprint from main cache"
- # - "Restore Gradle dependencies from branch cache"
- # - "Restore Gradle dependencies from main cache"
- key: gradle-main-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}-${{ github.run_id }}
+ # Include Gradle properties in key to force rebuild when properties change.
+ # Keep the `hashFiles` call for Gradle config in-sync with the
+ # sibling "Restore Gradle dependencies from branch cache" step above.
+ key: gradle-main-${{ env.GRADLE_CACHE_VERSION }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
- name: Build Android E2E APKs
- if: ${{ inputs.runner_provider == 'namespace' || (steps.apk-cache-restore.outputs.cache-hit != 'true' && steps.apk-cache-restore-main.outputs.cache-hit != 'true') }}
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
run: |
echo "🏗 Building Android E2E APKs..."
export NODE_OPTIONS="--max-old-space-size=4096"
@@ -245,7 +321,7 @@ jobs:
MM_PREDICT_GTM_MODAL_ENABLED: 'false'
- name: Repack APK with JS updates using @expo/repack-app
- if: ${{ inputs.runner_provider != 'namespace' && (steps.apk-cache-restore.outputs.cache-hit == 'true' || steps.apk-cache-restore-main.outputs.cache-hit == 'true') }}
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
run: |
echo "📦 Repacking APK with updated JavaScript bundle using @expo/repack-app..."
# Use the optimized repack script which uses @expo/repack-app
@@ -261,7 +337,7 @@ jobs:
GITHUB_CI: 'true'
CI: 'true'
NODE_OPTIONS: '--max-old-space-size=8192'
- METRO_MAX_WORKERS: '2'
+ METRO_MAX_WORKERS: '6'
BRIDGE_USE_DEV_APIS: 'true'
RAMP_INTERNAL_BUILD: 'true'
SEEDLESS_ONBOARDING_ENABLED: 'true'
diff --git a/.github/workflows/build-ios-e2e.yml b/.github/workflows/build-ios-e2e.yml
index 2095d077355..6be48da940d 100644
--- a/.github/workflows/build-ios-e2e.yml
+++ b/.github/workflows/build-ios-e2e.yml
@@ -17,16 +17,21 @@ on:
required: false
default: 'qa'
type: string
+ source-fingerprint:
+ description: >-
+ Canonical @expo/fingerprint hash for this commit, computed once in
+ the `post-build-source-hash` job. Used for cache keys and cross-run
+ artifact lookups. When empty (e.g. forked PR where the hash job is
+ skipped), the build compiles fresh with no cache reuse.
+ required: false
+ default: ''
+ type: string
runner_provider:
description: Runner provider forwarded from the caller
required: false
type: string
default: current
-permissions:
- contents: read
- id-token: write
-
jobs:
build-ios-apps:
name: Build iOS E2E Apps
@@ -36,9 +41,7 @@ jobs:
app-uploaded: ${{ steps.upload-app.outcome == 'success' }}
sourcemap-uploaded: ${{ steps.upload-sourcemap.outcome == 'success' }}
env:
- # Bump these to bust the respective caches and force a full rebuild
- XCODE_CACHE_VERSION: 4
- IOS_APP_CACHE_VERSION: 5
+ XCODE_CACHE_VERSION: 1
RCT_NO_LAUNCH_PACKAGER: 1
XCODE_BUILD_SETTINGS: 'COMPILER_INDEX_STORE_ENABLE=NO'
GITHUB_CI: 'true' # This ensures it's available during pod install
@@ -75,25 +78,84 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v6
- # TEMPORARY: `${{ github.run_id }}` makes every key unique per workflow
- # run so we always get a fresh build during the RN 0.81 upgrade — the
- # `yarn fingerprint:generate` heuristic doesn't track every native input
- # being changed (yarn patches, AppDelegate, Podfile shims, etc.) so the
- # branch cache can serve a stale .app and only the JS gets repacked.
- # Remove the trailing `-${{ github.run_id }}` from each `key:` below
- # once the upgrade is settled and fingerprint covers the touched paths.
+ - name: Check force-builds override
+ id: force-builds
+ uses: ./.github/actions/check-force-builds
+ with:
+ github-token: ${{ github.token }}
+
+ - name: Report source fingerprint
+ run: |
+ if [[ -z "$SOURCE_FINGERPRINT" ]]; then
+ echo "::warning::No source-fingerprint provided (likely a forked PR); artifact reuse disabled."
+ else
+ echo "Source fingerprint: $SOURCE_FINGERPRINT"
+ fi
+ env:
+ SOURCE_FINGERPRINT: ${{ inputs.source-fingerprint }}
+
+ - name: Find reusable build from prior run
+ id: find-reusable-build
+ if: ${{ steps.force-builds.outputs.force != 'true' && inputs.source-fingerprint != '' }}
+ uses: ./.github/actions/find-reusable-build
+ with:
+ fingerprint: ${{ inputs.source-fingerprint }}
+ artifact-names: '["${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app"]'
+ github-token: ${{ github.token }}
+
+ - name: Download reusable iOS build from prior run
+ id: download-reusable-app
+ if: ${{ steps.find-reusable-build.outputs.found == 'true' }}
+ continue-on-error: true
+ uses: actions/download-artifact@v4
+ with:
+ name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-MetaMask.app
+ path: ios/build/Build/Products/Release-iphonesimulator/MetaMask.app
+ github-token: ${{ github.token }}
+ repository: ${{ github.repository }}
+ run-id: ${{ steps.find-reusable-build.outputs.run-id }}
+
+ - name: Log reused iOS build source
+ if: ${{ steps.download-reusable-app.outcome == 'success' }}
+ run: |
+ echo "Reusing iOS build from run ${{ steps.find-reusable-build.outputs.run-id }}"
+ echo "Source SHA: ${{ steps.find-reusable-build.outputs.source-sha }}"
+ echo "Source branch: ${{ steps.find-reusable-build.outputs.source-branch }}"
+ shell: bash
+
+ - name: Compute native-build gate
+ id: gate
+ run: |
+ if [[ "${{ steps.find-reusable-build.outputs.found }}" == "true" \
+ && "${{ steps.download-reusable-app.outcome }}" == "success" ]]; then
+ echo "needs-native-build=false" >> "$GITHUB_OUTPUT"
+ echo "Reuse path active (cross-run artifact download succeeded); heavy native setup will be skipped."
+ else
+ if [[ "${{ steps.find-reusable-build.outputs.found }}" == "true" ]]; then
+ echo "::warning::Reusable run was found but artifact download failed (outcome=${{ steps.download-reusable-app.outcome }}); falling back to fresh native build."
+ fi
+ echo "needs-native-build=true" >> "$GITHUB_OUTPUT"
+ echo "No reuse path; full native build + setup will run."
+ fi
+ shell: bash
+
+ # -------------------------------------------------------------------------
+ # Heavy native setup — only runs on a full native-build path.
+ # -------------------------------------------------------------------------
+
- name: Restore Xcode derived data from branch cache
id: xcode-restore-cache
+ if: ${{ 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:
path: |
~/Library/Developer/Xcode/DerivedData
ios/build
- key: ${{ runner.os }}-xcode-${{ github.ref_name }}-${{ env.XCODE_CACHE_VERSION }}-${{ hashFiles('ios/**/*.{h,m,mm,swift}', 'ios/**/Podfile.lock', 'yarn.lock') }}-${{ github.run_id }}
+ 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.xcode-restore-cache.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
+ if: ${{ 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
@@ -101,23 +163,20 @@ jobs:
path: |
~/Library/Developer/Xcode/DerivedData
ios/build
- key: ${{ runner.os }}-xcode-main-${{ env.XCODE_CACHE_VERSION }}-${{ hashFiles('ios/**/*.{h,m,mm,swift}', 'ios/**/Podfile.lock', 'yarn.lock') }}-${{ github.run_id }}
+ key: ${{ runner.os }}-xcode-main-${{ env.XCODE_CACHE_VERSION }}-${{ hashFiles('ios/**/*.{h,m,mm,swift}', 'ios/**/Podfile.lock', 'yarn.lock') }}
- - name: Restore .metamask folder (Foundry download cache for install:foundryup)
- uses: actions/cache@v4
- with:
- path: .metamask
- key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
-
- # Install Node.js, Xcode tools, and other iOS development dependencies
+ # Install Node.js, Xcode tools, and other iOS development dependencies.
- name: Installing iOS Environment Setup
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
timeout-minutes: 15
uses: ./.github/actions/setup-e2e-env
with:
platform: ios
setup-simulator: false
+ install-foundry: false
- name: Print iOS tool versions
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
run: |
echo "🔧 Node.js Version:"
node -v || echo "Node not found"
@@ -133,10 +192,20 @@ jobs:
# Clean iOS plist files to prevent extended attribute issues
- name: Clean iOS plist files
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
run: find ios -name "*.plist" -exec xattr -c {} \;
+ - name: Restore .metamask folder
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
+ id: restore-metamask
+ uses: actions/cache@v4
+ with:
+ path: .metamask
+ key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
+
# Run project setup with retry for better resilience
- name: Setup project dependencies with retry
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
with:
timeout_minutes: 10
@@ -146,36 +215,61 @@ jobs:
echo "🚀 Setting up project..."
yarn setup:github-ci --build-ios --no-build-android
- # Generate fingerprint AFTER setup but BEFORE any build modifications
- - name: Generate current fingerprint
- id: generate-fingerprint
+ - name: Setup Node.js (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ uses: actions/setup-node@v6
+ with:
+ node-version: '20.18.0'
+
+ - name: Enable corepack (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
run: |
- FINGERPRINT=$(yarn fingerprint:generate)
- echo "fingerprint=$FINGERPRINT" >> "$GITHUB_OUTPUT"
- echo "Current fingerprint: ${FINGERPRINT}"
+ corepack enable
+ corepack prepare yarn@3.8.7 --activate
+ shell: bash
- - name: Restore iOS app matching fingerprint from branch cache
- id: cache-restore
- # This action automatically updates the cache at the end of the workflow
- uses: cirruslabs/cache@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
+ - name: Restore yarn cache (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ uses: actions/cache@v4
with:
path: |
- ios/build/Build/Products/Release-iphonesimulator/MetaMask.app
- key: ios-app-${{ github.ref_name }}-v${{ env.IOS_APP_CACHE_VERSION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}-${{ github.run_id }}
+ node_modules
+ key: e2e-yarn-ios-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- - name: Restore iOS app matching fingerprint from main cache
- if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && github.ref_name != 'main' }}
- id: cache-restore-main
- # This will only restore the cache, not update it
- uses: cirruslabs/cache/restore@bba69c6578b863ad0398ad40567bd2ef70290fe0 # v4
+ - name: Install JS dependencies (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
with:
- path: |
- ios/build/Build/Products/Release-iphonesimulator/MetaMask.app
- key: ios-app-main-v${{ env.IOS_APP_CACHE_VERSION }}-${{ steps.generate-fingerprint.outputs.fingerprint }}-${{ github.run_id }}
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 30
+ command: yarn install --immutable
+ env:
+ NODE_OPTIONS: --max-old-space-size=4096
+ YARN_ENABLE_GLOBAL_CACHE: 'true'
+
+ - name: Restore .metamask folder (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ id: restore-metamask-lean
+ uses: actions/cache@v4
+ with:
+ path: .metamask
+ key: .metamask-${{ hashFiles('package.json', 'yarn.lock') }}
+
+ - name: Run lightweight project setup (reuse-hit path)
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
+ uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 30
+ command: |
+ echo "📦 Setting up project (lightweight, skips Xcode build)..."
+ yarn setup:github-ci --no-build-ios --no-build-android
# Build the iOS E2E app for simulator
- name: Build iOS E2E App
- if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && steps.cache-restore-main.outputs.cache-hit != 'true' }}
+ if: ${{ steps.gate.outputs.needs-native-build == 'true' }}
run: |
echo "🏗 Building iOS E2E App..."
export NODE_OPTIONS="--max-old-space-size=8192"
@@ -205,7 +299,7 @@ jobs:
GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
- name: Repack iOS app with JS updates using @expo/repack-app
- if: ${{ steps.cache-restore.outputs.cache-hit == 'true' || steps.cache-restore-main.outputs.cache-hit == 'true' }}
+ if: ${{ steps.gate.outputs.needs-native-build != 'true' }}
run: |
echo "📦 Repacking iOS app with updated JavaScript bundle using @expo/repack-app..."
# Use the optimized repack script which uses @expo/repack-app
@@ -221,6 +315,7 @@ jobs:
GITHUB_CI: 'true'
CI: 'true'
NODE_OPTIONS: '--max-old-space-size=8192'
+ METRO_MAX_WORKERS: '6'
BRIDGE_USE_DEV_APIS: 'true'
RAMP_INTERNAL_BUILD: 'true'
SEEDLESS_ONBOARDING_ENABLED: 'true'
@@ -276,11 +371,12 @@ jobs:
if-no-files-found: error
continue-on-error: true
- # Upload source map file for crash debugging and error tracking if exists
- # Only runs when repack step runs (cache hit), as that's when sourcemap is generated
+ # Upload source map file for crash debugging and error tracking.
+ # Both paths produce it: `yarn build:ios:main:e2e` via
+ # `scripts/ios/bundle-js-and-sentry-upload.sh` and `yarn build:repack:ios`
+ # via `scripts/repack.js` both write to `sourcemaps/ios/index.js.map`.
- name: Upload iOS Source Map
id: upload-sourcemap
- if: ${{ steps.cache-restore.outputs.cache-hit == 'true' || steps.cache-restore-main.outputs.cache-hit == 'true' }}
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.build_type }}-${{ inputs.metamask_environment }}-index.js.map
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bcdf6e82a0a..704d767485c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,6 +86,41 @@ jobs:
echo "No changes detected"
fi
+ post-build-source-hash:
+ name: Post build-source-hash commit status
+ runs-on: ubuntu-latest
+ if: ${{ needs.get_requirements.outputs.skip_everything != 'true' }}
+ permissions:
+ contents: read
+ statuses: write
+ needs:
+ - get_requirements
+ 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
+ with:
+ node-version-file: '.nvmrc'
+ cache: yarn
+ - name: Install Yarn dependencies with retry
+ uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 #v3.0.2
+ with:
+ timeout_minutes: 10
+ max_attempts: 3
+ retry_wait_seconds: 30
+ command: yarn install --immutable
+ - name: Post build-source-hash commit status
+ id: publish
+ 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.
+ target-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+
dedupe:
name: Dedupe
runs-on: ${{ inputs.runner_provider == 'namespace' && 'namespace-profile-metamask-ci-linux' || 'ubuntu-latest' }}
@@ -798,12 +833,16 @@ jobs:
permissions:
contents: read
id-token: write
- needs: [get_requirements, smart-e2e-selection]
+ actions: read
+ statuses: read
+ pull-requests: read
+ needs: [get_requirements, smart-e2e-selection, post-build-source-hash]
uses: ./.github/workflows/build-android-e2e.yml
with:
build_type: 'main'
metamask_environment: 'e2e'
keystore_target: 'qa'
+ source-fingerprint: ${{ needs.post-build-source-hash.outputs.fingerprint }}
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -836,9 +875,13 @@ jobs:
permissions:
contents: read
id-token: write
- needs: [get_requirements, smart-e2e-selection]
+ actions: read
+ statuses: read
+ pull-requests: read
+ needs: [get_requirements, smart-e2e-selection, post-build-source-hash]
uses: ./.github/workflows/build-ios-e2e.yml
with:
+ source-fingerprint: ${{ needs.post-build-source-hash.outputs.fingerprint }}
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
diff --git a/scripts/repack.js b/scripts/repack.js
index 43f139e4a95..49908a6ece3 100644
--- a/scripts/repack.js
+++ b/scripts/repack.js
@@ -218,8 +218,9 @@ async function repackIos() {
throw new Error(
`Repacked app is missing its bundle executable at "${executablePath}". ` +
`@expo/repack-app may have dropped the binary (possible symlink handling issue). ` +
- `Aborting to prevent uploading a broken artifact — bust IOS_APP_CACHE_VERSION ` +
- `in build-ios-e2e.yml to force a full rebuild.`
+ `Aborting to prevent uploading a broken artifact — add the \`force-builds\` ` +
+ `label (or a \`[force-builds]\` token in the commit message) to the PR to ` +
+ `bypass cross-run artifact reuse and force a full native rebuild.`
);
}
logger.success(`Bundle executable verified: ${sourceAppName}`);
From e5a8b17558867a506bcd1492aab38db3bc868e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Tani=C3=A7a?=
Date: Fri, 8 May 2026 12:18:27 -0600
Subject: [PATCH 03/10] feat(predict): add confirmation hook plumbing (#29914)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## **Description**
This PR adds minimal Predict confirmation hook plumbing needed by the
upcoming Polymarket Deposit Wallet migration.
It wires TransactionController confirmation lifecycle hooks to
PredictController while keeping Predict behavior as passthrough by
default:
- `beforePublish` delegates to `PredictController.beforePublish`, which
currently returns `true`.
- `publish` delegates to `PredictController.publish` before Transaction
Pay / 7702 / Smart Transactions, and continues normal publishing when
Predict returns no transaction hash.
- If a future Predict publish implementation returns `{ transactionHash,
isIntentComplete: true }`, TransactionController marks the latest
transaction meta as `isIntentComplete` before returning the hash.
This PR intentionally contains no Polymarket Deposit Wallet business
logic. It is a small foundation PR for confirmation-team review.
## **Changelog**
CHANGELOG entry: null
## **Related issues**
Fixes: N/A — preparatory plumbing for the Predict Deposit Wallet
migration.
## **Manual testing steps**
```gherkin
Feature: Predict confirmation hook plumbing
Scenario: non-Predict transactions continue through the normal publish flow
Given a transaction is published through TransactionController
And PredictController.publish returns no transaction hash
When the publish hook runs
Then Transaction Pay / 7702 / Smart Transaction publishing continues as before
Scenario: Predict publish can complete a transaction intent
Given PredictController.publish returns a transaction hash and isIntentComplete
When the publish hook runs
Then normal publishing is short-circuited
And the latest TransactionController transaction meta is marked intent complete
```
Local validation run:
```bash
yarn jest app/core/Engine/controllers/transaction-controller/transaction-controller-init.test.ts app/components/UI/Predict/controllers/PredictController.test.ts --runInBand
yarn lint:tsc
```
## **Screenshots/Recordings**
N/A — no UI changes.
### **Before**
N/A
### **After**
N/A
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [x] I've tested on Android
- N/A — hook plumbing only, no UI/runtime performance path manually
exercised.
- [x] I've tested with a power user scenario
- N/A — hook plumbing only, no account/token rendering path changed.
- [x] I've instrumented key operations with Sentry traces for production
performance metrics
- N/A — this PR only adds passthrough hook plumbing.
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Touches transaction publishing lifecycle by adding new hooks and a
short-circuit path, which could affect submission ordering and
integration with Pay/7702/Smart Transactions if miswired. Default
behavior remains passthrough, reducing blast radius.
>
> **Overview**
> Adds Predict-specific confirmation hook plumbing into the transaction
submission lifecycle. TransactionController init now calls
`PredictController:beforePublish` as a new `hooks.beforePublish`, and
calls `PredictController:publish` at the start of `hooks.publish`,
**short-circuiting** the rest of the publish pipeline when Predict
returns a `transactionHash`.
>
> Updates PredictController to expose new messenger methods
(`beforePublish`, `publish`) with default passthrough implementations,
extends messenger action typings/permissions accordingly, and adds unit
tests verifying delegation, call ordering, and the short-circuit
behavior.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
3f9d6182134dd88a4adec93fb6a62a80f4e4422e. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.../PredictController-method-action-types.ts | 12 ++
.../controllers/PredictController.test.ts | 34 ++++++
.../Predict/controllers/PredictController.ts | 16 +++
.../transaction-controller-init.test.ts | 115 ++++++++++++++++--
.../transaction-controller-init.ts | 20 +++
.../transaction-controller-messenger.ts | 10 +-
6 files changed, 198 insertions(+), 9 deletions(-)
diff --git a/app/components/UI/Predict/controllers/PredictController-method-action-types.ts b/app/components/UI/Predict/controllers/PredictController-method-action-types.ts
index 611cc69c66c..5dc2a92767b 100644
--- a/app/components/UI/Predict/controllers/PredictController-method-action-types.ts
+++ b/app/components/UI/Predict/controllers/PredictController-method-action-types.ts
@@ -248,11 +248,21 @@ export type PredictControllerPrepareWithdrawAction = {
handler: PredictController['prepareWithdraw'];
};
+export type PredictControllerBeforePublishAction = {
+ type: `PredictController:beforePublish`;
+ handler: PredictController['beforePublish'];
+};
+
export type PredictControllerBeforeSignAction = {
type: `PredictController:beforeSign`;
handler: PredictController['beforeSign'];
};
+export type PredictControllerPublishAction = {
+ type: `PredictController:publish`;
+ handler: PredictController['publish'];
+};
+
export type PredictControllerClearWithdrawTransactionAction = {
type: `PredictController:clearWithdrawTransaction`;
handler: PredictController['clearWithdrawTransaction'];
@@ -300,5 +310,7 @@ export type PredictControllerMethodActions =
| PredictControllerGetAccountStateAction
| PredictControllerGetBalanceAction
| PredictControllerPrepareWithdrawAction
+ | PredictControllerBeforePublishAction
| PredictControllerBeforeSignAction
+ | PredictControllerPublishAction
| PredictControllerClearWithdrawTransactionAction;
diff --git a/app/components/UI/Predict/controllers/PredictController.test.ts b/app/components/UI/Predict/controllers/PredictController.test.ts
index 6b0122eb258..08562cacbcc 100644
--- a/app/components/UI/Predict/controllers/PredictController.test.ts
+++ b/app/components/UI/Predict/controllers/PredictController.test.ts
@@ -6139,6 +6139,40 @@ describe('PredictController', () => {
});
});
+ describe('beforePublish', () => {
+ it('passes through by default', async () => {
+ await withController(async ({ controller }) => {
+ const result = await controller.beforePublish({
+ transactionMeta: {
+ id: 'tx-1',
+ txParams: {
+ from: MOCK_ADDRESS,
+ },
+ } as TransactionMeta,
+ });
+
+ expect(result).toBe(true);
+ });
+ });
+ });
+
+ describe('publish', () => {
+ it('passes through by default', async () => {
+ await withController(async ({ controller }) => {
+ const result = await controller.publish({
+ transactionMeta: {
+ id: 'tx-1',
+ txParams: {
+ from: MOCK_ADDRESS,
+ },
+ } as TransactionMeta,
+ });
+
+ expect(result).toEqual({ transactionHash: undefined });
+ });
+ });
+ });
+
describe('beforeSign', () => {
const mockTransactionMeta = {
id: 'tx-1',
diff --git a/app/components/UI/Predict/controllers/PredictController.ts b/app/components/UI/Predict/controllers/PredictController.ts
index 4396fb809e1..cab0aa6762a 100644
--- a/app/components/UI/Predict/controllers/PredictController.ts
+++ b/app/components/UI/Predict/controllers/PredictController.ts
@@ -345,6 +345,7 @@ export interface PredictControllerOptions {
}
const MESSENGER_EXPOSED_METHODS = [
+ 'beforePublish',
'beforeSign',
'claimWithConfirmation',
'clearActiveOrder',
@@ -370,6 +371,7 @@ const MESSENGER_EXPOSED_METHODS = [
'onPlaceOrderSuccess',
'placeOrder',
'prepareWithdraw',
+ 'publish',
'previewOrder',
'refreshEligibility',
'selectPaymentToken',
@@ -2619,6 +2621,12 @@ export class PredictController extends BaseController<
}
}
+ public async beforePublish(_request: {
+ transactionMeta: TransactionMeta;
+ }): Promise {
+ return true;
+ }
+
public async beforeSign(request: {
transactionMeta: TransactionMeta;
}): Promise<
@@ -2722,6 +2730,12 @@ export class PredictController extends BaseController<
};
}
+ public async publish(_request: {
+ transactionMeta: TransactionMeta;
+ }): Promise<{ transactionHash?: string }> {
+ return { transactionHash: undefined };
+ }
+
public clearWithdrawTransaction(): void {
this.update((state) => {
state.withdrawTransaction = null;
@@ -2730,6 +2744,7 @@ export class PredictController extends BaseController<
}
export type {
+ PredictControllerBeforePublishAction,
PredictControllerBeforeSignAction,
PredictControllerClaimWithConfirmationAction,
PredictControllerClearActiveOrderAction,
@@ -2754,6 +2769,7 @@ export type {
PredictControllerPlaceOrderAction,
PredictControllerPrepareWithdrawAction,
PredictControllerPreviewOrderAction,
+ PredictControllerPublishAction,
PredictControllerRefreshEligibilityAction,
PredictControllerSelectPaymentTokenAction,
PredictControllerSetSelectedPaymentTokenAction,
diff --git a/app/core/Engine/controllers/transaction-controller/transaction-controller-init.test.ts b/app/core/Engine/controllers/transaction-controller/transaction-controller-init.test.ts
index 7d77de82cfe..d811d27d661 100644
--- a/app/core/Engine/controllers/transaction-controller/transaction-controller-init.test.ts
+++ b/app/core/Engine/controllers/transaction-controller/transaction-controller-init.test.ts
@@ -92,10 +92,20 @@ const MOCK_TRANSACTION_META = {
* with the default mock.
* @returns A mock NetworkController.
*/
+type ControllerMock = NetworkController & {
+ beforePublish: jest.Mock;
+ beforeSign: jest.Mock;
+ publish: jest.Mock;
+};
+
function buildControllerMock(
- partialMock?: Partial,
-): NetworkController {
- const defaultControllerMocks = {};
+ partialMock?: Partial,
+): ControllerMock {
+ const defaultControllerMocks = {
+ beforePublish: jest.fn().mockResolvedValue(true),
+ beforeSign: jest.fn(),
+ publish: jest.fn().mockResolvedValue({ transactionHash: undefined }),
+ };
// @ts-expect-error Incomplete mock, just includes properties used by code-under-test.
return {
@@ -112,22 +122,43 @@ function buildInitRequestMock(
TransactionControllerInitMessenger
>
> {
+ const {
+ predictControllerMock: providedPredictControllerMock,
+ ...requestOverrides
+ } = initRequestProperties;
+ const predictControllerMock =
+ (providedPredictControllerMock as ControllerMock | undefined) ??
+ buildControllerMock();
const initMessenger = new ExtendedMessenger({
namespace: MOCK_ANY_NAMESPACE,
});
const baseControllerMessenger = new ExtendedMessenger({
namespace: MOCK_ANY_NAMESPACE,
});
+ (initMessenger as unknown as { call: jest.Mock }).call = jest.fn(
+ (actionType: string, params: unknown) => {
+ if (actionType === 'PredictController:beforePublish') {
+ return predictControllerMock.beforePublish(params);
+ }
+
+ if (actionType === 'PredictController:publish') {
+ return predictControllerMock.publish(params);
+ }
+
+ throw new Error(`Unexpected init messenger action: ${actionType}`);
+ },
+ );
+
const requestMock = {
...buildMessengerClientInitRequestMock(baseControllerMessenger),
initMessenger:
initMessenger as unknown as TransactionControllerInitMessenger,
controllerMessenger:
baseControllerMessenger as unknown as TransactionControllerMessenger,
- ...initRequestProperties,
+ ...requestOverrides,
};
- if (!initRequestProperties.getMessengerClient) {
+ if (!requestOverrides.getMessengerClient) {
requestMock.getMessengerClient.mockReturnValue(buildControllerMock());
}
@@ -180,9 +211,11 @@ describe('Transaction Controller Init', () => {
): TransactionControllerOptions[T] {
const requestMock = buildInitRequestMock(initRequestProperties);
- requestMock.getMessengerClient.mockReturnValue(
- buildControllerMock(dependencyProperties),
- );
+ if (!initRequestProperties.getMessengerClient) {
+ requestMock.getMessengerClient.mockReturnValue(
+ buildControllerMock(dependencyProperties),
+ );
+ }
TransactionControllerInit(requestMock);
@@ -320,6 +353,25 @@ describe('Transaction Controller Init', () => {
expect(optionFn?.()).toBe(false);
});
+ describe('beforePublish hook', () => {
+ it('delegates to PredictController beforePublish', async () => {
+ const predictControllerMock = buildControllerMock();
+ const hooks = testConstructorOption(
+ 'hooks',
+ {},
+ {
+ predictControllerMock,
+ },
+ );
+
+ await hooks?.beforePublish?.(MOCK_TRANSACTION_META);
+
+ expect(predictControllerMock.beforePublish).toHaveBeenCalledWith({
+ transactionMeta: MOCK_TRANSACTION_META,
+ });
+ });
+ });
+
describe('publish hook', () => {
it('calls submitSmartTransactionHook', async () => {
const hooks = testConstructorOption('hooks');
@@ -347,6 +399,53 @@ describe('Transaction Controller Init', () => {
expect(payHookMock).toHaveBeenCalledTimes(1);
});
+ it('calls Predict publish before pay and smart transaction hooks', async () => {
+ const predictControllerMock = buildControllerMock();
+ const hooks = testConstructorOption(
+ 'hooks',
+ {},
+ {
+ predictControllerMock,
+ },
+ );
+
+ await hooks?.publish?.(MOCK_TRANSACTION_META);
+
+ expect(predictControllerMock.publish).toHaveBeenCalledWith({
+ transactionMeta: MOCK_TRANSACTION_META,
+ });
+ expect(payHookMock).toHaveBeenCalledTimes(1);
+ expect(
+ (predictControllerMock.publish as jest.Mock).mock
+ .invocationCallOrder[0],
+ ).toBeLessThan(payHookMock.mock.invocationCallOrder[0]);
+ expect(
+ (predictControllerMock.publish as jest.Mock).mock
+ .invocationCallOrder[0],
+ ).toBeLessThan(
+ submitSmartTransactionHookMock.mock.invocationCallOrder[0],
+ );
+ });
+
+ it('short-circuits publish when Predict returns a transaction hash', async () => {
+ const predictControllerMock = buildControllerMock({
+ publish: jest.fn().mockResolvedValue({ transactionHash: '0xpredict' }),
+ } as unknown as Partial);
+ const hooks = testConstructorOption(
+ 'hooks',
+ {},
+ {
+ predictControllerMock,
+ },
+ );
+
+ const result = await hooks?.publish?.(MOCK_TRANSACTION_META);
+
+ expect(result).toEqual({ transactionHash: '0xpredict' });
+ expect(payHookMock).not.toHaveBeenCalled();
+ expect(submitSmartTransactionHookMock).not.toHaveBeenCalled();
+ });
+
it('passes isSmartTransaction returning false to pay hook when stxDisabled is true', async () => {
selectMetaMaskPayFlagsMock.mockReturnValue({
attemptsMax: 2,
diff --git a/app/core/Engine/controllers/transaction-controller/transaction-controller-init.ts b/app/core/Engine/controllers/transaction-controller/transaction-controller-init.ts
index 64bc20e25cb..e4757003edd 100644
--- a/app/core/Engine/controllers/transaction-controller/transaction-controller-init.ts
+++ b/app/core/Engine/controllers/transaction-controller/transaction-controller-init.ts
@@ -136,6 +136,8 @@ export const TransactionControllerInit: MessengerClientInitFunction<
transactions:
_request.transactions as PublishBatchHookTransaction[],
}),
+ beforePublish: (transactionMeta: TransactionMeta) =>
+ beforePublish(transactionMeta, initMessenger),
beforeSign: (_request: { transactionMeta: TransactionMeta }) =>
beforeSign(_request, request),
},
@@ -226,6 +228,15 @@ async function publishHook({
initMessenger: TransactionControllerInitMessenger;
signedTransactionInHex: Hex;
}): Promise<{ transactionHash?: string }> {
+ const { transactionHash: predictTransactionHash } = await initMessenger.call(
+ 'PredictController:publish',
+ { transactionMeta },
+ );
+
+ if (predictTransactionHash) {
+ return { transactionHash: predictTransactionHash };
+ }
+
const state = getState();
const { shouldUseSmartTransaction, featureFlags } =
@@ -441,6 +452,15 @@ function getControllers(
};
}
+function beforePublish(
+ transactionMeta: TransactionMeta,
+ initMessenger: TransactionControllerInitMessenger,
+) {
+ return initMessenger.call('PredictController:beforePublish', {
+ transactionMeta,
+ });
+}
+
function beforeSign(
hookRequest: { transactionMeta: TransactionMeta },
request: MessengerClientInitRequest<
diff --git a/app/core/Engine/messengers/transaction-controller-messenger/transaction-controller-messenger.ts b/app/core/Engine/messengers/transaction-controller-messenger/transaction-controller-messenger.ts
index ca6bb67d57f..324fbdd8ccc 100644
--- a/app/core/Engine/messengers/transaction-controller-messenger/transaction-controller-messenger.ts
+++ b/app/core/Engine/messengers/transaction-controller-messenger/transaction-controller-messenger.ts
@@ -55,6 +55,10 @@ import {
MessengerActions,
MessengerEvents,
} from '@metamask/messenger';
+import type {
+ PredictControllerBeforePublishAction,
+ PredictControllerPublishAction,
+} from '../../../../components/UI/Predict/controllers/PredictController-method-action-types';
export function getTransactionControllerMessenger(
rootMessenger: RootMessenger,
@@ -114,7 +118,9 @@ type InitMessengerActions =
| TransactionPayControllerGetDelegationTransactionAction
| TransactionPayControllerGetStateAction
| TransactionPayControllerGetStrategyAction
- | AnalyticsControllerActions;
+ | AnalyticsControllerActions
+ | PredictControllerBeforePublishAction
+ | PredictControllerPublishAction;
type InitMessengerEvents =
| BridgeStatusControllerEvents
@@ -173,6 +179,8 @@ export function getTransactionControllerInitMessenger(
'TransactionPayController:getState',
'TransactionPayController:getStrategy',
'AnalyticsController:trackEvent',
+ 'PredictController:beforePublish',
+ 'PredictController:publish',
],
events: [
'BridgeStatusController:stateChange',
From 4d3e3e69a0649c8981b117bafc8eff5b2d04f568 Mon Sep 17 00:00:00 2001
From: George Marshall
Date: Fri, 8 May 2026 11:54:45 -0700
Subject: [PATCH 04/10] chore(ui): remove dead aggregated percentage component
(#29873)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## **Description**
This PR is a follow-up to the BN.js to native `BigInt` burndown effort
called out in [this Slack
post](https://consensys.slack.com/archives/C02U025CVU4/p1777911707412459).
In the design-system-owned `AggregatedPercentage` area, it completes the
remaining `app/util/number/index.js` migration by switching
`AggregatedPercentage/utils.ts` to `app/util/number/bigint`, removing
the migrated path from `utilNumberImportBurndownFiles`, and deleting the
stale migration-guide entry.
While doing that cleanup, it also removes the unused
`AggregatedPercentage` component, its dead story/test/export surface,
and the type dependency that kept `useMultichainBalances` coupled to the
deleted file. The live hook now uses a local `AggregatedBalance`
interface instead.
## **Changelog**
CHANGELOG entry: null
## **Related issues**
No issue: maintenance-only BN.js to BigInt burndown follow-up prompted
by the internal migration announcement.
## **Manual testing steps**
```gherkin
Feature: AggregatedPercentage bigint migration cleanup
Scenario: validate remaining AggregatedPercentage consumers after migration
Given the AggregatedPercentage dead component has been removed
When I run the AggregatedPercentage and balance change Jest suites
Then all related tests should pass using the BigInt-backed renderFiat import
```
## **Screenshots/Recordings**
### **Before**
N/A
### **After**
N/A
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [x] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [x] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [x] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Low Risk**
> Low risk maintenance: removes unused UI component/story/test and
tightens types; the only functional change is switching
`AggregatedPercentage/utils.ts` to the BigInt-backed `renderFiat`, which
could slightly affect formatting if any remaining caller relies on
legacy behavior.
>
> **Overview**
> Removes the unused `AggregatedPercentage` component surface (component
file, types, index export), along with its Storybook story and Jest
test, and drops its story registration.
>
> Completes remaining BN.js→BigInt cleanup in this area by switching
`AggregatedPercentage/utils.ts` to import `renderFiat` from
`app/util/number/bigint`, updating ESLint’s legacy `util/number`
allowlist and pruning the corresponding entry from
`docs/bigint-migration-guide.md`. The `useMultichainBalances` hook types
are decoupled from the deleted component by introducing a local
`AggregatedBalance` interface and returning it from
`getAggregatedBalance`.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
feb08640557ce3a30e9af72cfdb0dffe71fb9447. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.eslintrc.js | 2 -
.storybook/storybook.requires.js | 1 -
.../AggregatedPercentage.stories.tsx | 72 --------------
.../AggregatedPercentage.test.tsx | 91 ------------------
.../AggregatedPercentage.tsx | 94 -------------------
.../AggregatedPercentage.types.ts | 7 --
.../Price/AggregatedPercentage/index.ts | 1 -
.../Price/AggregatedPercentage/utils.ts | 6 +-
.../useMultichainBalances.types.ts | 10 +-
.../hooks/useMultichainBalances/utils.ts | 5 +-
docs/bigint-migration-guide.md | 2 -
11 files changed, 16 insertions(+), 275 deletions(-)
delete mode 100644 app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx
delete mode 100644 app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.test.tsx
delete mode 100644 app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx
delete mode 100644 app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.types.ts
delete mode 100644 app/component-library/components-temp/Price/AggregatedPercentage/index.ts
diff --git a/.eslintrc.js b/.eslintrc.js
index 147bbca7708..58a60686452 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,8 +9,6 @@
const utilNumberImportBurndownFiles = [
'app/component-library/components-temp/CustomSpendCap/CustomInput/CustomInput.tsx',
'app/component-library/components-temp/CustomSpendCap/CustomSpendCap.tsx',
- 'app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx',
- 'app/component-library/components-temp/Price/AggregatedPercentage/utils.ts',
'app/components/UI/AccountInfoCard/index.js',
'app/components/UI/AssetOverview/Price/Price.advanced.tsx',
'app/components/UI/AssetOverview/Price/Price.legacy.tsx',
diff --git a/.storybook/storybook.requires.js b/.storybook/storybook.requires.js
index 68b6c2694da..10dd87d50a6 100644
--- a/.storybook/storybook.requires.js
+++ b/.storybook/storybook.requires.js
@@ -59,7 +59,6 @@ const getStories = () => {
"./app/component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList.stories.tsx": require("../app/component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList.stories.tsx"),
"./app/component-library/components-temp/MultichainAccounts/MultichainAddressRow/MultichainAddressRow.stories.tsx": require("../app/component-library/components-temp/MultichainAccounts/MultichainAddressRow/MultichainAddressRow.stories.tsx"),
"./app/component-library/components-temp/MultichainAccounts/MultichainAddressRowsList/MultichainAddressRowsList.stories.tsx": require("../app/component-library/components-temp/MultichainAccounts/MultichainAddressRowsList/MultichainAddressRowsList.stories.tsx"),
- "./app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx": require("../app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx"),
"./app/component-library/components-temp/Price/PercentageChange/PercentageChange.stories.tsx": require("../app/component-library/components-temp/Price/PercentageChange/PercentageChange.stories.tsx"),
"./app/component-library/components-temp/QuickActionButtons/QuickActionButton/QuickActionButton.stories.tsx": require("../app/component-library/components-temp/QuickActionButtons/QuickActionButton/QuickActionButton.stories.tsx"),
"./app/component-library/components-temp/QuickActionButtons/QuickActionButtons.stories.tsx": require("../app/component-library/components-temp/QuickActionButtons/QuickActionButtons.stories.tsx"),
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx
deleted file mode 100644
index 666439a3648..00000000000
--- a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.stories.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import AggregatedPercentage from './AggregatedPercentage';
-import { createStore } from 'redux';
-import initialBackgroundState from '../../../../util/test/initial-background-state.json';
-import { AggregatedPercentageProps } from './AggregatedPercentage.types';
-const mockInitialState = {
- engine: {
- backgroundState: initialBackgroundState,
- },
-};
-
-const rootReducer = (state = mockInitialState) => state;
-const store = createStore(rootReducer);
-
-export default {
- title: 'Component Library / AggregatedPercentage',
- component: AggregatedPercentage,
- decorators: [
- (Story: typeof React.Component) => (
-
-
-
- ),
- ],
-};
-
-const Template = (args: AggregatedPercentageProps) => (
-
-);
-
-export const Default = Template.bind(
- {},
- {
- ethFiat: 1000,
- tokenFiat: 500,
- tokenFiat1dAgo: 950,
- ethFiat1dAgo: 450,
- },
-);
-
-export const NegativePercentageChange: (
- args: AggregatedPercentageProps,
-) => void = Template.bind(
- {},
- {
- ethFiat: 900,
- tokenFiat: 400,
- tokenFiat1dAgo: 950,
- ethFiat1dAgo: 1000,
- },
-);
-
-export const PositivePercentageChange = Template.bind(
- {},
- {
- ethFiat: 1100,
- tokenFiat: 600,
- tokenFiat1dAgo: 500,
- ethFiat1dAgo: 1000,
- },
-);
-
-export const MixedPercentageChange = Template.bind(
- {},
- {
- ethFiat: 1050,
- tokenFiat: 450,
- tokenFiat1dAgo: 500,
- ethFiat1dAgo: 1000,
- },
-);
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.test.tsx b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.test.tsx
deleted file mode 100644
index d7d9d5ee32f..00000000000
--- a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.test.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react-native';
-import AggregatedPercentage from './AggregatedPercentage';
-import { mockTheme } from '../../../../util/theme';
-import { useSelector } from 'react-redux';
-import { selectCurrentCurrency } from '../../../../selectors/currencyRateController';
-import {
- FORMATTED_VALUE_PRICE_TEST_ID,
- FORMATTED_PERCENTAGE_TEST_ID,
-} from './AggregatedPercentage.constants';
-
-jest.mock('react-redux', () => ({
- ...jest.requireActual('react-redux'),
- useSelector: jest.fn(),
-}));
-describe('AggregatedPercentage', () => {
- beforeEach(() => {
- (useSelector as jest.Mock).mockImplementation((selector) => {
- if (selector === selectCurrentCurrency) return 'USD';
- });
- });
- afterEach(() => {
- (useSelector as jest.Mock).mockClear();
- });
- it('renders percentage and value price elements', () => {
- const { getByTestId } = render(
- ,
- );
- expect(getByTestId(FORMATTED_PERCENTAGE_TEST_ID)).toBeOnTheScreen();
- expect(getByTestId(FORMATTED_VALUE_PRICE_TEST_ID)).toBeOnTheScreen();
- });
-
- it('renders positive percentage change correctly', () => {
- const { getByText } = render(
- ,
- );
-
- expect(getByText('(+25.00%)')).toBeOnTheScreen();
- expect(getByText('+100 USD')).toBeOnTheScreen();
-
- expect(getByText('(+25.00%)').props.style).toMatchObject({
- color: mockTheme.colors.success.default,
- });
- });
-
- it('renders negative percentage change correctly', () => {
- const { getByText } = render(
- ,
- );
-
- expect(getByText('(-30.00%)')).toBeOnTheScreen();
- expect(getByText('-150 USD')).toBeOnTheScreen();
-
- expect(getByText('(-30.00%)').props.style).toMatchObject({
- color: mockTheme.colors.error.default,
- });
- });
-
- it('renders correctly with privacy mode on', () => {
- const { getByTestId } = render(
- ,
- );
-
- const formattedPercentage = getByTestId(FORMATTED_PERCENTAGE_TEST_ID);
- const formattedValuePrice = getByTestId(FORMATTED_VALUE_PRICE_TEST_ID);
-
- expect(formattedPercentage.props.children).toBe('••••••••••');
- expect(formattedValuePrice.props.children).toBe('••••••••••');
- });
-});
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx
deleted file mode 100644
index a56675d122b..00000000000
--- a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React from 'react';
-import {
- TextColor,
- TextVariant,
-} from '../../../../component-library/components/Texts/Text';
-import SensitiveText from '../../../../component-library/components/Texts/SensitiveText';
-import { View } from 'react-native';
-import { renderFiat } from '../../../../util/number';
-import { useSelector } from 'react-redux';
-import { selectCurrentCurrency } from '../../../../selectors/currencyRateController';
-import styleSheet from './AggregatedPercentage.styles';
-import { useStyles } from '../../../hooks';
-import {
- FORMATTED_VALUE_PRICE_TEST_ID,
- FORMATTED_PERCENTAGE_TEST_ID,
-} from './AggregatedPercentage.constants';
-import { DECIMALS_TO_SHOW } from '../../../../components/UI/Tokens/constants';
-import { AggregatedPercentageProps } from './AggregatedPercentage.types';
-
-const isValidAmount = (amount: number | null | undefined): boolean =>
- amount !== null && amount !== undefined && !Number.isNaN(amount);
-
-const AggregatedPercentage = ({
- ethFiat,
- tokenFiat,
- tokenFiat1dAgo,
- ethFiat1dAgo,
- privacyMode = false,
-}: AggregatedPercentageProps) => {
- const { styles } = useStyles(styleSheet, {});
-
- const currentCurrency = useSelector(selectCurrentCurrency);
-
- const totalBalance = ethFiat + tokenFiat;
- const totalBalance1dAgo = ethFiat1dAgo + tokenFiat1dAgo;
-
- const amountChange = totalBalance - totalBalance1dAgo;
-
- const percentageChange =
- ((totalBalance - totalBalance1dAgo) / totalBalance1dAgo) * 100 || 0;
-
- let percentageTextColor = TextColor.Default;
-
- if (!privacyMode) {
- if (percentageChange === 0) {
- percentageTextColor = TextColor.Default;
- } else if (percentageChange > 0) {
- percentageTextColor = TextColor.Success;
- } else {
- percentageTextColor = TextColor.Error;
- }
- } else {
- percentageTextColor = TextColor.Alternative;
- }
-
- const formattedPercentage = isValidAmount(percentageChange)
- ? `(${(percentageChange as number) >= 0 ? '+' : ''}${(
- percentageChange as number
- ).toFixed(2)}%)`
- : '';
-
- const formattedValuePrice = isValidAmount(amountChange)
- ? `${(amountChange as number) >= 0 ? '+' : ''}${renderFiat(
- amountChange,
- currentCurrency,
- DECIMALS_TO_SHOW,
- )} `
- : '';
-
- return (
-
-
- {formattedValuePrice}
-
-
- {formattedPercentage}
-
-
- );
-};
-
-export default AggregatedPercentage;
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.types.ts b/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.types.ts
deleted file mode 100644
index 45fd7d283dc..00000000000
--- a/app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface AggregatedPercentageProps {
- ethFiat: number;
- tokenFiat: number;
- tokenFiat1dAgo: number;
- ethFiat1dAgo: number;
- privacyMode?: boolean;
-}
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/index.ts b/app/component-library/components-temp/Price/AggregatedPercentage/index.ts
deleted file mode 100644
index 3e7965d02fa..00000000000
--- a/app/component-library/components-temp/Price/AggregatedPercentage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './AggregatedPercentage';
diff --git a/app/component-library/components-temp/Price/AggregatedPercentage/utils.ts b/app/component-library/components-temp/Price/AggregatedPercentage/utils.ts
index 5c0602db9e3..bd58526ef45 100644
--- a/app/component-library/components-temp/Price/AggregatedPercentage/utils.ts
+++ b/app/component-library/components-temp/Price/AggregatedPercentage/utils.ts
@@ -1,16 +1,18 @@
import i18n from '../../../../../locales/i18n';
import { DECIMALS_TO_SHOW } from '../../../../components/UI/Tokens/constants';
import { formatWithThreshold } from '../../../../util/assets';
-import { renderFiat } from '../../../../util/number';
+import { renderFiat } from '../../../../util/number/bigint';
import { TextColor } from '../../../components/Texts/Text';
+type RenderFiatCurrencyCode = Parameters[1];
+
export const getFormattedAmountChange = (
input: number,
currentCurrency: string,
) =>
`${input >= 0 ? '+' : ''}${renderFiat(
input,
- currentCurrency,
+ currentCurrency as RenderFiatCurrencyCode,
DECIMALS_TO_SHOW,
)} `;
diff --git a/app/components/hooks/useMultichainBalances/useMultichainBalances.types.ts b/app/components/hooks/useMultichainBalances/useMultichainBalances.types.ts
index 23e560d9ae2..56f38724302 100644
--- a/app/components/hooks/useMultichainBalances/useMultichainBalances.types.ts
+++ b/app/components/hooks/useMultichainBalances/useMultichainBalances.types.ts
@@ -1,7 +1,13 @@
import { InternalAccount } from '@metamask/keyring-internal-api';
-import { AggregatedPercentageProps } from '../../../component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.types';
import { AggregatedPercentageCrossChainsProps } from '../../../component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains.types';
+export interface AggregatedBalance {
+ ethFiat: number;
+ tokenFiat: number;
+ tokenFiat1dAgo: number;
+ ethFiat1dAgo: number;
+}
+
export interface MultichainBalancesData {
displayBalance?: string;
displayCurrency: string;
@@ -11,7 +17,7 @@ export interface MultichainBalancesData {
nativeTokenUnit: string;
shouldShowAggregatedPercentage: boolean;
isPortfolioViewEnabled: boolean;
- aggregatedBalance: AggregatedPercentageProps;
+ aggregatedBalance: AggregatedBalance;
isLoadingAccount: boolean;
}
diff --git a/app/components/hooks/useMultichainBalances/utils.ts b/app/components/hooks/useMultichainBalances/utils.ts
index 7c7bfd33d2d..6d12036d18b 100644
--- a/app/components/hooks/useMultichainBalances/utils.ts
+++ b/app/components/hooks/useMultichainBalances/utils.ts
@@ -18,6 +18,7 @@ import Engine from '../../../core/Engine';
import { SupportedCaipChainId } from '@metamask/multichain-network-controller';
import { TotalFiatBalancesCrossChains } from '../useGetTotalFiatBalanceCrossChains';
import { isTestNet } from '../../../util/networks';
+import type { AggregatedBalance } from './useMultichainBalances.types';
// Production balance calculation (EVM)
const getEvmBalance = (
@@ -89,7 +90,9 @@ export const getShouldShowAggregatedPercentage = (
return !isTestNet(chainId);
};
-export const getAggregatedBalance = (account: InternalAccount) => {
+export const getAggregatedBalance = (
+ account: InternalAccount,
+): AggregatedBalance => {
const balance = Engine.getTotalEvmFiatAccountBalance(account);
return {
ethFiat: balance?.ethFiat ?? 0,
diff --git a/docs/bigint-migration-guide.md b/docs/bigint-migration-guide.md
index 6028547edf9..c7e87faa1c8 100644
--- a/docs/bigint-migration-guide.md
+++ b/docs/bigint-migration-guide.md
@@ -92,8 +92,6 @@ The table below maps each burndown path to the GitHub team(s) from [`.github/COD
- `app/component-library/components-temp/CustomSpendCap/CustomInput/CustomInput.tsx`
- `app/component-library/components-temp/CustomSpendCap/CustomSpendCap.tsx`
-- `app/component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentage.tsx`
-- `app/component-library/components-temp/Price/AggregatedPercentage/utils.ts`
### @MetaMask/earn
From 8fb0fbfc433786d8e8ec09427ecb5b4f7660ff58 Mon Sep 17 00:00:00 2001
From: Wei Sun
Date: Fri, 8 May 2026 12:52:51 -0700
Subject: [PATCH 05/10] feat(bridge): use native stack navigator with inline
headers (#29829)
## **Description**
**Reason:** The Bridge feature stack used JavaScript-based
`@react-navigation/stack`, which differs from native stack behavior
elsewhere and relied on `navigation.setOptions` plus compact header
helpers for several screens.
**Solution:**
- Bridge and Bridge modal navigators now use
`@react-navigation/native-stack`. Stack screens hide the default React
Navigation header (`headerShown: false`). Titles and back actions are
rendered in-screen with `HeaderStandard` from the design system, wrapped
with `SafeAreaView` so top insets stay correct.
- `ScreenView` gains an optional `safeAreaEdges` prop (default
unchanged) so screens that already apply bottom/left/right safe area in
an outer wrapper can pass `safeAreaEdges={[]}` and avoid double padding.
**For reviews** please view the files with this link
https://github.com/MetaMask/metamask-mobile/pull/29829/changes?w=1
because a lot of changes in
app/components/UI/Bridge/Views/BridgeView/index.tsx are just formatting
## **Changelog**
CHANGELOG entry: Updated Bridge navigation to use the native stack with
in-screen headers for Bridge, token selection, and quote selection.
## **Related issues**
Fixes:
## **Manual testing steps**
```gherkin
Feature: Bridge native stack and inline headers
Scenario: Open Bridge and use the inline header
Given the user is on a wallet account with Bridge available
When the user opens Bridge from the app
Then the Bridge screen shows the correct title (Bridge, Swaps, or combined per mode) and a working back control
Scenario: Token selector header and safe area
Given the user is on the Bridge screen
When the user opens the source or destination token selector
Then the token selector shows the "Select token" title, back returns to Bridge, and content is not clipped by device safe areas
Scenario: Quote selector header
Given the user is on Bridge with valid quotes
When the user opens the quote selector
Then the quote selector shows the "Select quote" title and back returns to the previous Bridge step
Scenario: Bridge modals still present as overlays
Given the user is on Bridge
When the user opens a Bridge modal (e.g. slippage or network list, as applicable)
Then the modal still presents with expected transparent overlay behavior
```
## **Screenshots/Recordings**
### **Before**
https://github.com/user-attachments/assets/ce10fe39-db04-42dd-830e-4c908c38d76e
https://github.com/user-attachments/assets/72d0539f-d554-47e2-99a4-79f47df34f50
### **After**
https://github.com/user-attachments/assets/b6f4c3ea-5e2e-4d77-92d6-a561ad4db79f
https://github.com/user-attachments/assets/3f2acc31-b4c4-4418-81e9-4da313f59ec5
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [x] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Navigation for Bridge screens is refactored to native-stack and moves
headers into screen layouts, which can subtly affect transitions,
safe-area insets, and back behavior across platforms. Risk is moderate
because changes are mostly UI/navigation but touch multiple entry
screens and modal presentation options.
>
> **Overview**
> Bridge navigation is migrated from JS `@react-navigation/stack` to
`@react-navigation/native-stack`, hiding the default navigator header
and rendering in-screen headers via design-system `HeaderStandard` for
`BridgeView`, `BridgeTokenSelector`, and `QuoteSelectorView`.
>
> To support this, `ScreenView` now accepts `safeAreaEdges` (defaulting
to bottom/left/right) so screens that wrap themselves in an outer
`SafeAreaView` can disable internal insets (`safeAreaEdges={[]}`) and
avoid double padding; Bridge screens also add wrapper styles to ensure
correct background/safe-area handling.
>
> Tests are updated to assert inline header rendering (instead of
`navigation.setOptions`) and to adjust mocks/selectors to avoid
`ButtonIcon` testID collisions with the new back button.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
3a898d1bf19a3892b1ef3dd68b7af30b642c8938. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
app/components/Base/ScreenView.tsx | 28 +-
.../Views/BridgeView/BridgeView.styles.ts | 4 +
.../UI/Bridge/Views/BridgeView/index.tsx | 553 +++++++++---------
.../BridgeTokenSelector.test.tsx | 58 +-
.../BridgeTokenSelector.tsx | 18 +-
.../QuoteSelectorView.styles.ts | 12 +
.../QuoteSelectorView/index.test.tsx | 12 +-
.../components/QuoteSelectorView/index.tsx | 42 +-
app/components/UI/Bridge/routes.tsx | 29 +-
9 files changed, 415 insertions(+), 341 deletions(-)
create mode 100644 app/components/UI/Bridge/components/QuoteSelectorView/QuoteSelectorView.styles.ts
diff --git a/app/components/Base/ScreenView.tsx b/app/components/Base/ScreenView.tsx
index e4b425711c1..e4db11ff2e8 100644
--- a/app/components/Base/ScreenView.tsx
+++ b/app/components/Base/ScreenView.tsx
@@ -1,7 +1,7 @@
import type { ThemeColors } from '@metamask/design-tokens';
import React from 'react';
-import { StyleSheet, ScrollView } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import { StyleSheet, ScrollView, View, ScrollViewProps } from 'react-native';
+import { SafeAreaView, type Edge } from 'react-native-safe-area-context';
import { useTheme } from '../../util/theme';
const createStyles = (colors: ThemeColors) =>
@@ -12,16 +12,34 @@ const createStyles = (colors: ThemeColors) =>
},
});
-interface ScreenViewProps {
+interface ScreenViewProps extends ScrollViewProps {
children: React.ReactNode;
+ /**
+ * Safe-area edges applied by the internal SafeAreaView wrapper.
+ * Defaults to `['bottom', 'left', 'right']` for backwards compatibility.
+ * Pass `[]` when an ancestor SafeAreaView already handles the insets to
+ * avoid double padding.
+ */
+ safeAreaEdges?: readonly Edge[];
}
-const ScreenView: React.FC = (props) => {
+const ScreenView: React.FC = ({
+ safeAreaEdges = ['bottom', 'left', 'right'],
+ ...props
+}) => {
const { colors } = useTheme();
const styles = createStyles(colors);
+ if (safeAreaEdges.length === 0) {
+ return (
+
+
+
+ );
+ }
+
return (
-
+
);
diff --git a/app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts b/app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts
index 22c4221f321..6a7015861f3 100644
--- a/app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts
+++ b/app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts
@@ -10,6 +10,10 @@ export const createStyles = (params: { theme: Theme }) => {
screen: {
flex: 1,
},
+ screenWrapper: {
+ flex: 1,
+ backgroundColor: theme.colors.background.default,
+ },
inputsContainer: {
paddingVertical: 12,
paddingHorizontal: 16,
diff --git a/app/components/UI/Bridge/Views/BridgeView/index.tsx b/app/components/UI/Bridge/Views/BridgeView/index.tsx
index 0483c61094e..b540f7389e1 100644
--- a/app/components/UI/Bridge/Views/BridgeView/index.tsx
+++ b/app/components/UI/Bridge/Views/BridgeView/index.tsx
@@ -18,6 +18,7 @@ import {
BannerAlert,
BannerAlertSeverity,
Box,
+ HeaderStandard,
Icon,
IconColor,
IconName,
@@ -56,9 +57,9 @@ import {
useFocusEffect,
type RouteProp,
} from '@react-navigation/native';
-import { getBridgeNavbar } from '../../../Navbar';
import { useTheme } from '../../../../../util/theme';
import { strings } from '../../../../../../locales/i18n';
+import { BridgeViewMode } from '../../types';
import Engine from '../../../../../core/Engine';
import Routes from '../../../../../constants/navigation/Routes';
import QuoteDetailsCard from '../../components/QuoteDetailsCard';
@@ -81,6 +82,7 @@ import {
type NativeSyntheticEvent,
type NativeScrollEvent,
} from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
import useIsInsufficientBalance from '../../hooks/useInsufficientBalance';
import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
import { isHardwareAccount } from '../../../../../util/address';
@@ -351,9 +353,17 @@ const BridgeViewContent = ({ latestSourceBalance }: BridgeViewContentProps) => {
[dispatch],
);
- useEffect(() => {
- navigation.setOptions(getBridgeNavbar(navigation, bridgeViewMode, colors));
- }, [navigation, bridgeViewMode, colors]);
+ let headerTitle: string;
+ if (bridgeViewMode === BridgeViewMode.Bridge) {
+ headerTitle = strings('bridge.title');
+ } else if (
+ bridgeViewMode === BridgeViewMode.Swap ||
+ bridgeViewMode === BridgeViewMode.Unified
+ ) {
+ headerTitle = strings('swaps.title');
+ } else {
+ headerTitle = `${strings('swaps.title')}/${strings('bridge.title')}`;
+ }
useTrackSwapPageViewed();
@@ -426,280 +436,291 @@ const BridgeViewContent = ({ latestSourceBalance }: BridgeViewContentProps) => {
);
return (
- // Need this to be full height of screen
- // @ts-expect-error The type is incorrect, this will work
-
- !shouldShowTrendingTokens}
- onResponderRelease={dismissInputAndKeypad}
- >
-
+ navigation.goBack()}
+ includesTopInset
+ />
+
+ !shouldShowTrendingTokens}
+ onResponderRelease={dismissInputAndKeypad}
>
-
- keypadRef.current?.open()}
- onSelectionChange={handleSourceSelectionChange}
- onTokenPress={handleSourceTokenPress}
- onMaxPress={handleSourceMaxPress}
- latestAtomicBalance={latestSourceBalance?.atomicBalance}
- isSourceToken
- isQuoteSponsored={isQuoteSponsored}
- />
-
- keypadRef.current?.close()}
- onTokenPress={handleDestTokenPress}
- isLoading={!destTokenAmount && isLoading}
- style={styles.destTokenArea}
- isQuoteSponsored={isQuoteSponsored}
- />
-
-
-
- {quoteStreamComplete?.reason || quoteFetchError
- ? (() => {
- const quoteStreamErrorBannerStyle = {
- borderLeftWidth: 4,
- borderColor: colors.error.default,
- backgroundColor: colors.error.muted,
- paddingLeft: 8,
- };
- return (
-
- }
- description={getQuoteStreamReasonString(
- quoteStreamComplete?.reason,
- )}
- />
- );
- })()
- : null}
-
- {tokenWarning
- ? (() => {
- const isMalicious =
- tokenWarning.type === SecurityDataType.Malicious;
- const bannerColors = isMalicious
- ? colors.error
- : colors.warning;
- const bannerStyle = {
- borderLeftWidth: 4,
- borderColor: bannerColors.default,
- backgroundColor: bannerColors.muted,
- paddingLeft: 8,
- };
- const securityConfig = getBridgeTokenSecurityConfig(
- tokenWarning.type,
- );
- const navigateToModal = () =>
- navigation.navigate(Routes.BRIDGE.MODALS.ROOT, {
- screen: Routes.BRIDGE.MODALS.TOKEN_WARNING_MODAL,
- params: {
- warningType: tokenWarning.type,
- features: tokenWarning.metadata?.features ?? [],
- mode: TokenWarningModalMode.Info,
- location,
- },
- });
- return (
-
+
+
+ keypadRef.current?.open()}
+ onSelectionChange={handleSourceSelectionChange}
+ onTokenPress={handleSourceTokenPress}
+ onMaxPress={handleSourceMaxPress}
+ latestAtomicBalance={latestSourceBalance?.atomicBalance}
+ isSourceToken
+ isQuoteSponsored={isQuoteSponsored}
+ />
+
+ keypadRef.current?.close()}
+ onTokenPress={handleDestTokenPress}
+ isLoading={!destTokenAmount && isLoading}
+ style={styles.destTokenArea}
+ isQuoteSponsored={isQuoteSponsored}
+ />
+
+
+
+ {quoteStreamComplete?.reason || quoteFetchError
+ ? (() => {
+ const quoteStreamErrorBannerStyle = {
+ borderLeftWidth: 4,
+ borderColor: colors.error.default,
+ backgroundColor: colors.error.muted,
+ paddingLeft: 8,
+ };
+ return (
}
- description={
- isMalicious
- ? strings('bridge.token_warning_malicious_banner', {
- token: destToken?.symbol,
- })
- : strings(
- 'bridge.token_warning_suspicious_banner',
- {
- token: destToken?.symbol,
- },
- )
- }
- onClose={navigateToModal}
- closeButtonProps={{ iconName: CLIconName.ArrowRight }}
+ description={getQuoteStreamReasonString(
+ quoteStreamComplete?.reason,
+ )}
/>
-
- );
- })()
- : null}
-
- {insufficientNativeReserveError && !hasInsufficientBalance
- ? (() => {
- const bannerStyle = {
- borderLeftWidth: 4,
- borderColor: colors.warning.default,
- backgroundColor: colors.warning.muted,
- paddingLeft: 8,
- };
- return (
- {
+ const isMalicious =
+ tokenWarning.type === SecurityDataType.Malicious;
+ const bannerColors = isMalicious
+ ? colors.error
+ : colors.warning;
+ const bannerStyle = {
+ borderLeftWidth: 4,
+ borderColor: bannerColors.default,
+ backgroundColor: bannerColors.muted,
+ paddingLeft: 8,
+ };
+ const securityConfig = getBridgeTokenSecurityConfig(
+ tokenWarning.type,
+ );
+ const navigateToModal = () =>
+ navigation.navigate(Routes.BRIDGE.MODALS.ROOT, {
+ screen: Routes.BRIDGE.MODALS.TOKEN_WARNING_MODAL,
+ params: {
+ warningType: tokenWarning.type,
+ features: tokenWarning.metadata?.features ?? [],
+ mode: TokenWarningModalMode.Info,
+ location,
+ },
+ });
+ return (
+
+
+ }
+ description={
+ isMalicious
+ ? strings(
+ 'bridge.token_warning_malicious_banner',
+ {
+ token: destToken?.symbol,
+ },
+ )
+ : strings(
+ 'bridge.token_warning_suspicious_banner',
+ {
+ token: destToken?.symbol,
+ },
+ )
+ }
+ onClose={navigateToModal}
+ closeButtonProps={{ iconName: CLIconName.ArrowRight }}
/>
- }
- title={strings(
- 'bridge.insufficient_native_reserve_title',
- { ticker },
- )}
- style={bannerStyle}
- actionButtonProps={{
- label: strings(
- 'bridge.insufficient_native_reserve_cta',
- ),
- onPress: () =>
- handleSourcePresetAmountSelect(
- insufficientNativeReserveError.maxSwappableNativeBalance,
+
+ );
+ })()
+ : null}
+
+ {insufficientNativeReserveError && !hasInsufficientBalance
+ ? (() => {
+ const bannerStyle = {
+ borderLeftWidth: 4,
+ borderColor: colors.warning.default,
+ backgroundColor: colors.warning.muted,
+ paddingLeft: 8,
+ };
+ return (
+
+ }
+ title={strings(
+ 'bridge.insufficient_native_reserve_title',
+ { ticker },
+ )}
+ style={bannerStyle}
+ actionButtonProps={{
+ label: strings(
+ 'bridge.insufficient_native_reserve_cta',
),
- variant: ButtonVariants.Primary,
- size: ButtonSize.Sm,
- style: {
- marginTop: 6,
- },
- }}
- description={strings(
- 'bridge.insufficient_native_reserve_message',
- {
- ticker,
- minimumReserve:
- insufficientNativeReserveError.minimumNativeBalanceToBeKeptInAccount,
- maxSwappable:
- insufficientNativeReserveError.maxSwappableNativeBalance,
- },
- )}
- />
- );
- })()
- : null}
-
- {contentMode === 'quote' &&
- activeQuote &&
- hasMissingPriceData(activeQuote) ? (
-
- ) : null}
-
+ onPress: () =>
+ handleSourcePresetAmountSelect(
+ insufficientNativeReserveError.maxSwappableNativeBalance,
+ ),
+ variant: ButtonVariants.Primary,
+ size: ButtonSize.Sm,
+ style: {
+ marginTop: 6,
+ },
+ }}
+ description={strings(
+ 'bridge.insufficient_native_reserve_message',
+ {
+ ticker,
+ minimumReserve:
+ insufficientNativeReserveError.minimumNativeBalanceToBeKeptInAccount,
+ maxSwappable:
+ insufficientNativeReserveError.maxSwappableNativeBalance,
+ },
+ )}
+ />
+ );
+ })()
+ : null}
+
+ {contentMode === 'quote' &&
+ activeQuote &&
+ hasMissingPriceData(activeQuote) ? (
+
+ ) : null}
+
-
+ {contentMode === 'loading' ? (
+
+
+
+ ) : null}
+ {contentMode === 'quote' ? (
+
+
+
+ ) : null}
+ {shouldShowTrendingTokens ? (
+
+ ) : null}
+
+
+
+
+
+
- {contentMode === 'loading' ? (
-
-
-
- ) : null}
- {contentMode === 'quote' ? (
-
-
-
- ) : null}
- {shouldShowTrendingTokens ? (
-
- ) : null}
-
-
-
-
-
-
- {sourceAmount && sourceAmount !== '0' ? (
-
- ) : (
-
- )}
-
-
-
+ {sourceAmount && sourceAmount !== '0' ? (
+
+ ) : (
+
+ )}
+
+
+
+
);
};
diff --git a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
index 80e81b5414e..5c241be8da8 100644
--- a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
+++ b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.test.tsx
@@ -230,12 +230,6 @@ jest.mock('../../hooks/useTokenSelection', () => ({
jest.mock('../../../../../../locales/i18n', () => ({
strings: (key: string) => key,
}));
-jest.mock(
- '../../../../../component-library/components-temp/HeaderCompactStandard',
- () => ({
- getHeaderCompactStandardNavbarOptions: jest.fn(() => ({})),
- }),
-);
const mockTrackEvent = jest.fn();
jest.mock('../../../../../core/Engine', () => ({
@@ -298,13 +292,48 @@ jest.mock('@metamask/design-system-react-native', () => {
Box: ({ children, style }: { children: React.ReactNode; style?: object }) =>
createElement(View, { style }, children),
Text: 'Text',
- ButtonIcon: ({ onPress }: { onPress?: () => void }) =>
- createElement(TouchableOpacity, { onPress, testID: 'button-icon-info' }),
+ ButtonIcon: ({
+ onPress,
+ iconName,
+ }: {
+ onPress?: () => void;
+ iconName?: string;
+ }) =>
+ createElement(TouchableOpacity, {
+ onPress,
+ // Derive the testID from the iconName so different ButtonIcons
+ // (e.g. Info on each row, ArrowLeft in the inline header) don't
+ // collide on the same selector.
+ testID: `button-icon-${String(iconName ?? 'unknown').toLowerCase()}`,
+ }),
ButtonIconSize: { Md: 'Md' },
IconColor: { IconAlternative: 'IconAlternative' },
- IconName: { Info: 'Info', Check: 'Check' },
+ IconName: { Info: 'Info', Check: 'Check', ArrowLeft: 'ArrowLeft' },
Icon: 'Icon',
IconSize: { Md: 'Md' },
+ HeaderStandard: ({
+ title,
+ onBack,
+ }: {
+ title?: string;
+ onBack?: () => void;
+ }) =>
+ createElement(
+ View,
+ { testID: 'header-standard' },
+ // Render the title text so existing assertions on `getByText(title)` pass.
+ // Render the back button only when onBack is provided to mirror the
+ // real component's behaviour.
+ title
+ ? createElement('Text', { testID: 'header-standard-title' }, title)
+ : null,
+ onBack
+ ? createElement(TouchableOpacity, {
+ onPress: onBack,
+ testID: 'button-icon-arrowleft',
+ })
+ : null,
+ ),
TextVariant: {
HeadingSm: 'HeadingSm',
HeadingMd: 'HeadingMd',
@@ -587,10 +616,15 @@ describe('BridgeTokenSelector', () => {
});
describe('rendering', () => {
- it('renders and sets navigation options', () => {
- const { getByTestId } = renderWithReduxProvider();
+ it('renders the search input and inline header title', () => {
+ const { getByTestId, getByText } = renderWithReduxProvider(
+ ,
+ );
expect(getByTestId('bridge-token-search-input')).toBeTruthy();
- expect(mockSetOptions).toHaveBeenCalled();
+ // Header is now inlined inside the screen instead of being set via
+ // navigation.setOptions, so assert on the rendered title instead.
+ // strings() is mocked to return the key.
+ expect(getByText('bridge.select_token')).toBeTruthy();
});
it('renders skeleton items during loading', async () => {
diff --git a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
index 825bb7ad8b1..146649da2d0 100644
--- a/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
+++ b/app/components/UI/Bridge/components/BridgeTokenSelector/BridgeTokenSelector.tsx
@@ -19,7 +19,6 @@ import {
} from '@react-navigation/native';
import { useSelector, useDispatch } from 'react-redux';
import { strings } from '../../../../../../locales/i18n';
-import { getHeaderCompactStandardNavbarOptions } from '../../../../../component-library/components-temp/HeaderCompactStandard';
import { FlatList } from 'react-native-gesture-handler';
import { NetworkPills } from './NetworkPills';
import Routes from '../../../../../constants/navigation/Routes';
@@ -40,6 +39,7 @@ import {
Box,
ButtonIcon,
ButtonIconSize,
+ HeaderStandard,
IconColor,
IconName,
Text,
@@ -105,17 +105,6 @@ export const BridgeTokenSelector: React.FC = () => {
const enabledChainRanking = useSelector(selectAllowedChainRanking);
- // Set navigation options for header
- useEffect(() => {
- navigation.setOptions(
- getHeaderCompactStandardNavbarOptions({
- title: strings('bridge.select_token'),
- onBack: () => navigation.goBack(),
- includesTopInset: true,
- }),
- );
- }, [navigation]);
-
// Use custom hook for token selection
const { handleTokenPress, selectedToken } = useTokenSelection(
route.params?.type,
@@ -525,6 +514,11 @@ export const BridgeTokenSelector: React.FC = () => {
return (
+ navigation.goBack()}
+ includesTopInset
+ />
{
+ const { theme } = params;
+ return StyleSheet.create({
+ screenWrapper: {
+ flex: 1,
+ backgroundColor: theme.colors.background.default,
+ },
+ });
+};
diff --git a/app/components/UI/Bridge/components/QuoteSelectorView/index.test.tsx b/app/components/UI/Bridge/components/QuoteSelectorView/index.test.tsx
index 0b9a494c156..e9c8097ec2a 100644
--- a/app/components/UI/Bridge/components/QuoteSelectorView/index.test.tsx
+++ b/app/components/UI/Bridge/components/QuoteSelectorView/index.test.tsx
@@ -210,16 +210,10 @@ describe('QuoteSelectorView', () => {
});
describe('navigation setup', () => {
- it('sets navigation options on mount', () => {
- render();
-
- expect(mockSetOptions).toHaveBeenCalled();
- });
-
- it('calls goBack when back action is triggered', () => {
- render();
+ it('renders inline header with the screen title', () => {
+ const { getByText } = render();
- expect(mockSetOptions).toHaveBeenCalled();
+ expect(getByText(strings('bridge.select_quote'))).toBeTruthy();
});
});
diff --git a/app/components/UI/Bridge/components/QuoteSelectorView/index.tsx b/app/components/UI/Bridge/components/QuoteSelectorView/index.tsx
index 1813e8d0a54..bdd52d1c29b 100644
--- a/app/components/UI/Bridge/components/QuoteSelectorView/index.tsx
+++ b/app/components/UI/Bridge/components/QuoteSelectorView/index.tsx
@@ -1,14 +1,17 @@
import ScreenView from '../../../../Base/ScreenView';
import {
Box,
+ HeaderStandard,
Text,
TextColor,
TextVariant,
} from '@metamask/design-system-react-native';
import React, { useCallback, useEffect, useMemo } from 'react';
+import { SafeAreaView } from 'react-native-safe-area-context';
import { strings } from '../../../../../../locales/i18n';
import { useNavigation } from '@react-navigation/native';
-import { getHeaderCompactStandardNavbarOptions } from '../../../../../component-library/components-temp/HeaderCompactStandard';
+import { useStyles } from '../../../../../component-library/hooks';
+import { createStyles } from './QuoteSelectorView.styles';
import { useDispatch, useSelector } from 'react-redux';
import {
selectDestToken,
@@ -30,6 +33,7 @@ import { useTrackAllQuotesSortedEvent } from '../../hooks/useTrackAllQuotesSorte
import { fromTokenMinimalUnit } from '../../../../../util/number';
export const QuoteSelectorView = () => {
+ const { styles } = useStyles(createStyles, {});
const navigation = useNavigation();
const dispatch = useDispatch();
const selectedQuoteRequestId = useSelector(selectSelectedQuoteRequestId);
@@ -112,16 +116,6 @@ export const QuoteSelectorView = () => {
destToken,
]);
- useEffect(() => {
- navigation.setOptions(
- getHeaderCompactStandardNavbarOptions({
- title: strings('bridge.select_quote'),
- onBack: () => navigation.goBack(),
- includesTopInset: true,
- }),
- );
- }, [navigation]);
-
// Go back to bridge view only if there's an error or quotes are expired
useEffect(() => {
if (quoteFetchError || blockaidError) {
@@ -130,13 +124,23 @@ export const QuoteSelectorView = () => {
}, [quoteFetchError, blockaidError, navigation]);
return (
-
-
-
- {strings('bridge.select_quote_info')}
-
-
-
-
+
+ navigation.goBack()}
+ includesTopInset
+ />
+
+
+
+ {strings('bridge.select_quote_info')}
+
+
+
+
+
);
};
diff --git a/app/components/UI/Bridge/routes.tsx b/app/components/UI/Bridge/routes.tsx
index 58e11e90cc9..eabc77826ad 100644
--- a/app/components/UI/Bridge/routes.tsx
+++ b/app/components/UI/Bridge/routes.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { createStackNavigator } from '@react-navigation/stack';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
import Routes from '../../../constants/navigation/Routes';
import { BridgeTokenSelector } from './components/BridgeTokenSelector';
import BridgeView from './Views/BridgeView';
@@ -12,44 +12,37 @@ import { CustomSlippageModal } from './components/SlippageModal/CustomSlippageMo
import NetworkListModal from './components/BridgeTokenSelector/NetworkListModal';
import { QuoteSelectorView } from './components/QuoteSelectorView';
import { PriceImpactModal } from './components/PriceImpactModal';
-import { clearStackNavigatorOptions } from '../../../constants/navigation/clearStackNavigatorOptions';
+import {
+ clearNativeStackNavigatorOptions,
+ transparentModalScreenOptions,
+} from '../../../constants/navigation/clearStackNavigatorOptions';
import { TokenWarningModal } from './components/TokenWarningModal';
import { MissingPriceModal } from './components/MissingPriceModal';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type ScreenComponent = React.ComponentType;
-const Stack = createStackNavigator();
+const Stack = createNativeStackNavigator();
export const BridgeScreenStack = () => (
-
-
+
+
);
-const ModalStack = createStackNavigator();
+const ModalStack = createNativeStackNavigator();
export const BridgeModalStack = () => (
Date: Fri, 8 May 2026 15:42:42 -0600
Subject: [PATCH 06/10] feat(predict): add deposit wallet deposit foundation
(#29917)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## **Description**
This is PR 2 for the Predict Deposit Wallet migration and is temporarily
opened against `predict/dw-confirmation-hooks` to accelerate review
while PR 1 is reviewed. Once PR 1 merges, this PR should be
rebased/retargeted to `main`.
Polymarket migrated new API users from the legacy Safe/proxy wallet
model to deterministic Deposit Wallets. This PR adds the shared Predict
Deposit Wallet foundation and enables the deposit flow while preserving
legacy Safe behavior for users with existing Polymarket activity.
Included changes:
- Adds `walletType` to Predict account state and routes users by legacy
Safe activity:
- legacy Safe with raw Polymarket activity stays on Safe
- legacy Safe without activity routes to Deposit Wallet
- deployed legacy Safe + Activity API failure fails closed
- Adds Deposit Wallet helper utilities for deterministic address
derivation, relayer proxy calls, polling, EIP-712 batch execution, and
CLOB balance-allowance sync.
- Adds Deposit Wallet deposit preflight to deploy/setup allowances in
`beforePublish`.
- Adds legacy Safe migration sweep planning for zero-activity users with
stranded pUSD/USDC.e.
- Updates deposit preparation so Deposit Wallet users receive pUSD
transfers to their Deposit Wallet.
- Updates balance/position lookup to use the active Predict wallet.
- Adds post-confirm best-effort CLOB balance-allowance sync for Deposit
Wallet deposits and deposit-and-order deposits.
- Keeps order and claim execution support out of scope for this PR;
those follow in separate PRs.
Validation performed:
- `yarn jest
app/components/UI/Predict/providers/polymarket/depositWallet.test.ts
app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.test.ts
app/components/UI/Predict/providers/polymarket/preflight/depositWallet.test.ts
app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.test.ts
app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
app/components/UI/Predict/controllers/PredictController.test.ts
app/components/UI/Predict/hooks/usePredictAccountState.test.ts
--runInBand --forceExit`
- `yarn lint:tsc`
## **Changelog**
CHANGELOG entry: Added support for Polymarket Deposit Wallet deposits in
Predict
## **Related issues**
Fixes:
[PRED-858](https://consensyssoftware.atlassian.net/browse/PRED-858)
## **Manual testing steps**
```gherkin
Feature: Predict Deposit Wallet deposits
Scenario: new Predict user deposits to a Polymarket Deposit Wallet
Given the selected wallet has no legacy Safe Polymarket activity
And the user opens Predict deposit
When user confirms a Predict deposit
Then the Deposit Wallet setup preflight runs through the relayer
And the pUSD deposit transaction transfers funds to the derived Deposit Wallet
And the deposit completes without changing legacy Safe users' behavior
```
```gherkin
Feature: Legacy Safe compatibility
Scenario: existing Predict user with legacy Safe activity deposits
Given the selected wallet has a deployed legacy Safe with Polymarket activity
When user prepares a Predict deposit
Then Predict keeps using the legacy Safe path
And no Deposit Wallet relayer preflight is run
```
## **Screenshots/Recordings**
N/A — core/provider flow changes covered by tests and manual wallet-flow
validation.
### **Before**
N/A
### **After**
N/A
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [ ] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
[PRED-858]:
https://consensyssoftware.atlassian.net/browse/PRED-858?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
---
> [!NOTE]
> **High Risk**
> High risk because it changes how Predict chooses deposit addresses and
adds new pre-publish relayer/batch execution plus post-confirm sync,
which directly affects deposit and deposit+order transaction flows and
fund routing.
>
> **Overview**
> Adds first-class support for Polymarket **Deposit Wallet** accounts in
Predict by extending `AccountState` with `walletType` and routing users
to either legacy Safe or a deterministic deposit wallet based on legacy
Safe deployment and Polymarket Activity API results (failing closed on
API errors).
>
> Implements deposit-wallet infrastructure in the Polymarket provider:
deterministic address derivation, relayer proxy calls/polling, EIP-712
batch execution, allowance-preflight planning (excluding Permit2), and a
legacy Safe “sweep” preflight to migrate stranded USDC.e/pUSD to the
deposit wallet.
>
> Updates the deposit pipeline to (1) build deposits targeting the
deposit wallet (with optional sweep), (2) run a new `beforePublish`
deposit-wallet preflight to ensure wallet deployment and required
allowances, and (3) on confirmed deposits/deposit+order, invalidate
cached account state and best-effort sync CLOB balance/allowance—waiting
for that sync before placing the follow-on order.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
c5f61e2c7f1547215769a938375c6972031174ab. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.../controllers/PredictController.test.ts | 165 ++++-
.../Predict/controllers/PredictController.ts | 83 ++-
.../hooks/usePredictAccountState.test.ts | 1 +
.../polymarket/PolymarketProvider.test.ts | 428 ++++++++++++-
.../polymarket/PolymarketProvider.ts | 571 +++++++++++++++---
.../polymarket/depositWallet.test.ts | 432 +++++++++++++
.../providers/polymarket/depositWallet.ts | 450 ++++++++++++++
.../preflight/depositWallet.test.ts | 107 ++++
.../polymarket/preflight/depositWallet.ts | 44 ++
.../preflight/legacySafeMigration.test.ts | 234 +++++++
.../preflight/legacySafeMigration.ts | 117 ++++
.../preflight/v2AllowanceRequirements.test.ts | 29 +
.../preflight/v2AllowanceRequirements.ts | 15 +
app/components/UI/Predict/providers/types.ts | 1 +
app/components/UI/Predict/types/index.ts | 8 +-
15 files changed, 2557 insertions(+), 128 deletions(-)
create mode 100644 app/components/UI/Predict/providers/polymarket/depositWallet.test.ts
create mode 100644 app/components/UI/Predict/providers/polymarket/depositWallet.ts
create mode 100644 app/components/UI/Predict/providers/polymarket/preflight/depositWallet.test.ts
create mode 100644 app/components/UI/Predict/providers/polymarket/preflight/depositWallet.ts
create mode 100644 app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.test.ts
create mode 100644 app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.ts
diff --git a/app/components/UI/Predict/controllers/PredictController.test.ts b/app/components/UI/Predict/controllers/PredictController.test.ts
index 08562cacbcc..dafc316251a 100644
--- a/app/components/UI/Predict/controllers/PredictController.test.ts
+++ b/app/components/UI/Predict/controllers/PredictController.test.ts
@@ -278,8 +278,18 @@ describe('PredictController', () => {
createOptimisticPositionFromPreview: jest.fn(),
clearOptimisticPosition: jest.fn(),
getCryptoTargetPrice: jest.fn(),
+ invalidateAccountState: jest.fn(),
+ beforePublishDepositWalletDeposit: jest.fn(),
+ syncDepositWalletBalanceAllowanceForDepositTransaction: jest.fn(),
} as unknown as jest.Mocked;
+ mockPolymarketProvider.beforePublishDepositWalletDeposit.mockResolvedValue(
+ true,
+ );
+ mockPolymarketProvider.syncDepositWalletBalanceAllowanceForDepositTransaction.mockResolvedValue(
+ undefined,
+ );
+
// Default safe mocks for async fire-and-forget methods
// (prevents unhandled rejections when payWithAnyTokenConfirmation is
// triggered by onBuyPaymentTokenChange but the async chain completes
@@ -4885,6 +4895,38 @@ describe('PredictController', () => {
});
});
+ it('invalidates account state and syncs deposit-wallet balance allowance after confirmed deposits', async () => {
+ await withController(async ({ controller, messenger }) => {
+ const transactionMeta = createPredictTransactionMeta({
+ nestedType: TransactionType.predictDeposit,
+ status: TransactionStatus.confirmed,
+ from: accountAddress,
+ });
+
+ controller.updateStateForTesting((state) => {
+ state.pendingDeposits = {
+ [accountAddress]: 'pending',
+ };
+ });
+
+ messenger.publish('TransactionController:transactionStatusUpdated', {
+ transactionMeta,
+ } as { transactionMeta: TransactionMeta });
+
+ await Promise.resolve();
+
+ expect(
+ mockPolymarketProvider.invalidateAccountState,
+ ).toHaveBeenCalledWith(accountAddress);
+ expect(
+ mockPolymarketProvider.syncDepositWalletBalanceAllowanceForDepositTransaction,
+ ).toHaveBeenCalledWith({
+ transactionMeta,
+ signerAddress: accountAddress,
+ });
+ });
+ });
+
it('clears only sender pending deposit when selected account differs', () => {
withController(({ controller, messenger }) => {
const selectedAddress = accountAddress;
@@ -5721,6 +5763,7 @@ describe('PredictController', () => {
const mockAccountState = {
address: '0xProxyAddress' as `0x${string}`,
isDeployed: true,
+ walletType: 'safe' as const,
balance: 100.5,
};
@@ -6140,18 +6183,24 @@ describe('PredictController', () => {
});
describe('beforePublish', () => {
- it('passes through by default', async () => {
+ it('delegates to provider deposit-wallet preflight', async () => {
await withController(async ({ controller }) => {
- const result = await controller.beforePublish({
- transactionMeta: {
- id: 'tx-1',
- txParams: {
- from: MOCK_ADDRESS,
- },
- } as TransactionMeta,
- });
+ const transactionMeta = {
+ id: 'tx-before-publish',
+ txParams: {
+ from: '0x1234567890123456789012345678901234567890',
+ },
+ } as TransactionMeta;
+
+ const result = await controller.beforePublish({ transactionMeta });
expect(result).toBe(true);
+ expect(
+ mockPolymarketProvider.beforePublishDepositWalletDeposit,
+ ).toHaveBeenCalledWith({
+ transactionMeta,
+ getSigner: expect.any(Function),
+ });
});
});
});
@@ -9077,8 +9126,8 @@ describe('PredictController', () => {
],
}) as any;
- it('places the order when depositAndOrder transaction is confirmed and preview exists', () => {
- withController(({ controller, messenger }) => {
+ it('places the order when depositAndOrder transaction is confirmed and preview exists', async () => {
+ await withController(async ({ controller, messenger }) => {
const preview = createMockOrderPreview();
const placeOrderSpy = jest
.spyOn(controller, 'placeOrder')
@@ -9126,6 +9175,9 @@ describe('PredictController', () => {
},
} as { transactionMeta: TransactionMeta });
+ await Promise.resolve();
+ await Promise.resolve();
+
expect(placeOrderSpy).toHaveBeenCalledWith({
analyticsProperties: { marketId: 'market-1' },
preview,
@@ -9135,8 +9187,78 @@ describe('PredictController', () => {
});
});
- it('forwards activeAbTests to placeOrder when depositAndOrder is confirmed', () => {
- withController(({ controller, messenger }) => {
+ it('waits for deposit-wallet balance allowance sync before placing depositAndOrder', async () => {
+ await withController(async ({ controller, messenger }) => {
+ const preview = createMockOrderPreview();
+ const placeOrderSpy = jest
+ .spyOn(controller, 'placeOrder')
+ .mockResolvedValue({
+ success: true,
+ response: {
+ id: 'order-123',
+ spentAmount: '100',
+ receivedAmount: '200',
+ },
+ } as any);
+ let resolveSync: () => void = jest.fn();
+ const syncPromise = new Promise((resolve) => {
+ resolveSync = resolve;
+ });
+ mockPolymarketProvider.syncDepositWalletBalanceAllowanceForDepositTransaction.mockReturnValueOnce(
+ syncPromise,
+ );
+
+ setActiveOrderForTest(controller, {
+ state: ActiveOrderState.DEPOSITING,
+ transactionId: 'tx-1',
+ });
+ (
+ controller as unknown as {
+ pendingOrderPreviews: {
+ [transactionId: string]: {
+ preview: OrderPreview;
+ signerAddress: string;
+ };
+ };
+ }
+ ).pendingOrderPreviews['tx-1'] = {
+ preview,
+ signerAddress: accountAddress,
+ };
+
+ messenger.publish('TransactionController:transactionStatusUpdated', {
+ transactionMeta: {
+ ...createPredictTransactionMeta({
+ nestedType: TransactionType.predictDeposit,
+ status: TransactionStatus.confirmed,
+ }),
+ type: TransactionType.predictDepositAndOrder,
+ nestedTransactions: [
+ { type: TransactionType.predictDepositAndOrder },
+ ],
+ },
+ } as { transactionMeta: TransactionMeta });
+
+ await Promise.resolve();
+
+ expect(placeOrderSpy).not.toHaveBeenCalled();
+
+ resolveSync();
+ await Promise.resolve();
+ await Promise.resolve();
+
+ expect(placeOrderSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ preview,
+ address: accountAddress,
+ transactionId: 'tx-1',
+ }),
+ );
+ });
+ });
+
+ it('forwards activeAbTests to placeOrder when depositAndOrder is confirmed', async () => {
+ await withController(async ({ controller, messenger }) => {
const preview = createMockOrderPreview();
const abTests = [
{ key: 'predict-pwat-experiment', value: 'treatment' },
@@ -9184,6 +9306,9 @@ describe('PredictController', () => {
},
} as { transactionMeta: TransactionMeta });
+ await Promise.resolve();
+ await Promise.resolve();
+
expect(placeOrderSpy).toHaveBeenCalledWith(
expect.objectContaining({ activeAbTests: abTests }),
);
@@ -9645,8 +9770,8 @@ describe('PredictController', () => {
});
});
- it('does not update activeBuyOrder when deposit confirms for a different active order', () => {
- withController(({ controller, messenger }) => {
+ it('does not update activeBuyOrder when deposit confirms for a different active order', async () => {
+ await withController(async ({ controller, messenger }) => {
setActiveOrderForTest(controller, {
state: ActiveOrderState.PREVIEW,
});
@@ -9694,6 +9819,9 @@ describe('PredictController', () => {
},
} as { transactionMeta: TransactionMeta });
+ await Promise.resolve();
+ await Promise.resolve();
+
expect(placeOrderSpy).toHaveBeenCalledWith({
analyticsProperties: { marketId: 'market-1' },
preview,
@@ -9805,8 +9933,8 @@ describe('PredictController', () => {
],
}) as any;
- it('forwards the transaction address to placeOrder when depositAndOrder confirms after account switch', () => {
- withController(({ controller, messenger }) => {
+ it('forwards the transaction address to placeOrder when depositAndOrder confirms after account switch', async () => {
+ await withController(async ({ controller, messenger }) => {
const preview = createMockOrderPreview();
const placeOrderSpy = jest
.spyOn(controller, 'placeOrder')
@@ -9854,6 +9982,9 @@ describe('PredictController', () => {
},
} as { transactionMeta: TransactionMeta });
+ await Promise.resolve();
+ await Promise.resolve();
+
expect(placeOrderSpy).toHaveBeenCalledWith({
analyticsProperties: { marketId: 'market-2' },
preview,
diff --git a/app/components/UI/Predict/controllers/PredictController.ts b/app/components/UI/Predict/controllers/PredictController.ts
index cab0aa6762a..c85e227de6a 100644
--- a/app/components/UI/Predict/controllers/PredictController.ts
+++ b/app/components/UI/Predict/controllers/PredictController.ts
@@ -2144,6 +2144,38 @@ export class PredictController extends BaseController<
});
}
+ private async syncDepositWalletBalanceAllowanceIfNeeded({
+ transactionMeta,
+ address,
+ }: {
+ transactionMeta: TransactionMeta;
+ address: string;
+ }): Promise {
+ try {
+ await this.provider.syncDepositWalletBalanceAllowanceForDepositTransaction(
+ {
+ transactionMeta,
+ signerAddress: address,
+ },
+ );
+ } catch (error) {
+ DevLogger.log(
+ 'PredictController: Deposit wallet balance-allowance sync failed',
+ {
+ error: error instanceof Error ? error.message : 'Unknown error',
+ transactionId: transactionMeta.id,
+ },
+ );
+ Logger.error(
+ ensureError(error),
+ this.getErrorContext('syncDepositWalletBalanceAllowanceIfNeeded', {
+ operation: 'deposit_wallet_balance_allowance_sync',
+ transactionId: transactionMeta.id,
+ }),
+ );
+ }
+ }
+
private handleTransactionSideEffects(
type: PredictTransactionEventType,
status: PredictTransactionEventStatus,
@@ -2157,6 +2189,20 @@ export class PredictController extends BaseController<
this.clearPendingDepositForAddress({ address });
}
+ let depositWalletSyncPromise: Promise | undefined;
+ if (
+ (type === 'deposit' || type === 'depositAndOrder') &&
+ status === 'confirmed'
+ ) {
+ this.provider.invalidateAccountState(address);
+ depositWalletSyncPromise = this.syncDepositWalletBalanceAllowanceIfNeeded(
+ {
+ transactionMeta,
+ address,
+ },
+ );
+ }
+
if (type === 'depositAndOrder' && status === 'confirmed') {
const transactionId = transactionMeta.id;
const pendingOrder = transactionId
@@ -2186,20 +2232,24 @@ export class PredictController extends BaseController<
activeAbTests: pendingActiveAbTests,
} = pendingOrder;
- this.placeOrder({
- analyticsProperties: pendingAnalytics,
- activeAbTests: pendingActiveAbTests,
- preview,
- address: signerAddress,
- transactionId,
- }).catch((error) => {
- Logger.error(
- ensureError(error),
- this.getErrorContext('handleTransactionSideEffects', {
- operation: 'placeOrder',
+ (depositWalletSyncPromise ?? Promise.resolve())
+ .then(() =>
+ this.placeOrder({
+ analyticsProperties: pendingAnalytics,
+ activeAbTests: pendingActiveAbTests,
+ preview,
+ address: signerAddress,
+ transactionId,
}),
- );
- });
+ )
+ .catch((error) => {
+ Logger.error(
+ ensureError(error),
+ this.getErrorContext('handleTransactionSideEffects', {
+ operation: 'placeOrder',
+ }),
+ );
+ });
}
if (type === 'depositAndOrder' && status === 'failed') {
@@ -2621,10 +2671,13 @@ export class PredictController extends BaseController<
}
}
- public async beforePublish(_request: {
+ public async beforePublish(request: {
transactionMeta: TransactionMeta;
}): Promise {
- return true;
+ return this.provider.beforePublishDepositWalletDeposit({
+ transactionMeta: request.transactionMeta,
+ getSigner: (address?: string) => this.getSigner(address),
+ });
}
public async beforeSign(request: {
diff --git a/app/components/UI/Predict/hooks/usePredictAccountState.test.ts b/app/components/UI/Predict/hooks/usePredictAccountState.test.ts
index 29bf6383312..d282222d359 100644
--- a/app/components/UI/Predict/hooks/usePredictAccountState.test.ts
+++ b/app/components/UI/Predict/hooks/usePredictAccountState.test.ts
@@ -63,6 +63,7 @@ describe('usePredictAccountState', () => {
const mockAccountState = {
address: '0x1234567890abcdef1234567890abcdef12345678',
isDeployed: true,
+ walletType: 'safe' as const,
};
beforeEach(() => {
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
index 2e6bf89212e..46e80f43ace 100644
--- a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
+++ b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
@@ -1,16 +1,34 @@
-import { CHAIN_IDS, TransactionType } from '@metamask/transaction-controller';
+import {
+ CHAIN_IDS,
+ TransactionType,
+ type TransactionMeta,
+} from '@metamask/transaction-controller';
import { SignTypedDataVersion } from '@metamask/keyring-controller';
+import { Interface } from 'ethers/lib/utils';
+import { analytics } from '../../../../../util/analytics/analytics';
+import { UserProfileProperty } from '../../../../../util/metrics/UserSettingsAnalyticsMetaData/UserProfileAnalyticsMetaData.types';
import { DEFAULT_FEE_COLLECTION_FLAG } from '../../constants/flags';
import type { OrderPreview } from '../types';
import { Side } from '../../types';
import type { PredictFeatureFlags } from '../../types/flags';
import { PolymarketProvider } from './PolymarketProvider';
+import {
+ deriveDepositWalletAddress,
+ executeDepositWalletBatch,
+ getDepositWalletRelayerTransactionId,
+ requestDepositWalletCreate,
+ syncDepositWalletCollateralBalanceAllowance,
+ toDepositWalletCalls,
+ waitForDepositWalletDeployed,
+ waitForDepositWalletTransaction,
+} from './depositWallet';
import {
DEFAULT_CLOB_BASE_URL,
MATIC_CONTRACTS_V2,
POLYMARKET_PROVIDER_ID,
USDC_E_ADDRESS,
} from './constants';
+import { OperationType } from './safe/types';
import {
computeProxyAddress,
createPermit2FeeAuthorization,
@@ -29,6 +47,9 @@ import {
} from './utils';
import { submitProtocolClobOrder } from './protocol/transport';
import { buildDepositMaintenanceTransaction } from './preflight/deposit';
+import type { SignedSafeExecution } from './preflight/core';
+import { planDepositWalletPreflight } from './preflight/depositWallet';
+import { buildLegacySafeMigrationSweepTransaction } from './preflight/legacySafeMigration';
import { buildTradeAllowancesTx } from './preflight/trade';
import { buildWithdrawTransaction } from './preflight/withdraw';
import {
@@ -93,10 +114,29 @@ jest.mock('./protocol/transport', () => ({
submitProtocolClobOrder: jest.fn(),
}));
+jest.mock('./depositWallet', () => ({
+ deriveDepositWalletAddress: jest.fn(),
+ executeDepositWalletBatch: jest.fn(),
+ getDepositWalletRelayerTransactionId: jest.fn(),
+ requestDepositWalletCreate: jest.fn(),
+ syncDepositWalletCollateralBalanceAllowance: jest.fn(),
+ toDepositWalletCalls: jest.fn(),
+ waitForDepositWalletDeployed: jest.fn(),
+ waitForDepositWalletTransaction: jest.fn(),
+}));
+
jest.mock('./preflight/deposit', () => ({
buildDepositMaintenanceTransaction: jest.fn(),
}));
+jest.mock('./preflight/depositWallet', () => ({
+ planDepositWalletPreflight: jest.fn(),
+}));
+
+jest.mock('./preflight/legacySafeMigration', () => ({
+ buildLegacySafeMigrationSweepTransaction: jest.fn(),
+}));
+
jest.mock('./preflight/trade', () => ({
buildTradeAllowancesTx: jest.fn(),
}));
@@ -105,8 +145,14 @@ jest.mock('./preflight/withdraw', () => ({
buildWithdrawTransaction: jest.fn(),
}));
+const mockAnalyticsIdentify = jest.mocked(analytics.identify);
const mockComputeProxyAddress = jest.mocked(computeProxyAddress);
const mockCreateApiKey = jest.mocked(createApiKey);
+const mockDeriveDepositWalletAddress = jest.mocked(deriveDepositWalletAddress);
+const mockExecuteDepositWalletBatch = jest.mocked(executeDepositWalletBatch);
+const mockGetDepositWalletRelayerTransactionId = jest.mocked(
+ getDepositWalletRelayerTransactionId,
+);
const mockCreatePermit2FeeAuthorization = jest.mocked(
createPermit2FeeAuthorization,
);
@@ -127,15 +173,63 @@ const mockSubmitProtocolClobOrder = jest.mocked(submitProtocolClobOrder);
const mockBuildDepositMaintenanceTransaction = jest.mocked(
buildDepositMaintenanceTransaction,
);
+const mockPlanDepositWalletPreflight = jest.mocked(planDepositWalletPreflight);
+const mockBuildLegacySafeMigrationSweepTransaction = jest.mocked(
+ buildLegacySafeMigrationSweepTransaction,
+);
+const mockRequestDepositWalletCreate = jest.mocked(requestDepositWalletCreate);
+const mockSyncDepositWalletCollateralBalanceAllowance = jest.mocked(
+ syncDepositWalletCollateralBalanceAllowance,
+);
+const mockToDepositWalletCalls = jest.mocked(toDepositWalletCalls);
+const mockWaitForDepositWalletDeployed = jest.mocked(
+ waitForDepositWalletDeployed,
+);
+const mockWaitForDepositWalletTransaction = jest.mocked(
+ waitForDepositWalletTransaction,
+);
const mockBuildTradeAllowancesTx = jest.mocked(buildTradeAllowancesTx);
const mockBuildWithdrawTransaction = jest.mocked(buildWithdrawTransaction);
+const depositWalletAddress = '0x2222222222222222222222222222222222222222';
+const legacySafeAddress = '0x9999999999999999999999999999999999999999';
const signer = {
address: '0x1111111111111111111111111111111111111111',
signPersonalMessage: jest.fn(),
signTypedMessage: jest.fn(),
};
+const erc20Interface = new Interface([
+ 'function transfer(address to, uint256 value)',
+]);
+
+function createDepositTransactionMeta({
+ recipient,
+ tokenAddress = MATIC_CONTRACTS_V2.collateral,
+ type = TransactionType.predictDeposit,
+}: {
+ recipient: string;
+ tokenAddress?: string;
+ type?: TransactionType;
+}): TransactionMeta {
+ return {
+ id: 'tx-1',
+ txParams: {
+ from: signer.address,
+ to: tokenAddress,
+ value: '0x0',
+ data: '0x',
+ },
+ nestedTransactions: [
+ {
+ type,
+ to: tokenAddress,
+ data: erc20Interface.encodeFunctionData('transfer', [recipient, 0]),
+ },
+ ],
+ } as TransactionMeta;
+}
+
const basePreview: OrderPreview = {
marketId: 'market-1',
outcomeId:
@@ -192,9 +286,8 @@ describe('PolymarketProvider', () => {
beforeEach(() => {
jest.clearAllMocks();
- mockComputeProxyAddress.mockReturnValue(
- '0x9999999999999999999999999999999999999999',
- );
+ mockComputeProxyAddress.mockReturnValue(legacySafeAddress);
+ mockDeriveDepositWalletAddress.mockReturnValue(depositWalletAddress);
mockCreateApiKey.mockResolvedValue({
apiKey: 'api-key',
secret: 'secret',
@@ -229,6 +322,34 @@ describe('PolymarketProvider', () => {
type: TransactionType.contractInteraction,
});
mockBuildDepositMaintenanceTransaction.mockResolvedValue(undefined);
+ mockBuildLegacySafeMigrationSweepTransaction.mockResolvedValue(undefined);
+ mockGetDepositWalletRelayerTransactionId.mockImplementation(
+ (response) => response.transactionID ?? response.id,
+ );
+ mockRequestDepositWalletCreate.mockResolvedValue({
+ transactionID: 'create-1',
+ });
+ mockPlanDepositWalletPreflight.mockResolvedValue({
+ missingRequirements: [],
+ transactions: [],
+ });
+ mockToDepositWalletCalls.mockImplementation((transactions) =>
+ transactions.map((transaction) => ({
+ target: transaction.to,
+ value: transaction.value,
+ data: transaction.data,
+ })),
+ );
+ mockExecuteDepositWalletBatch.mockResolvedValue({
+ transactionID: 'batch-1',
+ });
+ mockWaitForDepositWalletDeployed.mockResolvedValue(undefined);
+ mockWaitForDepositWalletTransaction.mockResolvedValue(
+ '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ );
+ mockSyncDepositWalletCollateralBalanceAllowance.mockResolvedValue(
+ undefined,
+ );
mockEncodeErc20Transfer.mockReturnValue('0xtransfer');
mockGetRawBalance.mockResolvedValue(0n);
mockGetSafeTransferAmount.mockReturnValue(1);
@@ -242,7 +363,7 @@ describe('PolymarketProvider', () => {
});
global.fetch = jest.fn().mockResolvedValue({
ok: true,
- json: jest.fn().mockResolvedValue([]),
+ json: jest.fn().mockResolvedValue([{}]),
});
signer.signTypedMessage.mockResolvedValue('0xsigned-order');
});
@@ -251,6 +372,79 @@ describe('PolymarketProvider', () => {
expect(createProvider().providerId).toBe(POLYMARKET_PROVIDER_ID);
});
+ it('routes to deposit wallet when legacy Safe is not deployed', async () => {
+ mockIsSmartContractAddress
+ .mockResolvedValueOnce(false)
+ .mockResolvedValueOnce(true);
+
+ const accountState = await createProvider().getAccountState({
+ ownerAddress: signer.address,
+ });
+
+ expect(accountState).toEqual({
+ address: depositWalletAddress,
+ isDeployed: true,
+ walletType: 'deposit-wallet',
+ });
+ expect(global.fetch).not.toHaveBeenCalled();
+ expect(mockIsSmartContractAddress).toHaveBeenNthCalledWith(
+ 1,
+ legacySafeAddress,
+ '0x89',
+ );
+ expect(mockIsSmartContractAddress).toHaveBeenNthCalledWith(
+ 2,
+ depositWalletAddress,
+ '0x89',
+ );
+ });
+
+ it('keeps legacy Safe users only when raw Activity API has activity', async () => {
+ const accountState = await createProvider().getAccountState({
+ ownerAddress: signer.address,
+ });
+
+ expect(accountState).toEqual({
+ address: legacySafeAddress,
+ isDeployed: true,
+ walletType: 'safe',
+ });
+ expect(global.fetch).toHaveBeenCalledWith(
+ `https://data-api.polymarket.com/activity?user=${legacySafeAddress}&limit=1`,
+ );
+ });
+
+ it('routes deployed legacy Safe with empty raw activity to deposit wallet', async () => {
+ global.fetch = jest.fn().mockResolvedValue({
+ ok: true,
+ json: jest.fn().mockResolvedValue([]),
+ });
+ mockIsSmartContractAddress
+ .mockResolvedValueOnce(true)
+ .mockResolvedValueOnce(false);
+
+ const accountState = await createProvider().getAccountState({
+ ownerAddress: signer.address,
+ });
+
+ expect(accountState).toEqual({
+ address: depositWalletAddress,
+ isDeployed: false,
+ walletType: 'deposit-wallet',
+ });
+ });
+
+ it('fails closed when raw Activity API fails for a deployed legacy Safe', async () => {
+ global.fetch = jest.fn().mockResolvedValue({
+ ok: false,
+ json: jest.fn(),
+ });
+
+ await expect(
+ createProvider().getAccountState({ ownerAddress: signer.address }),
+ ).rejects.toThrow('Failed to fetch Polymarket activity');
+ });
+
it('previews orders through canonical CLOB v2 with zero fee-rate bps', async () => {
const provider = createProvider();
@@ -341,7 +535,6 @@ describe('PolymarketProvider', () => {
});
it('prepares pUSD deposits and optional legacy sweep maintenance', async () => {
- mockIsSmartContractAddress.mockResolvedValue(false);
mockBuildDepositMaintenanceTransaction.mockResolvedValue({
params: {
to: '0x9999999999999999999999999999999999999999',
@@ -353,10 +546,8 @@ describe('PolymarketProvider', () => {
const result = await createProvider().prepareDeposit({ signer });
expect(result.chainId).toBe(CHAIN_IDS.POLYGON);
+ expect(mockGetDeployProxyWalletTransaction).not.toHaveBeenCalled();
expect(result.transactions).toEqual([
- expect.objectContaining({
- params: { to: '0xFactory', data: '0xdeploy' },
- }),
{
params: {
to: MATIC_CONTRACTS_V2.collateral,
@@ -373,6 +564,49 @@ describe('PolymarketProvider', () => {
]);
});
+ it('prepares deposit-wallet deposits with optional legacy Safe sweep first', async () => {
+ global.fetch = jest.fn().mockResolvedValue({
+ ok: true,
+ json: jest.fn().mockResolvedValue([]),
+ });
+ mockIsSmartContractAddress
+ .mockResolvedValueOnce(true)
+ .mockResolvedValueOnce(false)
+ .mockResolvedValueOnce(true);
+ const sweepTransaction: SignedSafeExecution = {
+ params: {
+ to: legacySafeAddress,
+ data: '0xsweep',
+ },
+ type: TransactionType.contractInteraction,
+ };
+ mockBuildLegacySafeMigrationSweepTransaction.mockResolvedValue(
+ sweepTransaction,
+ );
+
+ const result = await createProvider().prepareDeposit({ signer });
+
+ expect(result.chainId).toBe(CHAIN_IDS.POLYGON);
+ expect(mockBuildLegacySafeMigrationSweepTransaction).toHaveBeenCalledWith({
+ signer,
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: expect.objectContaining({ key: 'v2' }),
+ });
+ expect(result.transactions).toEqual([
+ sweepTransaction,
+ {
+ params: {
+ to: MATIC_CONTRACTS_V2.collateral,
+ data: '0xtransferData',
+ },
+ type: TransactionType.predictDeposit,
+ },
+ ]);
+ expect(mockRequestDepositWalletCreate).not.toHaveBeenCalled();
+ expect(mockPlanDepositWalletPreflight).not.toHaveBeenCalled();
+ });
+
it('reads displayed Predict balance from pUSD plus legacy USDC.e', async () => {
mockGetBalance.mockResolvedValue(12.5);
mockGetRawBalance.mockResolvedValue(2_500_000n);
@@ -405,6 +639,182 @@ describe('PolymarketProvider', () => {
expect(mockGetRawBalance).toHaveBeenCalledTimes(1);
});
+ it('runs deposit-wallet beforePublish deployment and allowance preflight', async () => {
+ const provider = createProvider();
+ const repairTransaction = {
+ to: '0x4444444444444444444444444444444444444444',
+ data: '0xrepair',
+ operation: OperationType.Call,
+ value: '0',
+ };
+ mockIsSmartContractAddress.mockResolvedValueOnce(false);
+ mockPlanDepositWalletPreflight.mockResolvedValue({
+ missingRequirements: [
+ {
+ type: 'erc20-allowance',
+ tokenAddress: repairTransaction.to,
+ spender: '0x5555555555555555555555555555555555555555',
+ },
+ ],
+ transactions: [repairTransaction],
+ });
+
+ const result = await provider.beforePublishDepositWalletDeposit({
+ transactionMeta: createDepositTransactionMeta({
+ recipient: depositWalletAddress,
+ }),
+ getSigner: () => signer,
+ });
+
+ expect(result).toBe(true);
+ expect(mockRequestDepositWalletCreate).toHaveBeenCalledWith({
+ ownerAddress: signer.address,
+ });
+ expect(mockWaitForDepositWalletTransaction).toHaveBeenNthCalledWith(1, {
+ transactionID: 'create-1',
+ requireCompletion: true,
+ });
+ expect(mockWaitForDepositWalletDeployed).toHaveBeenCalledTimes(1);
+ expect(mockWaitForDepositWalletDeployed).toHaveBeenCalledWith({
+ walletAddress: depositWalletAddress,
+ });
+ expect(mockAnalyticsIdentify).toHaveBeenCalledWith({
+ [UserProfileProperty.CREATED_POLYMARKET_ACCOUNT_VIA_MM]: true,
+ });
+ expect(
+ mockSyncDepositWalletCollateralBalanceAllowance,
+ ).not.toHaveBeenCalled();
+ expect(mockPlanDepositWalletPreflight).toHaveBeenCalledWith({
+ walletAddress: depositWalletAddress,
+ protocol: expect.objectContaining({ key: 'v2' }),
+ });
+ expect(mockExecuteDepositWalletBatch).toHaveBeenCalledWith({
+ signer,
+ walletAddress: depositWalletAddress,
+ calls: [
+ {
+ target: repairTransaction.to,
+ value: repairTransaction.value,
+ data: repairTransaction.data,
+ },
+ ],
+ });
+ expect(mockWaitForDepositWalletTransaction).toHaveBeenNthCalledWith(2, {
+ transactionID: 'batch-1',
+ requireCompletion: true,
+ });
+ });
+
+ it('waits for WALLET-CREATE polling before submitting allowance batch', async () => {
+ const provider = createProvider();
+ const repairTransaction = {
+ to: '0x4444444444444444444444444444444444444444',
+ data: '0xrepair',
+ operation: OperationType.Call,
+ value: '0',
+ };
+ let resolveCreateWait: () => void = jest.fn();
+ const createWaitPromise = new Promise<`0x${string}`>((resolve) => {
+ resolveCreateWait = () =>
+ resolve(
+ '0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+ );
+ });
+ mockIsSmartContractAddress.mockResolvedValueOnce(false);
+ mockPlanDepositWalletPreflight.mockResolvedValue({
+ missingRequirements: [
+ {
+ type: 'erc20-allowance',
+ tokenAddress: repairTransaction.to,
+ spender: '0x5555555555555555555555555555555555555555',
+ },
+ ],
+ transactions: [repairTransaction],
+ });
+ mockWaitForDepositWalletTransaction
+ .mockImplementationOnce(() => createWaitPromise)
+ .mockResolvedValueOnce(
+ '0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd',
+ );
+
+ const publishPromise = provider.beforePublishDepositWalletDeposit({
+ transactionMeta: createDepositTransactionMeta({
+ recipient: depositWalletAddress,
+ }),
+ getSigner: () => signer,
+ });
+
+ await Promise.resolve();
+
+ expect(mockRequestDepositWalletCreate).toHaveBeenCalled();
+ expect(mockWaitForDepositWalletDeployed).not.toHaveBeenCalled();
+ expect(mockExecuteDepositWalletBatch).not.toHaveBeenCalled();
+
+ resolveCreateWait();
+ await publishPromise;
+
+ expect(mockWaitForDepositWalletDeployed).toHaveBeenCalledWith({
+ walletAddress: depositWalletAddress,
+ });
+ expect(mockExecuteDepositWalletBatch).toHaveBeenCalled();
+ const deployedCallOrder =
+ mockWaitForDepositWalletDeployed.mock.invocationCallOrder[0] ?? 0;
+ const executeCallOrder =
+ mockExecuteDepositWalletBatch.mock.invocationCallOrder[0] ?? 0;
+ expect(deployedCallOrder).toBeLessThan(executeCallOrder);
+ });
+
+ it('does not run deposit-wallet beforePublish for Safe deposits', async () => {
+ const result = await createProvider().beforePublishDepositWalletDeposit({
+ transactionMeta: createDepositTransactionMeta({
+ recipient: legacySafeAddress,
+ }),
+ getSigner: () => signer,
+ });
+
+ expect(result).toBe(true);
+ expect(mockRequestDepositWalletCreate).not.toHaveBeenCalled();
+ expect(mockPlanDepositWalletPreflight).not.toHaveBeenCalled();
+ });
+
+ it('syncs deposit-wallet CLOB balance allowance after matching deposits', async () => {
+ await createProvider().syncDepositWalletBalanceAllowanceForDepositTransaction(
+ {
+ transactionMeta: createDepositTransactionMeta({
+ recipient: depositWalletAddress,
+ }),
+ signerAddress: signer.address,
+ },
+ );
+
+ expect(
+ mockSyncDepositWalletCollateralBalanceAllowance,
+ ).toHaveBeenCalledWith({
+ protocol: expect.objectContaining({ key: 'v2' }),
+ signerAddress: signer.address,
+ apiKey: {
+ apiKey: 'api-key',
+ secret: 'secret',
+ passphrase: 'passphrase',
+ },
+ });
+ });
+
+ it('skips CLOB sync for Safe deposits', async () => {
+ await createProvider().syncDepositWalletBalanceAllowanceForDepositTransaction(
+ {
+ transactionMeta: createDepositTransactionMeta({
+ recipient: legacySafeAddress,
+ }),
+ signerAddress: signer.address,
+ },
+ );
+
+ expect(
+ mockSyncDepositWalletCollateralBalanceAllowance,
+ ).not.toHaveBeenCalled();
+ });
+
it('prepares editable pUSD withdraw transfers', async () => {
const result = await createProvider().prepareWithdraw({ signer });
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
index 6a692e26c61..c306b918119 100644
--- a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
+++ b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
@@ -2,9 +2,13 @@ import {
SignTypedDataVersion,
type TypedMessageParams,
} from '@metamask/keyring-controller';
-import { CHAIN_IDS, TransactionType } from '@metamask/transaction-controller';
+import {
+ CHAIN_IDS,
+ TransactionType,
+ type TransactionMeta,
+} from '@metamask/transaction-controller';
import { Hex, numberToHex } from '@metamask/utils';
-import { getAddress, parseUnits } from 'ethers/lib/utils';
+import { getAddress, Interface, parseUnits } from 'ethers/lib/utils';
import { DevLogger } from '../../../../../core/SDKConnect/utils/DevLogger';
import Logger, { type LoggerErrorOptions } from '../../../../../util/Logger';
import { analytics } from '../../../../../util/analytics/analytics';
@@ -69,7 +73,6 @@ import {
import {
computeProxyAddress,
createPermit2FeeAuthorization,
- getDeployProxyWalletTransaction,
getSafeTransferAmount,
getSafeTransferAmountRaw,
} from './safe/utils';
@@ -109,7 +112,6 @@ import { GameCache } from './GameCache';
import { TeamsCache } from './TeamsCache';
import { WebSocketManager } from './WebSocketManager';
import {
- getProtocolDepositTokenAddress,
getProtocolWithdrawTokenAddress,
POLYMARKET_V2_PROTOCOL,
type PolymarketProtocolDefinition,
@@ -124,8 +126,20 @@ import {
import { submitProtocolClobOrder } from './protocol/transport';
import { buildClaimTransaction } from './preflight/claim';
import { buildDepositMaintenanceTransaction } from './preflight/deposit';
+import { planDepositWalletPreflight } from './preflight/depositWallet';
+import { buildLegacySafeMigrationSweepTransaction } from './preflight/legacySafeMigration';
import { buildTradeAllowancesTx } from './preflight/trade';
import { buildWithdrawTransaction } from './preflight/withdraw';
+import {
+ deriveDepositWalletAddress,
+ executeDepositWalletBatch,
+ getDepositWalletRelayerTransactionId,
+ requestDepositWalletCreate,
+ syncDepositWalletCollateralBalanceAllowance,
+ toDepositWalletCalls,
+ waitForDepositWalletDeployed,
+ waitForDepositWalletTransaction,
+} from './depositWallet';
export type SignTypedMessageFn = (
params: TypedMessageParams,
@@ -152,6 +166,10 @@ interface OptimisticPositionUpdate {
positionId?: string;
}
+const ERC20_TRANSFER_INTERFACE = new Interface([
+ 'function transfer(address to, uint256 value)',
+]);
+
export class PolymarketProvider implements PredictProvider {
readonly providerId = POLYMARKET_PROVIDER_ID;
readonly name = 'Polymarket';
@@ -178,6 +196,38 @@ export class PolymarketProvider implements PredictProvider {
this.#getFeatureFlags = getFeatureFlags;
}
+ #getAccountStateCacheKey(ownerAddress: string): string {
+ return getAddress(ownerAddress).toLowerCase();
+ }
+
+ #getCachedAccountState(ownerAddress: string): AccountState | undefined {
+ return this.#accountStateByAddress.get(
+ this.#getAccountStateCacheKey(ownerAddress),
+ );
+ }
+
+ #setCachedAccountState(
+ ownerAddress: string,
+ accountState: AccountState,
+ ): void {
+ this.#accountStateByAddress.set(
+ this.#getAccountStateCacheKey(ownerAddress),
+ accountState,
+ );
+ }
+
+ public invalidateAccountState(ownerAddress: string): void {
+ try {
+ this.#accountStateByAddress.delete(
+ this.#getAccountStateCacheKey(ownerAddress),
+ );
+ } catch (error) {
+ DevLogger.log('PolymarketProvider: Failed to invalidate account state', {
+ error: error instanceof Error ? error.message : 'Unknown error',
+ });
+ }
+ }
+
#getSupportedLeagues(): PredictSportsLeague[] {
const { liveSportsLeagues } = this.#getFeatureFlags();
return filterSupportedLeagues(liveSportsLeagues);
@@ -423,7 +473,7 @@ export class PolymarketProvider implements PredictProvider {
protocol: PolymarketProtocolDefinition;
}) {
const safeAddress =
- this.#accountStateByAddress.get(signer.address)?.address ??
+ this.#getCachedAccountState(signer.address)?.address ??
computeProxyAddress(signer.address);
const order = buildProtocolUnsignedOrder({
@@ -1436,7 +1486,9 @@ export class PolymarketProvider implements PredictProvider {
throw new Error('Address is required');
}
- const predictAddress = computeProxyAddress(address);
+ const predictAddress =
+ this.#getCachedAccountState(address)?.address ??
+ (await this.getAccountState({ ownerAddress: address })).address;
const queryParams = new URLSearchParams({
limit: limit.toString(),
@@ -1519,7 +1571,7 @@ export class PolymarketProvider implements PredictProvider {
try {
const predictAddress =
- this.#accountStateByAddress.get(address)?.address ??
+ this.#getCachedAccountState(address)?.address ??
(await this.getAccountState({ ownerAddress: address })).address;
const queryParams = new URLSearchParams({
@@ -1565,7 +1617,7 @@ export class PolymarketProvider implements PredictProvider {
const { DATA_API_ENDPOINT } = getPolymarketEndpoints();
const predictAddress =
- this.#accountStateByAddress.get(address)?.address ??
+ this.#getCachedAccountState(address)?.address ??
(await this.getAccountState({ ownerAddress: address })).address;
const response = await fetch(
@@ -1783,24 +1835,17 @@ export class PolymarketProvider implements PredictProvider {
throw new Error('Signer address is required for claim');
}
- // Get safe address from cache or fetch it
- let safeAddress: string | undefined;
+ let safeAddress: Hex;
try {
- safeAddress =
- this.#accountStateByAddress.get(signer.address)?.address ??
- computeProxyAddress(signer.address);
+ safeAddress = computeProxyAddress(signer.address);
} catch (error) {
throw new Error(
- `Failed to retrieve account state: ${
+ `Failed to compute safe address: ${
error instanceof Error ? error.message : 'Unknown error'
}`,
);
}
- if (!safeAddress) {
- throw new Error('Safe address not found for claim');
- }
-
const safeLegacyUsdceBalance = await this.#getLegacyUsdceBalance({
safeAddress,
protocol,
@@ -1903,7 +1948,7 @@ export class PolymarketProvider implements PredictProvider {
throw new Error('Signer address is required for deposit preparation');
}
- const depositTokenAddress = getProtocolDepositTokenAddress(protocol);
+ const depositTokenAddress = protocol.collateral.tradingToken;
if (!depositTokenAddress) {
throw new Error('Collateral contract address not configured');
@@ -1921,45 +1966,64 @@ export class PolymarketProvider implements PredictProvider {
throw new Error('Account address not found in account state');
}
- if (!accountState.isDeployed) {
- const deployTransaction = await getDeployProxyWalletTransaction({
- signer,
+ const buildDepositTransferTransaction = (toAddress: string) => {
+ const depositTransactionCallData = generateTransferData('transfer', {
+ toAddress,
+ amount: '0x0',
});
- if (!deployTransaction) {
- throw new Error('Failed to get deploy proxy wallet transaction params');
+ if (!depositTransactionCallData) {
+ throw new Error(
+ 'Failed to generate transfer data for deposit transaction',
+ );
}
- if (!deployTransaction.params?.to || !deployTransaction.params?.data) {
- throw new Error('Invalid deploy transaction: missing params');
+ return {
+ params: {
+ to: depositTokenAddress as Hex,
+ data: depositTransactionCallData as Hex,
+ },
+ type: TransactionType.predictDeposit,
+ };
+ };
+
+ if (accountState.walletType === 'deposit-wallet') {
+ const legacySafeAddress = computeProxyAddress(signer.address);
+ const legacySafeDeployed = await isSmartContractAddress(
+ legacySafeAddress,
+ numberToHex(POLYGON_MAINNET_CHAIN_ID),
+ );
+
+ if (legacySafeDeployed) {
+ const sweepTransaction = await buildLegacySafeMigrationSweepTransaction(
+ {
+ signer,
+ legacySafeAddress,
+ depositWalletAddress: accountState.address,
+ protocol,
+ },
+ );
+
+ if (sweepTransaction) {
+ transactions.push(sweepTransaction);
+ }
}
- transactions.push(deployTransaction);
+ transactions.push(buildDepositTransferTransaction(accountState.address));
- // Set user trait for Polymarket account creation via MetaMask
- this.setPolymarketAccountCreatedTrait();
+ return {
+ chainId: CHAIN_IDS.POLYGON,
+ transactions,
+ };
}
- const depositTransactionCallData = generateTransferData('transfer', {
- toAddress: accountState.address,
- amount: '0x0',
- });
-
- if (!depositTransactionCallData) {
+ if (!accountState.isDeployed) {
throw new Error(
- 'Failed to generate transfer data for deposit transaction',
+ 'Legacy Safe account state must be deployed for deposits',
);
}
- const depositTransaction = {
- params: {
- to: depositTokenAddress as Hex,
- data: depositTransactionCallData as Hex,
- },
- type: TransactionType.predictDeposit,
- };
-
- transactions.push(depositTransaction);
+ transactions.push(buildDepositTransferTransaction(accountState.address));
const preExistingSafeUsdceBalance = await this.#getLegacyUsdceBalance({
safeAddress: accountState.address,
@@ -1982,21 +2046,57 @@ export class PolymarketProvider implements PredictProvider {
};
}
+ async #hasPolymarketActivity({
+ address,
+ }: {
+ address: string;
+ }): Promise {
+ const { DATA_API_ENDPOINT } = getPolymarketEndpoints();
+ const queryParams = new URLSearchParams({
+ user: address,
+ limit: '1',
+ });
+ const response = await fetch(
+ `${DATA_API_ENDPOINT}/activity?${queryParams.toString()}`,
+ );
+
+ if (!response.ok) {
+ throw new Error('Failed to fetch Polymarket activity');
+ }
+
+ const activityRaw: unknown = await response.json();
+
+ if (!Array.isArray(activityRaw)) {
+ throw new Error('Polymarket activity response must be an array');
+ }
+
+ return activityRaw.length > 0;
+ }
+
public async getAccountState(
params: GetAccountStateParams,
): Promise {
try {
- const { ownerAddress } = params;
+ const { ownerAddress, forceRefresh } = params;
if (!ownerAddress) {
throw new Error('Owner address is required');
}
- // Get or compute safe address
- const cachedAddress = this.#accountStateByAddress.get(ownerAddress);
- let address: string;
+ const normalizedOwnerAddress = getAddress(ownerAddress);
+
+ if (!forceRefresh) {
+ const cachedAccountState = this.#getCachedAccountState(
+ normalizedOwnerAddress,
+ );
+ if (cachedAccountState) {
+ return cachedAccountState;
+ }
+ }
+
+ let legacySafeAddress: Hex;
try {
- address = cachedAddress?.address ?? computeProxyAddress(ownerAddress);
+ legacySafeAddress = computeProxyAddress(normalizedOwnerAddress);
} catch (error) {
throw new Error(
`Failed to compute safe address: ${
@@ -2005,30 +2105,41 @@ export class PolymarketProvider implements PredictProvider {
);
}
- if (!address) {
- throw new Error('Failed to get safe address');
- }
+ const legacySafeIsDeployed = await isSmartContractAddress(
+ legacySafeAddress,
+ numberToHex(POLYGON_MAINNET_CHAIN_ID),
+ );
- let isDeployed: boolean;
- try {
- isDeployed = await isSmartContractAddress(
- address,
- numberToHex(POLYGON_MAINNET_CHAIN_ID),
- );
- } catch (error) {
- throw new Error(
- `Failed to check account state: ${
- error instanceof Error ? error.message : 'Unknown error'
- }`,
- );
+ if (legacySafeIsDeployed) {
+ const hasActivity = await this.#hasPolymarketActivity({
+ address: legacySafeAddress,
+ });
+
+ if (hasActivity) {
+ const accountState: AccountState = {
+ address: legacySafeAddress,
+ isDeployed: true,
+ walletType: 'safe',
+ };
+ this.#setCachedAccountState(normalizedOwnerAddress, accountState);
+ return accountState;
+ }
}
- const accountState = {
- address: address as `0x${string}`,
- isDeployed,
+ const depositWalletAddress = deriveDepositWalletAddress(
+ normalizedOwnerAddress,
+ );
+ const depositWalletIsDeployed = await isSmartContractAddress(
+ depositWalletAddress,
+ numberToHex(POLYGON_MAINNET_CHAIN_ID),
+ );
+ const accountState: AccountState = {
+ address: depositWalletAddress,
+ isDeployed: depositWalletIsDeployed,
+ walletType: 'deposit-wallet',
};
- this.#accountStateByAddress.set(ownerAddress, accountState);
+ this.#setCachedAccountState(normalizedOwnerAddress, accountState);
return accountState;
} catch (error) {
@@ -2046,27 +2157,317 @@ export class PolymarketProvider implements PredictProvider {
throw new Error('address is required');
}
- const predictAddress =
- this.#accountStateByAddress.get(address)?.address ??
- computeProxyAddress(address);
const protocol = this.#getProtocol();
+ const accountState =
+ this.#getCachedAccountState(address) ??
+ (await this.getAccountState({ ownerAddress: address }));
+
+ if (accountState.walletType === 'safe') {
+ const [pusdBalance, legacyUsdceBalance] = await Promise.all([
+ getBalance({
+ address: accountState.address,
+ tokenAddress: protocol.collateral.tradingToken,
+ }),
+ this.#getLegacyUsdceBalance({
+ safeAddress: accountState.address,
+ protocol,
+ }),
+ ]);
- const [pusdBalance, legacyUsdceBalance] = await Promise.all([
- getBalance({
- address: predictAddress,
- tokenAddress: protocol.collateral.tradingToken,
- }),
- this.#getLegacyUsdceBalance({
- safeAddress: predictAddress,
- protocol,
- }),
- ]);
+ return (
+ pusdBalance +
+ Number(legacyUsdceBalance) / 10 ** COLLATERAL_TOKEN_DECIMALS
+ );
+ }
+
+ const depositPusdRaw = await getRawBalance({
+ address: accountState.address,
+ tokenAddress: protocol.collateral.tradingToken,
+ });
+ const legacySafeAddress = computeProxyAddress(address);
+ const legacySafeDeployed = await isSmartContractAddress(
+ legacySafeAddress,
+ numberToHex(POLYGON_MAINNET_CHAIN_ID),
+ );
+
+ let legacyPusdRaw = 0n;
+ let legacyUsdceRaw = 0n;
+ if (legacySafeDeployed) {
+ [legacyPusdRaw, legacyUsdceRaw] = await Promise.all([
+ getRawBalance({
+ address: legacySafeAddress,
+ tokenAddress: protocol.collateral.tradingToken,
+ }),
+ this.#getLegacyUsdceBalance({
+ safeAddress: legacySafeAddress,
+ protocol,
+ }),
+ ]);
+ }
return (
- pusdBalance + Number(legacyUsdceBalance) / 10 ** COLLATERAL_TOKEN_DECIMALS
+ Number(depositPusdRaw + legacyPusdRaw + legacyUsdceRaw) /
+ 10 ** COLLATERAL_TOKEN_DECIMALS
);
}
+ private getErc20TransferRecipient(data?: string): Hex | undefined {
+ if (!data) {
+ return undefined;
+ }
+
+ try {
+ const [recipient] = ERC20_TRANSFER_INTERFACE.decodeFunctionData(
+ 'transfer',
+ data,
+ );
+ return getAddress(String(recipient)) as Hex;
+ } catch {
+ return undefined;
+ }
+ }
+
+ private getDepositWalletDepositTransaction(transactionMeta: TransactionMeta):
+ | {
+ ownerAddress: Hex;
+ depositWalletAddress: Hex;
+ }
+ | undefined {
+ const ownerAddress = transactionMeta.txParams.from;
+
+ if (!ownerAddress) {
+ return undefined;
+ }
+
+ const nestedTransactions = transactionMeta.nestedTransactions ?? [];
+ const predictDepositTransactions = nestedTransactions.filter(
+ (transaction) =>
+ transaction.type === TransactionType.predictDeposit ||
+ transaction.type === TransactionType.predictDepositAndOrder,
+ );
+
+ if (predictDepositTransactions.length !== 1) {
+ return undefined;
+ }
+
+ const [depositTransaction] = predictDepositTransactions;
+ const protocol = this.#getProtocol();
+
+ try {
+ if (
+ !depositTransaction.to ||
+ getAddress(depositTransaction.to) !==
+ getAddress(protocol.collateral.tradingToken)
+ ) {
+ return undefined;
+ }
+ } catch {
+ return undefined;
+ }
+
+ const recipient = this.getErc20TransferRecipient(depositTransaction.data);
+
+ if (!recipient) {
+ return undefined;
+ }
+
+ const depositWalletAddress = deriveDepositWalletAddress(ownerAddress);
+
+ if (getAddress(recipient) !== getAddress(depositWalletAddress)) {
+ return undefined;
+ }
+
+ return {
+ ownerAddress: getAddress(ownerAddress) as Hex,
+ depositWalletAddress,
+ };
+ }
+
+ public isDepositWalletDepositTransaction(
+ transactionMeta: TransactionMeta,
+ ): boolean {
+ return Boolean(this.getDepositWalletDepositTransaction(transactionMeta));
+ }
+
+ public async beforePublishDepositWalletDeposit({
+ transactionMeta,
+ getSigner,
+ }: {
+ transactionMeta: TransactionMeta;
+ getSigner: (address?: string) => Signer;
+ }): Promise {
+ const depositWalletDeposit =
+ this.getDepositWalletDepositTransaction(transactionMeta);
+
+ if (!depositWalletDeposit) {
+ return true;
+ }
+
+ const { ownerAddress, depositWalletAddress } = depositWalletDeposit;
+ const protocol = this.#getProtocol();
+
+ try {
+ DevLogger.log('PolymarketProvider: Deposit wallet preflight started', {
+ operation: 'deposit_wallet_preflight',
+ walletType: 'deposit-wallet',
+ from: ownerAddress,
+ depositWalletAddress,
+ });
+
+ const depositWalletIsDeployed = await isSmartContractAddress(
+ depositWalletAddress,
+ numberToHex(POLYGON_MAINNET_CHAIN_ID),
+ );
+ let depositWalletDeploymentConfirmed = false;
+
+ if (!depositWalletIsDeployed) {
+ const createResponse = await requestDepositWalletCreate({
+ ownerAddress,
+ });
+ const transactionID =
+ getDepositWalletRelayerTransactionId(createResponse);
+
+ if (!transactionID) {
+ throw new Error(
+ 'Polymarket deposit wallet creation response missing transactionID',
+ );
+ }
+
+ DevLogger.log('PolymarketProvider: Waiting for deposit wallet create', {
+ operation: 'deposit_wallet_create',
+ walletType: 'deposit-wallet',
+ transactionID,
+ from: ownerAddress,
+ depositWalletAddress,
+ });
+
+ await waitForDepositWalletTransaction({
+ transactionID,
+ requireCompletion: true,
+ });
+
+ DevLogger.log(
+ 'PolymarketProvider: Waiting for deposit wallet relayer registry',
+ {
+ operation: 'deposit_wallet_relayer_registry',
+ walletType: 'deposit-wallet',
+ from: ownerAddress,
+ depositWalletAddress,
+ },
+ );
+
+ await waitForDepositWalletDeployed({
+ walletAddress: depositWalletAddress,
+ });
+ depositWalletDeploymentConfirmed = true;
+
+ this.#setCachedAccountState(ownerAddress, {
+ address: depositWalletAddress,
+ isDeployed: true,
+ walletType: 'deposit-wallet',
+ });
+ this.setPolymarketAccountCreatedTrait();
+ }
+
+ const preflightPlan = await planDepositWalletPreflight({
+ walletAddress: depositWalletAddress,
+ protocol,
+ });
+
+ DevLogger.log('PolymarketProvider: Deposit wallet preflight planned', {
+ operation: 'deposit_wallet_allowance_preflight',
+ walletType: 'deposit-wallet',
+ from: ownerAddress,
+ depositWalletAddress,
+ missingRequirementsCount: preflightPlan.missingRequirements.length,
+ });
+
+ if (preflightPlan.transactions.length > 0) {
+ if (!depositWalletDeploymentConfirmed) {
+ await waitForDepositWalletDeployed({
+ walletAddress: depositWalletAddress,
+ });
+ }
+
+ const signer = getSigner(ownerAddress);
+ const executeResponse = await executeDepositWalletBatch({
+ signer,
+ walletAddress: depositWalletAddress,
+ calls: toDepositWalletCalls(preflightPlan.transactions),
+ });
+ const transactionID =
+ getDepositWalletRelayerTransactionId(executeResponse);
+
+ if (!transactionID) {
+ throw new Error(
+ 'Polymarket deposit wallet batch response missing transactionID',
+ );
+ }
+
+ DevLogger.log('PolymarketProvider: Waiting for deposit wallet batch', {
+ operation: 'deposit_wallet_batch',
+ walletType: 'deposit-wallet',
+ transactionID,
+ from: ownerAddress,
+ depositWalletAddress,
+ missingRequirementsCount: preflightPlan.missingRequirements.length,
+ });
+
+ await waitForDepositWalletTransaction({
+ transactionID,
+ requireCompletion: true,
+ });
+ }
+
+ DevLogger.log('PolymarketProvider: Deposit wallet preflight completed', {
+ operation: 'deposit_wallet_preflight',
+ walletType: 'deposit-wallet',
+ from: ownerAddress,
+ depositWalletAddress,
+ });
+
+ return true;
+ } catch (error) {
+ DevLogger.log('PolymarketProvider: Deposit wallet preflight failed', {
+ operation: 'deposit_wallet_preflight',
+ walletType: 'deposit-wallet',
+ from: ownerAddress,
+ depositWalletAddress,
+ error: error instanceof Error ? error.message : 'Unknown error',
+ });
+ Logger.error(
+ error instanceof Error ? error : new Error(String(error)),
+ this.getErrorContext('beforePublishDepositWalletDeposit', {
+ operation: 'deposit_wallet_preflight',
+ walletType: 'deposit-wallet',
+ }),
+ );
+ throw error;
+ }
+ }
+
+ public async syncDepositWalletBalanceAllowanceForDepositTransaction({
+ transactionMeta,
+ signerAddress,
+ }: {
+ transactionMeta: TransactionMeta;
+ signerAddress: string;
+ }): Promise {
+ const depositWalletDeposit =
+ this.getDepositWalletDepositTransaction(transactionMeta);
+
+ if (!depositWalletDeposit) {
+ return;
+ }
+
+ const apiKey = await this.getApiKey({ address: signerAddress });
+ await syncDepositWalletCollateralBalanceAllowance({
+ protocol: this.#getProtocol(),
+ signerAddress,
+ apiKey,
+ });
+ }
+
public async prepareWithdraw(
params: PrepareWithdrawParams,
): Promise {
@@ -2078,7 +2479,7 @@ export class PolymarketProvider implements PredictProvider {
}
const safeAddress =
- this.#accountStateByAddress.get(signer.address)?.address ??
+ this.#getCachedAccountState(signer.address)?.address ??
(await this.getAccountState({ ownerAddress: signer.address })).address;
const withdrawTokenAddress = getProtocolWithdrawTokenAddress(protocol);
@@ -2113,7 +2514,7 @@ export class PolymarketProvider implements PredictProvider {
}
const safeAddress =
- this.#accountStateByAddress.get(signer.address)?.address ??
+ this.#getCachedAccountState(signer.address)?.address ??
computeProxyAddress(signer.address);
const amount = getSafeTransferAmount(callData);
diff --git a/app/components/UI/Predict/providers/polymarket/depositWallet.test.ts b/app/components/UI/Predict/providers/polymarket/depositWallet.test.ts
new file mode 100644
index 00000000000..a0b79fd5a42
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/depositWallet.test.ts
@@ -0,0 +1,432 @@
+import { SignTypedDataVersion } from '@metamask/keyring-controller';
+import type { Signer } from '../types';
+import {
+ DEPOSIT_WALLET_FACTORY_ADDRESS,
+ deriveDepositWalletAddress,
+ executeDepositWalletBatch,
+ executeDepositWalletBatchAndWaitForCompletion,
+ getDepositWalletNonce,
+ requestDepositWalletCreate,
+ syncDepositWalletCollateralBalanceAllowance,
+ toDepositWalletCalls,
+ waitForDepositWalletDeployed,
+ waitForDepositWalletTransaction,
+} from './depositWallet';
+import { POLYMARKET_V2_PROTOCOL } from './protocol/definitions';
+import { OperationType } from './safe/types';
+import { getL2Headers } from './utils';
+
+jest.mock('./utils', () => ({
+ getPolymarketEndpoints: jest.fn(() => ({
+ CLOB_RELAYER: 'https://predict.api.cx.metamask.io',
+ })),
+ getL2Headers: jest.fn(),
+}));
+
+const mockGetL2Headers = jest.mocked(getL2Headers);
+const mockFetch = jest.fn();
+
+type MockResponseBody = Record | Record[];
+
+function mockResponse(body: MockResponseBody, ok = true): Response {
+ return {
+ ok,
+ status: ok ? 200 : 500,
+ text: jest.fn().mockResolvedValue(JSON.stringify(body)),
+ } as unknown as Response;
+}
+
+function getFetchBody(callIndex = 0): unknown {
+ return JSON.parse(String(mockFetch.mock.calls[callIndex][1]?.body));
+}
+
+const ownerAddress = '0x1111111111111111111111111111111111111111';
+
+const signer: Signer = {
+ address: ownerAddress,
+ signTypedMessage: jest.fn().mockResolvedValue('0xsignature'),
+ signPersonalMessage: jest.fn(),
+};
+
+describe('depositWallet', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ global.fetch = mockFetch as unknown as typeof fetch;
+ mockGetL2Headers.mockResolvedValue({
+ POLY_ADDRESS: ownerAddress,
+ POLY_SIGNATURE: 'signature',
+ POLY_TIMESTAMP: '1',
+ POLY_API_KEY: 'api-key',
+ POLY_PASSPHRASE: 'passphrase',
+ });
+ });
+
+ it('derives the same address for checksum-equivalent owners', () => {
+ const lowerCaseAddress = ownerAddress.toLowerCase();
+ const checkSummedAddress = ownerAddress.toUpperCase().replace('0X', '0x');
+
+ const lowerResult = deriveDepositWalletAddress(lowerCaseAddress);
+ const checksumResult = deriveDepositWalletAddress(checkSummedAddress);
+
+ expect(lowerResult).toMatch(/^0x[a-fA-F0-9]{40}$/u);
+ expect(checksumResult).toBe(lowerResult);
+ });
+
+ it('maps Safe transactions to deposit-wallet calls', () => {
+ expect(
+ toDepositWalletCalls([
+ {
+ to: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ value: '0',
+ data: '0x1234',
+ operation: OperationType.Call,
+ },
+ ]),
+ ).toEqual([
+ {
+ target: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ value: '0',
+ data: '0x1234',
+ },
+ ]);
+ });
+
+ it('requests wallet creation through the relayer proxy envelope', async () => {
+ mockFetch.mockResolvedValue(mockResponse({ transactionID: 'relayer-1' }));
+
+ const result = await requestDepositWalletCreate({ ownerAddress });
+
+ expect(result.transactionID).toBe('relayer-1');
+ expect(mockFetch).toHaveBeenCalledWith(
+ 'https://predict.api.cx.metamask.io/transaction',
+ expect.objectContaining({ method: 'POST' }),
+ );
+ expect(getFetchBody()).toEqual({
+ path: '/submit',
+ method: 'POST',
+ body: {
+ type: 'WALLET-CREATE',
+ from: ownerAddress,
+ to: DEPOSIT_WALLET_FACTORY_ADDRESS,
+ },
+ });
+ });
+
+ it('reads wallet nonce through the relayer proxy envelope', async () => {
+ mockFetch.mockResolvedValue(mockResponse({ nonce: '7' }));
+
+ const nonce = await getDepositWalletNonce({ ownerAddress });
+
+ expect(nonce).toBe('7');
+ expect(getFetchBody()).toEqual({
+ path: '/nonce',
+ method: 'GET',
+ query: {
+ address: ownerAddress,
+ type: 'WALLET',
+ },
+ });
+ });
+
+ it('signs and submits wallet batches through the relayer proxy envelope', async () => {
+ const walletAddress = deriveDepositWalletAddress(ownerAddress);
+ const calls = [
+ {
+ target: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ value: '0',
+ data: '0x1234',
+ },
+ ];
+ mockFetch
+ .mockResolvedValueOnce(mockResponse({ nonce: '9' }))
+ .mockResolvedValueOnce(mockResponse({ transactionID: 'relayer-2' }));
+
+ const result = await executeDepositWalletBatch({
+ signer,
+ walletAddress,
+ calls,
+ });
+
+ expect(result.transactionID).toBe('relayer-2');
+ expect(signer.signTypedMessage).toHaveBeenCalledWith(
+ expect.objectContaining({
+ from: ownerAddress,
+ data: expect.objectContaining({
+ primaryType: 'Batch',
+ message: expect.objectContaining({
+ wallet: walletAddress,
+ nonce: '9',
+ calls,
+ }),
+ }),
+ }),
+ SignTypedDataVersion.V4,
+ );
+ expect(getFetchBody(1)).toEqual({
+ path: '/submit',
+ method: 'POST',
+ body: expect.objectContaining({
+ type: 'WALLET',
+ from: ownerAddress,
+ to: DEPOSIT_WALLET_FACTORY_ADDRESS,
+ nonce: '9',
+ signature: '0xsignature',
+ depositWalletParams: expect.objectContaining({
+ depositWallet: walletAddress,
+ calls,
+ }),
+ }),
+ });
+ });
+
+ it('polls by relayer id until wallet transaction hash is available', async () => {
+ mockFetch.mockResolvedValue(
+ mockResponse({
+ state: 'STATE_MINED',
+ transactionHash:
+ '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ }),
+ );
+
+ const hash = await waitForDepositWalletTransaction({
+ transactionID: 'relayer-mined',
+ pollIntervalMs: 0,
+ });
+
+ expect(hash).toBe(
+ '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+ );
+ expect(mockFetch).toHaveBeenCalledTimes(1);
+ expect(getFetchBody()).toEqual({
+ path: '/transaction',
+ method: 'GET',
+ query: { id: 'relayer-mined' },
+ });
+ });
+
+ it('returns hash before completion when completion is not required', async () => {
+ mockFetch.mockResolvedValue(
+ mockResponse({
+ state: 'STATE_NEW',
+ transactionHash:
+ '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+ }),
+ );
+
+ const hash = await waitForDepositWalletTransaction({
+ transactionID: 'relayer-hash',
+ pollIntervalMs: 0,
+ });
+
+ expect(hash).toBe(
+ '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
+ );
+ expect(mockFetch).toHaveBeenCalledTimes(1);
+ });
+
+ it('polls until wallet transaction is confirmed when completion is required', async () => {
+ mockFetch
+ .mockResolvedValueOnce(
+ mockResponse({
+ state: 'STATE_NEW',
+ transactionHash:
+ '0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+ }),
+ )
+ .mockResolvedValueOnce(
+ mockResponse({
+ state: 'STATE_CONFIRMED',
+ transactionHash:
+ '0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+ }),
+ );
+
+ const hash = await waitForDepositWalletTransaction({
+ transactionID: 'relayer-3',
+ requireCompletion: true,
+ pollIntervalMs: 0,
+ });
+
+ expect(hash).toBe(
+ '0xcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
+ );
+ expect(mockFetch).toHaveBeenCalledTimes(2);
+ });
+
+ it.each(['STATE_FAILED', 'STATE_INVALID'])(
+ 'throws when wallet transaction polling reaches %s',
+ async (state) => {
+ mockFetch.mockResolvedValue(mockResponse({ state }));
+
+ await expect(
+ waitForDepositWalletTransaction({
+ transactionID: 'relayer-4',
+ pollIntervalMs: 0,
+ }),
+ ).rejects.toThrow(state);
+ },
+ );
+
+ it('keeps polling when completion succeeds without a hash', async () => {
+ mockFetch
+ .mockResolvedValueOnce(mockResponse({ state: 'STATE_MINED' }))
+ .mockResolvedValueOnce(
+ mockResponse({
+ state: 'STATE_MINED',
+ transactionHash:
+ '0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd',
+ }),
+ );
+
+ const hash = await waitForDepositWalletTransaction({
+ transactionID: 'relayer-no-hash-yet',
+ requireCompletion: true,
+ pollIntervalMs: 0,
+ });
+
+ expect(hash).toBe(
+ '0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd',
+ );
+ expect(mockFetch).toHaveBeenCalledTimes(2);
+ });
+
+ it('throws when wallet transaction polling times out', async () => {
+ mockFetch.mockResolvedValue(mockResponse({ state: 'STATE_NEW' }));
+
+ await expect(
+ waitForDepositWalletTransaction({
+ transactionID: 'relayer-timeout',
+ maxPolls: 2,
+ pollIntervalMs: 0,
+ }),
+ ).rejects.toThrow('Timed out');
+ });
+
+ it('executes a wallet batch and waits for relayer completion', async () => {
+ const walletAddress = deriveDepositWalletAddress(ownerAddress);
+ const calls = [
+ {
+ target: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ value: '0',
+ data: '0x1234',
+ },
+ ];
+ mockFetch
+ .mockResolvedValueOnce(mockResponse({ nonce: '11' }))
+ .mockResolvedValueOnce(mockResponse({ transactionID: 'relayer-5' }))
+ .mockResolvedValueOnce(
+ mockResponse({
+ state: 'STATE_CONFIRMED',
+ transactionHash:
+ '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+ }),
+ );
+
+ const hash = await executeDepositWalletBatchAndWaitForCompletion({
+ signer,
+ walletAddress,
+ calls,
+ });
+
+ expect(hash).toBe(
+ '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+ );
+ expect(getFetchBody(2)).toEqual({
+ path: '/transaction',
+ method: 'GET',
+ query: { id: 'relayer-5' },
+ });
+ });
+
+ it('throws when completed wallet batch response is missing transactionID', async () => {
+ const walletAddress = deriveDepositWalletAddress(ownerAddress);
+ const calls = [
+ {
+ target: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ value: '0',
+ data: '0x1234',
+ },
+ ];
+ mockFetch
+ .mockResolvedValueOnce(mockResponse({ nonce: '12' }))
+ .mockResolvedValueOnce(mockResponse({}));
+
+ await expect(
+ executeDepositWalletBatchAndWaitForCompletion({
+ signer,
+ walletAddress,
+ calls,
+ }),
+ ).rejects.toThrow('missing transactionID');
+ });
+
+ it('polls relayer deployment status through the MetaMask proxy until the wallet is registered', async () => {
+ const walletAddress = deriveDepositWalletAddress(ownerAddress);
+ mockFetch
+ .mockResolvedValueOnce(mockResponse({ deployed: false }))
+ .mockResolvedValueOnce(mockResponse({ deployed: true }));
+
+ await waitForDepositWalletDeployed({
+ walletAddress,
+ pollIntervalMs: 0,
+ });
+
+ expect(mockFetch).toHaveBeenCalledTimes(2);
+ expect(mockFetch).toHaveBeenCalledWith(
+ 'https://predict.api.cx.metamask.io/transaction',
+ expect.objectContaining({ method: 'POST' }),
+ );
+ expect(getFetchBody()).toEqual({
+ path: '/deployed',
+ method: 'GET',
+ query: {
+ address: walletAddress,
+ type: 'WALLET',
+ },
+ });
+ });
+
+ it('throws when relayer deployment status times out', async () => {
+ const walletAddress = deriveDepositWalletAddress(ownerAddress);
+ mockFetch.mockResolvedValue(mockResponse({ deployed: false }));
+
+ await expect(
+ waitForDepositWalletDeployed({
+ walletAddress,
+ maxPolls: 2,
+ pollIntervalMs: 0,
+ }),
+ ).rejects.toThrow('Timed out');
+ });
+
+ it('syncs collateral balance allowance through direct CLOB endpoint', async () => {
+ mockFetch.mockResolvedValue(mockResponse({ ok: true }));
+
+ await syncDepositWalletCollateralBalanceAllowance({
+ protocol: POLYMARKET_V2_PROTOCOL,
+ signerAddress: ownerAddress,
+ apiKey: {
+ apiKey: 'api-key',
+ secret: 'secret',
+ passphrase: 'passphrase',
+ },
+ });
+
+ expect(mockGetL2Headers).toHaveBeenCalledWith({
+ l2HeaderArgs: {
+ method: 'GET',
+ requestPath: '/balance-allowance/update',
+ },
+ address: ownerAddress,
+ apiKey: {
+ apiKey: 'api-key',
+ secret: 'secret',
+ passphrase: 'passphrase',
+ },
+ });
+ expect(mockFetch).toHaveBeenCalledWith(
+ 'https://clob.polymarket.com/balance-allowance/update?asset_type=COLLATERAL&signature_type=3',
+ expect.objectContaining({ method: 'GET' }),
+ );
+ });
+});
diff --git a/app/components/UI/Predict/providers/polymarket/depositWallet.ts b/app/components/UI/Predict/providers/polymarket/depositWallet.ts
new file mode 100644
index 00000000000..32e7d144900
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/depositWallet.ts
@@ -0,0 +1,450 @@
+import { SignTypedDataVersion } from '@metamask/keyring-controller';
+import { Hex } from '@metamask/utils';
+import { ethers } from 'ethers';
+import {
+ getAddress,
+ getCreate2Address,
+ hexConcat,
+ hexZeroPad,
+ keccak256,
+} from 'ethers/lib/utils';
+import { POLYGON_MAINNET_CHAIN_ID } from './constants';
+import type { PolymarketProtocolDefinition } from './protocol/definitions';
+import type { SafeTransaction } from './safe/types';
+import type { ApiKeyCreds } from './types';
+import type { Signer } from '../types';
+import { getL2Headers, getPolymarketEndpoints } from './utils';
+
+export const DEPOSIT_WALLET_FACTORY_ADDRESS =
+ '0x00000000000Fb5C9ADea0298D729A0CB3823Cc07';
+export const DEPOSIT_WALLET_IMPLEMENTATION_ADDRESS =
+ '0x58CA52ebe0DadfdF531Cde7062e76746de4Db1eB';
+
+const DEPOSIT_WALLET_DOMAIN_NAME = 'DepositWallet';
+const DEPOSIT_WALLET_DOMAIN_VERSION = '1';
+// Polymarket's relayer rejects deadlines above 300s, so use the maximum
+// allowed window to reduce intermittent "deadline too soon" failures.
+const DEPOSIT_WALLET_BATCH_DEADLINE_SECONDS = 300;
+
+const RELAYER_SUCCESS_STATES = new Set(['STATE_MINED', 'STATE_CONFIRMED']);
+const RELAYER_FAILURE_STATES = new Set(['STATE_FAILED', 'STATE_INVALID']);
+
+/**
+ * Byte constants from Solady LibClone.initCodeHashERC1967 used by the
+ * Polymarket DepositWalletFactory.
+ */
+const ERC1967_CONST1 =
+ '0xcc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3';
+const ERC1967_CONST2 =
+ '0x5155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076';
+const ERC1967_PREFIX = 0x61003d3d8160233d3973n;
+
+export interface DepositWalletCall {
+ target: string;
+ value: string;
+ data: string;
+}
+
+export interface DepositWalletRelayerResponse {
+ transactionID?: string;
+ transactionHash?: string;
+ state?: string;
+ nonce?: string;
+ error?: string;
+ id?: string;
+ [key: string]: unknown;
+}
+
+interface DepositWalletDeploymentResponse {
+ deployed?: boolean;
+ error?: string;
+ [key: string]: unknown;
+}
+
+export type RelayerProxyEnvelope =
+ | { path: '/submit'; method: 'POST'; body: unknown }
+ | { path: '/nonce'; method: 'GET'; query: Record }
+ | { path: '/transaction'; method: 'GET'; query: Record }
+ | { path: '/deployed'; method: 'GET'; query: Record };
+
+function toFixedSizeHex(value: bigint, sizeBytes: number): Hex {
+ const hex = value.toString(16).padStart(sizeBytes * 2, '0');
+
+ if (hex.length > sizeBytes * 2) {
+ throw new Error('Value exceeds requested byte size');
+ }
+
+ return `0x${hex}` as Hex;
+}
+
+function initCodeHashERC1967({
+ implementation,
+ args,
+}: {
+ implementation: string;
+ args: Hex;
+}): Hex {
+ const argsLength = BigInt((args.length - 2) / 2);
+ const prefix = toFixedSizeHex(ERC1967_PREFIX + (argsLength << 56n), 10);
+
+ return keccak256(
+ hexConcat([
+ prefix,
+ getAddress(implementation),
+ '0x6009',
+ ERC1967_CONST2,
+ ERC1967_CONST1,
+ args,
+ ]),
+ ) as Hex;
+}
+
+export function getDepositWalletId(ownerAddress: string): Hex {
+ return hexZeroPad(getAddress(ownerAddress), 32) as Hex;
+}
+
+export function deriveDepositWalletAddress(ownerAddress: string): Hex {
+ const factoryAddress = getAddress(DEPOSIT_WALLET_FACTORY_ADDRESS);
+ const implementationAddress = getAddress(
+ DEPOSIT_WALLET_IMPLEMENTATION_ADDRESS,
+ );
+ const walletId = getDepositWalletId(ownerAddress);
+ const args = ethers.utils.defaultAbiCoder.encode(
+ ['address', 'bytes32'],
+ [factoryAddress, walletId],
+ ) as Hex;
+ const salt = keccak256(args) as Hex;
+ const bytecodeHash = initCodeHashERC1967({
+ implementation: implementationAddress,
+ args,
+ });
+
+ return getAddress(
+ getCreate2Address(factoryAddress, salt, bytecodeHash),
+ ) as Hex;
+}
+
+export function toDepositWalletCalls(
+ transactions: SafeTransaction[],
+): DepositWalletCall[] {
+ return transactions.map((transaction) => ({
+ target: transaction.to,
+ value: transaction.value,
+ data: transaction.data,
+ }));
+}
+
+async function postRelayerProxy(
+ envelope: RelayerProxyEnvelope,
+): Promise {
+ const { CLOB_RELAYER } = getPolymarketEndpoints();
+ const response = await fetch(`${CLOB_RELAYER}/transaction`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(envelope),
+ });
+ const responseText = await response.text();
+
+ if (!response.ok) {
+ throw new Error(
+ `Polymarket relayer proxy request failed: ${response.status} ${responseText}`,
+ );
+ }
+
+ if (!responseText) {
+ throw new Error('Polymarket relayer proxy returned an empty response');
+ }
+
+ let data: unknown;
+ try {
+ data = JSON.parse(responseText);
+ } catch (error) {
+ throw new Error('Polymarket relayer proxy returned malformed JSON');
+ }
+
+ if (
+ typeof data === 'object' &&
+ data !== null &&
+ 'error' in data &&
+ typeof (data as DepositWalletRelayerResponse).error === 'string'
+ ) {
+ throw new Error((data as DepositWalletRelayerResponse).error);
+ }
+
+ return data as TResponse;
+}
+
+export function getDepositWalletRelayerTransactionId(
+ response: DepositWalletRelayerResponse,
+): string | undefined {
+ return response.transactionID ?? response.id;
+}
+
+export async function requestDepositWalletCreate({
+ ownerAddress,
+}: {
+ ownerAddress: string;
+}): Promise {
+ return postRelayerProxy({
+ path: '/submit',
+ method: 'POST',
+ body: {
+ type: 'WALLET-CREATE',
+ from: ownerAddress,
+ to: DEPOSIT_WALLET_FACTORY_ADDRESS,
+ },
+ });
+}
+
+export async function getDepositWalletNonce({
+ ownerAddress,
+}: {
+ ownerAddress: string;
+}): Promise {
+ const response = await postRelayerProxy({
+ path: '/nonce',
+ method: 'GET',
+ query: {
+ address: ownerAddress,
+ type: 'WALLET',
+ },
+ });
+
+ if (!response.nonce) {
+ throw new Error('Polymarket relayer proxy nonce response missing nonce');
+ }
+
+ return response.nonce;
+}
+
+const DEPOSIT_WALLET_EIP712_TYPES = {
+ EIP712Domain: [
+ { name: 'name', type: 'string' },
+ { name: 'version', type: 'string' },
+ { name: 'chainId', type: 'uint256' },
+ { name: 'verifyingContract', type: 'address' },
+ ],
+ Call: [
+ { name: 'target', type: 'address' },
+ { name: 'value', type: 'uint256' },
+ { name: 'data', type: 'bytes' },
+ ],
+ Batch: [
+ { name: 'wallet', type: 'address' },
+ { name: 'nonce', type: 'uint256' },
+ { name: 'deadline', type: 'uint256' },
+ { name: 'calls', type: 'Call[]' },
+ ],
+};
+
+export async function executeDepositWalletBatch({
+ signer,
+ walletAddress,
+ calls,
+}: {
+ signer: Signer;
+ walletAddress: string;
+ calls: DepositWalletCall[];
+}): Promise {
+ if (calls.length === 0) {
+ throw new Error('Deposit wallet batch requires at least one call');
+ }
+
+ const nonce = await getDepositWalletNonce({ ownerAddress: signer.address });
+ const deadline = String(
+ Math.floor(Date.now() / 1000) + DEPOSIT_WALLET_BATCH_DEADLINE_SECONDS,
+ );
+ const normalizedWalletAddress = getAddress(walletAddress);
+
+ const signature = await signer.signTypedMessage(
+ {
+ from: signer.address,
+ data: {
+ domain: {
+ name: DEPOSIT_WALLET_DOMAIN_NAME,
+ version: DEPOSIT_WALLET_DOMAIN_VERSION,
+ chainId: POLYGON_MAINNET_CHAIN_ID,
+ verifyingContract: normalizedWalletAddress,
+ },
+ types: DEPOSIT_WALLET_EIP712_TYPES,
+ primaryType: 'Batch',
+ message: {
+ wallet: normalizedWalletAddress,
+ nonce,
+ deadline,
+ calls,
+ },
+ },
+ },
+ SignTypedDataVersion.V4,
+ );
+
+ return postRelayerProxy({
+ path: '/submit',
+ method: 'POST',
+ body: {
+ type: 'WALLET',
+ from: signer.address,
+ to: DEPOSIT_WALLET_FACTORY_ADDRESS,
+ nonce,
+ signature,
+ depositWalletParams: {
+ depositWallet: normalizedWalletAddress,
+ deadline,
+ calls,
+ },
+ },
+ });
+}
+
+function sleep(ms: number): Promise {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function getTransactionResponse(
+ response: DepositWalletRelayerResponse | DepositWalletRelayerResponse[],
+): DepositWalletRelayerResponse | undefined {
+ return Array.isArray(response) ? response[0] : response;
+}
+
+export async function waitForDepositWalletTransaction({
+ transactionID,
+ requireCompletion = false,
+ maxPolls = 20,
+ pollIntervalMs = 1000,
+}: {
+ transactionID: string;
+ requireCompletion?: boolean;
+ maxPolls?: number;
+ pollIntervalMs?: number;
+}): Promise {
+ for (let poll = 0; poll < maxPolls; poll++) {
+ const response = await postRelayerProxy<
+ DepositWalletRelayerResponse | DepositWalletRelayerResponse[]
+ >({
+ path: '/transaction',
+ method: 'GET',
+ query: { id: transactionID },
+ });
+ const transaction = getTransactionResponse(response);
+ const state = transaction?.state;
+ const transactionHash = transaction?.transactionHash;
+
+ if (state && RELAYER_FAILURE_STATES.has(state)) {
+ throw new Error(
+ `Polymarket deposit wallet relayer transaction ${transactionID} ${state}`,
+ );
+ }
+
+ if (state && RELAYER_SUCCESS_STATES.has(state) && transactionHash) {
+ return transactionHash as Hex;
+ }
+
+ if (!requireCompletion && transactionHash) {
+ return transactionHash as Hex;
+ }
+
+ if (poll < maxPolls - 1) {
+ await sleep(pollIntervalMs);
+ }
+ }
+
+ throw new Error(
+ `Timed out waiting for Polymarket deposit wallet relayer transaction ${transactionID}`,
+ );
+}
+
+export async function executeDepositWalletBatchAndWaitForCompletion({
+ signer,
+ walletAddress,
+ calls,
+}: {
+ signer: Signer;
+ walletAddress: string;
+ calls: DepositWalletCall[];
+}): Promise {
+ const response = await executeDepositWalletBatch({
+ signer,
+ walletAddress,
+ calls,
+ });
+ const transactionID = getDepositWalletRelayerTransactionId(response);
+
+ if (!transactionID) {
+ throw new Error(
+ 'Polymarket deposit wallet batch response missing transactionID',
+ );
+ }
+
+ return waitForDepositWalletTransaction({
+ transactionID,
+ requireCompletion: true,
+ });
+}
+
+export async function waitForDepositWalletDeployed({
+ walletAddress,
+ maxPolls = 20,
+ pollIntervalMs = 1000,
+}: {
+ walletAddress: string;
+ maxPolls?: number;
+ pollIntervalMs?: number;
+}): Promise {
+ const normalizedWalletAddress = getAddress(walletAddress);
+
+ for (let poll = 0; poll < maxPolls; poll++) {
+ const response = await postRelayerProxy({
+ path: '/deployed',
+ method: 'GET',
+ query: {
+ address: normalizedWalletAddress,
+ type: 'WALLET',
+ },
+ });
+
+ if (response.deployed === true) {
+ return;
+ }
+
+ if (poll < maxPolls - 1) {
+ await sleep(pollIntervalMs);
+ }
+ }
+
+ throw new Error(
+ `Timed out waiting for Polymarket deposit wallet ${normalizedWalletAddress} to be recognized by relayer`,
+ );
+}
+
+export async function syncDepositWalletCollateralBalanceAllowance({
+ protocol,
+ signerAddress,
+ apiKey,
+}: {
+ protocol: PolymarketProtocolDefinition;
+ signerAddress: string;
+ apiKey: ApiKeyCreds;
+}): Promise {
+ const requestPath = '/balance-allowance/update';
+ const queryString = 'asset_type=COLLATERAL&signature_type=3';
+ const headers = await getL2Headers({
+ l2HeaderArgs: { method: 'GET', requestPath },
+ address: signerAddress,
+ apiKey,
+ });
+ const response = await fetch(
+ `${protocol.transport.clobBaseUrl}${requestPath}?${queryString}`,
+ {
+ method: 'GET',
+ headers,
+ },
+ );
+
+ if (!response.ok) {
+ const responseText = await response.text();
+ throw new Error(
+ `Failed to sync deposit wallet collateral balance allowance: ${response.status} ${responseText}`,
+ );
+ }
+}
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.test.ts b/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.test.ts
new file mode 100644
index 00000000000..82faa08d4b7
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.test.ts
@@ -0,0 +1,107 @@
+jest.mock('./v2AllowanceRequirements', () => ({
+ filterDepositWalletUnsupportedRequirements: jest.fn(
+ (requirements: { type: string; spender?: string }[]) =>
+ requirements.filter(
+ (requirement: { type: string; spender?: string }) =>
+ requirement.type !== 'erc20-allowance' ||
+ requirement.spender?.toLowerCase() !==
+ '0x000000000022d473030f116ddee9f6b43ac78ba3',
+ ),
+ ),
+ getActiveV2AllowanceRequirements: jest.fn(),
+}));
+
+jest.mock('./inspectMissingRequirements', () => ({
+ inspectMissingRequirements: jest.fn(),
+}));
+
+jest.mock('./compileRequirementTransactions', () => ({
+ compileRequirementTransactions: jest.fn(),
+}));
+
+import { PERMIT2_ADDRESS } from '../safe/constants';
+import { OperationType, type SafeTransaction } from '../safe/types';
+import { compileRequirementTransactions } from './compileRequirementTransactions';
+import { planDepositWalletPreflight } from './depositWallet';
+import { inspectMissingRequirements } from './inspectMissingRequirements';
+import {
+ filterDepositWalletUnsupportedRequirements,
+ getActiveV2AllowanceRequirements,
+ type V2AllowanceRequirement,
+} from './v2AllowanceRequirements';
+
+const walletAddress = '0x1111111111111111111111111111111111111111';
+const activeRequirement: V2AllowanceRequirement = {
+ type: 'erc20-allowance',
+ tokenAddress: '0x2222222222222222222222222222222222222222',
+ spender: '0x3333333333333333333333333333333333333333',
+};
+const permit2Requirement: V2AllowanceRequirement = {
+ type: 'erc20-allowance',
+ tokenAddress: '0x2222222222222222222222222222222222222222',
+ spender: PERMIT2_ADDRESS,
+};
+const activeRequirements: V2AllowanceRequirement[] = [
+ activeRequirement,
+ permit2Requirement,
+];
+const depositWalletRequirements: V2AllowanceRequirement[] = [activeRequirement];
+const missingRequirements: V2AllowanceRequirement[] = [activeRequirement];
+const compiledTransactions: SafeTransaction[] = [
+ {
+ to: '0x2222222222222222222222222222222222222222',
+ data: '0xapprove',
+ operation: OperationType.Call,
+ value: '0',
+ },
+];
+
+const mockFilterDepositWalletUnsupportedRequirements = jest.mocked(
+ filterDepositWalletUnsupportedRequirements,
+);
+const mockGetActiveV2AllowanceRequirements = jest.mocked(
+ getActiveV2AllowanceRequirements,
+);
+const mockInspectMissingRequirements = jest.mocked(inspectMissingRequirements);
+const mockCompileRequirementTransactions = jest.mocked(
+ compileRequirementTransactions,
+);
+
+describe('planDepositWalletPreflight', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ mockGetActiveV2AllowanceRequirements.mockReturnValue(activeRequirements);
+ mockInspectMissingRequirements.mockResolvedValue(missingRequirements);
+ mockCompileRequirementTransactions.mockReturnValue(compiledTransactions);
+ });
+
+ it('uses active V2 requirements without Permit2 for the deposit wallet and compiles missing repairs', async () => {
+ const plan = await planDepositWalletPreflight({ walletAddress });
+
+ expect(mockGetActiveV2AllowanceRequirements).toHaveBeenCalledTimes(1);
+ expect(mockFilterDepositWalletUnsupportedRequirements).toHaveBeenCalledWith(
+ activeRequirements,
+ );
+ expect(mockInspectMissingRequirements).toHaveBeenCalledWith({
+ address: walletAddress,
+ requirements: depositWalletRequirements,
+ });
+ expect(mockCompileRequirementTransactions).toHaveBeenCalledWith(
+ missingRequirements,
+ );
+ expect(plan).toEqual({
+ missingRequirements,
+ transactions: compiledTransactions,
+ });
+ });
+
+ it('returns no transactions when no requirements are missing', async () => {
+ mockInspectMissingRequirements.mockResolvedValue([]);
+ mockCompileRequirementTransactions.mockReturnValue([]);
+
+ const plan = await planDepositWalletPreflight({ walletAddress });
+
+ expect(mockCompileRequirementTransactions).toHaveBeenCalledWith([]);
+ expect(plan).toEqual({ missingRequirements: [], transactions: [] });
+ });
+});
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.ts b/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.ts
new file mode 100644
index 00000000000..08afd79f031
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/preflight/depositWallet.ts
@@ -0,0 +1,44 @@
+import {
+ POLYMARKET_V2_PROTOCOL,
+ type PolymarketProtocolDefinition,
+} from '../protocol/definitions';
+import type { SafeTransaction } from '../safe/types';
+import { compileRequirementTransactions } from './compileRequirementTransactions';
+import { inspectMissingRequirements } from './inspectMissingRequirements';
+import {
+ filterDepositWalletUnsupportedRequirements,
+ getActiveV2AllowanceRequirements,
+ type V2AllowanceRequirement,
+} from './v2AllowanceRequirements';
+
+export interface DepositWalletPreflightPlan {
+ missingRequirements: V2AllowanceRequirement[];
+ transactions: SafeTransaction[];
+}
+
+function getDepositWalletAllowanceRequirements(
+ protocol: PolymarketProtocolDefinition,
+): V2AllowanceRequirement[] {
+ return filterDepositWalletUnsupportedRequirements(
+ getActiveV2AllowanceRequirements(protocol),
+ );
+}
+
+export async function planDepositWalletPreflight({
+ walletAddress,
+ protocol = POLYMARKET_V2_PROTOCOL,
+}: {
+ walletAddress: string;
+ protocol?: PolymarketProtocolDefinition;
+}): Promise {
+ const requirements = getDepositWalletAllowanceRequirements(protocol);
+ const missingRequirements = await inspectMissingRequirements({
+ address: walletAddress,
+ requirements,
+ });
+
+ return {
+ missingRequirements,
+ transactions: compileRequirementTransactions(missingRequirements),
+ };
+}
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.test.ts b/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.test.ts
new file mode 100644
index 00000000000..aebb781eb09
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.test.ts
@@ -0,0 +1,234 @@
+import { TransactionType } from '@metamask/transaction-controller';
+
+jest.mock('./core', () => {
+ const actual = jest.requireActual('./core');
+
+ return {
+ ...actual,
+ buildSignedSafeExecutionIfNeeded: jest.fn(),
+ getRawTokenBalance: jest.fn(),
+ };
+});
+
+jest.mock('../utils', () => ({
+ encodeApprove: jest.fn(() => '0xapprove'),
+ encodeErc20Transfer: jest.fn(() => '0xtransfer'),
+ getAllowance: jest.fn(),
+}));
+
+jest.mock('../protocol/orderCodec', () => ({
+ encodeWrap: jest.fn(() => '0xwrap'),
+}));
+
+import type { Hex } from '@metamask/utils';
+import type { Signer } from '../../types';
+import { POLYMARKET_V2_PROTOCOL } from '../protocol/definitions';
+import { encodeWrap } from '../protocol/orderCodec';
+import { OperationType } from '../safe/types';
+import { encodeApprove, encodeErc20Transfer, getAllowance } from '../utils';
+import {
+ buildSignedSafeExecutionIfNeeded,
+ getRawTokenBalance,
+ type SignedSafeExecution,
+} from './core';
+import {
+ buildLegacySafeMigrationSweepTransaction,
+ planLegacySafeMigrationSweep,
+} from './legacySafeMigration';
+
+const legacySafeAddress = '0x1111111111111111111111111111111111111111';
+const depositWalletAddress = '0x2222222222222222222222222222222222222222';
+const signer: Signer = {
+ address: '0x3333333333333333333333333333333333333333',
+ signPersonalMessage: jest.fn(),
+ signTypedMessage: jest.fn(),
+};
+
+const mockGetRawTokenBalance = jest.mocked(getRawTokenBalance);
+const mockGetAllowance = jest.mocked(getAllowance);
+const mockEncodeApprove = jest.mocked(encodeApprove);
+const mockEncodeWrap = jest.mocked(encodeWrap);
+const mockEncodeErc20Transfer = jest.mocked(encodeErc20Transfer);
+const mockBuildSignedSafeExecutionIfNeeded = jest.mocked(
+ buildSignedSafeExecutionIfNeeded,
+);
+
+function mockBalances({ usdce, pusd }: { usdce: bigint; pusd: bigint }): void {
+ mockGetRawTokenBalance
+ .mockResolvedValueOnce(usdce)
+ .mockResolvedValueOnce(pusd);
+}
+
+describe('legacy Safe migration sweep', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ mockGetAllowance.mockResolvedValue(0n);
+ });
+
+ it('returns no transactions when the legacy Safe has no sweepable balances', async () => {
+ mockBalances({ usdce: 0n, pusd: 0n });
+
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(plan).toEqual({
+ legacyUsdceBalance: 0n,
+ legacyPusdBalance: 0n,
+ transactions: [],
+ });
+ expect(mockGetAllowance).not.toHaveBeenCalled();
+ });
+
+ it('adds USDC.e approve then wrap when allowance is below balance', async () => {
+ mockBalances({ usdce: 1_000_000n, pusd: 0n });
+ mockGetAllowance.mockResolvedValue(0n);
+
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(mockGetAllowance).toHaveBeenCalledWith({
+ tokenAddress: POLYMARKET_V2_PROTOCOL.collateral.legacyUsdceToken,
+ owner: legacySafeAddress,
+ spender: POLYMARKET_V2_PROTOCOL.collateral.onrampAddress,
+ });
+ expect(mockEncodeApprove).toHaveBeenCalledWith({
+ spender: POLYMARKET_V2_PROTOCOL.collateral.onrampAddress,
+ amount: expect.anything(),
+ });
+ expect(mockEncodeWrap).toHaveBeenCalledWith({
+ asset: POLYMARKET_V2_PROTOCOL.collateral.legacyUsdceToken,
+ to: depositWalletAddress,
+ amount: 1_000_000n,
+ });
+ expect(plan.transactions).toEqual([
+ {
+ to: POLYMARKET_V2_PROTOCOL.collateral.legacyUsdceToken,
+ data: '0xapprove',
+ operation: OperationType.Call,
+ value: '0',
+ },
+ {
+ to: POLYMARKET_V2_PROTOCOL.collateral.onrampAddress,
+ data: '0xwrap',
+ operation: OperationType.Call,
+ value: '0',
+ },
+ ]);
+ });
+
+ it('skips USDC.e approve when allowance covers the balance', async () => {
+ mockBalances({ usdce: 1_000_000n, pusd: 0n });
+ mockGetAllowance.mockResolvedValue(1_000_000n);
+
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(mockEncodeApprove).not.toHaveBeenCalled();
+ expect(plan.transactions.map((transaction) => transaction.to)).toEqual([
+ POLYMARKET_V2_PROTOCOL.collateral.onrampAddress,
+ ]);
+ });
+
+ it('adds pUSD transfer to the deposit wallet', async () => {
+ mockBalances({ usdce: 0n, pusd: 2_000_000n });
+
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(mockEncodeErc20Transfer).toHaveBeenCalledWith({
+ to: depositWalletAddress,
+ value: 2_000_000n,
+ });
+ expect(plan.transactions).toEqual([
+ {
+ to: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ data: '0xtransfer',
+ operation: OperationType.Call,
+ value: '0',
+ },
+ ]);
+ });
+
+ it('orders both balances as USDC.e approve/wrap before pUSD transfer', async () => {
+ mockBalances({ usdce: 1_000_000n, pusd: 2_000_000n });
+ mockGetAllowance.mockResolvedValue(0n);
+
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(plan.transactions.map((transaction) => transaction.to)).toEqual([
+ POLYMARKET_V2_PROTOCOL.collateral.legacyUsdceToken,
+ POLYMARKET_V2_PROTOCOL.collateral.onrampAddress,
+ POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ ]);
+ });
+
+ it('returns undefined from the signed sweep builder when there are no transactions', async () => {
+ mockBalances({ usdce: 0n, pusd: 0n });
+ mockBuildSignedSafeExecutionIfNeeded.mockResolvedValue(undefined);
+
+ const result = await buildLegacySafeMigrationSweepTransaction({
+ signer,
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(result).toBeUndefined();
+ expect(mockBuildSignedSafeExecutionIfNeeded).toHaveBeenCalledWith({
+ signer,
+ safeAddress: legacySafeAddress,
+ transactions: [],
+ type: TransactionType.contractInteraction,
+ });
+ });
+
+ it('signs a Safe execution for sweep transactions', async () => {
+ mockBalances({ usdce: 0n, pusd: 2_000_000n });
+ const signedSweep: SignedSafeExecution = {
+ params: {
+ to: legacySafeAddress as Hex,
+ data: '0xsigned' as Hex,
+ },
+ type: TransactionType.contractInteraction,
+ };
+ mockBuildSignedSafeExecutionIfNeeded.mockResolvedValue(signedSweep);
+
+ const result = await buildLegacySafeMigrationSweepTransaction({
+ signer,
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol: POLYMARKET_V2_PROTOCOL,
+ });
+
+ expect(result).toBe(signedSweep);
+ expect(mockBuildSignedSafeExecutionIfNeeded).toHaveBeenCalledWith({
+ signer,
+ safeAddress: legacySafeAddress,
+ transactions: [
+ {
+ to: POLYMARKET_V2_PROTOCOL.collateral.tradingToken,
+ data: '0xtransfer',
+ operation: OperationType.Call,
+ value: '0',
+ },
+ ],
+ type: TransactionType.contractInteraction,
+ });
+ });
+});
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.ts b/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.ts
new file mode 100644
index 00000000000..a422f8e8748
--- /dev/null
+++ b/app/components/UI/Predict/providers/polymarket/preflight/legacySafeMigration.ts
@@ -0,0 +1,117 @@
+import { TransactionType } from '@metamask/transaction-controller';
+import { ethers } from 'ethers';
+import type { Signer } from '../../types';
+import {
+ POLYMARKET_V2_PROTOCOL,
+ type PolymarketProtocolDefinition,
+} from '../protocol/definitions';
+import { encodeWrap } from '../protocol/orderCodec';
+import { OperationType, type SafeTransaction } from '../safe/types';
+import { encodeApprove, encodeErc20Transfer, getAllowance } from '../utils';
+import {
+ buildSignedSafeExecutionIfNeeded,
+ getRawTokenBalance,
+ type SignedSafeExecution,
+} from './core';
+
+export interface LegacySafeMigrationSweepPlan {
+ legacyUsdceBalance: bigint;
+ legacyPusdBalance: bigint;
+ transactions: SafeTransaction[];
+}
+
+export async function planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol = POLYMARKET_V2_PROTOCOL,
+}: {
+ legacySafeAddress: string;
+ depositWalletAddress: string;
+ protocol?: PolymarketProtocolDefinition;
+}): Promise {
+ const [legacyUsdceBalance, legacyPusdBalance] = await Promise.all([
+ getRawTokenBalance({
+ address: legacySafeAddress,
+ tokenAddress: protocol.collateral.legacyUsdceToken,
+ }),
+ getRawTokenBalance({
+ address: legacySafeAddress,
+ tokenAddress: protocol.collateral.tradingToken,
+ }),
+ ]);
+ const transactions: SafeTransaction[] = [];
+
+ if (legacyUsdceBalance > 0n) {
+ const allowance = await getAllowance({
+ tokenAddress: protocol.collateral.legacyUsdceToken,
+ owner: legacySafeAddress,
+ spender: protocol.collateral.onrampAddress,
+ });
+
+ if (allowance < legacyUsdceBalance) {
+ transactions.push({
+ to: protocol.collateral.legacyUsdceToken,
+ data: encodeApprove({
+ spender: protocol.collateral.onrampAddress,
+ amount: ethers.constants.MaxUint256.toBigInt(),
+ }),
+ operation: OperationType.Call,
+ value: '0',
+ });
+ }
+
+ transactions.push({
+ to: protocol.collateral.onrampAddress,
+ data: encodeWrap({
+ asset: protocol.collateral.legacyUsdceToken,
+ to: depositWalletAddress,
+ amount: legacyUsdceBalance,
+ }),
+ operation: OperationType.Call,
+ value: '0',
+ });
+ }
+
+ if (legacyPusdBalance > 0n) {
+ transactions.push({
+ to: protocol.collateral.tradingToken,
+ data: encodeErc20Transfer({
+ to: depositWalletAddress,
+ value: legacyPusdBalance,
+ }),
+ operation: OperationType.Call,
+ value: '0',
+ });
+ }
+
+ return {
+ legacyUsdceBalance,
+ legacyPusdBalance,
+ transactions,
+ };
+}
+
+export async function buildLegacySafeMigrationSweepTransaction({
+ signer,
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol = POLYMARKET_V2_PROTOCOL,
+}: {
+ signer: Signer;
+ legacySafeAddress: string;
+ depositWalletAddress: string;
+ protocol?: PolymarketProtocolDefinition;
+}): Promise {
+ const plan = await planLegacySafeMigrationSweep({
+ legacySafeAddress,
+ depositWalletAddress,
+ protocol,
+ });
+
+ return buildSignedSafeExecutionIfNeeded({
+ signer,
+ safeAddress: legacySafeAddress,
+ transactions: plan.transactions,
+ type: TransactionType.contractInteraction,
+ });
+}
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.test.ts b/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.test.ts
index 2c6ff66433c..6abf83baaff 100644
--- a/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.test.ts
+++ b/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.test.ts
@@ -1,6 +1,7 @@
import { PERMIT2_ADDRESS } from '../safe/constants';
import { POLYMARKET_V2_PROTOCOL } from '../protocol/definitions';
import {
+ filterDepositWalletUnsupportedRequirements,
getActiveV2AllowanceRequirements,
getCanonicalV2AllowanceRequirements,
} from './v2AllowanceRequirements';
@@ -39,4 +40,32 @@ describe('v2 allowance requirements', () => {
]),
);
});
+
+ it('filters Permit2 approvals from deposit-wallet requirements', () => {
+ const requirements = getActiveV2AllowanceRequirements();
+ const filteredRequirements =
+ filterDepositWalletUnsupportedRequirements(requirements);
+
+ expect(filteredRequirements).toHaveLength(requirements.length - 1);
+ expect(filteredRequirements).not.toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ type: 'erc20-allowance',
+ spender: PERMIT2_ADDRESS,
+ }),
+ ]),
+ );
+ expect(filteredRequirements).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ type: 'erc20-allowance',
+ spender: POLYMARKET_V2_PROTOCOL.contracts.exchange,
+ }),
+ expect.objectContaining({
+ type: 'erc1155-operator',
+ operator: POLYMARKET_V2_PROTOCOL.contracts.exchange,
+ }),
+ ]),
+ );
+ });
});
diff --git a/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.ts b/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.ts
index b83b7538777..a25261da760 100644
--- a/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.ts
+++ b/app/components/UI/Predict/providers/polymarket/preflight/v2AllowanceRequirements.ts
@@ -90,6 +90,21 @@ export function getActiveV2AllowanceRequirements(
];
}
+export function filterDepositWalletUnsupportedRequirements(
+ requirements: V2AllowanceRequirement[],
+): V2AllowanceRequirement[] {
+ return requirements.filter((requirement) => {
+ if (requirement.type !== 'erc20-allowance') {
+ return true;
+ }
+
+ // Polymarket's deposit-wallet relayer allow-list blocks Permit2 approvals
+ // (`approve spender 0x000000000022D473030F116dDEE9F6B43aC78BA3 is not in the allowed list`).
+ // Skip this for deposit-wallet setup/claims; fees use a different flow.
+ return requirement.spender.toLowerCase() !== PERMIT2_ADDRESS.toLowerCase();
+ });
+}
+
export function getCanonicalV2AllowanceRequirements(
protocol: PolymarketProtocolDefinition = POLYMARKET_V2_PROTOCOL,
): V2AllowanceRequirement[] {
diff --git a/app/components/UI/Predict/providers/types.ts b/app/components/UI/Predict/providers/types.ts
index 17803ff6e59..7684f45261b 100644
--- a/app/components/UI/Predict/providers/types.ts
+++ b/app/components/UI/Predict/providers/types.ts
@@ -60,6 +60,7 @@ export interface PrepareDepositParams {
export interface GetAccountStateParams {
ownerAddress: string;
+ forceRefresh?: boolean;
}
export interface PrepareWithdrawParams {
diff --git a/app/components/UI/Predict/types/index.ts b/app/components/UI/Predict/types/index.ts
index 39970b2c497..fa4e975816d 100644
--- a/app/components/UI/Predict/types/index.ts
+++ b/app/components/UI/Predict/types/index.ts
@@ -612,9 +612,12 @@ export interface PreviewOrderParams {
positionId?: string;
}
+export type PredictWalletType = 'safe' | 'deposit-wallet';
+
export interface AccountState {
address: Hex;
isDeployed: boolean;
+ walletType: PredictWalletType;
}
export interface GeoBlockResponse {
@@ -635,8 +638,9 @@ export type CryptoPriceUpdateCallback = (update: CryptoPriceUpdate) => void;
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface PrepareDepositParams {}
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface GetAccountStateParams {}
+export interface GetAccountStateParams {
+ forceRefresh?: boolean;
+}
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface PrepareWithdrawParams {}
From 8af3edd307e4a7c422d45f61548f6bb6c0477f1d Mon Sep 17 00:00:00 2001
From: Christopher Ferreira
<104831203+christopherferreira9@users.noreply.github.com>
Date: Fri, 8 May 2026 22:52:00 +0100
Subject: [PATCH 07/10] test: fixes several bugs in update-fixtures workflow
(#29934)
## **Description**
Three bugs were identified and fixed in the `update-e2e-fixtures.yml`
workflow, which is triggered by commenting `@metamaskbot
update-mobile-fixture` on a PR.
**1. `dispatch` job failed with HTTP 403 when triggering
`workflow_dispatch`**
`issue_comment` events run from the default branch (`main`) with a
`GITHUB_TOKEN` that has read-only permissions by default. Calling `gh
workflow run` (which requires `actions: write`) and `gh pr comment`
(which requires `pull-requests: write`) with that token caused a 403.
Fixed by adding an explicit `permissions` block to the `dispatch` job
(`actions: write`, `contents: read`, `pull-requests: write`).
**2. iOS app artifact consistently failed to restore from cache**
The `prepare` job (running on `ubuntu-latest`) was saving the iOS `.app`
artifact to GitHub Actions cache, and the `update-fixtures` job (running
on `ghcr.io/cirruslabs/macos-runner:tahoe`) was trying to restore it.
The Cirrus Labs macOS runner does not reliably support GitHub Actions
cache restoration across jobs, causing a persistent `fail-on-cache-miss`
failure. Fixed by removing the cache entirely: `prepare` now validates
the CI run and exposes the `RUN_ID` as a job output; `update-fixtures`
downloads the artifact directly using `gh run download` with the
`GITHUB_TOKEN`, which uses the GitHub API and works on any runner with
network access.
**3. Misleading "No E2E fixture changes detected" comment posted on
failure**
When `update-fixtures` failed (e.g., at the cache restore step), the
`Cache updated fixture` step still ran due to its `if: ${{ !cancelled()
}}` condition, saving the unmodified fixture to cache.
`commit-updated-fixtures` then restored that stale fixture, saw no diff,
and posted a false success comment. Fixed by:
- Removing `if: ${{ !cancelled() }}` from `Cache updated fixture` so it
only runs when all prior steps succeed.
- Adding `needs.update-fixtures.result == 'success'` to
`commit-updated-fixtures`'s condition so it skips entirely when the
fixture job failed, allowing `failure-comment` to post the correct error
message instead.
## **Changelog**
CHANGELOG entry:
## **Related issues**
Fixes:
## **Manual testing steps**
N/A
## **Screenshots/Recordings**
### **Before**
N/A
### **After**
N/A
## **Pre-merge author checklist**
- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I've included tests if applicable
- [x] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [ ] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Modifies the `update-e2e-fixtures` GitHub Actions workflow execution
and artifact retrieval logic; failures could block or misreport fixture
updates, but changes are confined to CI automation.
>
> **Overview**
> Fixes the `update-e2e-fixtures` workflow so the bot-triggered run has
the required GitHub token permissions and more reliably targets the
correct CI artifacts.
>
> `prepare` now validates the latest `ci` run for the PR branch/HEAD and
exposes its `RUN_ID`, and `update-fixtures` downloads the iOS `.app`
artifact directly from that run (removing the cross-runner cache-based
artifact transfer).
>
> Tightens job gating so fixture caching/committing only happens after a
successful `update-fixtures` run, and switches fixture formatting to use
repo `yarn prettier` (with Node/yarn cache + install) instead of
installing `prettier` ad-hoc.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
03ce80ddd611e9278cd13daea81e3121805f6910. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.github/workflows/update-e2e-fixtures.yml | 65 ++++++++++-------------
1 file changed, 29 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/update-e2e-fixtures.yml b/.github/workflows/update-e2e-fixtures.yml
index 3e25ccd123b..6f4d5fdc58e 100644
--- a/.github/workflows/update-e2e-fixtures.yml
+++ b/.github/workflows/update-e2e-fixtures.yml
@@ -101,6 +101,7 @@ jobs:
COMMIT_SHA: ${{ steps.commit-sha.outputs.COMMIT_SHA }}
BRANCH: ${{ steps.branch.outputs.BRANCH }}
PR_NUMBER: ${{ needs.is-fork-pull-request.outputs.PR_NUMBER }}
+ RUN_ID: ${{ steps.validate-ci.outputs.RUN_ID }}
steps:
- uses: actions/checkout@v4
@@ -121,7 +122,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ needs.is-fork-pull-request.outputs.PR_NUMBER }}
- - name: Download iOS build artifact from CI
+ - name: Validate CI run and resolve RUN_ID
+ id: validate-ci
run: |
COMMIT_SHA_FULL=$(git rev-parse HEAD)
BRANCH="${{ steps.branch.outputs.BRANCH }}"
@@ -140,6 +142,7 @@ jobs:
RUN_CONCLUSION=$(echo "$RUN_INFO" | jq -r '.conclusion')
RUN_HEAD_SHA=$(echo "$RUN_INFO" | jq -r '.headSha')
RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${RUN_ID}"
+ echo "RUN_ID=${RUN_ID}" >> "$GITHUB_OUTPUT"
echo "CI workflow run: ${RUN_URL}"
echo "Status: ${RUN_STATUS}, Conclusion: ${RUN_CONCLUSION}"
@@ -161,29 +164,14 @@ jobs:
echo "::warning title=CI did not succeed::The CI workflow concluded with '${RUN_CONCLUSION}'. The iOS build artifact may not be available. View CI: ${RUN_URL}"
fi
- echo "::group::Downloading iOS app artifact"
- echo "Attempting to download iOS app artifact from CI run ${RUN_ID}..."
-
- if ! gh run download "${RUN_ID}" -n main-qa-MetaMask.app -D ios-app-artifact; then
- echo "::endgroup::"
- echo "::error title=iOS artifact not found::Failed to download 'main-qa-MetaMask.app' artifact. Possible causes:%0A- The 'Build iOS Apps' job has not completed%0A- The iOS build was skipped (no iOS-impacting changes)%0A- The iOS build failed%0A%0ACheck the CI workflow: ${RUN_URL}"
- exit 1
- fi
-
- echo "::endgroup::"
- echo "✅ Successfully downloaded iOS app artifact."
+ echo "✅ CI run validated. RUN_ID=${RUN_ID}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: Cache iOS app artifact
- uses: actions/cache/save@v4
- with:
- path: ios-app-artifact
- key: ios-app-${{ steps.commit-sha.outputs.COMMIT_SHA }}
-
update-fixtures:
name: Export & update fixtures
- needs: [prepare]
+ needs: [is-fork-pull-request, prepare]
+ if: ${{ needs.prepare.result == 'success' && needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
runs-on: ${{ startsWith(github.base_ref, 'release/') && fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe"]') || fromJSON('["ghcr.io/cirruslabs/macos-runner:tahoe", "low-priority"]') }}
timeout-minutes: 30
@@ -235,19 +223,22 @@ jobs:
yarn detox clean-framework-cache
yarn detox build-framework-cache
- - name: Restore iOS app artifact
- uses: actions/cache/restore@v4
- with:
- path: ios-app-artifact
- key: ios-app-${{ needs.prepare.outputs.COMMIT_SHA }}
- fail-on-cache-miss: true
-
- - name: Place iOS app artifact
+ - name: Download iOS app artifact from CI
run: |
- mkdir -p artifacts/main-qa-MetaMask.app
- cp -R ios-app-artifact/* artifacts/main-qa-MetaMask.app/
+ RUN_ID="${{ needs.prepare.outputs.RUN_ID }}"
+ echo "Downloading iOS artifact from CI run ${RUN_ID}..."
+
+ # gh run download uses the ListArtifacts API, which includes artifacts from all
+ # attempts of a run — including earlier attempts when only failed jobs were re-run.
+ if ! gh run download "${RUN_ID}" \
+ -n main-qa-MetaMask.app \
+ -D artifacts/main-qa-MetaMask.app; then
+ echo "::error title=iOS artifact not found::Failed to download 'main-qa-MetaMask.app' artifact from run ${RUN_ID}. Possible causes:%0A- The 'Build iOS Apps' job has not completed%0A- The iOS build was skipped (no iOS-impacting changes)%0A- The iOS build failed%0A%0ACheck the CI workflow: https://github.com/${{ github.repository }}/actions/runs/${RUN_ID}"
+ exit 1
+ fi
+ echo "✅ Downloaded iOS artifact."
env:
- PREBUILT_IOS_APP_PATH: artifacts/main-qa-MetaMask.app
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run fixture validation spec
timeout-minutes: 30
@@ -259,7 +250,6 @@ jobs:
PREBUILT_IOS_APP_PATH: artifacts/main-qa-MetaMask.app
- name: Cache updated fixture
- if: ${{ !cancelled() }}
uses: actions/cache/save@v4
with:
path: tests/framework/fixtures/json/default-fixture.json
@@ -276,7 +266,7 @@ jobs:
- prepare
- is-fork-pull-request
- update-fixtures
- if: ${{ !cancelled() && needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
+ if: ${{ !cancelled() && needs.update-fixtures.result == 'success' && needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -303,17 +293,20 @@ jobs:
echo "HAS_CHANGES=true" >> "$GITHUB_OUTPUT"
fi
- - name: Set up Node.js for prettier
+ - name: Set up Node.js
if: steps.fixture-changes.outputs.HAS_CHANGES == 'true'
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
+ cache: yarn
+
+ - name: Install dependencies
+ if: steps.fixture-changes.outputs.HAS_CHANGES == 'true'
+ run: yarn install --immutable
- name: Format updated fixture with prettier
if: steps.fixture-changes.outputs.HAS_CHANGES == 'true'
- run: |
- npm install --no-save --ignore-scripts prettier@^3.6.2
- ./node_modules/.bin/prettier --write tests/framework/fixtures/json/default-fixture.json
+ run: yarn prettier --write tests/framework/fixtures/json/default-fixture.json
# Note: Commits pushed with the default GITHUB_TOKEN do not trigger
# downstream CI workflows (GitHub anti-loop protection). This is
From 5a65c026186c9964843e4109b90a2c82add120be Mon Sep 17 00:00:00 2001
From: Cal Leung
Date: Fri, 8 May 2026 15:44:09 -0700
Subject: [PATCH 08/10] chore: Remove QA workflows, variants, and conditions
(#29830)
## **Description**
These changes removes most QA workflows, variants, and conditions
related to builds
## **Changelog**
CHANGELOG entry:
## **Related issues**
Fixes: https://consensyssoftware.atlassian.net/browse/MCWP-591
## **Manual testing steps**
```gherkin
Feature: my feature name
Scenario: user [verb for user action]
Given [describe expected initial app state]
When user [verb for user action]
Then [describe expected outcome]
```
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**
- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I've included tests if applicable
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [ ] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
---
> [!NOTE]
> **Medium Risk**
> Medium risk because it removes the `qa` build target across CI and
native projects, which can break builds/tests or artifact expectations
if any remaining jobs or external tooling still reference QA outputs.
>
> **Overview**
> **Removes the QA build variant/target across the repo and standardizes
CI on `main`/`flask` + `e2e` env.** GitHub Actions E2E build/test
workflows drop `keystore_target`/`qa` defaults and update
`metamask_environment` defaults to `e2e`.
>
> Android build config removes the `qa` flavor, QA signing config, and
QA-specific Google Services and resources, and tightens NDK path
selection to production only. iOS drops the `MetaMask-QA` target/scheme
and related export options/plists, and CocoaPods config is updated
accordingly.
>
> Build scripts and tooling (`scripts/build.sh`, `metro.transform.js`,
`scripts/rename-artifacts.js`, `package.json`) remove `qa`
handling/commands and adjust Sentry properties selection to be
environment-based (production vs non-production). Docs are updated to
remove legacy QA/Appium references and point BrowserStack upload
instructions to GitHub Actions artifacts.
>
> Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
88d2e04ce05d3cb4cd385c5ede3cbe0e46a226d9. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).
---
.github/actions/setup-e2e-env/action.yml | 2 +-
.github/workflows/build-android-e2e.yml | 8 +-
.github/workflows/build-ios-e2e.yml | 2 +-
.github/workflows/build.yml | 2 +-
.github/workflows/ci.yml | 2 -
.../run-e2e-regression-tests-android.yml | 1 -
.github/workflows/run-e2e-smoke-tests-ios.yml | 15 -
AGENTS.md | 1 -
android/app/build.gradle | 18 +-
android/app/google-services-example.json | 12 -
android/app/src/qa/res/drawable-hdpi/fox.png | Bin 6214 -> 0 bytes
...igationstack_src_views_assets_backicon.png | Bin 134 -> 0 bytes
android/app/src/qa/res/drawable-ldpi/fox.png | Bin 3374 -> 0 bytes
.../drawable-mdpi/app_images_astronaut.png | Bin 57411 -> 0 bytes
.../qa/res/drawable-mdpi/app_images_bg.png | Bin 74597 -> 0 bytes
.../res/drawable-mdpi/app_images_ethlogo.png | Bin 9497 -> 0 bytes
.../qa/res/drawable-mdpi/app_images_fox.png | Bin 78938 -> 0 bytes
.../res/drawable-mdpi/app_images_foxbadge.png | Bin 3485 -> 0 bytes
.../qa/res/drawable-mdpi/app_images_frame.png | Bin 1181 -> 0 bytes
.../qa/res/drawable-mdpi/app_images_lock.png | Bin 32577 -> 0 bytes
.../drawable-mdpi/app_images_metamaskname.png | Bin 24837 -> 0 bytes
.../drawable-mdpi/app_images_mminstapay.png | Bin 6182 -> 0 bytes
.../app_images_mminstapayselected.png | Bin 6078 -> 0 bytes
.../app_images_opensealogoflatcoloredblue.png | Bin 3003 -> 0 bytes
.../app_images_paymentchannelwatermark.png | Bin 577506 -> 0 bytes
.../app_images_paymentchannelwelcome.png | Bin 25864 -> 0 bytes
.../app_images_selectedwalleticon.png | Bin 9877 -> 0 bytes
.../res/drawable-mdpi/app_images_syncicon.png | Bin 7646 -> 0 bytes
.../drawable-mdpi/app_images_walleticon.png | Bin 449 -> 0 bytes
android/app/src/qa/res/drawable-mdpi/fox.png | Bin 4295 -> 0 bytes
...eflashmessage_src_icons_fm_icon_danger.png | Bin 382 -> 0 bytes
...iveflashmessage_src_icons_fm_icon_info.png | Bin 275 -> 0 bytes
...flashmessage_src_icons_fm_icon_success.png | Bin 329 -> 0 bytes
...flashmessage_src_icons_fm_icon_warning.png | Bin 306 -> 0 bytes
...igationstack_src_views_assets_backicon.png | Bin 100 -> 0 bytes
...ionstack_src_views_assets_backiconmask.png | Bin 1619 -> 0 bytes
.../src/qa/res/drawable-night-hdpi/fox.png | Bin 6214 -> 0 bytes
.../src/qa/res/drawable-night-ldpi/fox.png | Bin 3374 -> 0 bytes
.../src/qa/res/drawable-night-mdpi/fox.png | Bin 4295 -> 0 bytes
.../src/qa/res/drawable-night-xhdpi/fox.png | Bin 7894 -> 0 bytes
.../src/qa/res/drawable-night-xxhdpi/fox.png | Bin 11482 -> 0 bytes
.../src/qa/res/drawable-night-xxxhdpi/fox.png | Bin 15691 -> 0 bytes
.../qa/res/drawable-night/app_background.xml | 9 -
android/app/src/qa/res/drawable-night/fox.png | Bin 5094 -> 0 bytes
android/app/src/qa/res/drawable-xhdpi/fox.png | Bin 7894 -> 0 bytes
...eflashmessage_src_icons_fm_icon_danger.png | Bin 737 -> 0 bytes
...iveflashmessage_src_icons_fm_icon_info.png | Bin 435 -> 0 bytes
...flashmessage_src_icons_fm_icon_success.png | Bin 626 -> 0 bytes
...flashmessage_src_icons_fm_icon_warning.png | Bin 547 -> 0 bytes
...igationstack_src_views_assets_backicon.png | Bin 134 -> 0 bytes
.../app/src/qa/res/drawable-xxhdpi/fox.png | Bin 11482 -> 0 bytes
...eflashmessage_src_icons_fm_icon_danger.png | Bin 985 -> 0 bytes
...iveflashmessage_src_icons_fm_icon_info.png | Bin 568 -> 0 bytes
...flashmessage_src_icons_fm_icon_success.png | Bin 880 -> 0 bytes
...flashmessage_src_icons_fm_icon_warning.png | Bin 712 -> 0 bytes
...igationstack_src_views_assets_backicon.png | Bin 167 -> 0 bytes
.../app/src/qa/res/drawable-xxxhdpi/fox.png | Bin 15691 -> 0 bytes
...igationstack_src_views_assets_backicon.png | Bin 207 -> 0 bytes
.../src/qa/res/drawable/app_background.xml | 9 -
android/app/src/qa/res/drawable/fox.png | Bin 5094 -> 0 bytes
.../qa/res/drawable/rn_edit_text_material.xml | 29 --
.../app/src/qa/res/ic_launcher_background.png | Bin 2179 -> 0 bytes
.../app/src/qa/res/ic_launcher_foreground.png | Bin 16390 -> 0 bytes
.../src/qa/res/layout-night/launch_screen.xml | 6 -
.../app/src/qa/res/layout/launch_screen.xml | 6 -
.../qa/res/mipmap-anydpi-v26/ic_launcher.xml | 5 -
.../mipmap-anydpi-v26/ic_launcher_round.xml | 5 -
.../src/qa/res/mipmap-hdpi/ic_launcher.png | Bin 5490 -> 0 bytes
.../mipmap-hdpi/ic_launcher_background.png | Bin 538 -> 0 bytes
.../mipmap-hdpi/ic_launcher_foreground.png | Bin 3016 -> 0 bytes
.../qa/res/mipmap-hdpi/ic_launcher_round.png | Bin 6277 -> 0 bytes
.../qa/res/mipmap-hdpi/ic_notification.png | Bin 1366 -> 0 bytes
.../res/mipmap-hdpi/ic_notification_small.png | Bin 1278 -> 0 bytes
android/app/src/qa/res/mipmap-hdpi/splash.png | Bin 5399 -> 0 bytes
.../src/qa/res/mipmap-mdpi/ic_launcher.png | Bin 3415 -> 0 bytes
.../mipmap-mdpi/ic_launcher_background.png | Bin 363 -> 0 bytes
.../mipmap-mdpi/ic_launcher_foreground.png | Bin 2197 -> 0 bytes
.../qa/res/mipmap-mdpi/ic_launcher_round.png | Bin 3780 -> 0 bytes
.../qa/res/mipmap-mdpi/ic_notification.png | Bin 919 -> 0 bytes
.../res/mipmap-mdpi/ic_notification_small.png | Bin 870 -> 0 bytes
android/app/src/qa/res/mipmap-mdpi/splash.png | Bin 5399 -> 0 bytes
.../src/qa/res/mipmap-xhdpi/ic_launcher.png | Bin 7681 -> 0 bytes
.../mipmap-xhdpi/ic_launcher_background.png | Bin 700 -> 0 bytes
.../mipmap-xhdpi/ic_launcher_foreground.png | Bin 3842 -> 0 bytes
.../qa/res/mipmap-xhdpi/ic_launcher_round.png | Bin 9085 -> 0 bytes
.../qa/res/mipmap-xhdpi/ic_notification.png | Bin 1746 -> 0 bytes
.../mipmap-xhdpi/ic_notification_small.png | Bin 1965 -> 0 bytes
.../app/src/qa/res/mipmap-xhdpi/splash.png | Bin 10028 -> 0 bytes
.../src/qa/res/mipmap-xxhdpi/ic_launcher.png | Bin 11916 -> 0 bytes
.../mipmap-xxhdpi/ic_launcher_background.png | Bin 1024 -> 0 bytes
.../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 5624 -> 0 bytes
.../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 14881 -> 0 bytes
.../qa/res/mipmap-xxhdpi/ic_notification.png | Bin 2607 -> 0 bytes
.../mipmap-xxhdpi/ic_notification_small.png | Bin 2811 -> 0 bytes
.../app/src/qa/res/mipmap-xxhdpi/splash.png | Bin 15049 -> 0 bytes
.../src/qa/res/mipmap-xxxhdpi/ic_launcher.png | Bin 15994 -> 0 bytes
.../mipmap-xxxhdpi/ic_launcher_background.png | Bin 1699 -> 0 bytes
.../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 7758 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 20477 -> 0 bytes
.../qa/res/mipmap-xxxhdpi/ic_notification.png | Bin 3314 -> 0 bytes
.../mipmap-xxxhdpi/ic_notification_small.png | Bin 4942 -> 0 bytes
.../app/src/qa/res/mipmap-xxxhdpi/splash.png | Bin 21237 -> 0 bytes
.../app/src/qa/res/values-night/booleans.xml | 4 -
.../app/src/qa/res/values-night/colors.xml | 10 -
.../app/src/qa/res/values-night/strings.xml | 3 -
.../app/src/qa/res/values-night/styles.xml | 25 -
android/app/src/qa/res/values/booleans.xml | 4 -
android/app/src/qa/res/values/colors.xml | 10 -
android/app/src/qa/res/values/strings.xml | 3 -
android/app/src/qa/res/values/styles.xml | 26 --
android/app/src/qa/res/xml/filepaths.xml | 4 -
.../src/qa/res/xml/react_native_config.xml | 10 -
builds.yml | 4 +-
docs/readme/e2e-testing.md | 176 +------
ios/MetaMask.xcodeproj/project.pbxproj | 438 ------------------
.../xcschemes/MetaMask-QA.xcscheme | 96 ----
.../AppIcon-QA.appiconset/100.png | Bin 8397 -> 0 bytes
.../AppIcon-QA.appiconset/1024.png | Bin 57017 -> 0 bytes
.../AppIcon-QA.appiconset/114.png | Bin 9801 -> 0 bytes
.../AppIcon-QA.appiconset/120.png | Bin 10464 -> 0 bytes
.../AppIcon-QA.appiconset/144.png | Bin 12908 -> 0 bytes
.../AppIcon-QA.appiconset/152.png | Bin 13639 -> 0 bytes
.../AppIcon-QA.appiconset/167.png | Bin 15140 -> 0 bytes
.../AppIcon-QA.appiconset/180.png | Bin 16604 -> 0 bytes
.../AppIcon-QA.appiconset/20.png | Bin 1195 -> 0 bytes
.../AppIcon-QA.appiconset/29.png | Bin 1978 -> 0 bytes
.../AppIcon-QA.appiconset/40.png | Bin 2905 -> 0 bytes
.../AppIcon-QA.appiconset/50.png | Bin 3840 -> 0 bytes
.../AppIcon-QA.appiconset/57.png | Bin 4424 -> 0 bytes
.../AppIcon-QA.appiconset/58.png | Bin 4496 -> 0 bytes
.../AppIcon-QA.appiconset/60.png | Bin 4617 -> 0 bytes
.../AppIcon-QA.appiconset/72.png | Bin 5719 -> 0 bytes
.../AppIcon-QA.appiconset/76.png | Bin 6150 -> 0 bytes
.../AppIcon-QA.appiconset/80.png | Bin 6455 -> 0 bytes
.../AppIcon-QA.appiconset/87.png | Bin 7180 -> 0 bytes
.../AppIcon-QA.appiconset/Contents.json | 1 -
...osExportOptionsMetaMaskQADevelopment.plist | 17 -
.../IosExportOptionsMetaMaskQARelease.plist | 17 -
ios/MetaMask/MetaMask-QA-Info.plist | 128 -----
ios/Podfile | 4 -
ios/Podfile.lock | 2 +-
metro.transform.js | 2 -
package.json | 10 -
scripts/build.sh | 80 +---
scripts/rename-artifacts.js | 6 -
145 files changed, 28 insertions(+), 1184 deletions(-)
delete mode 100644 android/app/src/qa/res/drawable-hdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-hdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
delete mode 100644 android/app/src/qa/res/drawable-ldpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_astronaut.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_bg.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_ethlogo.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_fox.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_foxbadge.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_frame.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_lock.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_metamaskname.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_mminstapay.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_mminstapayselected.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_opensealogoflatcoloredblue.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_paymentchannelwatermark.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_paymentchannelwelcome.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_selectedwalleticon.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_syncicon.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/app_images_walleticon.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
delete mode 100644 android/app/src/qa/res/drawable-mdpi/node_modules_reactnavigationstack_src_views_assets_backiconmask.png
delete mode 100644 android/app/src/qa/res/drawable-night-hdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night-ldpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night-mdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night-xhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night-xxhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night-xxxhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-night/app_background.xml
delete mode 100644 android/app/src/qa/res/drawable-night/fox.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
delete mode 100644 android/app/src/qa/res/drawable-xhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_danger.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_info.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_success.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/node_modules_reactnativeflashmessage_src_icons_fm_icon_warning.png
delete mode 100644 android/app/src/qa/res/drawable-xxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
delete mode 100644 android/app/src/qa/res/drawable-xxxhdpi/fox.png
delete mode 100644 android/app/src/qa/res/drawable-xxxhdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
delete mode 100644 android/app/src/qa/res/drawable/app_background.xml
delete mode 100644 android/app/src/qa/res/drawable/fox.png
delete mode 100644 android/app/src/qa/res/drawable/rn_edit_text_material.xml
delete mode 100644 android/app/src/qa/res/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/layout-night/launch_screen.xml
delete mode 100644 android/app/src/qa/res/layout/launch_screen.xml
delete mode 100644 android/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml
delete mode 100644 android/app/src/qa/res/mipmap-anydpi-v26/ic_launcher_round.xml
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_launcher.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_launcher_round.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_notification.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/ic_notification_small.png
delete mode 100644 android/app/src/qa/res/mipmap-hdpi/splash.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_launcher.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_launcher_round.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_notification.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/ic_notification_small.png
delete mode 100644 android/app/src/qa/res/mipmap-mdpi/splash.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_launcher.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_launcher_round.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_notification.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/ic_notification_small.png
delete mode 100644 android/app/src/qa/res/mipmap-xhdpi/splash.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_launcher.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_launcher_round.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_notification.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/ic_notification_small.png
delete mode 100644 android/app/src/qa/res/mipmap-xxhdpi/splash.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_background.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_foreground.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_round.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_notification.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/ic_notification_small.png
delete mode 100644 android/app/src/qa/res/mipmap-xxxhdpi/splash.png
delete mode 100644 android/app/src/qa/res/values-night/booleans.xml
delete mode 100644 android/app/src/qa/res/values-night/colors.xml
delete mode 100644 android/app/src/qa/res/values-night/strings.xml
delete mode 100644 android/app/src/qa/res/values-night/styles.xml
delete mode 100644 android/app/src/qa/res/values/booleans.xml
delete mode 100644 android/app/src/qa/res/values/colors.xml
delete mode 100644 android/app/src/qa/res/values/strings.xml
delete mode 100644 android/app/src/qa/res/values/styles.xml
delete mode 100644 android/app/src/qa/res/xml/filepaths.xml
delete mode 100644 android/app/src/qa/res/xml/react_native_config.xml
delete mode 100644 ios/MetaMask.xcodeproj/xcshareddata/xcschemes/MetaMask-QA.xcscheme
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/100.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/1024.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/114.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/120.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/144.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/152.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/167.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/180.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/20.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/29.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/40.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/50.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/57.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/58.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/60.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/72.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/76.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/80.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/87.png
delete mode 100644 ios/MetaMask/Images.xcassets/AppIcon-QA.appiconset/Contents.json
delete mode 100644 ios/MetaMask/IosExportOptionsMetaMaskQADevelopment.plist
delete mode 100644 ios/MetaMask/IosExportOptionsMetaMaskQARelease.plist
delete mode 100644 ios/MetaMask/MetaMask-QA-Info.plist
diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml
index 5594b419c0f..e1591398eb8 100644
--- a/.github/actions/setup-e2e-env/action.yml
+++ b/.github/actions/setup-e2e-env/action.yml
@@ -84,7 +84,7 @@ inputs:
required: false
default: 'arn:aws:iam::363762752069:role/metamask-mobile-build-signer-qa'
target:
- description: 'Target for which the keystore is being configured (e.g., qa, flask, main)'
+ description: 'Target for which the keystore is being configured (e.g. flask, main)'
required: false
default: 'qa'
diff --git a/.github/workflows/build-android-e2e.yml b/.github/workflows/build-android-e2e.yml
index 2afc01d7fd5..a8da0c09828 100644
--- a/.github/workflows/build-android-e2e.yml
+++ b/.github/workflows/build-android-e2e.yml
@@ -18,12 +18,7 @@ on:
metamask_environment:
description: 'The environment to build for'
required: false
- default: 'qa'
- type: string
- keystore_target:
- description: 'The target to use for the keystore'
- required: false
- default: 'qa'
+ default: 'e2e'
type: string
source-fingerprint:
description: >-
@@ -198,7 +193,6 @@ jobs:
setup-simulator: false
configure-keystores: true
install-foundry: false
- target: ${{ inputs.keystore_target }} # qa for target=main, flask for target=flask
# The Namespace cache action above already includes `.metamask`, so the
# dedicated actions/cache restore is only needed on non-Namespace runners.
diff --git a/.github/workflows/build-ios-e2e.yml b/.github/workflows/build-ios-e2e.yml
index 6be48da940d..4e99d21c48b 100644
--- a/.github/workflows/build-ios-e2e.yml
+++ b/.github/workflows/build-ios-e2e.yml
@@ -15,7 +15,7 @@ on:
metamask_environment:
description: 'The environment to build for'
required: false
- default: 'qa'
+ default: 'e2e'
type: string
source-fingerprint:
description: >-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f64e0a8669..33ded5310a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -412,7 +412,7 @@ jobs:
security delete-keychain "$KEYCHAIN_PATH" || true
fi
- # Signing: uses role + secret from builds.yml (skipped when builds.yml omits signing, e.g. simulator-only flask-dev / qa-dev)
+ # Signing: uses role + secret from builds.yml (skipped when builds.yml omits signing, e.g. simulator-only flask-dev)
- name: Configure signing certificates
if: needs.prepare.outputs.signing_aws_role != ''
uses: ./.github/actions/configure-signing
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 704d767485c..e11c50aab2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -841,7 +841,6 @@ jobs:
with:
build_type: 'main'
metamask_environment: 'e2e'
- keystore_target: 'qa'
source-fingerprint: ${{ needs.post-build-source-hash.outputs.fingerprint }}
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -928,7 +927,6 @@ jobs:
split_number: 1
total_splits: 1
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
diff --git a/.github/workflows/run-e2e-regression-tests-android.yml b/.github/workflows/run-e2e-regression-tests-android.yml
index a39a83f7a68..50354ce8f5b 100644
--- a/.github/workflows/run-e2e-regression-tests-android.yml
+++ b/.github/workflows/run-e2e-regression-tests-android.yml
@@ -32,7 +32,6 @@ jobs:
with:
build_type: 'main'
metamask_environment: 'e2e'
- keystore_target: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
diff --git a/.github/workflows/run-e2e-smoke-tests-ios.yml b/.github/workflows/run-e2e-smoke-tests-ios.yml
index 19fb3ee5d7c..37c1cbdbc11 100644
--- a/.github/workflows/run-e2e-smoke-tests-ios.yml
+++ b/.github/workflows/run-e2e-smoke-tests-ios.yml
@@ -39,7 +39,6 @@ jobs:
total_splits: 4
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -58,7 +57,6 @@ jobs:
total_splits: 2
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -77,7 +75,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -96,7 +93,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -115,7 +111,6 @@ jobs:
total_splits: 3
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -134,7 +129,6 @@ jobs:
total_splits: 2
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -153,7 +147,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -172,7 +165,6 @@ jobs:
total_splits: 2
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -191,7 +183,6 @@ jobs:
total_splits: 2
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -210,7 +201,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -229,7 +219,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -248,7 +237,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -267,7 +255,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -286,7 +273,6 @@ jobs:
total_splits: 1
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
@@ -305,7 +291,6 @@ jobs:
total_splits: 4
changed_files: ${{ inputs.changed_files }}
build_type: 'main'
- metamask_environment: 'qa'
runner_provider: ${{ inputs.runner_provider }}
secrets: inherit
diff --git a/AGENTS.md b/AGENTS.md
index 2f4085f823a..ee8871c8781 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -179,7 +179,6 @@ The app supports multiple build types:
- `main`: Production MetaMask
- `flask`: Development/experimental features
-- `qa`: QA testing builds
Use environment variable `METAMASK_BUILD_TYPE` to switch.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3a4fe6340d6..0307e2fd43c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -23,7 +23,7 @@ react {
// The list of variants to that are debuggable. For those we're going to
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
- debuggableVariants = ["qaDebug", "prodDebug", "flaskDebug"]
+ debuggableVariants = ["prodDebug", "flaskDebug"]
/* Bundling */
// A list containing the node command and its flags. Default is just 'node'.
// nodeExecutableAndArgs = ["node"]
@@ -168,10 +168,10 @@ def reactNativeArchitectures() {
/**
-* Adding function that will retuen the Bitrise ndkPath if it is a QA or Production Build
+* Adding function that will retuen the Bitrise ndkPath if it is a Production Build
*/
def ndkPath() {
- return System.getenv('METAMASK_BUILD_TYPE') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'production' ? rootProject.ext.bitriseNdkPath : ""
+ return System.getenv('METAMASK_ENVIRONMENT') == 'production' ? rootProject.ext.bitriseNdkPath : ""
}
@@ -292,12 +292,6 @@ android {
keyAlias 'androiddebugkey'
keyPassword 'android'
}
- qaProd {
- storeFile file('../keystores/internalRelease.keystore')
- storePassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PASSWORD")
- keyAlias System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_ALIAS")
- keyPassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PRIVATE_KEY_PASSWORD")
- }
}
buildTypes {
@@ -315,12 +309,6 @@ android {
flavorDimensions "version"
productFlavors {
- qa {
- dimension "version"
- applicationIdSuffix ".qa"
- applicationId "io.metamask"
- signingConfig signingConfigs.qaProd
- }
prod {
dimension "version"
applicationId "io.metamask"
diff --git a/android/app/google-services-example.json b/android/app/google-services-example.json
index 02ea42cea0e..91ba30cea82 100644
--- a/android/app/google-services-example.json
+++ b/android/app/google-services-example.json
@@ -18,18 +18,6 @@
}
}
},
- {
- "api_key": [{ "current_key": "" }],
- "client_info": {
- "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
- "client_id": "android:io.metamask.qa",
- "client_type": 1,
- "android_client_info": {
- "package_name": "io.metamask.qa",
- "certificate_hash": []
- }
- }
- },
{
"api_key": [{ "current_key": "" }],
"client_info": {
diff --git a/android/app/src/qa/res/drawable-hdpi/fox.png b/android/app/src/qa/res/drawable-hdpi/fox.png
deleted file mode 100644
index 37732ac855526626759ba45a4b766b77e92eb9c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6214
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
RJ;?r8nyR`gb;@?({{#3<+H?Q_
diff --git a/android/app/src/qa/res/drawable-hdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png b/android/app/src/qa/res/drawable-hdpi/node_modules_reactnavigationstack_src_views_assets_backicon.png
deleted file mode 100644
index ad03a63bf3caba175695f5acca85a690dda2d02c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 134
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
Ef~(GttN;K2
diff --git a/android/app/src/qa/res/drawable-mdpi/app_images_astronaut.png b/android/app/src/qa/res/drawable-mdpi/app_images_astronaut.png
deleted file mode 100644
index b9870ef26dfc9579426d44d5279206e68fe0e00a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 57411
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