diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.html b/frontend/src/app/bisq/bisq-block/bisq-block.component.html index 2db1ed7d0..9a78d47af 100644 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.html +++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.html @@ -22,7 +22,7 @@ {{ block.time | date:'yyyy-MM-dd HH:mm' }}
- () + ()
diff --git a/frontend/src/app/bisq/bisq-market/bisq-market.component.scss b/frontend/src/app/bisq/bisq-market/bisq-market.component.scss index 8eff75a9d..232405ff4 100644 --- a/frontend/src/app/bisq/bisq-market/bisq-market.component.scss +++ b/frontend/src/app/bisq/bisq-market/bisq-market.component.scss @@ -32,11 +32,6 @@ } } -.symbol { - color: #ffffff66; - font-size: 11px; -} - .table-container { overflow: scroll; -ms-overflow-style: none; diff --git a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss b/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss index 45807f7e4..2b11649cf 100644 --- a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss +++ b/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss @@ -1,9 +1,3 @@ - -.symbol { - color: #ffffff66; - font-size: 11px; -} - .table-container { overflow: scroll; -ms-overflow-style: none; 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 75df75a32..51e06d7c8 100644 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html +++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html @@ -30,7 +30,7 @@ {{ bisqTx.time | date:'yyyy-MM-dd HH:mm' }}
- () + ()
diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index b2dd5dc49..ba134f88a 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -23,17 +23,17 @@ {{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}
- () + ()
Size - {{ block.size | bytes: 2 }} + Weight - {{ block.weight | wuBytes: 2 }} + diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index ee46d0832..4584974e2 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -12,7 +12,7 @@
{{ block.feeRange[1] | number:'1.0-0' }} - {{ block.feeRange[block.feeRange.length - 1] | number:'1.0-0' }} sat/vB
-
‎{{ block.size | bytes: 2 }}
+
‎
{{ i }} transaction diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.html b/frontend/src/app/components/latest-blocks/latest-blocks.component.html index 59239d55d..2bae5efaf 100644 --- a/frontend/src/app/components/latest-blocks/latest-blocks.component.html +++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.html @@ -21,7 +21,7 @@
-
{{ block.size | bytes: 2 }}
+
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 7e5a02190..dfafb9241 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -18,7 +18,7 @@ Fee span - {{ mempoolBlock.feeRange[0] | number:'1.0-0' }} - {{ mempoolBlock.feeRange[mempoolBlock.feeRange.length - 1] | number:'1.0-0' }} sat/vB + {{ mempoolBlock.feeRange[0] | number:'1.0-0' }} - {{ mempoolBlock.feeRange[mempoolBlock.feeRange.length - 1] | number:'1.0-0' }} sat/vB Total fees @@ -33,7 +33,7 @@
-
{{ mempoolBlock.blockSize | bytes: 2 }}
+
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 cd482a14f..6c6246103 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -10,7 +10,7 @@
{{ projectedBlock.feeRange[0] | number:'1.0-0' }} - {{ projectedBlock.feeRange[projectedBlock.feeRange.length - 1] | number:'1.0-0' }} sat/vB
-
‎{{ projectedBlock.blockSize | bytes: 2 }}
+
‎
{{ i }} transaction diff --git a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts index 4bdcd01cb..46d11d6f1 100644 --- a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts +++ b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts @@ -71,7 +71,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges { offset: this.offsetX, }, axisY: { - labelInterpolationFnc: (value: number): any => this.vbytesPipe.transform(value, 2), + labelInterpolationFnc: (value: number): any => this.vbytesPipe.transform(value, 2, 'vB', 'MvB', true), offset: this.showLegend ? 160 : 60, }, plugins: this.inverted ? [Chartist.plugins.ctTargetLine({ value: 1000000 })] : [] diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index d0c053821..00a645379 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -50,7 +50,7 @@ {{ tx.status.block_time * 1000 | date:'yyyy-MM-dd HH:mm' }}
- () + ()
@@ -115,10 +115,10 @@ -  () +  () -  () +  () @@ -161,11 +161,11 @@ Descendant - {{ cpfpInfo.bestDescendant.txid | shortenString : 10 }} + {{ cpfpInfo.bestDescendant.txid | shortenString : 8 }} {{ cpfpInfo.bestDescendant.txid }} - {{ cpfpInfo.bestDescendant.weight / 4 | vbytes: 2 }} + {{ cpfpInfo.bestDescendant.fee / (cpfpInfo.bestDescendant.weight / 4) | number : '1.1-1' }} sat/vB @@ -174,11 +174,11 @@ Ancestor - {{ cpfpTx.txid | shortenString : 10 }} + {{ cpfpTx.txid | shortenString : 8 }} {{ cpfpTx.txid }} - {{ cpfpTx.weight / 4 | vbytes: 2 }} + {{ cpfpTx.fee / (cpfpTx.weight / 4) | number : '1.1-1' }} sat/vB @@ -204,15 +204,15 @@ Size - {{ tx.size | bytes: 2 }} + Virtual size - {{ tx.weight / 4 | vbytes: 2 }} + Weight - {{ tx.weight | wuBytes: 2 }} + @@ -342,11 +342,13 @@ Effective fee rate - {{ tx.effectiveFeePerVsize | number : '1.1-1' }} sat/vB - - - - +
+ {{ tx.effectiveFeePerVsize | number : '1.1-1' }} sat/vB + + + +
+ diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss index 416cbbb13..f007735a5 100644 --- a/frontend/src/app/components/transaction/transaction.component.scss +++ b/frontend/src/app/components/transaction/transaction.component.scss @@ -110,6 +110,10 @@ h1{ .table { tr td { + padding: 0.75rem 0.5rem; + @media (min-width: 576px) { + padding: 0.75rem 0.75rem; + } &:last-child { text-align: right; @media (min-width: 768px) { @@ -120,4 +124,11 @@ h1{ display: block; } } +} + +.effective-fee-container{ + display: block; + @media (min-width: 768px){ + display: inline-block; + } } \ No newline at end of file diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index e8b8991b2..f230767c1 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -88,7 +88,7 @@
 
-
{{ block.size | bytes: 2 }}
+
@@ -114,7 +114,7 @@ {{ transaction.txid | shortenString : 10 }} - {{ transaction.fee / transaction.vsize | number : '1.1-1' }} sat/vB + {{ transaction.fee / transaction.vsize | number : '1.1-1' }} sat/vB @@ -175,7 +175,7 @@
 
-
{{ mempoolInfoData.value.memPoolInfo.usage | bytes }} / {{ mempoolInfoData.value.memPoolInfo.maxmempool | bytes }}
+
/
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 3b483e20d..fdb7c62bb 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -3,12 +3,6 @@ @media (min-width: 992px) { padding-bottom: 0px; } - .table { - .fiat{ - color: #ffffff66; - font-size: 10px; - } - } } .card { diff --git a/frontend/src/app/shared/pipes/bytes-pipe/bytes.pipe.ts b/frontend/src/app/shared/pipes/bytes-pipe/bytes.pipe.ts index b961669fc..f8ea4d4b6 100644 --- a/frontend/src/app/shared/pipes/bytes-pipe/bytes.pipe.ts +++ b/frontend/src/app/shared/pipes/bytes-pipe/bytes.pipe.ts @@ -53,7 +53,7 @@ export class BytesPipe implements PipeTransform { } static formatResult(result: number, unit: string): string { - return `${result} ${unit}`; + return `${result} ${unit}`; } static calculateResult(format: { max: number, prev?: ByteUnit }, bytes: number) { diff --git a/frontend/src/app/shared/pipes/bytes-pipe/vbytes.pipe.ts b/frontend/src/app/shared/pipes/bytes-pipe/vbytes.pipe.ts index a693631c8..b88791851 100644 --- a/frontend/src/app/shared/pipes/bytes-pipe/vbytes.pipe.ts +++ b/frontend/src/app/shared/pipes/bytes-pipe/vbytes.pipe.ts @@ -17,7 +17,7 @@ export class VbytesPipe implements PipeTransform { 'TvB': {max: Number.MAX_SAFE_INTEGER, prev: 'GvB'} }; - transform(input: any, decimal: number = 0, from: ByteUnit = 'vB', to?: ByteUnit): any { + transform(input: any, decimal: number = 0, from: ByteUnit = 'vB', to?: ByteUnit, plainText?: boolean): any { if (!(isNumberFinite(input) && isNumberFinite(decimal) && @@ -38,7 +38,7 @@ export class VbytesPipe implements PipeTransform { const result = toDecimal(VbytesPipe.calculateResult(format, bytes), decimal); - return VbytesPipe.formatResult(result, to); + return VbytesPipe.formatResult(result, to, plainText); } for (const key in VbytesPipe.formats) { @@ -47,13 +47,16 @@ export class VbytesPipe implements PipeTransform { const result = toDecimal(VbytesPipe.calculateResult(format, bytes), decimal); - return VbytesPipe.formatResult(result, key); + return VbytesPipe.formatResult(result, key, plainText); } } } - static formatResult(result: number, unit: string): string { - return `${result} ${unit}`; + static formatResult(result: number, unit: string, plainText: boolean): string { + if(plainText){ + return `${result} ${unit}`; + } + return `${result} ${unit}`; } static calculateResult(format: { max: number, prev?: ByteUnit }, bytes: number) { diff --git a/frontend/src/app/shared/pipes/bytes-pipe/wubytes.pipe.ts b/frontend/src/app/shared/pipes/bytes-pipe/wubytes.pipe.ts index ebb673d07..397873df2 100644 --- a/frontend/src/app/shared/pipes/bytes-pipe/wubytes.pipe.ts +++ b/frontend/src/app/shared/pipes/bytes-pipe/wubytes.pipe.ts @@ -53,7 +53,7 @@ export class WuBytesPipe implements PipeTransform { } static formatResult(result: number, unit: string): string { - return `${result} ${unit}`; + return `${result} ${unit}`; } static calculateResult(format: { max: number, prev?: ByteUnit }, bytes: number) { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index 733cf12d1..0c76ad6b1 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -168,7 +168,20 @@ body { .symbol { color: #ffffff66; - font-size: 11px; + font-size: 12px; +} + +.progress-text { + span { + color: #fff !important; + } +} + +.block-size, .blocks-container { + span { + font-size: 16px; + color: #fff !important; + } } .break-all {