fix bug event onConnect

vdg · Oct 5, 2019 · 8721713 · 8721713
1 parent d45ce4a
commit 8721713
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/examples/vue-example/main.vue b/examples/vue-example/main.vue
@@ -5,7 +5,7 @@
     <h1 v-else-if="$eth.walletDetected">
       Your wallet is not connected to an Ethereum network
       <br>
-      <span>error:{{ $eth.error }}</span>
+      <span v-if="$eth.error">error:{{ $eth.error }}</span>
     </h1>
     <h1 v-else>
       You are not connected to an Ethereum network

diff --git a/src/watcher.js b/src/watcher.js
@@ -59,25 +59,26 @@ const Web3Watcher = () => {
           ...$.state,
           isConnected: await $.instance.eth.net.isListening()
         }
+        updateState({ init: $.state.init + 1 })
       } catch (error) {
         $.state = { ...$.state, error: error.message, isConnected: false }
+        updateState({})
       }
-      updateState({ init: $.state.init + 1 })
-      $.walletType = await $.getWalletType()
-      updateState({})
-      return Promise.resolve($.state)
     } else {
       try {
-        // commit('setInjected', true)
         if (window.web3.currentProvider) {
           $.injected = window.web3
           $.instance = new Web3(window.web3.currentProvider)
         }
+        updateState({ init: $.state.init + 1 })
       } catch (error) {
-        console.log(error)
+        $.state = { ...$.state, error: error.message, isConnected: false }
+        updateState({})
       }
     }
     typeof eventHandler.connected === 'function' && $.state.isConnected && eventHandler.connected($)
+    $.walletType = await $.getWalletType()
+    updateState({})
     return Promise.resolve($.state)
   }