avoid the "duplicated promise" error which comes from the vue-router ( …

…fix symbol#252 )
JeRaytheon · Apr 22, 2020 · 32ccb64 · 32ccb64
1 parent f078610
commit 32ccb64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/components/PageNavigator/PageNavigator.vue b/src/components/PageNavigator/PageNavigator.vue
@@ -9,7 +9,7 @@
           $route.matched.map(({path}) => path).includes(route.path) ? 'active' : '',
           !currentAccount ? 'un_click' : '',
         ]"
-        @click="!currentAccount ? '' : $router.push({name: route.name})"
+        @click="onPageNavigate(route)"
       >
         <div class="navigator-icon-container">
           <img :src="route.meta.icon" class="navigator-icon">

diff --git a/src/components/PageNavigator/PageNavigatorTs.ts b/src/components/PageNavigator/PageNavigatorTs.ts
@@ -17,6 +17,7 @@ import {Component, Vue} from 'vue-property-decorator'
 import {mapGetters} from 'vuex'
 // internal dependencies
 import {AccountModel} from '@/core/database/entities/AccountModel'
+import { Route } from 'vue-router'
 
 @Component({
   computed: {
@@ -41,4 +42,8 @@ export class PageNavigatorTs extends Vue {
     await this.$store.dispatch('account/LOG_OUT')
     this.$router.push({name: 'accounts.login'})
   }
+
+  public onPageNavigate(route: Route) {
+    this.currentAccount && this.$router.push({ name: route.name }).catch(()=>{/**/})
+  }
 }
diff --git a/src/views/pages/wallets/WalletDetailsPage/WalletDetailsPage.vue b/src/views/pages/wallets/WalletDetailsPage/WalletDetailsPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="wallet-detail-outer-container" v-show="currentWallet">
+  <div v-show="currentWallet" class="wallet-detail-outer-container">
     <div class="wallet-detail-inner-container">
       <div class="left-container">
         <div class="wallet-details-grid">