diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html index 44f7b840e..4dd1c0a3e 100644 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html +++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html @@ -66,7 +66,7 @@ Fee per vByte - {{ tx.fee / (tx.weight / 4) | feeRounding }} sat/vB +   diff --git a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html index 795958fe3..636f2c16a 100644 --- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html +++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html @@ -25,13 +25,13 @@ Fee rate - {{ feeRate | feeRounding }} sat/vB + Effective fee rate - {{ effectiveRate | feeRounding }} sat/vB + diff --git a/frontend/src/app/components/block/block-preview.component.html b/frontend/src/app/components/block/block-preview.component.html index 29da36373..401f38487 100644 --- a/frontend/src/app/components/block/block-preview.component.html +++ b/frontend/src/app/components/block/block-preview.component.html @@ -34,7 +34,7 @@ Median fee - ~{{ block?.extras?.medianFee | number:'1.0-0' }} sat/vB + ~ diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index aa441ad9a..5acabf7d1 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -121,11 +121,11 @@ Fee span - {{ block?.extras?.minFee | number:'1.0-0' }} - {{ block?.extras?.maxFee | number:'1.0-0' }} sat/vB + - Median fee - ~{{ block?.extras?.medianFee | number:'1.0-0' }} sat/vB + ~
- ~{{ block?.extras?.medianFee | number:feeRounding }} sat/vB + ~
@@ -32,8 +31,9 @@
- {{ block.extras.minFee | number:feeRounding }} - {{ block.extras.maxFee | number:feeRounding }} sat/vB + + - +
diff --git a/frontend/src/app/components/clock/clock.component.html b/frontend/src/app/components/clock/clock.component.html index cff158697..373653b7e 100644 --- a/frontend/src/app/components/clock/clock.component.html +++ b/frontend/src/app/components/clock/clock.component.html @@ -45,7 +45,9 @@

priority rate

-

{{ recommendedFees.fastestFee }} sat/vB

+

+ +

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 1aea85429..580307df5 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 @@
-
{{ recommendedFees.economyFee }} sat/vB
+
-
{{ recommendedFees.hourFee }} sat/vB
+
-
{{ recommendedFees.halfHourFee }} sat/vB
+
-
{{ recommendedFees.fastestFee }} sat/vB
+
diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index 7d5b18ccb..b089a6d74 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -14,11 +14,15 @@ Median fee - ~{{ mempoolBlock.medianFee | number:'1.0-0' }} sat/vB + ~ Fee span - {{ mempoolBlock.feeRange[0] | number:'1.0-0' }} - {{ mempoolBlock.feeRange[mempoolBlock.feeRange.length - 1] | number:'1.0-0' }} sat/vB + + + - + + Total fees diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 5f09e0267..9c5c338c0 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -13,10 +13,12 @@
- ~{{ projectedBlock.medianFee | number:feeRounding }} sat/vB + ~
- {{ projectedBlock.feeRange[0] | number:feeRounding }} - {{ projectedBlock.feeRange[projectedBlock.feeRange.length - 1] | number:feeRounding }} sat/vB + + - +
diff --git a/frontend/src/app/components/rbf-timeline/rbf-timeline.component.html b/frontend/src/app/components/rbf-timeline/rbf-timeline.component.html index e9d531cb8..5af1c7a0b 100644 --- a/frontend/src/app/components/rbf-timeline/rbf-timeline.component.html +++ b/frontend/src/app/components/rbf-timeline/rbf-timeline.component.html @@ -31,7 +31,7 @@ >
- {{ cell.replacement.tx.fee / (cell.replacement.tx.vsize) | feeRounding }} sat/vB +
diff --git a/frontend/src/app/components/transaction/transaction-preview.component.html b/frontend/src/app/components/transaction/transaction-preview.component.html index e3a49d9b6..679138b14 100644 --- a/frontend/src/app/components/transaction/transaction-preview.component.html +++ b/frontend/src/app/components/transaction/transaction-preview.component.html @@ -33,7 +33,7 @@

- {{ tx.feePerVsize | feeRounding }} sat/vB +

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 216114cd0..5c2457c02 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -150,7 +150,7 @@ - {{ cpfpTx.fee / (cpfpTx.weight / 4) | feeRounding }} sat/vB + @@ -161,7 +161,7 @@ - {{ cpfpInfo.bestDescendant.fee / (cpfpInfo.bestDescendant.weight / 4) | feeRounding }} sat/vB + @@ -172,7 +172,7 @@ - {{ cpfpTx.fee / (cpfpTx.weight / 4) | feeRounding }} sat/vB + @@ -475,7 +475,7 @@ Fee rate - {{ tx.feePerVsize | feeRounding }} sat/vB +   @@ -486,7 +486,7 @@ Effective fee rate
- {{ tx.effectiveFeePerVsize | feeRounding }} sat/vB + diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index c509a799d..a758f3c94 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -290,8 +290,8 @@
- {{ tx.fee / (tx.weight / 4) | feeRounding }} sat/vB  – {{ tx.fee | number }} +  – {{ tx.fee | number }} sat
Show more inputs to reveal fee data
diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index e5504c84a..e7c17d87a 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -132,7 +132,7 @@ Confidential - {{ transaction.fee / transaction.vsize | feeRounding }} sat/vB + @@ -188,7 +188,7 @@
Minimum fee
Purging

- < {{ mempoolInfoData.value.memPoolInfo.mempoolminfee * 100000 | feeRounding }} sat/vB + <

diff --git a/frontend/src/app/shared/components/fee-rate/fee-rate.component.html b/frontend/src/app/shared/components/fee-rate/fee-rate.component.html index 3b6ecc75e..bd684369c 100644 --- a/frontend/src/app/shared/components/fee-rate/fee-rate.component.html +++ b/frontend/src/app/shared/components/fee-rate/fee-rate.component.html @@ -1,4 +1,4 @@ - {{ fee / (weight / 4) | feeRounding:rounding }} sat/vB - {{ fee / weight | feeRounding:rounding }} sat/WU + {{ fee / (weight / 4) | feeRounding:rounding }} sat/vB + {{ fee / weight | feeRounding:rounding }} sat/WU \ No newline at end of file diff --git a/frontend/src/app/shared/components/fee-rate/fee-rate.component.ts b/frontend/src/app/shared/components/fee-rate/fee-rate.component.ts index f48686ad5..4d65ef0c2 100644 --- a/frontend/src/app/shared/components/fee-rate/fee-rate.component.ts +++ b/frontend/src/app/shared/components/fee-rate/fee-rate.component.ts @@ -13,6 +13,7 @@ export class FeeRateComponent implements OnInit { @Input() rounding: string = null; @Input() showUnit: boolean = true; @Input() unitClass: string = 'symbol'; + @Input() unitStyle: any; rateUnits$: Observable;