Skip to content

fix(BETR-413): pass originalTransactionId for intent bridge history cp-7.76.0#29670

Merged
vivek-consensys merged 8 commits into
mainfrom
fix/ondo-rwa-activity-patch-main
May 5, 2026
Merged

fix(BETR-413): pass originalTransactionId for intent bridge history cp-7.76.0#29670
vivek-consensys merged 8 commits into
mainfrom
fix/ondo-rwa-activity-patch-main

Conversation

@dawnseeker8

@dawnseeker8 dawnseeker8 commented May 4, 2026

Copy link
Copy Markdown
Contributor

Description

Patches @metamask/bridge-status-controller@71.1.0 so that when recording intent-based bridge transactions in history, originalTransactionId is passed as a top-level argument to addTxToHistory. getInitialHistoryItem reads that field from the top-level args, not from bridgeTxMeta; without this, it fell back to bridgeTxMeta.id (the orderUid), which broke the link between the bridge history row and the synthetic TransactionController entry. That mismatch showed up in the activity tab for Ondo RWA swap flows (see BETR-413).

Dependency wiring: package.json / yarn.lock updated to apply the Yarn patch.

Changelog

CHANGELOG entry: Fixed bridge activity tab not correctly linking intent-based swaps to their underlying transaction for some bridge flows.

Related issues

Refs: BETR-413

Manual testing steps

Feature: Bridge / swap activity after intent-based flow

  Scenario: Activity shows consistent status for Ondo RWA swap
    Given a wallet that completes an intent-based bridge swap affected by BETR-413

    When the user opens the activity tab for that account

    Then the bridge / swap entry reflects the correct status and ties to the expected transaction metadata

Screenshots/Recordings

Before

image

After

image

Pre-merge author checklist

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 to import wallets with many accounts and tokens
  • I've instrumented key operations with Sentry traces for production performance metrics

For performance guidelines and tooling, see the Performance Guide.

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 changes how intent-based bridge transactions are keyed/linked between bridge history and TransactionController, which could affect activity/status rendering for those flows.

Overview
Fixes intent-based bridge history entries so they retain a stable link to the underlying synthetic transaction by passing originalTransactionId as a top-level argument to addTxToHistory (instead of embedding it in bridgeTxMeta).

Wires this via a Yarn patch for @metamask/bridge-status-controller@71.1.0 (updates package.json resolutions/dependency and yarn.lock) so the patched dist/bridge-status-controller code is used at build time.

Reviewed by Cursor Bugbot for commit db8990e. Bugbot is set up for automated code reviews on this repo. Configure here.

Patch @metamask/bridge-status-controller@71.1.0 so that
`originalTransactionId` is passed as a top-level argument to
`getInitialHistoryItem` for intent transactions (not nested on
`bridgeTxMeta`, where it is silently ignored).

Without this, the bridge history record's `originalTransactionId`
falls back to the orderUid, breaking the link between the bridge
history entry and the synthetic TransactionController entry. As a
result, Ondo (and other intent-based) swaps showed an incorrect
status on the wallet activity tab.

Refs: https://consensyssoftware.atlassian.net/browse/BETR-413
@dawnseeker8 dawnseeker8 self-assigned this May 4, 2026
@metamaskbotv2 metamaskbotv2 Bot added the team-be-trade BE Trade team label May 4, 2026
@github-actions

github-actions Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@github-actions github-actions Bot added pr-not-ready-for-e2e Skip E2E and block merging. Remove this label once the PR is ready to run the E2E tests. size-S labels May 4, 2026
@Akaryatrh Akaryatrh changed the title fix(bridge): patch status-controller for Ondo swap activity tab fix(BETR-413): pass originalTransactionId for intent bridge history May 4, 2026
@Akaryatrh Akaryatrh removed the pr-not-ready-for-e2e Skip E2E and block merging. Remove this label once the PR is ready to run the E2E tests. label May 4, 2026
@vivek-consensys vivek-consensys marked this pull request as ready for review May 4, 2026 15:40
@vivek-consensys vivek-consensys requested a review from a team as a code owner May 4, 2026 15:40
@Akaryatrh Akaryatrh changed the title fix(BETR-413): pass originalTransactionId for intent bridge history fix(BETR-413): pass originalTransactionId for intent bridge history cp-7.76.0 May 4, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 62e67b3. Configure here.

@vivek-consensys vivek-consensys added the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label May 5, 2026
@github-project-automation github-project-automation Bot moved this to Needs dev review in PR review queue May 5, 2026
@vivek-consensys vivek-consensys added the QA Passed QA testing has been completed and passed label May 5, 2026
@github-actions

github-actions Bot commented May 5, 2026

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

  • Selected E2E tags: SmokeAccounts, SmokeConfirmations, SmokeIdentity, SmokeNetworkAbstractions, SmokeNetworkExpansion, SmokeSwap, SmokeStake, SmokeWalletPlatform, SmokeMoney, SmokePerps, SmokeMultiChainAPI, SmokePredictions, SmokeSeedlessOnboarding, SmokeBrowser, SmokeSnaps
  • Selected Performance tags: @PerformanceAccountList, @PerformanceOnboarding, @PerformanceLogin, @PerformanceSwaps, @PerformanceLaunch, @PerformanceAssetLoading, @PerformancePredict, @PerformancePreps
  • Risk Level: high
  • AI Confidence: 100%
click to see 🤖 AI reasoning details

E2E Test Selection:
Hard rule (controller-version-update): @MetaMask controller package version updated in package.json: @metamask/bridge-status-controller@npm:^71.0.0, @metamask/bridge-status-controller. Running all tests.

Performance Test Selection:
Hard rule (controller-version-update): @MetaMask controller package version updated in package.json: @metamask/bridge-status-controller@npm:^71.0.0, @metamask/bridge-status-controller. Running all tests.

View GitHub Actions results

@sonarqubecloud

sonarqubecloud Bot commented May 5, 2026

Copy link
Copy Markdown

@github-project-automation github-project-automation Bot moved this from Needs dev review to Review finalised - Ready to be merged in PR review queue May 5, 2026
@vivek-consensys vivek-consensys added this pull request to the merge queue May 5, 2026
Merged via the queue into main with commit e15e997 May 5, 2026
114 checks passed
@vivek-consensys vivek-consensys deleted the fix/ondo-rwa-activity-patch-main branch May 5, 2026 12:48
@github-project-automation github-project-automation Bot moved this from Review finalised - Ready to be merged to Merged, Closed or Archived in PR review queue May 5, 2026
@github-actions github-actions Bot locked and limited conversation to collaborators May 5, 2026
@github-actions github-actions Bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label May 5, 2026
@metamaskbotv2 metamaskbotv2 Bot added the release-7.77.0 Issue or pull request that will be included in release 7.77.0 label May 5, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

QA Passed QA testing has been completed and passed release-7.77.0 Issue or pull request that will be included in release 7.77.0 size-S team-be-trade BE Trade team

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants