Skip to content
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

feat: bump @metamask/queued-request controller to ^2.0.0 to fix confirmation popup focus in request queue #25497

Merged
merged 8 commits into from
Jun 25, 2024
Merged

feat: bump @metamask/queued-request controller to ^2.0.0 to fix confirmation popup focus in request queue #25497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e3095fe
bump preview build
jiexi Jun 24, 2024
025a877
adopt change
jiexi Jun 24, 2024
4d41267
use actual 2.0.0 package instead of preview build
jiexi Jun 24, 2024
323c0b2
Merge branch 'develop' into jl/bump-queued-request-controller-fix-con…
jiexi Jun 24, 2024
4626a35
Merge branch 'develop' into jl/bump-queued-request-controller-fix-con…
jiexi Jun 25, 2024
f96d58e
Fix queueing spec
jiexi Jun 25, 2024
718dd6f
Merge branch 'develop' into jl/bump-queued-request-controller-fix-con…
jiexi Jun 25, 2024
ddb1787
Merge branch 'develop' into jl/bump-queued-request-controller-fix-con…
jiexi Jun 25, 2024
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
1 change: 1 addition & 0 deletions app/scripts/metamask-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,7 @@ export default class MetamaskController extends EventEmitter {
shouldRequestSwitchNetwork: ({ method }) =>
methodsRequiringNetworkSwitch.includes(method),
clearPendingConfirmations,
showApprovalRequest: opts.showUserConfirmation,
});

this.approvalController = new ApprovalController({
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
"@metamask/post-message-stream": "^8.0.0",
"@metamask/ppom-validator": "^0.31.0",
"@metamask/providers": "^14.0.2",
"@metamask/queued-request-controller": "^1.0.0",
"@metamask/queued-request-controller": "^2.0.0",
"@metamask/rate-limit-controller": "^5.0.1",
"@metamask/rpc-errors": "^6.2.1",
"@metamask/safe-event-emitter": "^3.1.1",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('Request Queuing Dapp 1 Send Tx -> Dapp 2 Request Accounts Tx', functio
assert.deepStrictEqual(accountsBeforeConnect, '');

// Reject the pending confirmation from the first dapp
await switchToNotificationWindow(driver);
await switchToNotificationWindow(driver, 4);
await driver.clickElement({ text: 'Reject', tag: 'button' });

// Wait for switch confirmation to close then request accounts confirmation to show for the second dapp
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6231,9 +6231,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/queued-request-controller@npm:^1.0.0":
version: 1.0.0
resolution: "@metamask/queued-request-controller@npm:1.0.0"
"@metamask/queued-request-controller@npm:^2.0.0":
version: 2.0.0
resolution: "@metamask/queued-request-controller@npm:2.0.0"
dependencies:
"@metamask/base-controller": "npm:^6.0.0"
"@metamask/controller-utils": "npm:^11.0.0"
Expand All @@ -6244,7 +6244,7 @@ __metadata:
peerDependencies:
"@metamask/network-controller": ^19.0.0
"@metamask/selected-network-controller": ^15.0.0
checksum: 10/84b5442035ef4843ad5c3effdb961c9725c07fa3caf37928c4315ffb4929160a1032b8e0f814061fa8487f499d147766f3cfdd4172c8a3941c2996b11628a46b
checksum: 10/b618fa05465a52e5b689d932d99b47552b5987a9141d58260966611f1057190132f14b1a2123c48399f218fc57c577e1c86375e8ee2b43871cdc597fbaeedb7a
languageName: node
linkType: hard

Expand Down Expand Up @@ -25499,7 +25499,7 @@ __metadata:
"@metamask/post-message-stream": "npm:^8.0.0"
"@metamask/ppom-validator": "npm:^0.31.0"
"@metamask/providers": "npm:^14.0.2"
"@metamask/queued-request-controller": "npm:^1.0.0"
"@metamask/queued-request-controller": "npm:^2.0.0"
"@metamask/rate-limit-controller": "npm:^5.0.1"
"@metamask/rpc-errors": "npm:^6.2.1"
"@metamask/safe-event-emitter": "npm:^3.1.1"
Expand Down