Merge develop

taylorjdawson · taylorjdawson · commit 105540dd11f5 · 2021-05-23T18:08:12.000-07:00
diff --git a/package.json b/package.json
@@ -83,4 +83,4 @@
     "authereum/ethers/elliptic": "^6.5.3",
     "@portis/web3/pocket-js-core/axios": "^0.21.1"
   }
-}
+}
diff --git a/src/modules/select/wallets/wallet-connect.ts b/src/modules/select/wallets/wallet-connect.ts
@@ -53,6 +53,12 @@ function walletConnect(
 
       const balanceProvider = createProvider({ rpcUrl })
 
+      if (infuraKey && rpc) {
+        throw new Error(
+          'WalletConnect requires  an Infura ID or a custom RPC object but not both.'
+        )
+      }
+
       const provider = new WalletConnectProvider({
         infuraId: infuraKey,
         rpc,

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,4 @@`
`83`	`83`	`"authereum/ethers/elliptic": "^6.5.3",`
`84`	`84`	`"@portis/web3/pocket-js-core/axios": "^0.21.1"`
`85`	`85`	`}`
`86`		`-}`
	`86`	`+}`