Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/connect-multichain/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Bump `@metamask/multichain-api-client` to prevent `RPC request with id already seen.` error on extension when using firefox ([#60](https://github.com/MetaMask/connect-monorepo/pull/60))

### Fixed

- Fixed incorrect caching of error responses for some requests/events ([#59](https://github.com/MetaMask/connect-monorepo/pull/59))
Expand Down
2 changes: 1 addition & 1 deletion packages/connect-multichain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@metamask/analytics": "workspace:^",
"@metamask/mobile-wallet-protocol-core": "^0.3.0",
"@metamask/mobile-wallet-protocol-dapp-client": "^0.2.1",
"@metamask/multichain-api-client": "^0.8.1",
"@metamask/multichain-api-client": "^0.10.1",
"@metamask/multichain-ui": "workspace:^",
"@metamask/onboarding": "^1.0.1",
"@metamask/utils": "^11.8.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class DefaultTransport implements ExtendedTransport {
readonly #pendingRequests = new Map<string, PendingRequest>();

#handleResponseListener: ((event: MessageEvent) => void) | undefined;

#handleNotificationListener: ((event: MessageEvent) => void) | undefined;

#notifyCallbacks(data: unknown): void {
Expand Down Expand Up @@ -131,8 +132,8 @@ export class DefaultTransport implements ExtendedTransport {

// Add the listener
// eslint-disable-next-line no-restricted-globals

window.addEventListener('message', this.#handleResponseListener);
// eslint-disable-next-line no-restricted-globals
window.addEventListener('message', this.#handleNotificationListener);
}

Expand Down Expand Up @@ -270,6 +271,13 @@ export class DefaultTransport implements ExtendedTransport {
this.#handleResponseListener = undefined;
}

// Remove the notification listener when disconnecting
if (this.#handleNotificationListener) {
// eslint-disable-next-line no-restricted-globals
window.removeEventListener('message', this.#handleNotificationListener);
this.#handleNotificationListener = undefined;
}

// Reject all pending requests
for (const [, request] of this.#pendingRequests) {
clearTimeout(request.timeout);
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4044,7 +4044,7 @@ __metadata:
"@metamask/auto-changelog": "npm:^3.4.4"
"@metamask/mobile-wallet-protocol-core": "npm:^0.3.0"
"@metamask/mobile-wallet-protocol-dapp-client": "npm:^0.2.1"
"@metamask/multichain-api-client": "npm:^0.8.1"
"@metamask/multichain-api-client": "npm:^0.10.1"
"@metamask/multichain-ui": "workspace:^"
"@metamask/onboarding": "npm:^1.0.1"
"@metamask/utils": "npm:^11.8.1"
Expand Down Expand Up @@ -4453,10 +4453,10 @@ __metadata:
languageName: node
linkType: hard

"@metamask/multichain-api-client@npm:^0.8.1":
version: 0.8.1
resolution: "@metamask/multichain-api-client@npm:0.8.1"
checksum: 10/a6e079b4acce94d25ffdccbbf7f09ce1b5c650ceec6119e7002f8095cd1eb18c59a26fbfe0ac775c60862e38c657273dad507e27ddbdc166fea404b03f54bdb6
"@metamask/multichain-api-client@npm:^0.10.1":
version: 0.10.1
resolution: "@metamask/multichain-api-client@npm:0.10.1"
checksum: 10/adedb90f433cd619eee54943197dc32eb30e461173e928ea698ec70bf8c6780d9ac0bb9b12a22a17f984170841c071d228aa49e6988d5060e8a30e99c433a8f5
languageName: node
linkType: hard

Expand Down
Loading