Skip to content

fix: controller send transaction approved when user reject transaction in hardware devices. #7214

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

Draft
dawnseeker8 wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix: controller send transaction approved when user reject transaction in hardware devices. #7214

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0caebb
fix: handle transaction approval and failure states
dawnseeker8 Nov 21, 2025
c134ef0
Revert back to main version
dawnseeker8 Dec 2, 2025
7293eb1
fix: enhance transaction approval handling
dawnseeker8 Dec 2, 2025
8f09eb8
Merge branch 'main' into fix/reject-hardware-send-transaction-approve…
dawnseeker8 Dec 2, 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: 15 additions & 4 deletions packages/transaction-controller/src/TransactionController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3078,10 +3078,21 @@ export class TransactionController extends BaseController<
const updatedTransactionMeta = this.#getTransaction(
transactionId,
) as TransactionMeta;
this.messenger.publish(`${controllerName}:transactionApproved`, {
transactionMeta: updatedTransactionMeta,
actionId,
});

// need to check status of updatedTransactionMeta to see if it is approved
// for special case like user reject request in hardware wallet, the transactionMeta is failed with error "user rejected request"
if (updatedTransactionMeta.status === TransactionStatus.failed) {
this.messenger.publish(`${controllerName}:transactionFailed`, {
Copy link
Member

@matthewwalsh0 matthewwalsh0 Dec 2, 2025

Choose a reason for hiding this comment

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

This is already published in #failTransaction whenever the status is changed to failed.

So we can just check ApprovalState.Approved here instead, before publishing approved event.

transactionMeta: updatedTransactionMeta,
actionId,
error: updatedTransactionMeta?.error?.message ?? 'Unknown error',
});
} else {
this.messenger.publish(`${controllerName}:transactionApproved`, {
transactionMeta: updatedTransactionMeta,
actionId,
});
}
}
} catch (rawError: unknown) {
const error = rawError as Error & { code?: number; data?: Json };
Expand Down
Loading