From 087bde0c125311e9ee2cbd3ffdda2e4230f1e197 Mon Sep 17 00:00:00 2001
From: Vincent-lee90 <Lee.52Hz@hotmail.com>
Date: Tue, 21 Apr 2020 16:25:09 +0800
Subject: [PATCH] avoid the "duplicated promise" error which comes from the
 vue-router ( fix #252 )

---
 src/components/PageNavigator/PageNavigator.vue              | 2 +-
 src/components/PageNavigator/PageNavigatorTs.ts             | 6 ++++++
 .../pages/wallets/WalletDetailsPage/WalletDetailsPage.vue   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/PageNavigator/PageNavigator.vue b/src/components/PageNavigator/PageNavigator.vue
index 0c4ec593d..b63c41e83 100644
--- 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
index 80ebf0b77..bf362cd6a 100644
--- 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,9 @@ export class PageNavigatorTs extends Vue {
     await this.$store.dispatch('account/LOG_OUT')
     this.$router.push({name: 'accounts.login'})
   }
+  
+  public onPageNavigate(route: Route) {
+    const isDuplicatedRoute = this.$route.matched.map(({ path }) => path).includes(route.path)
+    !isDuplicatedRoute && 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
index ef34fe7ae..8bef1de4a 100644
--- 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">