Merge branch 'develop' into fix/i18n_wallets_connected

blocknative · Dec 27, 2024 · 386c174 · 386c174
2 parents 329e5fe + 9db4d8e
commit 386c174
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/injected/src/helpers.ts b/packages/injected/src/helpers.ts
@@ -40,7 +40,7 @@ export const isWalletAvailable = (
   // For multiple injected providers, check providers array
   // example coinbase inj wallet pushes over-ridden wallets
   // into a providers array at window.ethereum
-  return !!provider.providers?.some(provider =>
+  return Array.isArray(provider.providers) && !!provider.providers?.some(provider =>
     checkProviderIdentity({ provider, device })
   )
 }

diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts
@@ -581,7 +581,7 @@ const bitget: InjectedWalletModule = {
   label: ProviderLabel.Bitget,
   injectedNamespace: InjectedNameSpace.Bitget,
   checkProviderIdentity: ({ provider }) =>
-    !!provider && !!provider['ethereum'][ProviderIdentityFlag.Bitget],
+    !!provider && !!provider['ethereum'] && !!provider['ethereum'][ProviderIdentityFlag.Bitget],
   getIcon: async () => (await import('./icons/bitget.js')).default,
   getInterface: async () => ({
     provider: window.bitkeep && window.bitkeep.ethereum