Merge pull request #49 from akropolisio/use-unknown-in-provider-type

fix: fix ethereum provider type
kaonone · May 11, 2022 · 148d8a3 · 148d8a3
2 parents 8da3af3 + 30a6e70
commit 148d8a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/packages/clover-connector/src/@types/extend-window.ts b/packages/clover-connector/src/@types/extend-window.ts
@@ -7,7 +7,7 @@ export type CloverProvider = Provider & {
 
 declare global {
   interface Window {
-    ethereum?: CloverProvider;
-    clover?: CloverProvider;
+    ethereum?: unknown;
+    clover?: unknown;
   }
 }
diff --git a/packages/clover-connector/src/index.ts b/packages/clover-connector/src/index.ts
@@ -12,7 +12,7 @@ export interface CloverConnectionPayload extends DefaultConnectionPayload {
 }
 export class CloverConnector extends AbstractConnector<CloverConnectionPayload> {
   public async connect(): Promise<CloverConnectionPayload> {
-    const provider = window.clover || window.ethereum;
+    const provider: CloverProvider = window.clover || window.ethereum;
 
     if (!provider?.isClover) {
       throw new Error(

diff --git a/packages/inpage-connector/src/@types/extend-window.ts b/packages/inpage-connector/src/@types/extend-window.ts
@@ -7,8 +7,8 @@ export type InpageProvider = Provider & {
 declare global {
   interface Window {
     web3?: {
-      currentProvider?: InpageProvider;
+      currentProvider?: unknown;
     };
-    ethereum?: InpageProvider;
+    ethereum?: unknown;
   }
 }
diff --git a/packages/inpage-connector/src/index.ts b/packages/inpage-connector/src/index.ts
@@ -15,16 +15,14 @@ export interface InpageConnectionPayload extends DefaultConnectionPayload {
 
 export class InpageConnector extends AbstractConnector<InpageConnectionPayload> {
   public async connect(): Promise<InpageConnectionPayload> {
-    let provider: InpageProvider;
-
-    if (window.ethereum) {
-      // edge case if Metamask and Coinbase extensions are both installed
-      const { providers } = window.ethereum;
-      provider =
-        (Array.isArray(providers) && providers.find((x) => x.isMetaMask)) || window.ethereum;
-    } else if (window.web3?.currentProvider) {
-      provider = window.web3.currentProvider;
-    } else {
+    let provider: InpageProvider = window.ethereum || window.web3?.currentProvider;
+
+    // edge case if Metamask and Coinbase extensions are both installed
+    if (Array.isArray(provider?.providers)) {
+      provider = provider.providers.find((x: InpageProvider) => x.isMetaMask) || provider;
+    }
+
+    if (!provider) {
       throw new Error(
         'Web3 provider not found! Please install the Web3 extension (e.g. Metamask) or use the Web3 browser (e.g. TrustWallet on your mobile device).',
       );