From e3095fe1ac12233aa2fee94638d6fb6826f47cf4 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Mon, 24 Jun 2024 14:17:15 -0700 Subject: [PATCH 1/4] bump preview build --- package.json | 1 + yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 722e82bae00b..7fbe73997051 100644 --- a/package.json +++ b/package.json @@ -125,6 +125,7 @@ "attributions:generate": "./development/generate-attributions.sh" }, "resolutions": { + "@metamask/queued-request-controller@^1.0.0": "npm:@metamask-previews/queued-request-controller@2.0.0-preview-83ca56e", "simple-update-notifier@^1.0.0": "^2.0.0", "@babel/core": "patch:@babel/core@npm%3A7.23.2#~/.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch", "@types/react": "^16.9.53", diff --git a/yarn.lock b/yarn.lock index c67266bb695b..22da3efa2bf2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6133,9 +6133,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:@metamask-previews/queued-request-controller@2.0.0-preview-83ca56e": + version: 2.0.0-preview-83ca56e + resolution: "@metamask-previews/queued-request-controller@npm:2.0.0-preview-83ca56e" dependencies: "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" @@ -6146,7 +6146,7 @@ __metadata: peerDependencies: "@metamask/network-controller": ^19.0.0 "@metamask/selected-network-controller": ^15.0.0 - checksum: 10/84b5442035ef4843ad5c3effdb961c9725c07fa3caf37928c4315ffb4929160a1032b8e0f814061fa8487f499d147766f3cfdd4172c8a3941c2996b11628a46b + checksum: 10/2819c9a994ccf9efc680c48235002b9ed6eefcc5639b73d2e4e45c7a579a1de0f2623f41cc6a11117095e753520d997bc1c8610562cda1d2c19a0b6d84ea18c7 languageName: node linkType: hard From 025a8779b1262a42a8911b8bdbe88d82fb708762 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Mon, 24 Jun 2024 14:17:20 -0700 Subject: [PATCH 2/4] adopt change --- app/scripts/metamask-controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 11463edf3430..9217320e3ad5 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -460,6 +460,7 @@ export default class MetamaskController extends EventEmitter { shouldRequestSwitchNetwork: ({ method }) => methodsRequiringNetworkSwitch.includes(method), clearPendingConfirmations, + showApprovalRequest: opts.showUserConfirmation, }); this.approvalController = new ApprovalController({ From 4d41267c2f2541bba408b77934ccd038cda7c1f3 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Mon, 24 Jun 2024 15:04:57 -0700 Subject: [PATCH 3/4] use actual 2.0.0 package instead of preview build --- package.json | 3 +-- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7fbe73997051..06e24748f560 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,6 @@ "attributions:generate": "./development/generate-attributions.sh" }, "resolutions": { - "@metamask/queued-request-controller@^1.0.0": "npm:@metamask-previews/queued-request-controller@2.0.0-preview-83ca56e", "simple-update-notifier@^1.0.0": "^2.0.0", "@babel/core": "patch:@babel/core@npm%3A7.23.2#~/.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch", "@types/react": "^16.9.53", @@ -331,7 +330,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", diff --git a/yarn.lock b/yarn.lock index 22da3efa2bf2..d3d95c2b3e6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6133,9 +6133,9 @@ __metadata: languageName: node linkType: hard -"@metamask/queued-request-controller@npm:@metamask-previews/queued-request-controller@2.0.0-preview-83ca56e": - version: 2.0.0-preview-83ca56e - resolution: "@metamask-previews/queued-request-controller@npm:2.0.0-preview-83ca56e" +"@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" @@ -6146,7 +6146,7 @@ __metadata: peerDependencies: "@metamask/network-controller": ^19.0.0 "@metamask/selected-network-controller": ^15.0.0 - checksum: 10/2819c9a994ccf9efc680c48235002b9ed6eefcc5639b73d2e4e45c7a579a1de0f2623f41cc6a11117095e753520d997bc1c8610562cda1d2c19a0b6d84ea18c7 + checksum: 10/b618fa05465a52e5b689d932d99b47552b5987a9141d58260966611f1057190132f14b1a2123c48399f218fc57c577e1c86375e8ee2b43871cdc597fbaeedb7a languageName: node linkType: hard @@ -25105,7 +25105,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" From f96d58e7e44cfd40d755dffb023a571e0dac92c4 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Tue, 25 Jun 2024 09:20:51 -0700 Subject: [PATCH 4/4] Fix queueing spec --- .../dapp1-switch-dapp2-eth-request-accounts.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js index 60690d4ab66b..e448c995e077 100644 --- a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js +++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js @@ -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