From 4220f99477f8e337478e68c5f647dd3c6228f083 Mon Sep 17 00:00:00 2001
From: BitcoinMechanic <bitcoinmechanic@ocean.xyz>
Date: Sun, 22 Sep 2024 14:46:53 -0700
Subject: [PATCH] remove 'on'/UI changes per feedback

---
 backend/src/utils/bitcoin-script.ts           |  3 ++-
 .../app/components/block/block.component.html |  1 -
 .../app/components/block/block.component.scss |  6 ------
 .../blockchain-blocks.component.html          | 21 +++++++++++--------
 .../blockchain-blocks.component.scss          | 17 ++++++++-------
 .../blockchain/blockchain.component.scss      |  2 +-
 .../transaction/transaction.component.html    |  1 -
 .../transaction/transaction.component.scss    |  6 ------
 .../app/dashboard/dashboard.component.scss    |  2 +-
 9 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/backend/src/utils/bitcoin-script.ts b/backend/src/utils/bitcoin-script.ts
index 619f1876d..b43b7a72d 100644
--- a/backend/src/utils/bitcoin-script.ts
+++ b/backend/src/utils/bitcoin-script.ts
@@ -220,7 +220,8 @@ export function parseDATUMTemplateCreator(coinbaseRaw: string): string[] | null
 
   const tagStart = tagLengthByte + 1;
   const tags = bytes.slice(tagStart, tagStart + tagsLength);
-  const tagString = String.fromCharCode(...tags);
+  let tagString = String.fromCharCode(...tags);
+  tagString = tagString.replace('\x00', '');
 
   return tagString.split('\x0f');
 }
\ No newline at end of file
diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html
index d97ebafc5..46900179b 100644
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -185,7 +185,6 @@
             <div class="on-pool-container" *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
               {{ block.extras.pool.minerNames[1] }}
               <div class="on-pool">
-                <span class="on-pool-text">on</span>
                 <img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
                 {{ block.extras.pool.name }}
               </div>
diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss
index 887d7281f..6eae3fe3a 100644
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -94,12 +94,6 @@ h1 {
   border-radius: .25rem;
 }
 
-.on-pool-text {
-  font-weight: normal;
-  color: gray;
-  padding-inline-end: 4px;
-}
-
 .pool-logo {
   width: 25px;
   height: 25px;
diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
index 3fdafb540..79b9cea62 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -61,18 +61,21 @@
         </div>
         <div class="animated" *ngIf="block.extras?.pool != undefined && showPools">
           <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
-            <div class="on-pool-container" *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
-              {{ block.extras.pool.minerNames[1] }}
-              <div class="on-pool">
-                <span class="on-pool-text">on</span>
-                <img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
-                <span class="on-pool-name-text">{{ block.extras.pool.name }}</span>
+            <div *ngIf="block.extras.pool.minerNames != undefined && block.extras.pool.minerNames.length > 1 && block.extras.pool.minerNames[1] != ''; else centralisedPool">
+              <div class="on-pool-container" *ngIf="block.height != markHeight; else selectedDecentralisedPool">
+                {{ block.extras.pool.minerNames[1] }}
+                <div class="on-pool">
+                  <img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
+                  <span class="on-pool-name-text">{{ block.extras.pool.name }}</span>
+                </div>
               </div>
+              <ng-template #selectedDecentralisedPool>
+                <img class="pool-logo faded" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'">
+                {{ block.extras.pool.minerNames[1] }}
+              </ng-template>
             </div>
             <ng-template #centralisedPool>
-              <div class="pool-container">
-                <img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'"> {{ block.extras.pool.name }}
-              </div>
+              <img class="pool-logo" [src]="'/resources/mining-pools/' + block.extras.pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'"> {{ block.extras.pool.name }}
             </ng-template>
           </a>
         </div>
diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
index b03b3d3cb..a0111215a 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -19,12 +19,6 @@
   pointer-events: none;
 }
 
-.on-pool-text {
-  font-weight: normal;
-  color: gray;
-  padding-inline-end: 4px;
-}
-
 .on-pool-name-text {
   display: inline-block;
   padding-top: 2px;
@@ -42,10 +36,17 @@
 }
 
 .on-pool-container {
+  align-items: center;
+  position: relative;
+  top: -8px;
   display: flex;
   flex-direction: column;
 }
 
+.on-pool-container.selected {
+  top: 0px;
+}
+
 .pool-container {
   margin-top: 12px;
 }
@@ -156,7 +157,7 @@
 #arrow-up {
   position: relative;
   left: calc(var(--block-size) * 0.6);
-  top: calc(var(--block-size) * 1.38);
+  top: calc(var(--block-size) * 1.28);
   width: 0;
   height: 0;
   border-left: calc(var(--block-size) * 0.2) solid transparent;
@@ -186,7 +187,7 @@
 
 .badge {
   position: relative;
-  top: 8px;
+  top: 15px;
   z-index: 101;
   color: #FFF;
 }
diff --git a/frontend/src/app/components/blockchain/blockchain.component.scss b/frontend/src/app/components/blockchain/blockchain.component.scss
index 7f98f5ed1..32225598a 100644
--- a/frontend/src/app/components/blockchain/blockchain.component.scss
+++ b/frontend/src/app/components/blockchain/blockchain.component.scss
@@ -14,7 +14,7 @@
 }
 
 .blockchain-wrapper {
-  height: 272px;
+  height: 260px;
   -webkit-user-select: none; /* Safari */
   -moz-user-select: none; /* Firefox */
   -ms-user-select: none; /* IE10+/Edge */
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index d00ab0e02..32eb10f8e 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -687,7 +687,6 @@
               <div class="on-pool-container" *ngIf="pool.minerNames != undefined && pool.minerNames.length > 1 && pool.minerNames[1] != ''; else centralisedPool">
                 {{ pool.minerNames[1] }}
                 <div class="on-pool">
-                  <span class="on-pool-text">on</span>
                   <img class="pool-logo" [src]="'/resources/mining-pools/' + pool.slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + pool.name + ' mining pool'">
                   {{ pool.name }}
                 </div>
diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss
index 43cece726..40b813cae 100644
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -73,12 +73,6 @@
   border-radius: .25rem;
 }
 
-.on-pool-text {
-  font-weight: normal;
-  color: gray;
-  padding-inline-end: 4px;
-}
-
 .pool-logo {
   width: 25px;
   height: 25px;
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss
index 0864f0096..9ad09981f 100644
--- a/frontend/src/app/dashboard/dashboard.component.scss
+++ b/frontend/src/app/dashboard/dashboard.component.scss
@@ -1,6 +1,6 @@
 .dashboard-container {
   text-align: center;
-  margin-top: 1.0rem;
+  margin-top: 0.5rem;
   .col {
     margin-bottom: 1.5rem;
   }