tweak: reconnect (#3782)

* tweak: reconnect * tweak * Create six-grapes-smash.md
wevm · Apr 2, 2024 · b907d5a · b907d5a
1 parent 1167bff
commit b907d5a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/.changeset/six-grapes-smash.md b/.changeset/six-grapes-smash.md
@@ -0,0 +1,5 @@
+---
+"@wagmi/core": patch
+---
+
+Refactored injected connector connection logic.
diff --git a/packages/core/src/connectors/injected.ts b/packages/core/src/connectors/injected.ts
@@ -1,4 +1,5 @@
 import {
+ type Address,
  type EIP1193Provider,
  type ProviderConnectInfo,
  ProviderRpcError,
@@ -144,32 +145,31 @@ export function injected(parameters: InjectedParameters = {}) {
  const provider = await this.getProvider()
  if (!provider) throw new ProviderNotFoundError()
 
- let accounts = await this.getAccounts().catch(() => null)
- if (!isReconnecting) {
- // Attempt to show another prompt for selecting account if already connected and `shimDisconnect` flag is enabled
- const isAuthorized = shimDisconnect && !!accounts?.length
- if (isAuthorized)
- try {
- const permissions = await provider.request({
- method: 'wallet_requestPermissions',
- params: [{ eth_accounts: {} }],
- })
- accounts = (permissions[0]?.caveats?.[0]?.value as string[])?.map(
- (x) => getAddress(x),
- )
- } catch (err) {
- const error = err as RpcError
- // Not all injected providers support `wallet_requestPermissions` (e.g. MetaMask iOS).
- // Only bubble up error if user rejects request
- if (error.code === UserRejectedRequestError.code)
- throw new UserRejectedRequestError(error)
- // Or prompt is already open
- if (error.code === ResourceUnavailableRpcError.code) throw error
- }
+ let accounts: readonly Address[] = []
+ if (isReconnecting) accounts = await this.getAccounts().catch(() => [])
+ else if (shimDisconnect) {
+ // Attempt to show another prompt for selecting account if `shimDisconnect` flag is enabled
+ try {
+ const permissions = await provider.request({
+ method: 'wallet_requestPermissions',
+ params: [{ eth_accounts: {} }],
+ })
+ accounts = (permissions[0]?.caveats?.[0]?.value as string[])?.map(
+ (x) => getAddress(x),
+ )
+ } catch (err) {
+ const error = err as RpcError
+ // Not all injected providers support `wallet_requestPermissions` (e.g. MetaMask iOS).
+ // Only bubble up error if user rejects request
+ if (error.code === UserRejectedRequestError.code)
+ throw new UserRejectedRequestError(error)
+ // Or prompt is already open
+ if (error.code === ResourceUnavailableRpcError.code) throw error
+ }
  }
 
  try {
- if (!accounts?.length) {
+ if (!accounts?.length && !isReconnecting) {
  const requestedAccounts = await provider.request({
  method: 'eth_requestAccounts',
  })