Browse Source

minor frontend tweaks

fix-133-memory-crash
Dan Janosik 6 years ago
parent
commit
5b68ee68b0
No known key found for this signature in database GPG Key ID: C6F8CE9FFDB2CED2
  1. 12
      views/address.pug
  2. 4
      views/includes/block-content.pug
  3. 2
      views/includes/transaction-io-details.pug
  4. 19
      views/transaction.pug

12
views/address.pug

@ -159,7 +159,7 @@ block content
div(class="row")
div(class="summary-split-table-label") Balance
div(class="summary-split-table-content monospace")
span(class="text-danger") Conflicted ElectrumX Results
span(class="text-warning") Conflicted ElectrumX Results
each item in balance.conflictedResults
- var currencyValue = item.confirmed / coinConfig.baseCurrencyUnit.multiplier;
@ -207,7 +207,7 @@ block content
if (flags[index])
i(class="fas fa-check text-success")
else
i(class="fas fa-times text-danger")
i(class="fas fa-times text-warning")
if (false)
div(class="card mb-3 shadow-sm")
@ -233,7 +233,7 @@ block content
if (flag)
i(class="fas fa-check text-success")
else
i(class="fas fa-times text-danger")
i(class="fas fa-times text-warning")
div(class="card mb-3 shadow-sm")
div(class="card-header clearfix")
@ -366,16 +366,16 @@ block content
div(id="tab-json", class="tab-pane", role="tabpanel")
div(class="highlight")
h4 Node.ValidateAddress
h4 validateaddress
pre
code(class="json bg-light", data-lang="json") #{JSON.stringify(result.validateaddress, null, 4)}
if (config.electrumXServers && config.electrumXServers.length > 0)
h4 Electrum.Balance
h4 ElectrumX-balance
pre
code(class="json bg-light", data-lang="json") #{JSON.stringify(electrumBalance, null, 4)}
h4 Electrum.History
h4 ElectrumX-history
pre
code(class="json bg-light", data-lang="json") #{JSON.stringify(electrumHistory, null, 4)}

4
views/includes/block-content.pug

@ -81,7 +81,7 @@ div(class="tab-content")
if (coinbaseTxTotalOutputValue < blockRewardMax)
div(class="row")
div(class="summary-split-table-label") Fees Destroyed
div(class="summary-split-table-content monospace text-danger")
div(class="summary-split-table-content monospace text-warning")
- var currencyValue = new Decimal(blockRewardMax).minus(coinbaseTxTotalOutputValue);
include ./value-display.pug
@ -112,7 +112,7 @@ div(class="tab-content")
div(class="summary-split-table-label") Confirmations
div(class="summary-split-table-content monospace")
if (result.getblock.confirmations < 6)
span(class="font-weight-bold text-danger") #{result.getblock.confirmations.toLocaleString()}
span(class="font-weight-bold text-warning") #{result.getblock.confirmations.toLocaleString()}
a(data-toggle="tooltip", title="Fewer than 6 confirmations is generally considered 'unsettled' for high-value transactions. The applicability of this guidance may vary.")
i(class="fas fa-unlock-alt")
else

2
views/includes/transaction-io-details.pug

@ -177,7 +177,7 @@ div(class="row monospace")
else
span(class="monospace")
span(class="text-danger font-weight-bold") Unable to decode output:
span(class="text-warning font-weight-bold") Unable to decode output:
br
span(class="font-weight-bold") type:
span #{vout.scriptPubKey.type}

19
views/transaction.pug

@ -76,7 +76,7 @@ block content
div(class="row")
div(class="summary-table-label") Status
div(class="summary-table-content monospace")
span(class="text-danger") Unconfirmed
span(class="text-warning") Unconfirmed
if (isTxConfirmed)
div(class="row")
@ -103,13 +103,14 @@ block content
div(class="row")
div(class="summary-table-label") Size
div(class="summary-table-content monospace")
span #{result.getrawtransaction.size.toLocaleString()} B
if (result.getrawtransaction.vsize != result.getrawtransaction.size)
span #{result.getrawtransaction.vsize.toLocaleString()}
span(title="Virtual Bytes", data-toggle="tooltip") vB
br
span(class="text-muted")
span (
span(title="virtual size", data-toggle="tooltip") vsize
span : #{result.getrawtransaction.vsize.toLocaleString()} VB)
span(class="text-muted") (#{result.getrawtransaction.size.toLocaleString()} B)
else
span #{result.getrawtransaction.size.toLocaleString()} B
if (result.getrawtransaction.locktime > 0)
div(class="row")
@ -131,7 +132,7 @@ block content
div(class="summary-table-label") Confirmations
div(class="summary-table-content monospace")
if (!result.getrawtransaction.confirmations || result.getrawtransaction.confirmations == 0)
strong(class="text-danger") 0 (unconfirmed)
strong(class="text-warning") 0 (unconfirmed)
else if (result.getrawtransaction.confirmations < 6)
strong(class="text-warning") #{result.getrawtransaction.confirmations}
@ -192,10 +193,10 @@ block content
div(class="summary-table-label") Fee Rate
div(class="summary-table-content monospace")
if (result.getrawtransaction.vsize != result.getrawtransaction.size)
span #{utils.addThousandsSeparators(new DecimalRounded(totalInputValue).minus(totalOutputValue).dividedBy(result.getrawtransaction.vsize).times(100000000))} sat/VB
span #{utils.addThousandsSeparators(new DecimalRounded(totalInputValue).minus(totalOutputValue).dividedBy(result.getrawtransaction.vsize).times(100000000))} sat/vB
br
span #{utils.addThousandsSeparators(new DecimalRounded(totalInputValue).minus(totalOutputValue).dividedBy(result.getrawtransaction.size).times(100000000))} sat/B
span(class="text-muted") (#{utils.addThousandsSeparators(new DecimalRounded(totalInputValue).minus(totalOutputValue).dividedBy(result.getrawtransaction.size).times(100000000))} sat/B)
if (result.getrawtransaction.vin[0].coinbase)

Loading…
Cancel
Save