Merge pull request #1318 from irisnet/develop

update document in date tooltip
irisnet · Mar 31, 2020 · c417612 · c417612
2 parents 3e5dae9 + 35c3db7
commit c417612
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/src/components/dateToolTip/DateTooltip.vue b/frontend/src/components/dateToolTip/DateTooltip.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="tooltip_content">
-		<el-tooltip content="Date selection range from first block to latest block">
+		<el-tooltip content="Date selection range from the first block to the latest block.">
 			<i class="iconfont iconyiwen"></i>
 		</el-tooltip>
 	</div>

diff --git a/frontend/src/components/header/AppHeader.vue b/frontend/src/components/header/AppHeader.vue
@@ -614,7 +614,7 @@
 					this.activeStaking  = true
 				}else if(this.$route.fullPath === '/txs/transfers'){
 					this.activeTransfers  = true
-                }else if(this.$route.fullPath === '/home' || this.$route.fullPath === '/blocks' || this.$route.fullPath.includes('/txs')){
+                }else if(this.$route.fullPath === '/home' || this.$route.fullPath === '/blocks' || this.$route.fullPath.includes('/txs') && this.$route.fullPath !== '/txs/governance'){
 					this.activeBlockChain  = true
                 }else if (this.$route.fullPath === '/assets/ntvassetstxs' || this.$route.fullPath === '/assets/gtwassetstxs' || this.$route.fullPath.includes('/assets/') || this.$route.fullPath.includes('/asset/')){
 					this.activeAssets  = true