fix(cherry-pick): Fix wallet_addEthereumChain/wallet_switchEthereumChain error handling bug
#25339
Conversation
This file contains 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
…ed in either wallet_switchEthereumChain nor wallet_addEthereumChain calls (#25269) ## **Description** A bug was introduced in #24415, where user rejected request errors are not correctly handled in either `wallet_switchEthereumChain` nor `wallet_addEthereumChain` calls. [](https://codespaces.new/MetaMask/metamask-extension/pull/25269?quickstart=1) ## **Related issues** Fixes: Regression in API error handling found on a local run of [the new API testing tool](#24132), will link report when available. ## **Manual testing steps** **wallet_addEthereumChain** 1. Go to https://docs.metamask.io/wallet/reference/wallet_addethereumchain/ 2. Submit the prepopulated `wallet_addEthereumChain` request 3. Confirm the request to add Gnosis Chain 4. But click "Cancel" on the second request to switch to the newly added chain 5. You should see `null` as the response **wallet_switchEthereumChain** 1. Make sure the wallet is on a chain other than gnosis 2. Go to https://docs.metamask.io/wallet/reference/wallet_switchethereumchain/ 3. Submit the prepopulated switchEthereumChain request (for chainId: 0x64) 4. Click cancel on the request to switch to gnosis chain 5. you should see: ``` { "code": 4001, "message": "User rejected the request.", "stack": "{\n \"code\": 4001,\n \"message\": \"User rejected the request.\",\n \"stack\": \"Error: User rejected the request.\\n } ``` in the response ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **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.
|
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. |
7 tasks
danjm
changed the title
wallet_addEthereumChain/wallet_switchEthereumChain error handling bugwallet_addEthereumChain/wallet_switchEthereumChain error handling bug
](https://codespaces.new/MetaMask/metamask-extension/pull/25269?quickstart=1){kind=link}
metamaskbot
added
the
release-12.0.0
|
No release label on PR. Adding release label release-12.0.0 on PR, as PR was cherry-picked in branch 12.0.0. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
A bug was introduced in #24415, where user rejected request errors are not correctly handled in either
wallet_switchEthereumChainnorwallet_addEthereumChaincalls.At first we thought his just resulted in incorrect errors being returned to dapps when users clicked cancel on
wallet_switchEthereumChaincalls but it turns out this incorrect error handling results in very strange and severe bugs when subsequent requests are enqueued in theQueuedRequestController- the functionality of which is turned on by default in release v12.0.0. See theBeforevideo below.Related issues
See: https://consensys.slack.com/archives/CTQAGKY5V/p1718385169900809?thread_ts=1718140104.578969&cid=CTQAGKY5V
Manual testing steps
(have gnosis chain added to the wallet)
Send EIP-1559 Transaction, see that the badge number in the MM tray icon incrementsScreenshots/Recordings
Before
Screen.Recording.2024-06-14.at.12.13.41.PM.mov
After
Screen.Recording.2024-06-14.at.2.32.04.PM.mov
Pre-merge author checklist
Pre-merge reviewer checklist