fix: watch isActivated for the onActivatedHook

johnson86tw · Oct 16, 2022 · dcf0c9a · dcf0c9a
1 parent a821e84
commit dcf0c9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 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/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,