Skip to content

Commit ae779d0

Browse files
authored
cherry-pick: bump @metamask/queued-request-controller with patch fix (#28355) (#28371)
## **Description** Bumps version of QueuedRequestController, with a patch that fixes an issue where `QueuedRequestController.state.queuedRequestCount` is not updated after flushing requests for an origin ## References - MetaMask/core#4899 - MetaMask/core#4846 - #28090 ## Fixes Fixes #28358 [Slack discussion in v12.7.0 RC Thread](https://consensys.slack.com/archives/C029JG63136/p1730918073046389?thread_ts=1729246801.516029&cid=C029JG63136) ## Before https://drive.google.com/file/d/1ujdQgVLlT8KlwRwO-Cc3XvRHPrkpxIg_/view?usp=drive_link ## After https://github.com/user-attachments/assets/e77928e5-165b-441a-b4da-0e10471c0529 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28355?quickstart=1) ## **Manual testing steps** On a dapp permissioned for chain A and B, on chain A, queue up one send transaction, then use wallet_switchEthereumChain to switch to chain B, then queue up several more send transactions. Reject/approve the first transaction. Afterwards, you should see chain B as the active chain for the dapp, and all subsequent approvals cleared/rejected automatically. - [ ] 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. <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28371?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **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.
1 parent e33eebd commit ae779d0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
"@metamask/preinstalled-example-snap": "^0.2.0",
334334
"@metamask/profile-sync-controller": "^0.9.7",
335335
"@metamask/providers": "^14.0.2",
336-
"@metamask/queued-request-controller": "^7.0.0",
336+
"@metamask/queued-request-controller": "^7.0.1",
337337
"@metamask/rate-limit-controller": "^6.0.0",
338338
"@metamask/rpc-errors": "^7.0.0",
339339
"@metamask/safe-event-emitter": "^3.1.1",

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6052,20 +6052,20 @@ __metadata:
60526052
languageName: node
60536053
linkType: hard
60546054

6055-
"@metamask/queued-request-controller@npm:^7.0.0":
6056-
version: 7.0.0
6057-
resolution: "@metamask/queued-request-controller@npm:7.0.0"
6055+
"@metamask/queued-request-controller@npm:^7.0.1":
6056+
version: 7.0.1
6057+
resolution: "@metamask/queued-request-controller@npm:7.0.1"
60586058
dependencies:
60596059
"@metamask/base-controller": "npm:^7.0.2"
6060-
"@metamask/controller-utils": "npm:^11.4.1"
6060+
"@metamask/controller-utils": "npm:^11.4.2"
60616061
"@metamask/json-rpc-engine": "npm:^10.0.1"
60626062
"@metamask/rpc-errors": "npm:^7.0.1"
60636063
"@metamask/swappable-obj-proxy": "npm:^2.2.0"
60646064
"@metamask/utils": "npm:^10.0.0"
60656065
peerDependencies:
60666066
"@metamask/network-controller": ^22.0.0
60676067
"@metamask/selected-network-controller": ^19.0.0
6068-
checksum: 10/69118c11e3faecdbec7c9f02f4ecec4734ce0950115bfac0cdd4338309898690ae3187bcef1cc4f75f54c5c02eff07d80286d3ef29088a665039c13cb50bef88
6068+
checksum: 10/e5b16b3dc2fa0dcf74a81b5046abb65bc05da3802ee891b5a59a80b980301c790cf949d72adba00ead6f5b3d2eaac40694308297f7dc08eb5e5f05b5a68bbf57
60696069
languageName: node
60706070
linkType: hard
60716071

@@ -26455,7 +26455,7 @@ __metadata:
2645526455
"@metamask/preinstalled-example-snap": "npm:^0.2.0"
2645626456
"@metamask/profile-sync-controller": "npm:^0.9.7"
2645726457
"@metamask/providers": "npm:^14.0.2"
26458-
"@metamask/queued-request-controller": "npm:^7.0.0"
26458+
"@metamask/queued-request-controller": "npm:^7.0.1"
2645926459
"@metamask/rate-limit-controller": "npm:^6.0.0"
2646026460
"@metamask/rpc-errors": "npm:^7.0.0"
2646126461
"@metamask/safe-event-emitter": "npm:^3.1.1"

0 commit comments

Comments
 (0)