diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 79a783f88..18cde0e8f 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -95,7 +95,7 @@ class WebsocketHandler { 'backendInfo': backendInfo.getBackendInfo(), 'loadingIndicators': loadingIndicators.getLoadingIndicators(), 'da': da?.previousTime ? da : undefined, - 'fees': feeApi.getRecommendedFee(), + 'fees': feeApi.getRecommendedFee(true), }); } @@ -567,7 +567,7 @@ class WebsocketHandler { } memPool.removeFromSpendMap(deletedTransactions); memPool.addToSpendMap(newTransactions); - const recommendedFees = feeApi.getRecommendedFee(); + const recommendedFees = feeApi.getRecommendedFee(true); const latestTransactions = memPool.getLatestTransactions(); @@ -1048,7 +1048,7 @@ class WebsocketHandler { const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas(); const da = difficultyAdjustment.getDifficultyAdjustment(); - const fees = feeApi.getRecommendedFee(); + const fees = feeApi.getRecommendedFee(true); const mempoolInfo = memPool.getMempoolInfo(); // pre-compute address transactions diff --git a/frontend/src/app/components/fees-box/fees-box.component.html b/frontend/src/app/components/fees-box/fees-box.component.html index 580307df5..71d3ef8aa 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.html +++ b/frontend/src/app/components/fees-box/fees-box.component.html @@ -13,23 +13,23 @@
-
+
-
+
-
+
-
+
diff --git a/frontend/src/app/components/fees-box/fees-box.component.ts b/frontend/src/app/components/fees-box/fees-box.component.ts index 78fd102ca..710fd345c 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.ts +++ b/frontend/src/app/components/fees-box/fees-box.component.ts @@ -36,7 +36,7 @@ export class FeesBoxComponent implements OnInit, OnDestroy { this.recommendedFees$ = this.stateService.recommendedFees$ .pipe( tap((fees) => { - this.fees = fees; + this.fees = this.roundFees(fees); this.setFeeGradient(); } ) @@ -61,6 +61,19 @@ export class FeesBoxComponent implements OnInit, OnDestroy { this.cd.markForCheck(); } + roundFees(fees: Recommendedfees): Recommendedfees { + fees.fastestFee = this.roundFeeValue(fees.fastestFee); + fees.halfHourFee = this.roundFeeValue(fees.halfHourFee); + fees.hourFee = this.roundFeeValue(fees.hourFee); + fees.economyFee = this.roundFeeValue(fees.economyFee); + fees.minimumFee = this.roundFeeValue(fees.minimumFee); + return fees; + } + + roundFeeValue(fee: number): number { + return fee >= 10.0 ? Math.ceil(fee) : fee; + } + ngOnDestroy(): void { this.themeSubscription.unsubscribe(); }