machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into update-screenshot-2.4.0

Browse Source
This commit is contained in:
wiz
2022-05-06 14:59:38 +09:00
committed by GitHub
parent 18316763c6 d82fc7d9aa
commit e4512fb612
6 changed files with 455 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/app/components/hashrate-chart/hashrate-chart.component.html
View File

@@ -5,8 +5,7 @@
<div class="item">
<h5 class="card-title" i18n="mining.hashrate">Hashrate</h5>
<p class="card-text">
{{ hashrates.currentHashrate | amountShortener }}
<span class="symbol">hashes/sec</span>
{{ hashrates.currentHashrate | amountShortener: 1 : 'H/s' }}
</p>
</div>
<div class="item">

12
frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
View File

@@ -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()

6
frontend/src/app/components/reward-stats/reward-stats.component.html
View File

@@ -43,21 +43,21 @@
<ng-template #loadingReward>
<div class="fee-estimation-container loading-container">
<div class="item">
<h5 class="card-title" i18n="fees-box.low-priority">Low priority</h5>
<h5 class="card-title" i18n="mining.rewards">Miners Reward</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="fees-box.medium-priority">Medium priority</h5>
<h5 class="card-title" i18n="mining.rewards-per-tx">Reward Per Tx</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="fees-box.high-priority">High priority</h5>
<h5 class="card-title" i18n="mining.average-fee">Average Fee</h5>
<div class="card-text">
<div class="skeleton-loader"></div>
<div class="skeleton-loader"></div>