Skip to content

fix: hwb 76 fix incorrect transaction approved events log when user reject in hardware wallet #38089

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+18 −1
Open

fix: hwb 76 fix incorrect transaction approved events log when user reject in hardware wallet #38089

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
073ea77
fix: fix the incorrect signature event logged when user reject a tran…
dawnseeker8 Nov 20, 2025
a452c97
Merge branch 'main' into fix/HWB-76-fix-incorrect-signaure-reject-eve…
dawnseeker8 Nov 20, 2025
af50248
fix: enhance transaction approval/rejection handling for hardware wal…
dawnseeker8 Nov 21, 2025
65e499e
fix: correct indentation for error message status in RPC method track…
dawnseeker8 Nov 21, 2025
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
19 changes: 18 additions & 1 deletion app/scripts/controller-init/confirmations/transaction-controller-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
TransactionController,
TransactionControllerMessenger,
TransactionMeta,
TransactionStatus,
TransactionType,
} from '@metamask/transaction-controller';
import {
Expand Down Expand Up @@ -300,7 +301,23 @@ function addTransactionControllerListeners(
'TransactionController:transactionApproved',
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31879
// eslint-disable-next-line @typescript-eslint/no-misused-promises
handleTransactionApproved.bind(null, transactionMetricsRequest),
async ({ transactionMeta }) => {
// when hardware wallet failed or rejected, due to user already click the confirm, then the flow will come to here.
// but because hardware wallet need double confirm in device, so we need to handle the transaction rejected here.
// if status is failed or rejected, then we need to handle the transaction rejected
if (
transactionMeta.status === TransactionStatus.failed ||
transactionMeta.status === TransactionStatus.rejected
) {
await handleTransactionRejected(transactionMetricsRequest, {
transactionMeta,
});
Copy link

@cursor cursor bot Nov 21, 2025

Choose a reason for hiding this comment

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

Bug: Duplicate metrics and incorrect event classification

Manually calling handleTransactionRejected here causes duplicate metrics, as the TransactionController emits separate transactionRejected and transactionFailed events that already trigger their own listeners. Additionally, treating TransactionStatus.failed as a user rejection (calling handleTransactionRejected) is semantically incorrect and will result in conflicting event data (both "rejected" and "failed" events for the same transaction). The handler should only skip the approved event logic when the status indicates failure.

Fix in Cursor Fix in Web

} else {
await handleTransactionApproved(transactionMetricsRequest, {
transactionMeta,
});
}
},
);

initMessenger.subscribe(
Expand Down
Loading