Browse Source

tx history self to send flag, compress vout amount = interest claimed into 1 row

v0.25
pbca26 7 years ago
parent
commit
ef704307eb
  1. 10
      react/src/components/dashboard/walletsData/walletsData.render.js
  2. 9
      react/src/components/dashboard/walletsData/walletsData.scss
  3. 1
      react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js

10
react/src/components/dashboard/walletsData/walletsData.render.js

@ -152,6 +152,12 @@ export const TxTypeRender = function(category) {
<i className="icon fa-meh-o"></i> <span>{ translate('DASHBOARD.UNKNOWN') }</span>
</span>
);
} else if (category === 'self') {
return (
<span className="label label-info self-send">
<span>self</span>
</span>
);
}
};
@ -171,7 +177,7 @@ export const TxAmountRender = function(tx) {
return (
<span>
<span data-tip={ tx.amount * _amountNegative }>
{ formatValue(tx.amount) * _amountNegative || translate('DASHBOARD.UNKNOWN') }
{ Math.abs(tx.interest) !== Math.abs(tx.amount) ? (formatValue(tx.amount) * _amountNegative || translate('DASHBOARD.UNKNOWN')) : '' }
{ tx.interest &&
<span
className="tx-interest"
@ -190,7 +196,7 @@ export const TxAmountRender = function(tx) {
return (
<span>
{ tx.amount * _amountNegative || translate('DASHBOARD.UNKNOWN') }
{ Math.abs(tx.interest) !== Math.abs(tx.amount) ? (tx.amount * _amountNegative || translate('DASHBOARD.UNKNOWN')) : '' }
{ tx.interest &&
<span
className="tx-interest"

9
react/src/components/dashboard/walletsData/walletsData.scss

@ -100,4 +100,13 @@
position: absolute;
right: 4px;
top: 3px;
}
.self-send {
background-color: #00bcd4;
border-color: #00bcd4;
font-size: 13px;
width: 44px;
display: block;
margin: 0 auto;
}

1
react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js

@ -190,7 +190,6 @@ const WalletsTxInfoRender = function(txInfo) {
</div>
<div className="modal-footer">
{ this.state.txDetails &&
this.props.ActiveCoin.coin !== 'CHIPS' &&
explorerList[this.props.ActiveCoin.coin] &&
<button
type="button"

Loading…
Cancel
Save