Fixes to the Wallet UI (#3787)
* Correct number of transactions for contracts * Remove daily limit info if set to 0 * Hide tx count for contracts
This commit is contained in:
parent
6655e7e3c0
commit
b9c04fcd00
@ -31,12 +31,14 @@ export default class Header extends Component {
|
||||
account: PropTypes.object,
|
||||
balance: PropTypes.object,
|
||||
className: PropTypes.string,
|
||||
children: PropTypes.node
|
||||
children: PropTypes.node,
|
||||
isContract: PropTypes.bool
|
||||
};
|
||||
|
||||
static defaultProps = {
|
||||
className: '',
|
||||
children: null
|
||||
children: null,
|
||||
isContract: false
|
||||
};
|
||||
|
||||
render () {
|
||||
@ -88,9 +90,9 @@ export default class Header extends Component {
|
||||
}
|
||||
|
||||
renderTxCount () {
|
||||
const { balance } = this.props;
|
||||
const { balance, isContract } = this.props;
|
||||
|
||||
if (!balance) {
|
||||
if (!balance || isContract) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@ -134,6 +134,7 @@ class Contract extends Component {
|
||||
<Header
|
||||
account={ account }
|
||||
balance={ balance }
|
||||
isContract
|
||||
/>
|
||||
|
||||
<Queries
|
||||
|
@ -127,6 +127,7 @@ class Wallet extends Component {
|
||||
className={ styles.header }
|
||||
account={ wallet }
|
||||
balance={ balance }
|
||||
isContract
|
||||
>
|
||||
{ this.renderInfos() }
|
||||
</Header>
|
||||
@ -152,7 +153,13 @@ class Wallet extends Component {
|
||||
return null;
|
||||
}
|
||||
|
||||
const limit = api.util.fromWei(dailylimit.limit).toFormat(3);
|
||||
const _limit = api.util.fromWei(dailylimit.limit);
|
||||
|
||||
if (_limit.equals(0)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const limit = _limit.toFormat(3);
|
||||
const spent = api.util.fromWei(dailylimit.spent).toFormat(3);
|
||||
const date = moment(dailylimit.last.toNumber() * 24 * 3600 * 1000);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user