@ethereansos/interfaces-core 0.4.54 → 0.4.58

package/dist/index.cjs.js

@@ -42704,17 +42704,18 @@ var Web3ContextProvider = function Web3ContextProvider(props) {
 var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   var children = _ref.children;
   var context = useEthosContext();
-  var wallet = useWallet.useWallet();
 
-  var _useState = React.useState(NOT_CONNECTED),
+  var _useState = React.useState(ipfsHttpClient.create(context.ipfsHost)),
       _useState2 = _slicedToArray(_useState, 2),
-      connectionStatus = _useState2[0],
-      setConnectionStatus = _useState2[1];
+      ipfsHttpClient$1 = _useState2[0],
+      setIpfsHttpClient = _useState2[1];
+
+  var wallet = useWallet.useWallet();
 
-  var _useState3 = React.useState(ipfsHttpClient.create(context.ipfsHost)),
+  var _useState3 = React.useState(NOT_CONNECTED),
       _useState4 = _slicedToArray(_useState3, 2),
-      ipfsHttpClient$1 = _useState4[0],
-      setIpfsHttpClient = _useState4[1];
+      connectionStatus = _useState4[0],
+      setConnectionStatus = _useState4[1];
 
   var _useState5 = React.useState(null),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -42741,22 +42742,44 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
       contracts = _useState14[0],
       setContracts = _useState14[1];
 
-  React.useEffect(function () {
-    setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus || NOT_CONNECTED);
-    setWeb3Instance(wallet && wallet.ethereum && new Web3__default["default"](wallet.ethereum) || null);
-    setChainId(wallet && wallet.chainId || null);
-  }, [wallet]);
   React.useEffect(function () {
     setIpfsHttpClient(ipfsHttpClient.create(context.ipfsHost));
   }, [context]);
   React.useEffect(function () {
-    setContracts(function () {
-      return {};
-    });
-    setGlobalContracts(function () {
-      return globalContractNames.map(newContractByName);
-    });
-  }, [chainId]);
+    setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus || NOT_CONNECTED);
+
+    if (web3Instance && wallet) {
+      setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var web3ChainId;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.t0 = parseInt;
+                _context.next = 3;
+                return sendAsync(web3Instance.currentProvider, 'eth_chainId');
+
+              case 3:
+                _context.t1 = _context.sent;
+                web3ChainId = (0, _context.t0)(_context.t1);
+                web3ChainId !== wallet.chainId && setWeb3Instance(wallet && wallet.ethereum && new Web3__default["default"](wallet.ethereum) || null);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      })));
+    } else {
+      setWeb3Instance(wallet && wallet.ethereum && new Web3__default["default"](wallet.ethereum) || null);
+    }
+  }, [wallet]);
+  React.useEffect(function () {
+    setContracts({});
+    setGlobalContracts(globalContractNames.map(newContractByName));
+    setChainId(wallet.chainId);
+  }, [web3Instance]);
 
   var setConnector = function setConnector(connector) {
     setConnectionStatus(connector ? CONNECTING : NOT_CONNECTED);
@@ -42768,7 +42791,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     address = address ? web3Utils__default["default"].toChecksumAddress(address) : '';
     var key = web3Utils__default["default"].sha3(JSON.stringify(abi) + address);
     var contract = contracts[key];
-    contract = contract || new web3Instance.eth.Contract(abi, address);
+    contract = contract || web3Instance && new web3Instance.eth.Contract(abi, address);
     contract && setContracts(function (oldValue) {
       return _objectSpread2(_objectSpread2({}, oldValue), {}, _defineProperty({}, key, contract));
     });
@@ -42778,7 +42801,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   var newContractByName = function newContractByName(contractName) {
     return newContract(context[contractName[0].toUpperCase() + contractName.substring(1) + 'ABI'], getNetworkElement({
       context: context,
-      chainId: chainId
+      chainId: wallet.chainId
     }, contractName + 'Address'));
   };