From e6dbde952eaa19685007e14261bdf44e80f872cc Mon Sep 17 00:00:00 2001
From: BitcoinMechanic <bitcoinmechanic@ocean.xyz>
Date: Mon, 23 Sep 2024 12:36:10 -0700
Subject: [PATCH] Strip non-alphanumeric chars from miner names

---
 .../blockchain-blocks.component.html                | 13 ++-----------
 .../blockchain-blocks.component.ts                  |  1 +
 2 files changed, 3 insertions(+), 11 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 79b9cea62..128d18774 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -62,17 +62,8 @@
         <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 *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>
+              <img [ngbTooltip]="block.extras.pool.name" 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] }}
             </div>
             <ng-template #centralisedPool>
               <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 }}
diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
index 512886f23..7846b66a2 100644
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
@@ -283,6 +283,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
           block.extras.maxFee = this.getMaxBlockFee(block);
           if (block.extras.pool?.minerNames) {
             block.extras.pool.minerNames = block.extras.pool.minerNames.map((name) => {
+              name = name.replace(/[^a-zA-Z0-9 ]/g, '');
               if (name.length > 16) {
                 return name.slice(0, 16) + '…';
               }