From 8a52b5d20ee4c3924e0d4af6ba3b8fa5ab6b75fb Mon Sep 17 00:00:00 2001
From: Georges KABBOUCHI <georges.kabbouchi@gmail.com>
Date: Thu, 5 Aug 2021 20:47:14 +0300
Subject: [PATCH] fixes

---
 components/Notification.vue                   |  6 ++--
 components/NotificationBar.vue                | 14 ++++----
 components/sidebar/context/SidebarContext.vue |  2 +-
 .../context/aaveV2/SidebarAaveV2Borrow.vue    |  5 ++-
 .../context/aaveV2/SidebarAaveV2Payback.vue   |  4 +--
 .../context/aaveV2/SidebarAaveV2Supply.vue    |  5 +--
 .../context/aaveV2/SidebarAaveV2Withdraw.vue  |  6 ++--
 .../context/overview/SidebarOverview.vue      | 33 ++-----------------
 composables/useSidebar.ts                     |  2 --
 layouts/default.vue                           |  7 +++-
 10 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/components/Notification.vue b/components/Notification.vue
index 4cd77be..924e0b8 100644
--- a/components/Notification.vue
+++ b/components/Notification.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex w-full pl-4 overflow-hidden border border-opacity-75 shadow-lg dark:bg-dark-300 border-grey-light">
+  <div class="flex w-full pl-4 overflow-hidden bg-white border border-opacity-75 shadow-lg dark:bg-dark-300 border-grey-light">
     <div class="flex items-center w-full py-4">
       <IconNotification :icon="icon" />
 
@@ -32,7 +32,7 @@
         class="h-full px-3 py-3 focus:outline-none text-grey-pure hover:text-brand dark:hover:text-light"
         @click="dismiss"
       >
-        <Icon name="x" class="w-full" />
+        <CloseIcon class="w-full" />
       </button>
     </div>
   </div>
@@ -41,10 +41,12 @@
 <script>
 import { defineComponent, onMounted } from '@nuxtjs/composition-api'
 import SVGExternalLink from '@/assets/icons/external-link.svg?inline'
