@ethereansos/interfaces-core 0.4.52 → 0.4.56

package/dist/index.esm.js

@@ -42693,55 +42693,54 @@ var Web3ContextProvider = function Web3ContextProvider(props) {
 var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
   var children = _ref.children;
   var context = useEthosContext();
-  var wallet = useWallet();
 
-  var _useState = useState(NOT_CONNECTED),
+  var _useState = useState(create(context.ipfsHost)),
       _useState2 = _slicedToArray(_useState, 2),
-      connectionStatus = _useState2[0],
-      setConnectionStatus = _useState2[1];
+      ipfsHttpClient = _useState2[0],
+      setIpfsHttpClient = _useState2[1];
+
+  var wallet = useWallet();
 
-  var _useState3 = useState(create(context.ipfsHost)),
+  var _useState3 = useState(NOT_CONNECTED),
       _useState4 = _slicedToArray(_useState3, 2),
-      ipfsHttpClient = _useState4[0],
-      setIpfsHttpClient = _useState4[1];
+      connectionStatus = _useState4[0],
+      setConnectionStatus = _useState4[1];
 
   var _useState5 = useState(null),
       _useState6 = _slicedToArray(_useState5, 2),
       web3Instance = _useState6[0],
       setWeb3Instance = _useState6[1];
 
-  var _useState7 = useState(null),
+  var _useState7 = useState([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      chainId = _useState8[0],
-      setChainId = _useState8[1];
+      globalContractNames = _useState8[0],
+      setGlobalContractNames = _useState8[1];
 
   var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
-      globalContractNames = _useState10[0],
-      setGlobalContractNames = _useState10[1];
+      globalContracts = _useState10[0],
+      setGlobalContracts = _useState10[1];
 
-  var _useState11 = useState([]),
+  var _useState11 = useState({}),
       _useState12 = _slicedToArray(_useState11, 2),
-      globalContracts = _useState12[0],
-      setGlobalContracts = _useState12[1];
+      contracts = _useState12[0],
+      setContracts = _useState12[1];
 
-  var _useState13 = useState({}),
-      _useState14 = _slicedToArray(_useState13, 2),
-      contracts = _useState14[0],
-      setContracts = _useState14[1];
-
-  useEffect(function () {
-    setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus || NOT_CONNECTED);
-    setWeb3Instance(wallet && wallet.ethereum && new Web3(wallet.ethereum) || null);
-    setChainId(wallet && wallet.chainId || null);
-  }, [wallet]);
   useEffect(function () {
     setIpfsHttpClient(create(context.ipfsHost));
   }, [context]);
   useEffect(function () {
-    setContracts({});
-    setGlobalContracts(globalContractNames.map(newContractByName));
-  }, [chainId]);
+    setConnectionStatus(wallet && wallet.ethereum ? CONNECTED : connectionStatus || NOT_CONNECTED);
+    setWeb3Instance(wallet && wallet.ethereum && new Web3(wallet.ethereum) || null);
+  }, [web3Instance]);
+  useEffect(function () {
+    setContracts(function () {
+      return {};
+    });
+    setGlobalContracts(function () {
+      return globalContractNames.map(newContractByName);
+    });
+  }, [web3Instance]);
 
   var setConnector = function setConnector(connector) {
     setConnectionStatus(connector ? CONNECTING : NOT_CONNECTED);
@@ -42753,7 +42752,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     address = address ? web3Utils.toChecksumAddress(address) : '';
     var key = web3Utils.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));
     });
@@ -42763,7 +42762,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'));
   };
 
@@ -42797,7 +42796,7 @@ var Web3ContextInitializer = function Web3ContextInitializer(_ref) {
     ipfsHttpClient: ipfsHttpClient
   }, wallet && connectionStatus === CONNECTED && {
     account: wallet.account,
-    chainId: chainId,
+    chainId: wallet.chainId,
     chainName: wallet.networkName,
     web3: web3Instance,
     getGlobalContract: getGlobalContract,