diff --git a/assets/mainWindow/js/init.js b/assets/mainWindow/js/init.js index b7f1414..612ba1d 100644 --- a/assets/mainWindow/js/init.js +++ b/assets/mainWindow/js/init.js @@ -3,6 +3,11 @@ $(document).ready(function() { var window = remote.getCurrentWindow(); var appConf = remote.getCurrentWindow().appConfig; + if (!appConf.experimentalFeatures) { + $('#normalStartBtn').hide(); + $('.dropdown-menu').css('right', '34.8%'); + } + $('#pulse').jRoll({ radius: 100, animation: 'pulse' diff --git a/react/src/components/dashboard/walletsBalance/walletsBalance.js b/react/src/components/dashboard/walletsBalance/walletsBalance.js index 3a37d8f..7508115 100755 --- a/react/src/components/dashboard/walletsBalance/walletsBalance.js +++ b/react/src/components/dashboard/walletsBalance/walletsBalance.js @@ -15,15 +15,36 @@ class WalletsBalance extends React.Component { super(); this.state = { currentAddress: null, + isExplorerData: false, }; this.isFullySynced = this.isFullySynced.bind(this); this.refreshBalance = this.refreshBalance.bind(this); } componentWillReceiveProps(props) { - if (!this.state.currentAddress && - this.props.ActiveCoin.activeAddress) { + if (this.props.ActiveCoin.activeAddress) { + const _mode = this.props.ActiveCoin.mode; + let _isExplorerData = false; + + if (_mode === 'basilisk') { + if (this.props.ActiveCoin.cache) { + const _cache = this.props.ActiveCoin.cache; + const _coin = this.props.ActiveCoin.coin; + const _address = this.props.ActiveCoin.activeAddress; + + if (_address && + _cache[_coin] && + _cache[_coin][_address] && + _cache[_coin][_address].getbalance && + _cache[_coin][_address].getbalance.data && + _cache[_coin][_address].getbalance.data.source) { + _isExplorerData = true; + } + } + } + this.setState(Object.assign({}, this.state, { + isExplorerData: _isExplorerData, currentAddress: this.props.ActiveCoin.activeAddress, })); } diff --git a/react/src/components/dashboard/walletsBalance/walletsBalance.render.js b/react/src/components/dashboard/walletsBalance/walletsBalance.render.js index 39b9f63..1513a6b 100644 --- a/react/src/components/dashboard/walletsBalance/walletsBalance.render.js +++ b/react/src/components/dashboard/walletsBalance/walletsBalance.render.js @@ -108,6 +108,8 @@ const WalletsBalanceRender = function() { + +
Notice: balance is fetched from KMD explorer as a fallback measure!
); }; diff --git a/react/src/components/dashboard/walletsData/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js index c0975ec..747ad58 100644 --- a/react/src/components/dashboard/walletsData/walletsData.js +++ b/react/src/components/dashboard/walletsData/walletsData.js @@ -54,6 +54,7 @@ class WalletsData extends React.Component { searchTerm: null, coin: null, txhistory: null, + isExplorerData: false, }; this.toggleBasiliskActionsMenu = this.toggleBasiliskActionsMenu.bind(this); @@ -344,6 +345,7 @@ class WalletsData extends React.Component { (this.state.coin && this.state.coin !== this.props.ActiveCoin.coin) || (JSON.stringify(this.props.ActiveCoin.txhistory) !== JSON.stringify(this.state.txhistory))) {*/ _stateChange = Object.assign({}, _stateChange, { + isExplorerData: this.props.ActiveCoin.txhistory[0].source ? true : false, itemsList: this.props.ActiveCoin.txhistory, filteredItemsList: this.filterTransactions(this.props.ActiveCoin.txhistory, this.state.searchTerm), txhistory: this.props.ActiveCoin.txhistory, diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js index 6aa4c8e..5ef4129 100644 --- a/react/src/components/dashboard/walletsData/walletsData.render.js +++ b/react/src/components/dashboard/walletsData/walletsData.render.js @@ -249,6 +249,7 @@ export const WalletsDataRender = function() {

{ translate('INDEX.TRANSACTION_HISTORY') }

+
Notice: transactions list is fetched from KMD explorer as a fallback measure!
{ this.shouldDisplayAddressList() &&