diff --git a/backend/src/routes.ts b/backend/src/routes.ts
index db5b4f05f..d27fab683 100644
--- a/backend/src/routes.ts
+++ b/backend/src/routes.ts
@@ -630,6 +630,8 @@ class Routes {
res.json({
hashrates: hashrates,
difficulty: difficulty,
+ currentHashrate: await bitcoinClient.getNetworkHashPs(),
+ currentDifficulty: await bitcoinClient.getDifficulty(),
});
} catch (e) {
res.status(500).send(e instanceof Error ? e.message : e);
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 b01a68dc4..4223eb50f 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
@@ -5,8 +5,7 @@
Hashrate
- {{ hashrates.currentHashrate | amountShortener }}
- hashes/sec
+ {{ hashrates.currentHashrate | amountShortener: 1 : 'H/s' }}
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 2a8419c24..e2c2e1db0 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
@@ -114,23 +114,15 @@ export class HashrateChartComponent implements OnInit {
difficulty: diffFixed.map(val => [val.timestamp * 1000, val.difficulty]),
});
this.isLoading = false;
-
- if (data.hashrates.length === 0) {
- this.cd.markForCheck();
- throw new Error();
- }
}),
map((response) => {
const data = response.body;
return {
blockCount: parseInt(response.headers.get('x-total-count'), 10),
- currentDifficulty: Math.round(data.difficulty[data.difficulty.length - 1].difficulty * 100) / 100,
- currentHashrate: data.hashrates[data.hashrates.length - 1].avgHashrate,
+ currentDifficulty: data.currentDifficulty,
+ currentHashrate: data.currentHashrate,
};
}),
- retryWhen((errors) => errors.pipe(
- delay(60000)
- ))
);
}),
share()