Skip to content

fix(bridge-status-controller): preserve original transaction id when recording intent swaps in history #8655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dawnseeker8 merged 3 commits into from
May 4, 2026
+12 −2
Merged

fix(bridge-status-controller): preserve original transaction id when recording intent swaps in history #8655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4391d2b
refactor(bridge-status-controller): update bridge transaction metadat…
dawnseeker8 Apr 30, 2026
37d1e6d
fix(bridge-status-controller): correct comment formatting in bridge t…
dawnseeker8 Apr 30, 2026
60ee344
docs(bridge-status-controller): add changelog for intent history orig…
dawnseeker8 Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/bridge-status-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Bump `@metamask/keyring-controller` from `^25.2.0` to `^25.3.0` ([#8634](https://github.com/MetaMask/core/pull/8634))
- Bump `@metamask/network-controller` from `^30.0.1` to `^30.1.0` ([#8636](https://github.com/MetaMask/core/pull/8636))

### Fixed

- When `submitIntent` records bridge history keyed by `orderUid`, pass `originalTransactionId` at the top level to `#addTxToHistory` so `getInitialHistoryItem` links the history item to the synthetic `TransactionController` entry instead of incorrectly using `orderUid` ([#8655](https://github.com/MetaMask/core/pull/8655))

## [71.1.0]

### Added
Expand Down
10 changes: 8 additions & 2 deletions packages/bridge-status-controller/src/bridge-status-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,17 +1486,23 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid

// Record in bridge history with actual transaction metadata
try {
// Create a bridge transaction metadata that includes the original txId
// Create a bridge transaction metadata keyed by orderUid for intent polling
const bridgeTxMetaForHistory = {
...syntheticMeta,
id: orderUid,
originalTransactionId: syntheticMeta.id, // Keep original txId for TransactionController updates
};

// Use orderId as the history key for intent transactions
// IMPORTANT: pass originalTransactionId as a top-level argument so
// `getInitialHistoryItem` reads it. Setting it on `bridgeTxMeta` is a no-op
// because `getInitialHistoryItem` destructures `originalTransactionId` from
// the top-level args, not from `bridgeTxMeta`. Without this, the field
// falls back to `bridgeTxMeta.id` (the orderUid), severing the link between
// the bridge history record and the synthetic TransactionController entry.
const historyKey = this.#addTxToHistory({
accountAddress,
bridgeTxMeta: bridgeTxMetaForHistory,
originalTransactionId: syntheticMeta.id,
quoteResponse,
slippagePercentage: 0,
isStxEnabled: false,
Expand Down
Loading