@reef-knot/web3-react 1.0.5 → 1.0.6

package/dist/context/web3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web3.d.ts","sourceRoot":"","sources":["../../src/context/web3.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAO7D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAK7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAGvC,OAA2B,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;IAC/D,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;;AA6ED,wBAAyD"}
+{"version":3,"file":"web3.d.ts","sourceRoot":"","sources":["../../src/context/web3.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAO7D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAK7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAGvC,OAA2B,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE1E,MAAM,WAAW,iBAAkB,SAAQ,sBAAsB;IAC/D,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACpC;;AAkFD,wBAAyD"}

package/dist/context/web3.js

@@ -39,7 +39,7 @@ var ProviderSDK = props => {
     library,
     account
   } = useWeb3();
-  var [providerWeb3, setProviderWeb3] = useState(library);
+  var [providerWeb3, setProviderWeb3] = useState();
   // attempt to get providerWeb3 from wagmi
   var {
     connector: connectorWagmi,
@@ -48,11 +48,16 @@ var ProviderSDK = props => {
   useEffect(() => {
     (() => __awaiter(void 0, void 0, void 0, function* () {
       if (isConnected && !providerWeb3 && connectorWagmi) {
+        // Set wagmi provider
         var p = yield connectorWagmi.getProvider();
         setProviderWeb3(getLibrary(p));
+      } else if (!providerWeb3) {
+        // Set web3-react provider
+        // Passing `library` as init value for useState does not work, but works like this:
+        setProviderWeb3(library);
       }
     }))();
-  }, [connectorWagmi, isConnected, providerWeb3]);
+  }, [connectorWagmi, isConnected, library, providerWeb3]);
   invariant(rpc[chainId], "RPC url for chain ".concat(chainId, " is not provided"));
   invariant(rpc[CHAINS.Mainnet], 'RPC url for mainnet is not provided');
   var providerRpc = getStaticRpcBatchProvider(chainId, rpc[chainId], 0, pollingInterval);

package/dist/hooks/useSupportedChains.js

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { getNetwork } from '@ethersproject/providers';
 import { useNetwork } from 'wagmi';
-import { useWeb3 } from './useWeb3.js';
-import { UnsupportedChainIdError } from '@web3-react/core';
+import { useWeb3React, UnsupportedChainIdError } from '@web3-react/core';
 
 var STABLE_ARRAY = [];
 var useSupportedChains = () => {
@@ -12,7 +11,7 @@ var useSupportedChains = () => {
   var {
     error,
     connector
-  } = useWeb3();
+  } = useWeb3React();
   // wagmi data
   var {
     chain,

package/dist/hooks/useWeb3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWeb3.d.ts","sourceRoot":"","sources":["../../src/hooks/useWeb3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAGxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,wBAAgB,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,CA6B3E"}
+{"version":3,"file":"useWeb3.d.ts","sourceRoot":"","sources":["../../src/hooks/useWeb3.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAIxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,wBAAgB,OAAO,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,CAkD3E"}

package/dist/hooks/useWeb3.js

@@ -1,6 +1,7 @@
 import { useWeb3React } from '@web3-react/core';
 export { UnsupportedChainIdError } from '@web3-react/core';
 import { useAccount, useNetwork, useConnect } from 'wagmi';
+import { useSupportedChains } from './useSupportedChains.js';
 
 // Shimming useWeb3React hook to also use data returned from wagmi
 function useWeb3(key) {
@@ -12,8 +13,25 @@ function useWeb3(key) {
     error: wagmiError
   } = useConnect();
   var account = web3ReactData.account || (wagmiAccount === null || wagmiAccount === void 0 ? void 0 : wagmiAccount.address);
-  var active = web3ReactData.active || (wagmiAccount === null || wagmiAccount === void 0 ? void 0 : wagmiAccount.isConnected);
-  var chainId = web3ReactData.chainId || ((_a = wagmiNetwork === null || wagmiNetwork === void 0 ? void 0 : wagmiNetwork.chain) === null || _a === void 0 ? void 0 : _a.id);
+  // web3-react and wagmi have different logic around unsupported chains.
+  // If a chain is not supported:
+  // web3-react sets:
+  //   `chainId` === undefined
+  //   `error` === UnsupportedChainIdError
+  //   `active` === false
+  // wagmi sets:
+  //   `chain.id` === actual value from wallet
+  //   `chain.unsupported` === true
+  //   `error` === null
+  //   `isConnected` === true (connects via default chain)
+  // These differences break our widgets, because the widgets don't expect
+  // chainId to be unsupported, they expect chainId === undefined in that case.
+  // Making wagmi's logic to be the same as web3-react here, except setting an error:
+  var {
+    isUnsupported
+  } = useSupportedChains();
+  var chainId = isUnsupported ? undefined : web3ReactData.chainId || ((_a = wagmiNetwork === null || wagmiNetwork === void 0 ? void 0 : wagmiNetwork.chain) === null || _a === void 0 ? void 0 : _a.id);
+  var active = isUnsupported ? false : web3ReactData.active || (wagmiAccount === null || wagmiAccount === void 0 ? void 0 : wagmiAccount.isConnected);
   // wagmi and web3-react use the same Error type
   // wagmi is first here because it can be null, but we need Error | undefined
   var error = wagmiError || web3ReactData.error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/web3-react",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {