From eec6efcc226ee0ab2214e47ce4d43c3bb502f0c2 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 8 Jul 2024 21:45:57 +0900
Subject: [PATCH 1/5] Block pool logos

---
 .../blockchain-blocks/blockchain-blocks.component.html   | 9 ++++++---
 .../blockchain-blocks/blockchain-blocks.component.scss   | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

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 603c7e4c0..6d4868114 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -60,9 +60,12 @@
           </ng-container>
         </div>
         <div class="animated" [class]="markHeight === block.height ? 'hide' : 'show'" *ngIf="block.extras?.pool != undefined && showPools">
-          <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge badge-primary"
-            [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
-            {{ block.extras.pool.name}}</a>
+          <a [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
+            <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'"> 
+          </a>
+          <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge badge-primary" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
+            {{ block.extras.pool.name}}
+          </a>
         </div>
       </div>
     </ng-container>
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 b11a35513..754b2c111 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -157,6 +157,15 @@
   position: relative;
   top: 15px;
   z-index: 101;
+  left: -7.5px;
+}
+
+.pool-logo {
+  width: 15px;
+  height: 15px;
+  position: relative;
+  top: 15px;
+  left: -12px;
 }
 
 .animated {

From c391a532dea60cde836b4669bf00277cde72931e Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 8 Jul 2024 22:29:49 +0900
Subject: [PATCH 2/5] fix overflow

---
 .../blockchain-blocks/blockchain-blocks.component.scss           | 1 +
 1 file changed, 1 insertion(+)

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 754b2c111..f2dca18ca 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -173,6 +173,7 @@
 }
 .show {
   opacity: 1;
+  white-space: nowrap;
 }
 .hide {
   opacity: 0.4;

From 432496d2a002325a3cabe055121425c6eab04f1d Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 8 Jul 2024 22:47:49 +0900
Subject: [PATCH 3/5] move logo into the badge

---
 frontend/src/app/components/block/block.component.html    | 1 +
 frontend/src/app/components/block/block.component.scss    | 7 +++++++
 .../blockchain-blocks/blockchain-blocks.component.html    | 4 +---
 .../blockchain-blocks/blockchain-blocks.component.scss    | 8 +++-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html
index 79151ecc3..758d470c7 100644
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -183,6 +183,7 @@
         <td *ngIf="stateService.env.MINING_DASHBOARD">
           <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, block.extras.pool.slug]" class="badge"
             [class]="block.extras.pool.slug === 'unknown' ? 'badge-secondary' : 'badge-primary'">
+            <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 }}
           </a>
         </td>
diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss
index af3d60c56..7a5ef0d87 100644
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -272,3 +272,10 @@ h1 {
     }
   }
 }
+
+.pool-logo {
+  width: 12px;
+  height: 12px;
+  position: relative;
+  top: 0px;
+}
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 6d4868114..d73ad40ca 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -60,10 +60,8 @@
           </ng-container>
         </div>
         <div class="animated" [class]="markHeight === block.height ? 'hide' : 'show'" *ngIf="block.extras?.pool != undefined && showPools">
-          <a [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
-            <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'"> 
-          </a>
           <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge badge-primary" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
+            <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}}
           </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 f2dca18ca..ae7a88f3a 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -157,15 +157,13 @@
   position: relative;
   top: 15px;
   z-index: 101;
-  left: -7.5px;
 }
 
 .pool-logo {
-  width: 15px;
-  height: 15px;
+  width: 12px;
+  height: 12px;
   position: relative;
-  top: 15px;
-  left: -12px;
+  top: -1px;
 }
 
 .animated {

From 852e2b2fa053683a68e91aa15bec5b26fd20c3bd Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 8 Jul 2024 23:44:22 +0900
Subject: [PATCH 4/5] miner tag as texts instead of badges

---
 frontend/src/app/components/block/block.component.html     | 3 +--
 frontend/src/app/components/block/block.component.scss     | 7 ++++---
 .../blockchain-blocks/blockchain-blocks.component.html     | 2 +-
 .../blockchain-blocks/blockchain-blocks.component.scss     | 6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html
index 758d470c7..2ef18b9dc 100644
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -181,8 +181,7 @@
       <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
         <td i18n="block.miner">Miner</td>
         <td *ngIf="stateService.env.MINING_DASHBOARD">
-          <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, block.extras.pool.slug]" class="badge"
-            [class]="block.extras.pool.slug === 'unknown' ? 'badge-secondary' : 'badge-primary'">
+          <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, block.extras.pool.slug]" class="badge" style="color: #FFF;padding:0;">
             <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 }}
           </a>
diff --git a/frontend/src/app/components/block/block.component.scss b/frontend/src/app/components/block/block.component.scss
index 7a5ef0d87..fe5318375 100644
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -274,8 +274,9 @@ h1 {
 }
 
 .pool-logo {
-  width: 12px;
-  height: 12px;
+  width: 15px;
+  height: 15px;
   position: relative;
-  top: 0px;
+  top: -1px;
+  margin-right: 2px;
 }
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 d73ad40ca..f7d46fefd 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -60,7 +60,7 @@
           </ng-container>
         </div>
         <div class="animated" [class]="markHeight === block.height ? 'hide' : 'show'" *ngIf="block.extras?.pool != undefined && showPools">
-          <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge badge-primary" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
+          <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge" [routerLink]="[('/mining/pool/' + block.extras.pool.slug) | relativeUrl]">
             <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}}
           </a>
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 ae7a88f3a..0af327dbd 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -157,13 +157,15 @@
   position: relative;
   top: 15px;
   z-index: 101;
+  color: #FFF;
 }
 
 .pool-logo {
-  width: 12px;
-  height: 12px;
+  width: 15px;
+  height: 15px;
   position: relative;
   top: -1px;
+  margin-right: 2px;
 }
 
 .animated {

From d914df20ba96e4938c52e21fe18c35b2115aa204 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Tue, 9 Jul 2024 00:01:20 +0900
Subject: [PATCH 5/5] updating miner tag on tx page

---
 .../components/transaction/transaction.component.html  |  6 +++---
 .../components/transaction/transaction.component.scss  | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 28a68b424..b8b8602cb 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -676,9 +676,9 @@
         <td class="td-width" i18n="block.miner">Miner</td>
         @if (pool) {
           <td class="wrap-cell">
-            <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, pool.slug]" class="badge mr-1"
-              [class]="pool.slug === 'unknown' ? 'badge-secondary' : 'badge-primary'">
-              {{ pool.name }}
+            <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, pool.slug]" class="badge" style="color: #FFF;padding:0;">
+              <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  }}
             </a>
           </td>
         } @else {
diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss
index f32d8d9ea..7db417126 100644
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -324,4 +324,12 @@
 .goggles-icon {
   display: block;
   width: 2.7em;
-}
\ No newline at end of file
+}
+
+.pool-logo {
+  width: 15px;
+  height: 15px;
+  position: relative;
+  top: -1px;
+  margin-right: 2px;
+}