diff --git a/react/src/components/dashboard/navbar.js b/react/src/components/dashboard/navbar.js index 58f87f4..18f1779 100644 --- a/react/src/components/dashboard/navbar.js +++ b/react/src/components/dashboard/navbar.js @@ -100,7 +100,8 @@ class Navbar extends React.Component {
  • + className={ this.props.Dashboard.activeSection === 'jumblr' ? 'active nav-top-menu' : 'nav-top-menu' } + style={{ display: 'none' }}> this.dashboardChangeSection('jumblr') }> Jumblr diff --git a/react/src/components/dashboard/receiveCoin.js b/react/src/components/dashboard/receiveCoin.js index df40154..78bd0b5 100644 --- a/react/src/components/dashboard/receiveCoin.js +++ b/react/src/components/dashboard/receiveCoin.js @@ -78,11 +78,11 @@ class ReceiveCoin extends React.Component { let address = this.props.addresses.public[i]; if (this.props.mode === 'basilisk' && - address.amount === 'N/A') { + (address.amount === 'N/A' || address.amount === 0)) { address.amount = this.props.cache && this.props.cache[this.props.coin][address.address] && this.props.cache[this.props.coin][address.address].getbalance.data && this.props.cache[this.props.coin][address.address].getbalance.data.balance ? this.props.cache[this.props.coin][address.address].getbalance.data.balance : 'N/A'; } if (this.props.mode === 'basilisk' && - (address.interest === 'N/A' || !address.interest)) { + (address.interest === 'N/A' || address.interest === 0 || !address.interest)) { address.interest = this.props.cache && this.props.cache[this.props.coin][address.address] && this.props.cache[this.props.coin][address.address].getbalance.data && this.props.cache[this.props.coin][address.address].getbalance.data.interest ? this.props.cache[this.props.coin][address.address].getbalance.data.interest : 'N/A'; } diff --git a/react/src/components/dashboard/sendCoin.js b/react/src/components/dashboard/sendCoin.js index 72edc9f..db0c873 100644 --- a/react/src/components/dashboard/sendCoin.js +++ b/react/src/components/dashboard/sendCoin.js @@ -235,13 +235,13 @@ class SendCoin extends React.Component { if (this.props.ActiveCoin.mode === 'basilisk') { _amount = this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address.address] && this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address.address].getbalance.data && this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address.address].getbalance.data.balance ? this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address.address].getbalance.data.balance : 'N/A'; } + console.log('mainAddressAmount ' + address.address, _amount); if (_amount !== 'N/A') { items.push(
  • + className={ _amount <= 0 ? 'hide' : '' }> this.updateAddressSelection(address.address, type, _amount) }> [ { _amount } { this.props.ActiveCoin.coin } ]  { address.address } @@ -265,7 +265,7 @@ class SendCoin extends React.Component { this.props.ActiveCoin.mode === 'basilisk') { _amount = this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][this.state.sendFrom].getbalance.data && this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][this.state.sendFrom].getbalance.data.balance ? this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][this.state.sendFrom].getbalance.data.balance : 'N/A'; } else { - _amount = this.state._sendFromAmount; + _amount = this.state.sendFromAmount; } return (