Skip to content

Commit

Permalink
fix: shimmed injected removeListener
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm committed Jan 26, 2024
1 parent 713f150 commit 2a72214
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changeset/many-crabs-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wagmi/core": patch
---

Shimmed EIP-1193 removeListener for injected since some wallets do not follow spec.
5 changes: 5 additions & 0 deletions .changeset/tender-snails-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wagmi": patch
---

Bumped core dependency.
22 changes: 18 additions & 4 deletions packages/core/src/connectors/injected.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,26 @@ export function injected(parameters: InjectedParameters = {}) {
},
async getProvider() {
if (typeof window === 'undefined') return undefined

let provider
const target = getTarget()
if (typeof target.provider === 'function')
return target.provider(window as Window | undefined)
if (typeof target.provider === 'string')
return findProvider(window, target.provider)
return target.provider
provider = target.provider(window as Window | undefined)
else if (typeof target.provider === 'string')
provider = findProvider(window, target.provider)
else provider = target.provider

// Some wallets do not conform to EIP-1193 (e.g. Trust Wallet)
// https://github.com/wevm/wagmi/issues/3526#issuecomment-1912683002
if (provider && !provider.removeListener) {
// Try using `off` handler if it exists, otherwise noop
if ('off' in provider && typeof provider.off === 'function')
provider.removeListener =
provider.off as typeof provider.removeListener
else provider.removeListener = () => {}
}

return provider
},
async isAuthorized() {
try {
Expand Down

0 comments on commit 2a72214

Please sign in to comment.