Merge branch 'master' into simon/loading-indicator-ux

2022-05-18 21:37:40 +09:00
parent 1093efe844 4dd75cd24e
commit 6f3739feb7
28 changed files with 275 additions and 208 deletions
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -67,6 +67,7 @@ import { HashrateChartPoolsComponent } from './components/hashrates-chart-pools/
 import { MiningStartComponent } from './components/mining-start/mining-start.component';
 import { AmountShortenerPipe } from './shared/pipes/amount-shortener.pipe';
 import { ShortenStringPipe } from './shared/pipes/shorten-string-pipe/shorten-string.pipe';
+import { CapAddressPipe } from './shared/pipes/cap-address-pipe/cap-address-pipe';
 import { GraphsComponent } from './components/graphs/graphs.component';
 import { DifficultyAdjustmentsTable } from './components/difficulty-adjustments-table/difficulty-adjustments-table.components';
 import { BlocksList } from './components/blocks-list/blocks-list.component';
@@ -161,6 +162,7 @@ import { BlockSizesWeightsGraphComponent } from './components/block-sizes-weight
    StorageService,
    LanguageService,
    ShortenStringPipe,
+    CapAddressPipe,
    { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true }
  ],
  bootstrap: [AppComponent]
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
@@ -157,7 +157,7 @@ export class BlockFeesGraphComponent implements OnInit {
      series: [
        {
          zlevel: 0,
-          name: 'Fees',
+          name: $localize`:@@c20172223f84462032664d717d739297e5a9e2fe:Fees`,
          showSymbol: false,
          symbol: 'none',
          data: data.blockFees,
--- a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
+++ b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
@@ -157,7 +157,7 @@ export class BlockRewardsGraphComponent implements OnInit {
      series: [
        {
          zlevel: 0,
-          name: 'Reward',
+          name: $localize`:@@12f86e6747a5ad39e62d3480ddc472b1aeab5b76:Reward`,
          showSymbol: false,
          symbol: 'none',
          data: data.blockRewards,
--- a/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
+++ b/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
@@ -178,7 +178,7 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
        padding: 10,
        data: [
          {
-            name: 'Size',
+            name: $localize`:@@7faaaa08f56427999f3be41df1093ce4089bbd75:Size`,
            inactiveColor: 'rgb(110, 112, 121)',
            textStyle: {
              color: 'white',
@@ -186,7 +186,7 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
            icon: 'roundRect',
          },
          {
-            name: 'Weight',
+            name: $localize`:@@919f2fd60a898850c24b1584362bbf18a4628bcb:Weight`,
            inactiveColor: 'rgb(110, 112, 121)',
            textStyle: {
              color: 'white',
@@ -224,7 +224,7 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
      series: data.sizes.length === 0 ? [] : [
        {
          zlevel: 1,
-          name: 'Size',
+          name: $localize`:@@7faaaa08f56427999f3be41df1093ce4089bbd75:Size`,
          showSymbol: false,
          symbol: 'none',
          data: data.sizes,
@@ -255,7 +255,7 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
        {
          zlevel: 1,
          yAxisIndex: 0,
-          name: 'Weight',
+          name: $localize`:@@919f2fd60a898850c24b1584362bbf18a4628bcb:Weight`,
          showSymbol: false,
          symbol: 'none',
          data: data.weights,
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -195,7 +195,7 @@
    </div>
    <div class="clearfix"></div>

-    <app-transactions-list [transactions]="transactions"></app-transactions-list>
+    <app-transactions-list [transactions]="transactions" [paginated]="true"></app-transactions-list>

    <ng-template [ngIf]="isLoadingTransactions">
      <div class="text-center mb-4" class="tx-skeleton">
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -40,10 +40,10 @@
            <app-time-since [time]="block.timestamp" [fastRender]="true"></app-time-since>
          </td>
          <td class="reward text-right" [class]="widget ? 'widget' : ''">
-            <app-amount [satoshis]="block.extras.reward" digitsInfo="1.2-2"></app-amount>
+            <app-amount [satoshis]="block.extras.reward" [noFiat]="true" digitsInfo="1.2-2"></app-amount>
          </td>
          <td class="fees text-right" *ngIf="!widget">
-            <app-amount [satoshis]="block.extras.totalFees" digitsInfo="1.2-2"></app-amount>
+            <app-amount [satoshis]="block.extras.totalFees" [noFiat]="true" digitsInfo="1.2-2"></app-amount>
          </td>
          <td class="txs text-right" [class]="widget ? 'widget' : ''">
            {{ block.tx_count | number }}
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
@@ -11,7 +11,7 @@
        </p>
      </div>
      <div class="item">
-        <h5 class="card-title" i18n="master-page.blocks">Difficulty</h5>
+        <h5 class="card-title" i18n="block.difficulty">Difficulty</h5>
        <p class="card-text">
          {{ hashrates.currentDifficulty | amountShortener }}
        </p>
@@ -64,13 +64,13 @@
 <ng-template #loadingStats>
  <div class="pool-distribution">
    <div class="item">
-      <h5 class="card-title" i18n="mining.miners-luck">Hashrate</h5>
+      <h5 class="card-title" i18n="mining.hashrate">Hashrate</h5>
      <p class="card-text">
        <span class="skeleton-loader skeleton-loader-big"></span>
      </p>
    </div>
    <div class="item">
-      <h5 class="card-title" i18n="master-page.blocks">Difficulty</h5>
+      <h5 class="card-title" i18n="block.difficulty">Difficulty</h5>
      <p class="card-text">
        <span class="skeleton-loader skeleton-loader-big"></span>
      </p>
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
@@ -223,7 +223,7 @@ export class HashrateChartComponent implements OnInit {
      legend: (this.widget || data.hashrates.length === 0) ? undefined : {
        data: [
          {
-            name: 'Hashrate',
+            name: $localize`:@@79a9dc5b1caca3cbeb1733a19515edacc5fc7920:Hashrate`,
            inactiveColor: 'rgb(110, 112, 121)',
            textStyle: {
              color: 'white',
@@ -234,9 +234,9 @@ export class HashrateChartComponent implements OnInit {
            },
          },
          {
-            name: 'Difficulty',
+            name: $localize`:@@25148835d92465353fc5fe8897c27d5369978e5a:Difficulty`,
            inactiveColor: 'rgb(110, 112, 121)',
-            textStyle: {
+            textStyle: {  
              color: 'white',
            },
            icon: 'roundRect',
@@ -290,7 +290,7 @@ export class HashrateChartComponent implements OnInit {
      series: data.hashrates.length === 0 ? [] : [
        {
          zlevel: 0,
-          name: 'Hashrate',
+          name: $localize`:@@79a9dc5b1caca3cbeb1733a19515edacc5fc7920:Hashrate`,
          showSymbol: false,
          symbol: 'none',
          data: data.hashrates,
@@ -302,7 +302,7 @@ export class HashrateChartComponent implements OnInit {
        {
          zlevel: 1,
          yAxisIndex: 1,
-          name: 'Difficulty',
+          name: $localize`:@@25148835d92465353fc5fe8897c27d5369978e5a:Difficulty`,
          showSymbol: false,
          symbol: 'none',
          data: data.difficulty,
--- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html
+++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html
@@ -7,7 +7,6 @@
    <button class="btn" style="margin: 0 0 4px 0px" (click)="onSaveChart()">
      <fa-icon [icon]="['fas', 'download']" [fixedWidth]="true"></fa-icon>
    </button>
-    <span i18n="mining.pools-dominance">Pools Dominance</span>
    <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(hashrateObservable$ | async) as stats">
      <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
        <label ngbButtonLabel class="btn-primary btn-sm" *ngIf="stats.blockCount >= 4320">
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -153,13 +153,14 @@ export class PoolRankingComponent implements OnInit {
          },
          borderColor: '#000',
          formatter: () => {
+            const i = pool.blockCount.toString();
            if (this.miningWindowPreference === '24h') {
              return `<b style="color: white">${pool.name} (${pool.share}%)</b><br>` +
                pool.lastEstimatedHashrate.toString() + ' PH/s' +
-                `<br>` + pool.blockCount.toString() + ` blocks`;
+                `<br>` + $localize`${i} blocks`;
            } else {
              return `<b style="color: white">${pool.name} (${pool.share}%)</b><br>` +
-                pool.blockCount.toString() + ` blocks`;
+                $localize`${i} blocks`;
            }
          }
        },
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -65,7 +65,10 @@
                      <ng-template #defaultAddress>
                        <a [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey_address]" title="{{ vin.prevout.scriptpubkey_address }}">
                          <span class="d-block d-lg-none">{{ vin.prevout.scriptpubkey_address | shortenString : 16 }}</span>
-                          <span class="d-none d-lg-block">{{ vin.prevout.scriptpubkey_address | shortenString : 35 }}</span>
+                          <span class="d-none d-lg-flex justify-content-start">
+                            <span class="addr-left flex-grow-1" [style]="vin.prevout.scriptpubkey_address.length > 40 ? 'max-width: 235px' : ''">{{ vin.prevout.scriptpubkey_address }}</span>
+                            <span *ngIf="vin.prevout.scriptpubkey_address.length > 40" class="addr-right">{{ vin.prevout.scriptpubkey_address | capAddress: 40: 10 }}</span>
+                          </span>
                        </a>
                        <div>
                          <app-address-labels [vin]="vin"></app-address-labels>
@@ -156,7 +159,10 @@
                <td>
                  <a *ngIf="vout.scriptpubkey_address; else scriptpubkey_type" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey_address]" title="{{ vout.scriptpubkey_address }}">
                    <span class="d-block d-lg-none">{{ vout.scriptpubkey_address | shortenString : 16 }}</span>
-                    <span class="d-none d-lg-block">{{ vout.scriptpubkey_address | shortenString : 35 }}</span>
+                    <span class="d-none d-lg-flex justify-content-start">
+                      <span class="addr-left flex-grow-1" [style]="vout.scriptpubkey_address.length > 40 ? 'max-width: 235px' : ''">{{ vout.scriptpubkey_address }}</span>
+                      <span *ngIf="vout.scriptpubkey_address.length > 40" class="addr-right">{{ vout.scriptpubkey_address | capAddress: 40: 10 }}</span>
+                    </span>
                  </a>
                  <div>
                    <app-address-labels [vout]="vout"></app-address-labels>
--- a/frontend/src/app/components/transactions-list/transactions-list.component.scss
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss
@@ -129,3 +129,14 @@ h2 {
 .summary {
 	margin-top: 10px;
 }
+
+.addr-left {
+	font-family: monospace;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	margin-right: -7px
+}
+
+.addr-right {
+	font-family: monospace;
+}
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -22,6 +22,7 @@ export class TransactionsListComponent implements OnInit, OnChanges {
  @Input() showConfirmations = false;
  @Input() transactionPage = false;
  @Input() errorUnblinded = false;
+  @Input() paginated = false;
  @Input() outputIndex: number;
  @Input() address: string = '';

@@ -84,6 +85,9 @@ export class TransactionsListComponent implements OnInit, OnChanges {
    if (!this.transactions || !this.transactions.length) {
      return;
    }
+    if (this.paginated) {
+      this.outspends = [];
+    }
    if (this.outputIndex) {
      setTimeout(() => {
        const assetBoxElements = document.getElementsByClassName('assetBox');
--- a/frontend/src/app/docs/api-docs/api-docs.component.ts
+++ b/frontend/src/app/docs/api-docs/api-docs.component.ts
@@ -39,7 +39,7 @@ export class ApiDocsComponent implements OnInit {
      }
      window.addEventListener('scroll', function() {
        that.desktopDocsNavPosition = ( window.pageYOffset > 182 ) ? "fixed" : "relative";
-      });
+      }, { passive: true} );
    }, 1 );
  }

--- a/frontend/src/app/services/websocket.service.ts
+++ b/frontend/src/app/services/websocket.service.ts
@@ -9,9 +9,9 @@ import { take } from 'rxjs/operators';
 import { TransferState, makeStateKey } from '@angular/platform-browser';
 import { BlockExtended } from '../interfaces/node-api.interface';

-const OFFLINE_RETRY_AFTER_MS = 10000;
-const OFFLINE_PING_CHECK_AFTER_MS = 30000;
-const EXPECT_PING_RESPONSE_AFTER_MS = 4000;
+const OFFLINE_RETRY_AFTER_MS = 1000;
+const OFFLINE_PING_CHECK_AFTER_MS = 10000;
+const EXPECT_PING_RESPONSE_AFTER_MS = 5000;

 const initData = makeStateKey('/api/v1/init-data');

--- a/frontend/src/app/shared/pipes/cap-address-pipe/cap-address-pipe.ts
+++ b/frontend/src/app/shared/pipes/cap-address-pipe/cap-address-pipe.ts
@@ -0,0 +1,12 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'capAddress' })
+export class CapAddressPipe implements PipeTransform {
+  transform(str: string, cap: number, leftover: number) {
+    if (!str) { return; }
+    if (str.length <= cap) {
+      return str;
+    }
+    return str.slice(-Math.max(cap - str.length, leftover));
+  }
+}
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -29,6 +29,7 @@ import { MempoolBlocksComponent } from '../components/mempool-blocks/mempool-blo
 import { BlockchainBlocksComponent } from '../components/blockchain-blocks/blockchain-blocks.component';
 import { AmountComponent } from '../components/amount/amount.component';
 import { RouterModule } from '@angular/router';
+import { CapAddressPipe } from './pipes/cap-address-pipe/cap-address-pipe';

@NgModule({
  declarations: [
@@ -51,6 +52,7 @@ import { RouterModule } from '@angular/router';
    WuBytesPipe,
    CeilPipe,
    ShortenStringPipe,
+    CapAddressPipe,
    Decimal2HexPipe,
    FeeRoundingPipe,
    ColoredPriceDirective,
@@ -103,6 +105,7 @@ import { RouterModule } from '@angular/router';
    WuBytesPipe,
    CeilPipe,
    ShortenStringPipe,
+    CapAddressPipe,
    Decimal2HexPipe,
    FeeRoundingPipe,
    ColoredPriceDirective,
--- a/frontend/src/locale/messages.xlf
+++ b/frontend/src/locale/messages.xlf
@@ -1878,6 +1878,25 @@
        </context-group>
        <note priority="1" from="description">mining.block-fees</note>
      </trans-unit>
+      <trans-unit id="c20172223f84462032664d717d739297e5a9e2fe" datatype="html">
+        <source>Fees</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-fees-graph/block-fees-graph.component.ts</context>
+          <context context-type="linenumber">160,158</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
+          <context context-type="linenumber">16,17</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
+          <context context-type="linenumber">217,219</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
+          <context context-type="linenumber">265,267</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="8ba8fe810458280a83df7fdf4c614dfc1a826445" datatype="html">
        <source>Block Rewards</source>
        <context-group purpose="location">
@@ -1894,6 +1913,25 @@
        </context-group>
        <note priority="1" from="description">mining.block-rewards</note>
      </trans-unit>
+      <trans-unit id="12f86e6747a5ad39e62d3480ddc472b1aeab5b76" datatype="html">
+        <source>Reward</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-rewards-graph/block-rewards-graph.component.ts</context>
+          <context context-type="linenumber">160,158</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
+          <context context-type="linenumber">15,17</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
+          <context context-type="linenumber">216,218</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
+          <context context-type="linenumber">264,266</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="56fa1cd221491b6478998679cba2dc8d55ba330d" datatype="html">
        <source>Block Sizes and Weights</source>
        <context-group purpose="location">
@@ -1910,32 +1948,16 @@
        </context-group>
        <note priority="1" from="description">mining.block-sizes-weights</note>
      </trans-unit>
-      <trans-unit id="bdf0e930eb22431140a2eaeacd809cc5f8ebd38c" datatype="html">
-        <source>Next Block</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
-          <context context-type="linenumber">7,8</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
-          <context context-type="linenumber">19,20</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/mempool-block/mempool-block.component.ts</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-        <note priority="1" from="description">Next Block</note>
-      </trans-unit>
-      <trans-unit id="a0e07a711d171f4d40dd388d70ed32f9b8101e0a" datatype="html">
-        <source>Previous Block</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
-          <context context-type="linenumber">26,27</context>
-        </context-group>
-        <note priority="1" from="description">Previous Block</note>
-      </trans-unit>
      <trans-unit id="7faaaa08f56427999f3be41df1093ce4089bbd75" datatype="html">
        <source>Size</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts</context>
+          <context context-type="linenumber">181,180</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts</context>
+          <context context-type="linenumber">227,225</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
          <context context-type="linenumber">64,66</context>
@@ -1972,10 +1994,17 @@
          <context context-type="sourcefile">src/app/dashboard/dashboard.component.html</context>
          <context context-type="linenumber">116,119</context>
        </context-group>
-        <note priority="1" from="description">block.size</note>
      </trans-unit>
      <trans-unit id="919f2fd60a898850c24b1584362bbf18a4628bcb" datatype="html">
        <source>Weight</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts</context>
+          <context context-type="linenumber">189,188</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts</context>
+          <context context-type="linenumber">258,255</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
          <context context-type="linenumber">68,70</context>
@@ -1984,7 +2013,30 @@
          <context context-type="sourcefile">src/app/components/transaction/transaction.component.html</context>
          <context context-type="linenumber">220,222</context>
        </context-group>
-        <note priority="1" from="description">block.weight</note>
+      </trans-unit>
+      <trans-unit id="bdf0e930eb22431140a2eaeacd809cc5f8ebd38c" datatype="html">
+        <source>Next Block</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
+          <context context-type="linenumber">7,8</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
+          <context context-type="linenumber">19,20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/mempool-block/mempool-block.component.ts</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+        <note priority="1" from="description">Next Block</note>
+      </trans-unit>
+      <trans-unit id="a0e07a711d171f4d40dd388d70ed32f9b8101e0a" datatype="html">
+        <source>Previous Block</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/block/block.component.html</context>
+          <context context-type="linenumber">26,27</context>
+        </context-group>
+        <note priority="1" from="description">Previous Block</note>
      </trans-unit>
      <trans-unit id="0b47a777f024ab4e3cdf0062acb4d86e9ae1f635" datatype="html">
        <source>Median fee</source>
@@ -2167,6 +2219,14 @@
          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.html</context>
          <context context-type="linenumber">73,75</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.ts</context>
+          <context context-type="linenumber">237,236</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.ts</context>
+          <context context-type="linenumber">305,302</context>
+        </context-group>
        <note priority="1" from="description">block.difficulty</note>
      </trans-unit>
      <trans-unit id="a6bb63d98a8a67689070a79ccf13960c25b572ef" datatype="html">
@@ -2253,38 +2313,6 @@
        </context-group>
        <note priority="1" from="description">latest-blocks.mined</note>
      </trans-unit>
-      <trans-unit id="12f86e6747a5ad39e62d3480ddc472b1aeab5b76" datatype="html">
-        <source>Reward</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">15,17</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
-          <context context-type="linenumber">216,218</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
-          <context context-type="linenumber">264,266</context>
-        </context-group>
-        <note priority="1" from="description">latest-blocks.reward</note>
-      </trans-unit>
-      <trans-unit id="c20172223f84462032664d717d739297e5a9e2fe" datatype="html">
-        <source>Fees</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/blocks-list/blocks-list.component.html</context>
-          <context context-type="linenumber">16,17</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
-          <context context-type="linenumber">217,219</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/pool/pool.component.html</context>
-          <context context-type="linenumber">265,267</context>
-        </context-group>
-        <note priority="1" from="description">latest-blocks.fees</note>
-      </trans-unit>
      <trans-unit id="e6213c3f05146287cf121868d9f3d3c3ff5f9714" datatype="html">
        <source>TXs</source>
        <context-group purpose="location">
@@ -2559,10 +2587,6 @@
          <context context-type="sourcefile">src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html</context>
          <context context-type="linenumber">6,8</context>
        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html</context>
-          <context context-type="linenumber">10,11</context>
-        </context-group>
        <note priority="1" from="description">mining.pools-dominance</note>
      </trans-unit>
      <trans-unit id="3510fc6daa1d975f331e3a717bdf1a34efa06dff" datatype="html">
@@ -2591,6 +2615,14 @@
          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.html</context>
          <context context-type="linenumber">67,69</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.ts</context>
+          <context context-type="linenumber">226,225</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/hashrate-chart/hashrate-chart.component.ts</context>
+          <context context-type="linenumber">293,291</context>
+        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/pool-ranking/pool-ranking.component.html</context>
          <context context-type="linenumber">87,89</context>
@@ -2816,6 +2848,17 @@
          <context context-type="linenumber">55</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="6095122426142344316" datatype="html">
+        <source><x id="PH" equiv-text="i"/> blocks</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool-ranking/pool-ranking.component.ts</context>
+          <context context-type="linenumber">160,158</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/pool-ranking/pool-ranking.component.ts</context>
+          <context context-type="linenumber">163,162</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
        <source>Tags</source>
        <context-group purpose="location">