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

Merge pull request #3222 from mempool/simon/incoming-transactions-progress-color

Browse Source 
Correct incoming transaction progress colors
This commit is contained in:
softsimon 2023-03-04 16:55:44 +09:00 committed by GitHub
commit 2ed4e5bb6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/dashboard/dashboard.component.html
View File

@ -250,7 +250,7 @@
</span> </span>
<ng-template #inSync> <ng-template #inSync>
<div class="progress inc-tx-progress-bar"> <div class="progress inc-tx-progress-bar">
<div class="progress-bar" role="progressbar" [ngStyle]="{'width': mempoolInfoData.value.progressWidth, 'background-color': mempoolInfoData.value.progressColor}">&nbsp;</div> <div class="progress-bar {{ mempoolInfoData.value.progressColor }}" role="progressbar" [ngStyle]="{'width': mempoolInfoData.value.progressWidth}">&nbsp;</div>
<div class="progress-text">&lrm;{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} <ng-container i18n="shared.vbytes-per-second|vB/s">vB/s</ng-container></div> <div class="progress-text">&lrm;{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} <ng-container i18n="shared.vbytes-per-second|vB/s">vB/s</ng-container></div>
</div> </div>
</ng-template> </ng-template>

15
frontend/src/app/dashboard/dashboard.component.ts
View File

@ -78,21 +78,12 @@ export class DashboardComponent implements OnInit, OnDestroy {
map(([mempoolInfo, vbytesPerSecond]) => { map(([mempoolInfo, vbytesPerSecond]) => {
const percent = Math.round((Math.min(vbytesPerSecond, this.vBytesPerSecondLimit) / this.vBytesPerSecondLimit) * 100); const percent = Math.round((Math.min(vbytesPerSecond, this.vBytesPerSecondLimit) / this.vBytesPerSecondLimit) * 100);
let progressColor = '#7CB342'; let progressColor = 'bg-success';
if (vbytesPerSecond > 1667) { if (vbytesPerSecond > 1667) {
progressColor = '#FDD835'; progressColor = 'bg-warning';
}
if (vbytesPerSecond > 2000) {
progressColor = '#FFB300';
}
if (vbytesPerSecond > 2500) {
progressColor = '#FB8C00';
} }
if (vbytesPerSecond > 3000) { if (vbytesPerSecond > 3000) {
progressColor = '#F4511E'; progressColor = 'bg-danger';
}
if (vbytesPerSecond > 3500) {
progressColor = '#D81B60';
} }
const mempoolSizePercentage = (mempoolInfo.usage / mempoolInfo.maxmempool * 100); const mempoolSizePercentage = (mempoolInfo.usage / mempoolInfo.maxmempool * 100);