Merge pull request #87 from chnejohnson/dev

Fix some
vu3th · Oct 21, 2022 · 977a562 · 977a562
2 parents 650b021 + 7dd5d5d
commit 977a562
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/demo/src/App.vue b/demo/src/App.vue
@@ -8,7 +8,6 @@ import {
   displayChainName,
   displayEther,
   shortenAddress,
-  ChainId,
   useEthersHooks,
   MetaMaskConnector,
   WalletConnectConnector,

diff --git a/demo/src/main.ts b/demo/src/main.ts
@@ -19,6 +19,17 @@ app.use(VueDapp, {
       symbol: 'MATIC',
     },
   },
+  42161: {
+    chainId: ethers.utils.hexValue(42161),
+    blockExplorerUrls: ['https://arbiscan.io'],
+    chainName: 'Arbitrum One',
+    rpcUrls: ['https://arb1.arbitrum.io/rpc'],
+    nativeCurrency: {
+      name: 'Arbitrum',
+      symbol: 'ETH',
+      decimals: 18,
+    },
+  },
 })
 
 app.mount('#app')
diff --git a/src/composables/useEthers.ts b/src/composables/useEthers.ts
@@ -91,8 +91,12 @@ async function activate(externalProvider: ExternalProvider) {
   const updateBalance = async (interval: number = 10000) => {
     updateBalanceInterval = setInterval(async () => {
       if (!signer.value) return
-      const _balance = await signer?.value.getBalance()
-      balance.value = _balance.toBigInt()
+      try {
+        const _balance = await signer?.value.getBalance()
+        balance.value = _balance.toBigInt()
+      } catch (e) {
+        console.error(e)
+      }
     }, interval)
   }
 

diff --git a/src/composables/useEthersHooks.ts b/src/composables/useEthersHooks.ts
@@ -15,24 +15,28 @@ export type OnActivatedHook = (context: EthersHooksContext) => void
 export type OnChangedHook = (context: EthersHooksContext) => void
 export type OnDeactivatedHook = () => void
 
-const { provider, signer, network, address, balance } = useEthers()
+const { provider, signer, network, address, balance, isActivated } = useEthers()
 
 export function useEthersHooks() {
   const onActivatedHook = ref<OnActivatedHook | null>(null)
   const onDeactivatedHook = ref<OnDeactivatedHook | null>(null)
   const onChangedHook = ref<OnChangedHook | null>(null)
 
-  watch(provider, (provider, oldProvider) => {
-    if (!oldProvider && provider) {
+  watch(isActivated, (val, oldVal) => {
+    if (!oldVal && val) {
       onActivatedHook.value &&
         onActivatedHook.value({
-          provider,
+          provider: provider.value!,
           signer: signer.value!,
           network: network.value!,
           address: address.value,
           balance: balance.value,
         })
-    } else if (oldProvider && provider) {
+    }
+  })
+
+  watch(provider, (provider, oldProvider) => {
+    if (oldProvider && provider) {
       onChangedHook.value &&
         onChangedHook.value({
           provider,