From 988b72272009cb889a1e6e8cc0078011e36ce212 Mon Sep 17 00:00:00 2001
From: Georges KABBOUCHI <georges.kabbouchi@gmail.com>
Date: Mon, 6 Sep 2021 01:40:07 +0300
Subject: [PATCH] fixes

---
 components/modal/web3/Web3Modal.vue |  2 +-
 composables/useStrategy.ts          | 20 +++++++++++---------
 layouts/default.vue                 |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/components/modal/web3/Web3Modal.vue b/components/modal/web3/Web3Modal.vue
index f0ba796..9bc7ebd 100644
--- a/components/modal/web3/Web3Modal.vue
+++ b/components/modal/web3/Web3Modal.vue
@@ -41,7 +41,7 @@
         </button>
       </div>
 
-      <div class="mt-6 text-center text-sm">
+      <div class="mt-6 text-center text-sm hidden">
         Need help connecting a wallet?
         <nuxt-link to="/faqs" class="font-semibold text-ocean-blue-pure"
           >Read our FAQ</nuxt-link
diff --git a/composables/useStrategy.ts b/composables/useStrategy.ts
index ff0ef4b..3e8c48e 100644
--- a/composables/useStrategy.ts
+++ b/composables/useStrategy.ts
@@ -25,13 +25,15 @@ import useEventBus from "./useEventBus";
 import { useNotification } from "./useNotification";
 import { useSidebar } from "./useSidebar";
 import { useToken } from "./useToken";
-import { useWeb3 } from "./useWeb3";
+import { useWeb3 } from "@instadapp/vue-web3";
 import { useBigNumber } from "./useBigNumber";
 import tokenIdMapping from "~/constant/tokenIdMapping";
 import { useFormatting } from "./useFormatting";
+import { useNetwork } from "./useNetwork";
 
 export function useStrategy(defineStrategy: DefineStrategy) {
-  const { web3, networkName, account } = useWeb3();
+  const { library, account } = useWeb3();
+  const { activeNetworkId } = useNetwork()
   const { dsa } = useDSA();
   const { prices, balances, fetchBalances } = useBalances();
   const { close } = useSidebar();
@@ -114,29 +116,29 @@ export function useStrategy(defineStrategy: DefineStrategy) {
     { immediate: true }
   );
 
-  watch(web3, () => strategy.setWeb3(web3.value), { immediate: true });
+  watch(library, () => strategy.setWeb3(library.value), { immediate: true });
   watch(dsa, () => strategy.setDSA(dsa.value), { immediate: true });
   watch(
     prices,
-    () => strategy.setProps({ prices: prices[networkName.value] }),
+    () => strategy.setProps({ prices: prices[activeNetworkId.value] }),
     { immediate: true }
   );
   watch(
     balances,
     () => {
       strategy.setProps({
-        dsaBalances: balances.dsa[networkName.value],
-        userBalances: balances.user[networkName.value]
+        dsaBalances: balances.dsa[activeNetworkId.value],
+        userBalances: balances.user[activeNetworkId.value]
       });
     },
     { immediate: true }
   );
   watch(
-    networkName,
+    activeNetworkId,
     () =>
       strategy.setProps({
-        tokens: tokens[networkName.value].allTokens,
-        tokenKeys: tokens[networkName.value].tokenKeys
+        tokens: tokens[activeNetworkId.value].allTokens,
+        tokenKeys: tokens[activeNetworkId.value].tokenKeys
       }),
     { immediate: true }
   );
diff --git a/layouts/default.vue b/layouts/default.vue
index d74d177..d60dd84 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -110,7 +110,7 @@ export default defineComponent({
     const { redirect } = useContext()
     const { showSidebarBalances } = useSidebar()
     const { showNetworksMismatchDialog } = useModal()
-    // useEagerConnect()
+    useEagerConnect()
     const route = useRoute()
 
     watch(isBackdropShown, () => {