diff --git a/react/src/actions/actions/nativeDashboardUpdate.js b/react/src/actions/actions/nativeDashboardUpdate.js index 9c9fa28..fae99b5 100644 --- a/react/src/actions/actions/nativeDashboardUpdate.js +++ b/react/src/actions/actions/nativeDashboardUpdate.js @@ -97,8 +97,6 @@ export function getDashboardUpdateState(json, coin, fakeResponse) { } } - console.warn(_tbalance); - json.result.z_gettotalbalance.result.transparent = _tbalance.toFixed(8); json.result.z_gettotalbalance.result.total = json.result.z_gettotalbalance.result.transparent + Number(json.result.z_gettotalbalance.result.interest) + Number(json.result.z_gettotalbalance.result.private); diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js index ab8440e..a9ce840 100644 --- a/react/src/components/dashboard/receiveCoin/receiveCoin.js +++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js @@ -23,6 +23,7 @@ class ReceiveCoin extends React.Component { openDropMenu: false, hideZeroAdresses: false, toggledAddressMenu: null, + toggleIsMine: false, }; this.openDropMenu = this.openDropMenu.bind(this); this.handleClickOutside = this.handleClickOutside.bind(this); @@ -30,6 +31,7 @@ class ReceiveCoin extends React.Component { this.checkTotalBalance = this.checkTotalBalance.bind(this); this.ReceiveCoinTableRender = _ReceiveCoinTableRender.bind(this); this.toggleAddressMenu = this.toggleAddressMenu.bind(this); + this.toggleIsMine = this.toggleIsMine.bind(this); } toggleAddressMenu(address) { @@ -119,6 +121,12 @@ class ReceiveCoin extends React.Component { })); } + toggleIsMine() { + this.setState(Object.assign({}, this.state, { + toggleIsMine: !this.state.toggleIsMine, + })); + } + checkTotalBalance() { let _balance = '0'; @@ -147,10 +155,20 @@ class ReceiveCoin extends React.Component { AddressItemRender.call(this, address, type) ); } + + if (!this.state.toggleIsMine && + !address.canspend) { + items.pop(); + } } else { items.push( AddressItemRender.call(this, address, type) ); + + if (!this.state.toggleIsMine && + !address.canspend) { + items.pop(); + } } } diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js index 8c05df2..9c5a8a7 100644 --- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js +++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js @@ -45,7 +45,7 @@ export const AddressItemRender = function(address, type) { { this.renderAddressActions(address.address, type) }