From 72d01a0b679e1403036c5718039af0d162cf45d7 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sat, 1 May 2021 21:03:01 +0400
Subject: [PATCH] Improve taproot detection. Only display when detected.

---
 frontend/src/app/components/block/block.component.html |  2 +-
 frontend/src/app/components/block/block.component.ts   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html
index 5bf0d71a1..6929f064f 100644
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -90,7 +90,7 @@
               <tbody>
                 <tr>
                   <td class="td-width" i18n="transaction.version">Version</td>
-                  <td>{{ block.version | decimal2hex }} <span *ngIf="block.height > 681407" class="badge ml-1" [ngClass]="{'badge-success': hasTaproot(block.version), 'badge-danger': !hasTaproot(block.version) }">Taproot</span></td>
+                  <td>{{ block.version | decimal2hex }} <span *ngIf="displayTaprootStatus() && hasTaproot(block.version)" class="badge badge-success ml-1" >Taproot</span></td>
                 </tr>
                 <tr>
                   <td i18n="block.merkle-root">Merkle root</td>
diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts
index b2b8cb342..80fb4b847 100644
--- a/frontend/src/app/components/block/block.component.ts
+++ b/frontend/src/app/components/block/block.component.ts
@@ -204,6 +204,14 @@ export class BlockComponent implements OnInit, OnDestroy {
   }
 
   hasTaproot(version: number): boolean {
-    return (Number(version) & (1 << 2)) > 0;
+    const versionBit = 2; // Taproot
+    return (Number(version) & (1 << versionBit)) === (1 << versionBit);
+  }
+
+  displayTaprootStatus(): boolean {
+    if (this.stateService.network !== '') {
+      return false;
+    }
+    return this.block && this.block.height > 681407 && (new Date().getTime() / 1000) < 1628640000;
   }
 }