diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.html b/frontend/src/app/bisq/bisq-address/bisq-address.component.html index e741452fb..3a66b68b3 100644 --- a/frontend/src/app/bisq/bisq-address/bisq-address.component.html +++ b/frontend/src/app/bisq/bisq-address/bisq-address.component.html @@ -2,10 +2,10 @@

Address

- {{ addressString | shortenString : 24 }} - {{ addressString }} + + + -
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 257281c7a..0c53bceab 100644 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html +++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html @@ -6,12 +6,12 @@

Transaction

- - - {{ bisqTx.id | shortenString : 24 }} - {{ bisqTx.id }} + + + + + -
diff --git a/frontend/src/app/components/address/address-preview.component.html b/frontend/src/app/components/address/address-preview.component.html index ede06247c..5ff9616af 100644 --- a/frontend/src/app/components/address/address-preview.component.html +++ b/frontend/src/app/components/address/address-preview.component.html @@ -6,17 +6,18 @@
-

{{addressString.slice(0,-4)}}{{addressString.slice(-4)}}

+

- + diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index ed3b1bd7e..d6c141efa 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -3,10 +3,10 @@

Address

@@ -21,10 +21,13 @@ - + diff --git a/frontend/src/app/components/asset/asset.component.html b/frontend/src/app/components/asset/asset.component.html index 800e0a8f6..1608f2355 100644 --- a/frontend/src/app/components/asset/asset.component.html +++ b/frontend/src/app/components/asset/asset.component.html @@ -3,10 +3,10 @@

Asset

diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss index 7f44ade2c..f901f31a3 100644 --- a/frontend/src/app/components/master-page-preview/master-page-preview.component.scss +++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.scss @@ -64,26 +64,6 @@ white-space: nowrap; margin: 0; display: inline-block; - - &.truncated { - text-overflow: unset; - display: flex; - flex-direction: row; - align-items: baseline; - - .first { - flex-grow: 1; - flex-shrink: 1; - overflow: hidden; - text-overflow: ellipsis; - margin-right: -2px; - } - - .last-four { - flex-shrink: 0; - flex-grow: 0; - } - } } ::ng-deep .title-wrapper { diff --git a/frontend/src/app/components/transaction/transaction-preview.component.html b/frontend/src/app/components/transaction/transaction-preview.component.html index 8feb980a3..1043a7d30 100644 --- a/frontend/src/app/components/transaction/transaction-preview.component.html +++ b/frontend/src/app/components/transaction/transaction-preview.component.html @@ -4,7 +4,7 @@
-

{{txId.slice(0,-4)}}{{txId.slice(-4)}}

+

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index b6ed2868f..8c0cfe967 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -4,20 +4,19 @@

Transaction

- - - {{ txId | shortenString : 24 }} - {{ txId }} + + + + + -
@@ -144,12 +143,12 @@

CPFP

-
-
Unconfidential - {{ addressInfo.unconfidential | shortenString : 14 }} - {{ addressInfo.unconfidential }} - + + + +
Unconfidential - {{ addressInfo.unconfidential | shortenString : 14 }} - {{ addressInfo.unconfidential }} - + + + + + +
+
+
- + @@ -160,8 +159,7 @@ @@ -172,10 +170,9 @@ - @@ -186,9 +183,9 @@ - diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss index 619cac89a..6881fd14b 100644 --- a/frontend/src/app/components/transaction/transaction.component.scss +++ b/frontend/src/app/components/transaction/transaction.component.scss @@ -19,22 +19,33 @@ } } .tx-link { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: baseline; + width: 0; + max-width: 100%; + overflow: hidden; + margin-right: 0px; margin-bottom: 0px; margin-top: 8px; - display: inline-block; - width: 100%; - flex-shrink: 0; @media (min-width: 651px) { - display: flex; - width: auto; flex-grow: 1; margin-bottom: 0px; + margin-right: 1em; top: 1px; position: relative; } @media (max-width: 650px) { + width: 100%; order: 3; } + + .txid { + width: 200px; + min-width: 200px; + flex-grow: 1; + } } .td-width { @@ -188,4 +199,10 @@ margin-left: 8px; } } +} + +.cpfp-details { + .txids { + width: 60%; + } } \ No newline at end of file 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 8368a62c4..56e853f71 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -1,16 +1,14 @@
- - {{ tx.txid | shortenString : 16 }} - {{ tx.txid }} + + -
+
‎{{ tx.status.block_time * 1000 | date:'yyyy-MM-dd HH:mm' }}
-
@@ -18,7 +16,7 @@
{{ errorUnblinded }}
-
TypeTXIDTXID Virtual size Fee rate
Descendant - {{ cpfpTx.txid | shortenString : 8 }} - {{ cpfpTx.txid }} +
Descendant + - {{ cpfpInfo.bestDescendant.txid | shortenString : 8 }} - {{ cpfpInfo.bestDescendant.txid }} +
Ancestor - {{ cpfpTx.txid | shortenString : 8 }} - {{ cpfpTx.txid }} + + +
+
Coinbase (Newly Generated Coins)
{{ vin.scriptsig | hex2ascii }}
@@ -66,12 +64,8 @@ - - {{ vin.prevout.scriptpubkey_address | shortenString : 16 }} - - {{ vin.prevout.scriptpubkey_address }} - {{ vin.prevout.scriptpubkey_address | capAddress: 40: 10 }} - + + {{ vin.prevout.scriptpubkey_type?.toUpperCase() }} @@ -162,20 +156,16 @@
-
+
- - + diff --git a/frontend/src/app/lightning/channel/channel-box/channel-box.component.html b/frontend/src/app/lightning/channel/channel-box/channel-box.component.html index 47b7fa3ba..7f098ac71 100644 --- a/frontend/src/app/lightning/channel/channel-box/channel-box.component.html +++ b/frontend/src/app/lightning/channel/channel-box/channel-box.component.html @@ -2,9 +2,10 @@
diff --git a/frontend/src/app/lightning/channels-list/channels-list.component.html b/frontend/src/app/lightning/channels-list/channels-list.component.html index 5d40c9b3d..9fc92401a 100644 --- a/frontend/src/app/lightning/channels-list/channels-list.component.html +++ b/frontend/src/app/lightning/channels-list/channels-list.component.html @@ -47,9 +47,10 @@
{{ node.alias || '?' }}
- - {{ vout.scriptpubkey_address | shortenString : 16 }} - - {{ vout.scriptpubkey_address }} - {{ vout.scriptpubkey_address | capAddress: 40: 10 }} - + + +
@@ -185,13 +175,11 @@ Peg-out to - {{ vout.pegout.scriptpubkey_address | shortenString : 16 }} - {{ vout.pegout.scriptpubkey_address | shortenString : 35 }} + - {{ vout.pegout.scriptpubkey_address | shortenString : 16 }} - {{ vout.pegout.scriptpubkey_address | shortenString : 35 }} + diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.scss b/frontend/src/app/components/transactions-list/transactions-list.component.scss index 11e013e23..1e1eb5c7c 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.scss +++ b/frontend/src/app/components/transactions-list/transactions-list.component.scss @@ -1,6 +1,6 @@ .arrow-td { - width: 20px; + width: 30px; padding-top: 0; padding-bottom: 0; } @@ -45,6 +45,10 @@ } } +td.amount { + width: 32.5%; +} + .extra-info { display: none; @media (min-width: 576px) { @@ -81,6 +85,10 @@ } .tx-page-container { + display: flex; + flex-direction: row; + align-items: baseline; + white-space: nowrap; padding: 10px; margin-bottom: 10px; margin-top: 10px; @@ -130,14 +138,7 @@ h2 { margin-top: 10px; } -.addr-left { - font-family: monospace; - overflow: hidden; - text-overflow: ellipsis; - margin-right: -7px -} - -.addr-right { +.address { font-family: monospace; } @@ -146,3 +147,9 @@ h2 { font-style: italic; font-size: 12px; } + +.tx-link { + width: 0; + flex-grow: 1; + margin-right: 2em; +} \ No newline at end of file diff --git a/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html b/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html index 6262c56a7..25e9ccc1f 100644 --- a/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html +++ b/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -31,8 +31,7 @@

Peg Out

- {{ line.pegout.slice(0, -4) }} - {{ line.pegout.slice(-4) }} +

@@ -49,8 +48,7 @@

Transaction  - {{ line.txid.slice(0, 8) }}... - {{ line.txid.slice(-4) }} +

Output  #{{ line.vout + 1 }}

@@ -60,8 +58,7 @@

Confidential

- {{ line.address.slice(0, -4) }} - {{ line.address.slice(-4) }} +

diff --git a/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.scss b/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.scss index d0551f2c8..4e1efa980 100644 --- a/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.scss +++ b/frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.scss @@ -17,22 +17,5 @@ .address { width: 100%; max-width: 100%; - display: flex; - flex-direction: row; - align-items: baseline; - justify-content: flex-start; - - .first { - flex-grow: 0; - flex-shrink: 1; - overflow: hidden; - text-overflow: ellipsis; - margin-right: -2px; - } - - .last-four { - flex-shrink: 0; - flex-grow: 0; - } } } \ 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 03cd613f4..882e4f9ad 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -127,7 +127,11 @@
{{ transaction.txid | shortenString : 10 }} + + + + Confidential {{ transaction.fee / transaction.vsize | feeRounding }} sat/vB diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html index b5d472d2c..5f6b5ed5e 100644 --- a/frontend/src/app/lightning/node/node.component.html +++ b/frontend/src/app/lightning/node/node.component.html @@ -3,11 +3,11 @@ diff --git a/frontend/src/app/lightning/node/node.component.scss b/frontend/src/app/lightning/node/node.component.scss index 77b9cabb7..ad3304eaf 100644 --- a/frontend/src/app/lightning/node/node.component.scss +++ b/frontend/src/app/lightning/node/node.component.scss @@ -8,6 +8,11 @@ flex-wrap: wrap; } +.node-id { + width: 0; + flex-grow: 1; +} + .qr-wrapper { background-color: #FFF; padding: 10px;