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
5 changes: 5 additions & 0 deletions .changeset/walletconnect-switchchain-listener-leak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wagmi/connectors": patch
---

Fixed listener leak in WalletConnect connector `switchChain` when chain switch fails.
10 changes: 4 additions & 6 deletions packages/connectors/src/walletConnect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,15 +338,12 @@ export function walletConnect(parameters: WalletConnectParameters) {
const chain = config.chains.find((x) => x.id === chainId)
if (!chain) throw new SwitchChainError(new ChainNotConfiguredError())

let listener: (opts: { chainId?: number | undefined }) => void = () => {}
try {
await Promise.all([
new Promise<void>((resolve) => {
const listener = ({
chainId: currentChainId,
}: {
chainId?: number | undefined
}) => {
if (currentChainId === chainId) {
listener = (opts) => {
if (opts.chainId === chainId) {
config.emitter.off('change', listener)
resolve()
}
Expand All @@ -364,6 +361,7 @@ export function walletConnect(parameters: WalletConnectParameters) {

return chain
} catch (err) {
config.emitter.off('change', listener)
const error = err as RpcError

if (/(user rejected)/i.test(error.message))
Expand Down