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 f8dc73b88..751c2d140 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
@@ -13,6 +13,7 @@ import { download } from '@app/shared/graphs.utils';
import { ActivatedRoute } from '@angular/router';
import { StateService } from '@app/services/state.service';
import { seoDescriptionNetwork } from '@app/shared/common.utils';
+import { AmountShortenerPipe } from '@app/shared/pipes/amount-shortener.pipe';
@Component({
selector: 'app-hashrate-chart',
@@ -60,6 +61,7 @@ export class HashrateChartComponent implements OnInit {
private storageService: StorageService,
private miningService: MiningService,
private route: ActivatedRoute,
+ private amountShortenerPipe: AmountShortenerPipe,
public stateService: StateService
) {
}
@@ -250,29 +252,19 @@ export class HashrateChartComponent implements OnInit {
let hashrateString = '';
let difficultyString = '';
let hashrateStringMA = '';
- let hashratePowerOfTen: any = selectPowerOfTen(1);
for (const tick of ticks) {
if (tick.seriesIndex === 0) { // Hashrate
- let hashrate = tick.data[1];
- hashratePowerOfTen = selectPowerOfTen(tick.data[1], 10);
- hashrate = tick.data[1] / hashratePowerOfTen.divider;
- hashrateString = `${tick.marker} ${tick.seriesName}: ${formatNumber(hashrate, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s
`;
+ hashrateString = `${tick.marker} ${tick.seriesName}: ${this.amountShortenerPipe.transform(tick.data[1], 3, 'H/s', false, true)}
`;
} else if (tick.seriesIndex === 1) { // Difficulty
- let difficultyPowerOfTen = hashratePowerOfTen;
let difficulty = tick.data[1];
if (difficulty === null) {
difficultyString = `${tick.marker} ${tick.seriesName}: No data
`;
} else {
- difficultyPowerOfTen = selectPowerOfTen(tick.data[1]);
- difficulty = tick.data[1] / difficultyPowerOfTen.divider;
- difficultyString = `${tick.marker} ${tick.seriesName}: ${formatNumber(difficulty, this.locale, '1.2-2')} ${difficultyPowerOfTen.unit}
`;
+ difficultyString = `${tick.marker} ${tick.seriesName}: ${this.amountShortenerPipe.transform(tick.data[1], 2, '', false)}
`;
}
} else if (tick.seriesIndex === 2) { // Hashrate MA
- let hashrate = tick.data[1];
- hashratePowerOfTen = selectPowerOfTen(tick.data[1], 10);
- hashrate = tick.data[1] / hashratePowerOfTen.divider;
- hashrateStringMA = `${tick.marker} ${tick.seriesName}: ${formatNumber(hashrate, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s`;
+ hashrateStringMA = `${tick.marker} ${tick.seriesName}: ${this.amountShortenerPipe.transform(tick.data[1], 3, 'H/s', false, true)}
`;
}
}
@@ -346,9 +338,7 @@ export class HashrateChartComponent implements OnInit {
axisLabel: {
color: 'rgb(110, 112, 121)',
formatter: (val): string => {
- const selectedPowerOfTen: any = selectPowerOfTen(val);
- const newVal = Math.round(val / selectedPowerOfTen.divider);
- return `${newVal} ${selectedPowerOfTen.unit}H/s`;
+ return this.amountShortenerPipe.transform(val, 3, 'H/s', false, true).toString();
},
showMinLabel: false,
showMaxLabel: false,
@@ -384,9 +374,7 @@ export class HashrateChartComponent implements OnInit {
if (this.stateService.network === 'signet') {
return `${val}`;
}
- const selectedPowerOfTen: any = selectPowerOfTen(val);
- const newVal = Math.round(val / selectedPowerOfTen.divider);
- return `${newVal} ${selectedPowerOfTen.unit}`;
+ return this.amountShortenerPipe.transform(val, 3, '', false, true).toString();
},
showMinLabel: false,
showMaxLabel: false,
diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html
index 2ee25f001..a493b2038 100644
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -98,7 +98,7 @@
|
- {{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }} |
+ {{ poolStats.estimatedHashrate | amountShortener : 3 : 'H/s' : false : true }} |
{{ poolStats.avgBlockHealth }}%
diff --git a/frontend/src/app/components/pool/pool.component.ts b/frontend/src/app/components/pool/pool.component.ts
index 4b4b643a2..352e5972c 100644
--- a/frontend/src/app/components/pool/pool.component.ts
+++ b/frontend/src/app/components/pool/pool.component.ts
@@ -6,7 +6,7 @@ import { catchError, distinctUntilChanged, filter, map, share, switchMap, tap }
import { BlockExtended, PoolStat } from '@interfaces/node-api.interface';
import { ApiService } from '@app/services/api.service';
import { StateService } from '@app/services/state.service';
-import { selectPowerOfTen } from '@app/bitcoin.utils';
+import { AmountShortenerPipe } from '@app/shared/pipes/amount-shortener.pipe';
import { formatNumber } from '@angular/common';
import { SeoService } from '@app/services/seo.service';
import { HttpErrorResponse } from '@angular/common/http';
@@ -63,6 +63,7 @@ export class PoolComponent implements OnInit {
private websocketService: WebsocketService,
private miningService: MiningService,
private seoService: SeoService,
+ public amountShortenerPipe: AmountShortenerPipe,
) {
this.auditAvailable = this.stateService.env.AUDIT;
}
@@ -217,9 +218,7 @@ export class PoolComponent implements OnInit {
for (const tick of ticks) {
if (tick.seriesIndex === 0) {
- let hashratePowerOfTen = selectPowerOfTen(tick.data[1], 10);
- let hashrateData = tick.data[1] / hashratePowerOfTen.divider;
- hashrateString = `${tick.marker} ${tick.seriesName}: ${formatNumber(hashrateData, this.locale, '1.0-0')} ${hashratePowerOfTen.unit}H/s
`;
+ hashrateString = `${tick.marker} ${tick.seriesName}: ${this.amountShortenerPipe.transform(tick.data[1], 3, 'H/s', false, true)}
`;
} else if (tick.seriesIndex === 1) {
dominanceString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.0-2')}%`;
}
@@ -271,9 +270,7 @@ export class PoolComponent implements OnInit {
axisLabel: {
color: 'rgb(110, 112, 121)',
formatter: (val) => {
- const selectedPowerOfTen: any = selectPowerOfTen(val);
- const newVal = Math.round(val / selectedPowerOfTen.divider);
- return `${newVal} ${selectedPowerOfTen.unit}H/s`
+ return this.amountShortenerPipe.transform(val, 3, 'H/s', false, true).toString();
}
},
splitLine: {
diff --git a/frontend/src/app/shared/pipes/amount-shortener.pipe.ts b/frontend/src/app/shared/pipes/amount-shortener.pipe.ts
index ec50285cb..4a7fb1569 100644
--- a/frontend/src/app/shared/pipes/amount-shortener.pipe.ts
+++ b/frontend/src/app/shared/pipes/amount-shortener.pipe.ts
@@ -11,10 +11,16 @@ export class AmountShortenerPipe implements PipeTransform {
const sigfigs = args[3] || false; // if true, "digits" is the number of significant digits, not the number of decimal places
if (num < 1000) {
+ let formattedNum: string;
if (sigfigs) {
- return Number(num.toPrecision(digits));
+ formattedNum = Number(num.toPrecision(digits)).toString();
+ } else {
+ formattedNum = num.toFixed(digits);
}
- return num.toFixed(digits);
+
+ return unit !== undefined
+ ? formattedNum + ' ' + unit
+ : formattedNum;
}
const lookup = [
@@ -24,7 +30,9 @@ export class AmountShortenerPipe implements PipeTransform {
{ value: 1e9, symbol: isMoney ? 'B' : 'G' },
{ value: 1e12, symbol: 'T' },
{ value: 1e15, symbol: 'P' },
- { value: 1e18, symbol: 'E' }
+ { value: 1e18, symbol: 'E' },
+ { value: 1e21, symbol: 'Z' },
+ { value: 1e24, symbol: 'Y' }
];
const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
const item = lookup.slice().reverse().find((item) => num >= item.value);
|