Merge branch 'master' into mononaut/simple-acceleration-mode

This commit is contained in:
wiz
2024-04-08 17:05:51 +09:00
committed by GitHub
8 changed files with 283 additions and 235 deletions

View File

@@ -615,8 +615,8 @@
}
<td>
<div class="effective-fee-container">
@if (accelerationInfo) {
<app-fee-rate [fee]="accelerationInfo.acceleratedFee" [weight]="accelerationInfo.effectiveVsize * 4"></app-fee-rate>
@if (accelerationInfo && (accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) {
<app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
} @else {
<app-fee-rate [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
}