From 14ad0c8ecb7d20a329c8f50b1a88f56ee8fc0a85 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 21 Jul 2023 14:13:36 +0900
Subject: [PATCH] Add more acceleration stats

---
 .../acceleration-stats.component.html          |  6 +++---
 .../acceleration-stats.component.ts            |  5 +++--
 .../accelerator-dashboard.component.html       | 18 ++++++++++++++----
 .../block-fee-rates-graph.component.ts         |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/components/acceleration-stats/acceleration-stats.component.html b/frontend/src/app/components/acceleration-stats/acceleration-stats.component.html
index e8ded44fc..a2f201eb4 100644
--- a/frontend/src/app/components/acceleration-stats/acceleration-stats.component.html
+++ b/frontend/src/app/components/acceleration-stats/acceleration-stats.component.html
@@ -27,21 +27,21 @@
 <ng-template #loading>
   <div class="stats-container loading-container">
     <div class="item">
-      <h5 class="card-title" i18n="mining.rewards">Miners Reward</h5>
+      <h5 class="card-title" i18n="address.transactions">Transactions</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="mining.fees-per-block">Avg Block Fees</h5>
+      <h5 class="card-title" i18n="accelerator.fee-delta">Fee delta</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
       </div>
     </div>
     <div class="item">
-      <h5 class="card-title" i18n="mining.average-fee">Avg Tx Fee</h5>
+      <h5 class="card-title" i18n="accelerator.success-rate">Success rate</h5>
       <div class="card-text">
         <div class="skeleton-loader"></div>
         <div class="skeleton-loader"></div>
diff --git a/frontend/src/app/components/acceleration-stats/acceleration-stats.component.ts b/frontend/src/app/components/acceleration-stats/acceleration-stats.component.ts
index fa69b1a9d..2d6355940 100644
--- a/frontend/src/app/components/acceleration-stats/acceleration-stats.component.ts
+++ b/frontend/src/app/components/acceleration-stats/acceleration-stats.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { ApiService } from '../../services/api.service';
@@ -11,13 +11,14 @@ import { StateService } from '../../services/state.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccelerationStatsComponent implements OnInit {
+  @Input() timespan: '24h' | '1w' = '24h';
   public accelerationStats$: Observable<any>;
   private lastBlockHeight: number;
 
   constructor(private apiService: ApiService, private stateService: StateService) { }
 
   ngOnInit(): void {
-    this.accelerationStats$ = this.apiService.getAccelerations$().pipe(
+    this.accelerationStats$ = this.apiService.getAccelerations$(this.timespan).pipe(
       switchMap(accelerations => {
         let totalFeeDelta = 0;
         let totalMined = 0;
diff --git a/frontend/src/app/components/accelerator-dashboard/accelerator-dashboard.component.html b/frontend/src/app/components/accelerator-dashboard/accelerator-dashboard.component.html
index 71baeceb9..530cbbb10 100644
--- a/frontend/src/app/components/accelerator-dashboard/accelerator-dashboard.component.html
+++ b/frontend/src/app/components/accelerator-dashboard/accelerator-dashboard.component.html
@@ -4,6 +4,7 @@
 
   <div class="row row-cols-1 row-cols-md-2">
 
+    <!-- 24h stats -->
     <div class="col">
       <div class="main-title">
         <span [attr.data-cy]="'acceleration-stats'" i18n="accelerator.acceleration-stats">Acceleration stats</span>&nbsp;
@@ -12,16 +13,25 @@
       <div class="card-wrapper">
         <div class="card">
           <div class="card-body more-padding">
-            <app-acceleration-stats></app-acceleration-stats>
+            <app-acceleration-stats timespan="24h"></app-acceleration-stats>
           </div>
         </div>
       </div>
     </div>
 
-    <!-- difficulty adjustment -->
+    <!-- 1w stats -->
     <div class="col">
-      <div class="main-title" i18n="dashboard.difficulty-adjustment">Difficulty Adjustment</div>
-      <app-difficulty-mining [attr.data-cy]="'difficulty-adjustment'" [showTitle]="false" [showProgress]="false" [showHalving]="true"></app-difficulty-mining>
+      <div class="main-title">
+        <span [attr.data-cy]="'acceleration-stats'" i18n="accelerator.acceleration-stats">Acceleration stats</span>&nbsp;
+        <span style="font-size: xx-small" i18n="mining.144-blocks">(1008 blocks)</span>
+      </div>
+      <div class="card-wrapper">
+        <div class="card">
+          <div class="card-body more-padding">
+            <app-acceleration-stats timespan="1w"></app-acceleration-stats>
+          </div>
+        </div>
+      </div>
     </div>
 
     <!-- acceleration fees graph -->
diff --git a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
index 19c51527f..0de1e8474 100644
--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
@@ -210,7 +210,7 @@ export class BlockFeeRatesGraphComponent implements OnInit {
         top: this.widget ? 20 : (this.isMobile() ? 10 : 50),
       },
       tooltip: {
-        show: !this.isMobile() && !this.widget,
+        show: !this.isMobile(),
         trigger: 'axis',
         axisPointer: {
           type: 'line'