+import CloseIcon from '@/assets/img/icons/heroicons/solid/x.svg?inline'
 
 export default defineComponent({
   components: {
     SVGExternalLink,
+    CloseIcon
   },
   props: {
     title: { type: String, deafult: '' },
diff --git a/components/NotificationBar.vue b/components/NotificationBar.vue
index 197d7dc..ddf4ea2 100644
--- a/components/NotificationBar.vue
+++ b/components/NotificationBar.vue
@@ -14,11 +14,7 @@
       <Notification
         v-for="item in queue"
         :key="item.key"
-        :title="item.title"
-        :body="item.body"
-        :href="item.href"
-        :icon="item.icon"
-        :duration="item.duration"
+        v-bind="item"
         class="mr-2"
         @dismiss="close(item.key)"
       />
@@ -30,16 +26,20 @@
       style="top: 0px; font-size: 13px"
       @click="closeAll"
     >
-      <Icon name="x" class="w-4 h-4 mr-1" />Clear all
+      <CloseIcon class="w-4 h-4 mr-1" />Clear all
     </button>
   </div>
 </template>
 
 <script>
-import { defineComponent } from '@nuxtjs/composition-api'
+import { defineComponent, onErrorCaptured } from '@nuxtjs/composition-api'
 import { useNotification } from '~/composables/useNotification'
+import CloseIcon from '@/assets/img/icons/heroicons/solid/x.svg?inline'
 
 export default defineComponent({
+  components :{
+    CloseIcon
+  },
   setup() {
     const { queue, close, closeAll } = useNotification()
 
diff --git a/components/sidebar/context/SidebarContext.vue b/components/sidebar/context/SidebarContext.vue
index 8513d98..73a85eb 100644
--- a/components/sidebar/context/SidebarContext.vue
+++ b/components/sidebar/context/SidebarContext.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="absolute inset-y-0 right-0 z-10 flex flex-col w-full overflow-hidden transform shadow bg-white"
+    class="absolute inset-y-0 right-0 z-10 flex max-h-screen flex-col w-full overflow-hidden transform shadow bg-white"
     style="max-width: clamp(var(--min-width-app), var(--width-sidebar-context), 100%)"
     :class="{
       'translate-x-0 duration-300': isOpen,
diff --git a/components/sidebar/context/aaveV2/SidebarAaveV2Borrow.vue b/components/sidebar/context/aaveV2/SidebarAaveV2Borrow.vue
index 6af17f6..ff16129 100644
--- a/components/sidebar/context/aaveV2/SidebarAaveV2Borrow.vue
+++ b/components/sidebar/context/aaveV2/SidebarAaveV2Borrow.vue
@@ -106,11 +106,10 @@ export default defineComponent({
     const { networkName, account } = useWeb3()
     const { dsa } = useDSA()
     const { getTokenByKey, valInt } = useToken()
-    const { getBalanceByKey, fetchBalances } = useBalances()
     const { formatNumber, formatUsdMax, formatUsd } = useFormatting()
     const { isZero, gt, plus } = useBigNumber()
     const { parseSafeFloat } = useParsing()
-
+    const { showPendingTransaction } = useNotification()
     const { status, displayPositions, liquidation, maxLiquidation, liquidationPrice, liquidationMaxPrice, annualPercentageRateTypes } = useAaveV2Position({
       overridePosition: (position) => {
         if (rootTokenKey.value !== position.key) return position
@@ -195,7 +194,7 @@ export default defineComponent({
         from: account.value,
       })
 
-      fetchBalances(true)
+      showPendingTransaction(txHash)
 
       pending.value = false
 
diff --git a/components/sidebar/context/aaveV2/SidebarAaveV2Payback.vue b/components/sidebar/context/aaveV2/SidebarAaveV2Payback.vue
index 3b907bd..e5e08d5 100644
--- a/components/sidebar/context/aaveV2/SidebarAaveV2Payback.vue
+++ b/components/sidebar/context/aaveV2/SidebarAaveV2Payback.vue
@@ -122,7 +122,7 @@ export default defineComponent({
     const { formatNumber, formatUsdMax, formatUsd } = useFormatting()
     const { isZero, gt, plus, max, minus } = useBigNumber()
     const { parseSafeFloat } = useParsing()
-
+const { showPendingTransaction } = useNotification()
     const { status, displayPositions, liquidation, maxLiquidation, liquidationPrice, liquidationMaxPrice, annualPercentageRateTypes } = useAaveV2Position({
       overridePosition: (position) => {
         if (rootTokenKey.value !== position.key) return position
@@ -214,7 +214,7 @@ export default defineComponent({
         from: account.value,
       })
 
-      fetchBalances(true)
+      showPendingTransaction(txHash)
 
       pending.value = false
 
diff --git a/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue b/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue
index 85f7780..529d081 100644
--- a/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue
+++ b/components/sidebar/context/aaveV2/SidebarAaveV2Supply.vue
@@ -70,6 +70,7 @@ import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
 import { useAaveV2Position } from '~/composables/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
+import { useNotification } from '~/composables/useNotification'
 import { useBigNumber } from '~/composables/useBigNumber'
 import { useFormatting } from '~/composables/useFormatting'
 import { useValidators } from '~/composables/useValidators'
@@ -99,7 +100,7 @@ export default defineComponent({
     const { formatNumber, formatUsdMax, formatUsd } = useFormatting()
     const { isZero, gt, plus } = useBigNumber()
     const { parseSafeFloat } = useParsing()
-
+  const { showPendingTransaction } = useNotification()
     const { status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useAaveV2Position({
       overridePosition: (position) => {
         if (rootTokenKey.value !== position.key) return position
@@ -161,7 +162,7 @@ export default defineComponent({
         from: account.value,
       })
 
-      fetchBalances(true)
+      showPendingTransaction(txHash)
 
       pending.value = false
 
diff --git a/components/sidebar/context/aaveV2/SidebarAaveV2Withdraw.vue b/components/sidebar/context/aaveV2/SidebarAaveV2Withdraw.vue
index c5b58da..764f8df 100644
--- a/components/sidebar/context/aaveV2/SidebarAaveV2Withdraw.vue
+++ b/components/sidebar/context/aaveV2/SidebarAaveV2Withdraw.vue
@@ -68,7 +68,7 @@
 </template>
 
 <script>
-import { computed, defineComponent, ref } from '@nuxtjs/composition-api'
+import { computed, defineComponent, onMounted, ref } from '@nuxtjs/composition-api'
 import InputNumeric from '~/components/common/input/InputNumeric.vue'
 import { useAaveV2Position } from '~/composables/useAaveV2Position'
 import { useBalances } from '~/composables/useBalances'
@@ -102,6 +102,7 @@ export default defineComponent({
     const { formatNumber, formatUsdMax, formatUsd } = useFormatting()
     const { isZero, gt, plus, max, minus } = useBigNumber()
     const { parseSafeFloat } = useParsing()
+    const { showPendingTransaction } = useNotification()
 
     const { stats, status, displayPositions, maxLiquidation, liquidationPrice, liquidationMaxPrice } = useAaveV2Position({
       overridePosition: (position) => {
@@ -114,7 +115,6 @@ export default defineComponent({
       },
     })
 
-
     const availableLiquidity = computed(
       () => displayPositions.value.find((position) => position.key === rootTokenKey.value)?.availableLiquidity || '0'
     )
@@ -180,7 +180,7 @@ export default defineComponent({
         from: account.value,
       })
 
-      fetchBalances(true)
+      showPendingTransaction(txHash)
 
       pending.value = false
 
diff --git a/components/sidebar/context/overview/SidebarOverview.vue b/components/sidebar/context/overview/SidebarOverview.vue
index 9b0e950..d23e360 100644
--- a/components/sidebar/context/overview/SidebarOverview.vue
+++ b/components/sidebar/context/overview/SidebarOverview.vue
@@ -13,25 +13,8 @@
               <search-input
                 v-model.trim="search"
                 placeholder="Search Currency"
-                class="w-full mr-2"
+                class="w-full"
               />
-              <Menu>
-                <template v-slot:activator="{ on }">
-                  <menu-button size="38" v-on="on" />
-                </template>
-                <template>
-                  <list :items="menuActions">
-                    <template v-slot:default="{ item }">
-                      <menu-list-item
-                        :item="item.text"
-                        :icon="item.icon"
-                        :disabled="item.disabled"
-                        @click="item.onClick"
-                      ></menu-list-item>
-                    </template>
-                  </list>
-                </template>
-              </Menu>
             </div>
 
             <div class="flex flex-col flex-grow mt-2 sm:mt-4 overflow-y-scroll">
@@ -72,21 +55,9 @@ export default defineComponent({
   components: { SVGAdd, CurrencyList, List, Menu, MenuButton, MenuListItem },
   setup() {
 
-    const menuActions = computed(() => [
-      {
-        text: 'Add custom token',
-        onClick: startAddingCustomToken,
-        icon: SVGAdd,
-        disabled: false,
-      },
-    ])
-
-    function startAddingCustomToken() {
-    }
-
     const search = ref(null)
 
-    return { search, menuActions }
+    return { search }
   },
 })
 </script>
diff --git a/composables/useSidebar.ts b/composables/useSidebar.ts
index 241884b..f6447ff 100644
--- a/composables/useSidebar.ts
+++ b/composables/useSidebar.ts
@@ -73,8 +73,6 @@ export function init() {
         return
       }
 
-      console.log(hash, sidebars[route.path + hash], sidebars[hash]);
-      
       sidebar.value = sidebars[route.path + hash] || sidebars[hash];
         
       if (!sidebar.value) {
diff --git a/layouts/default.vue b/layouts/default.vue
index b7acb31..967ee84 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import { defineComponent, nextTick, useContext, useRoute, watch } from "@nuxtjs/composition-api";
+import { defineComponent, nextTick, onErrorCaptured, useContext, useRoute, watch } from "@nuxtjs/composition-api";
 import MakerDAOIcon from '~/assets/icons/makerdao.svg?inline'
 import CompoundIcon from '~/assets/icons/compound.svg?inline'
 import AaveIcon from '~/assets/icons/aave.svg?inline'
@@ -104,6 +104,11 @@ export default defineComponent({
       }
     }, { immediate: true })
 
+    onErrorCaptured(() => {
+      
+      return false
+    })
+
     return {
       active,
       activate,