fix: hwb 76 fix incorrect transaction approved events log when user reject in hardware wallet #38089
+18
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nts-for-hardware-wallet
…lets - Updated the transaction controller to properly handle transaction approval and rejection events, particularly for hardware wallets. - Added logic to differentiate between failed and rejected transactions, ensuring that the appropriate event handlers are invoked based on the transaction status. - revert the createRPCMethodTrackingMiddleware.js back to main version. This change aims to provide a more robust user experience when interacting with hardware wallets during transaction confirmations.
…ing middleware - Adjusted the indentation of the error message status assignment in the createRPCMethodTrackingMiddleware.js file to improve code readability and maintain consistency with surrounding code structure.
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. |
Collaborator
✨ Files requiring CODEOWNER review ✨✅ @MetaMask/confirmations (1 files, +18 -1)
|
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
app/scripts/controller-init/confirmations/transaction-controller-init.ts
Show resolved
Hide resolved
| ) { | ||
| await handleTransactionRejected(transactionMetricsRequest, { | ||
| transactionMeta, | ||
| }); |
There was a problem hiding this comment.
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.
Collaborator
Builds ready [65e499e]
UI Startup Metrics (1153 ± 94 ms)
📊 Page Load Benchmark ResultsCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fix incorrect transaction approved events log when user reject in hardware wallet, which relative to #18361
Basically this pr override the transactionApproved listener in
Transaction-controller-init.tsand check the transactionMetadata return, if the metadata status isfailedorrejected, then we should logtransaction rejectedevent instead, which mean user reject in hardware wallet side which cause the transaction rejected.This PR fix the incorrect
Changelog
CHANGELOG entry: Override Transaction Approved event listener to handle hardware wallet user rejected event.
Related issues
Fixes: #18361
https://consensyssoftware.atlassian.net/browse/HWB-76
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist
Note
Ensure
transactionApprovedevents withfailedorrejectedstatus invokehandleTransactionRejectedinstead ofhandleTransactionApproved, fixing hardware wallet rejection logging.app/scripts/controller-init/confirmations/transaction-controller-init.ts):handleTransactionApprovedsubscription with async handler that checkstransactionMeta.statusand routes tohandleTransactionRejectedwhenTransactionStatus.failedorTransactionStatus.rejected; otherwise callshandleTransactionApproved.TransactionStatusimport to support status checks.Written by Cursor Bugbot for commit 65e499e. This will update automatically on new commits. Configure here.