From b7254e7acae74388fb6aeb83c36158f17bd685fe Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Mon, 7 Mar 2022 18:06:07 +0100
Subject: [PATCH] Replace difficulty adjustment timestamp with block height

---
 .../hashrate-chart.component.html             | 38 ++++++++--------
 .../hashrate-chart.component.scss             | 44 +++++++++++++++++--
 .../hashrate-chart.component.ts               |  2 +-
 .../mining-dashboard.component.html           |  2 +-
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
index c58861d36..79d7a9f1b 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
@@ -31,25 +31,23 @@
     <div class="spinner-border text-light"></div>
   </div>
   
-  <div [class]="!widget ? 'mt-3 p-2' : 'ml-4 mr-4 mt-1'" *ngIf="tableOnly" style="min-height: 295px">
-    <table class="table table-borderless table-sm text-left" [class]="widget ? 'compact' : ''">
-      <thead>
-        <tr>
-          <th class="d-none d-md-block" i18n="block.timestamp">Timestamp</th>
-          <th i18n="mining.adjusted">Adjusted</th>
-          <th i18n="mining.difficulty" class="text-right">Difficulty</th>
-          <th i18n="mining.change" class="text-right">Change</th>
-        </tr>
-      </thead>
-      <tbody *ngIf="(hashrateObservable$ | async) as data">
-        <tr *ngFor="let diffChange of data.difficulty">
-          <td class="d-none d-md-block">&lrm;{{ diffChange.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}</td>
-          <td><app-time-since [time]="diffChange.timestamp" [fastRender]="true"></app-time-since></td>
-          <td class="text-right">{{ diffChange.difficultyShorten }}</td>
-          <td class="text-right" [style]="diffChange.change >= 0 ? 'color: #42B747' : 'color: #B74242'">{{ formatNumber(diffChange.change, locale, '1.2-2') }}%</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+  <table *ngIf="tableOnly" class="table latest-transactions" style="min-height: 295px">
+    <thead>
+      <tr>
+        <th class="d-none d-md-block" i18n="block.height">Height</th>
+        <th i18n="mining.adjusted" class="text-left">Adjusted</th>
+        <th i18n="mining.difficulty" class="text-right">Difficulty</th>
+        <th i18n="mining.change" class="text-right">Change</th>
+      </tr>
+    </thead>
+    <tbody *ngIf="(hashrateObservable$ | async) as data">
+      <tr *ngFor="let diffChange of data.difficulty">
+        <td class="d-none d-md-block"><a [routerLink]="['/block' | relativeUrl, diffChange.height]">{{ diffChange.height }}</a></td>
+        <td class="text-left"><app-time-since [time]="diffChange.timestamp" [fastRender]="true"></app-time-since></td>
+        <td class="text-right">{{ diffChange.difficultyShorten }}</td>
+        <td class="text-right" [style]="diffChange.change >= 0 ? 'color: #42B747' : 'color: #B74242'">{{ formatNumber(diffChange.change, locale, '1.2-2') }}%</td>
+      </tr>
+    </tbody>
+  </table>
 
 </div>
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
index 4d9e0e5fa..c68e2f406 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
@@ -49,7 +49,43 @@
   }
 }
 
-.compact td {
-  padding: 0 !important;
-  margin: 0.15rem !important;
-}
\ No newline at end of file
+.latest-transactions {
+  width: 100%;
+  text-align: left;
+  table-layout:fixed;
+  tr, td, th {
+    border: 0px;
+  }
+  td {
+    width: 25%;
+  }
+  .table-cell-satoshis {
+    display: none;
+    text-align: right;
+    @media (min-width: 576px) {
+      display: table-cell;
+    }
+    @media (min-width: 768px) {
+      display: none;
+    }
+    @media (min-width: 1100px) {
+      display: table-cell;
+    }
+  }
+  .table-cell-fiat {
+    display: none;
+    text-align: right;
+    @media (min-width: 485px) {
+      display: table-cell;
+    }
+    @media (min-width: 768px) {
+      display: none;
+    }
+    @media (min-width: 992px) {
+      display: table-cell;
+    }
+  }
+  .table-cell-fees {
+    text-align: right;
+  }
+}
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
index b5db5bb65..948ffed41 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
@@ -115,7 +115,7 @@ export class HashrateChartComponent implements OnInit {
                 }
                 return {
                   availableTimespanDay: availableTimespanDay,
-                  difficulty: this.tableOnly ? (this.isMobile() ? tableData.slice(0, 12) : tableData.slice(0, 9)) : tableData
+                  difficulty: this.tableOnly ? tableData.slice(0, 5) : tableData
                 };
               }),
             );
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html
index 2fb47427f..dff5436f0 100644
--- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html
+++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html
@@ -112,7 +112,7 @@
       <div class="card" style="height: 385px">
         <div class="card-body">
           <h5 class="card-title">
-            Adjusments
+            Adjustments
           </h5>
           <app-hashrate-chart [tableOnly]=true [widget]=true></app-hashrate-chart>
           <div class="mt-1"><a [routerLink]="['/mining/hashrate' | relativeUrl]" i18n="dashboard.view-more">View more