basilisk sendcoin addr selector balance

react/src/components/dashboard/sendCoin.js

@@ -30,6 +30,8 @@ import { SocketProvider } from 'socket.io-react';
 import io from 'socket.io-client';
 const socket = io.connect('http://127.0.0.1:' + Config.agamaPort);
 
+// TODO: prevent any cache updates rather than utxo while on send coin form
+
 class SendCoin extends React.Component {
   constructor(props) {
     super(props);
@@ -159,7 +161,9 @@ class SendCoin extends React.Component {
         this.props.ActiveCoin.addresses['public'].length) {
       for (let i = 0; i < this.props.ActiveCoin.addresses['public'].length; i++) {
         if (this.props.ActiveCoin.addresses['public'][i].address === address) {
-          return this.props.ActiveCoin.addresses['public'][i].amount;
+          if (this.props.ActiveCoin.addresses['public'][i].amount !== 'N/A') {
+            return this.props.ActiveCoin.addresses['public'][i].amount;
+          }
         }
       }
     } else {
@@ -181,11 +185,24 @@ class SendCoin extends React.Component {
           </li>
         );
       } else {
-        return this.props.ActiveCoin.addresses[type].map((address) =>
-          <li data-original-index="2" key={address.address} className={address.amount <= 0 ? 'hide' : ''}>
-            <a tabIndex="0" data-tokens="null" onClick={() => this.updateAddressSelection(address.address, type, address.amount)}><i className={type === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash'}></i>  <span className="text">[ {address.amount} {this.props.ActiveCoin.coin} ]  {address.address}</span><span className="glyphicon glyphicon-ok check-mark"></span></a>
-          </li>
-        );
+        let items = [];
+
+        for (let i = 0; i < this.props.ActiveCoin.addresses[type].length; i++) {
+          const address = this.props.ActiveCoin.addresses[type][i];
+          let _amount = address.amount;
+
+          if (this.props.ActiveCoin.mode === 'basilisk') {
+            _amount = 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';
+          }
+
+          items.push(
+            <li data-original-index="2" key={address.address} className={address.amount <= 0 ? 'hide' : ''}>
+              <a tabIndex="0" data-tokens="null" onClick={() => this.updateAddressSelection(address.address, type, _amount)}><i className={type === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash'}></i>  <span className="text">[ {_amount} {this.props.ActiveCoin.coin} ]  {address.address}</span><span className="glyphicon glyphicon-ok check-mark"></span></a>
+            </li>
+          );
+        }
+
+        return items;
       }
     } else {
       return null;
@@ -240,10 +257,16 @@ class SendCoin extends React.Component {
   }
 
   updateAddressSelection(address, type, amount) {
+    let _sendFromAmount = amount ? amount : this.props.ActiveCoin.addresses[type][address].amount;
+
+    if (this.props.ActiveCoin.mode === 'basilisk') {
+      _sendFromAmount = this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address].getbalance.data && this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address].getbalance.data.balance ? this.props.ActiveCoin.cache[this.props.ActiveCoin.coin][address].getbalance.data.balance : 'N/A';
+    }
+
     this.setState(Object.assign({}, this.state, {
       sendFrom: address,
       addressType: type,
-      sendFromAmount: amount ? amount : this.props.ActiveCoin.addresses[type][address].amount,
+      sendFromAmount: _sendFromAmount,
       addressSelectorOpen: !this.state.addressSelectorOpen,
     }));
   }
@@ -701,7 +724,7 @@ class SendCoin extends React.Component {
                       <label className="padding-top-3" htmlFor="edexcoin_send_sig" onClick={this.toggleSendSig}>{translate('INDEX.DONT_SEND')}</label>
                     </div>
                     {this.renderUTXOCacheInfo()}
-                    <div className="col-lg-2">
+                    <div className="col-lg-12">
                       <button type="button" className="btn btn-primary waves-effect waves-light pull-right edexcoin_send_coins_btn_step1" onClick={() => this.changeSendCoinStep(1)}>
                         {translate('INDEX.SEND')} {Number(this.state.amount) - Number(this.state.fee)} {this.props.ActiveCoin.coin}
                       </button>

react/src/components/dashboard/walletsData.js

@@ -357,18 +357,20 @@ class WalletsData extends React.Component {
       activePage: 1,
     }));
 
-    setTimeout(function() {
-      Store.dispatch(changeMainBasiliskAddress(address));
-      Store.dispatch(getBasiliskTransactionsList(this.props.ActiveCoin.coin, address));
-    }.bind(this), 100);
-
-    Store.dispatch(fetchNewCacheData({
-      'pubkey': this.props.Dashboard.activeHandle.pubkey,
-      'allcoins': false,
-      'coin': this.props.ActiveCoin.coin,
-      'calls': 'listtransactions:getbalance',
-      'address': address,
-    }));
+    if (this.props.ActiveCoin.mode === 'basilisk') {
+      setTimeout(function() {
+        Store.dispatch(changeMainBasiliskAddress(address));
+        Store.dispatch(getBasiliskTransactionsList(this.props.ActiveCoin.coin, address));
+      }.bind(this), 100);
+
+      Store.dispatch(fetchNewCacheData({
+        'pubkey': this.props.Dashboard.activeHandle.pubkey,
+        'allcoins': false,
+        'coin': this.props.ActiveCoin.coin,
+        'calls': 'listtransactions:getbalance',
+        'address': address,
+      }));
+    }
   }
 
   openDropMenu() {

react/src/components/dashboard/walletsNativeSyncProgress.js

@@ -5,22 +5,22 @@ class WalletsNativeSyncProgress extends React.Component {
   renderSyncPercentagePlaceholder() {
     if (this.props.Dashboard.progress.blocks > 0 && this.props.Dashboard.progress.longestchain === 0) {
       return (
-        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: '100%', fontSize: '80%'}} role="progressbar" data-extcoin="COIN" id="extcoin-sync">
-          <span data-extcoin="COIN" id="extcoin-sync-percent" style={{width: '100%'}}>Unable to get current sync progress. Err: no longestchain param in response</span>
+        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: '100%', fontSize: '80%'}} role="progressbar" id="extcoin-sync">
+          <span id="extcoin-sync-percent" style={{width: '100%'}}>{translate('INDEX.SYNC_ERR_LONGESTCHAIN')}</span>
         </div>
       );
     } else if (this.props.Dashboard.progress.blocks === 0) {
       return (
-        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: '100%', fontSize: '80%'}} role="progressbar" data-extcoin="COIN" id="extcoin-sync">
-          <span data-extcoin="COIN" id="extcoin-sync-percent" style={{width: '100%'}}>Unable to get current sync progress. Err: no blocks param in response</span>
+        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: '100%', fontSize: '80%'}} role="progressbar" id="extcoin-sync">
+          <span id="extcoin-sync-percent" style={{width: '100%'}}>{translate('INDEX.SYNC_ERR_BLOCKS')}</span>
         </div>
       );
     } else {
       var syncPercentage = (parseFloat(parseInt(this.props.Dashboard.progress.blocks, 10) * 100 / parseInt(this.props.Dashboard.progress.longestchain, 10)).toFixed(2) + '%').replace('NaN', 0);
 
       return (
-        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: syncPercentage, fontSize: '80%'}} role="progressbar" data-extcoin="COIN" id="extcoin-sync">
-          <span data-extcoin="COIN" id="extcoin-sync-percent" style={{width: syncPercentage}}>{syncPercentage}</span> | <span data-extcoin="COIN" id="extcoin-synced-blocks">{this.props.Dashboard.progress.blocks}</span> / <span data-extcoin="COIN" id="extcoin-longestchain">{this.props.Dashboard.progress.longestchain}</span> | {translate('INDEX.CONNECTIONS')}: <span data-extcoin="COIN" id="extcoin-connections">{this.props.Dashboard.progress.connections}</span>
+        <div className="progress-bar progress-bar-info progress-bar-striped active" style={{width: syncPercentage, fontSize: '80%'}} role="progressbar" id="extcoin-sync">
+          <span id="extcoin-sync-percent" style={{width: syncPercentage}}>{syncPercentage}</span> | <span id="extcoin-synced-blocks">{this.props.Dashboard.progress.blocks}</span> / <span id="extcoin-longestchain">{this.props.Dashboard.progress.longestchain}</span> | {translate('INDEX.CONNECTIONS')}: <span id="extcoin-connections">{this.props.Dashboard.progress.connections}</span>
         </div>
       );
     }
@@ -29,10 +29,10 @@ class WalletsNativeSyncProgress extends React.Component {
   renderActivatingBestChainProgress() {
     if (this.props.Settings && this.props.Settings.debugLog && this.props.Dashboard.progress.remoteKMDNode) {
       if (this.props.Settings.debugLog.indexOf('UpdateTip') > -1) {
-        var temp = this.props.Settings.debugLog.split(' ');
-        var currentBestChain;
+        let temp = this.props.Settings.debugLog.split(' ');
+        let currentBestChain;
 
-        for (var i = 0; i < temp.length; i++) {
+        for (let i = 0; i < temp.length; i++) {
           if (temp[i].indexOf('height=') > -1) {
             currentBestChain = temp[i].replace('height=', '');
           }
@@ -48,7 +48,7 @@ class WalletsNativeSyncProgress extends React.Component {
   renderChainActivationNotification() {
     if ((this.props.Dashboard.progress.blocks < this.props.Dashboard.progress.longestchain) || this.props.Dashboard.progress.remoteKMDNode) {
       return (
-        <div role="alert" className="alert alert-info alert-dismissible" data-extcoin="COIN" id="extcoin-wallet-activating-alert" style={{marginBottom: '40px'}}>
+        <div role="alert" className="alert alert-info alert-dismissible" id="extcoin-wallet-activating-alert" style={{marginBottom: '40px'}}>
           <button aria-label="Close" data-dismiss="alert" className="close" type="button">
             <span aria-hidden="true">×</span>
           </button>
@@ -68,7 +68,7 @@ class WalletsNativeSyncProgress extends React.Component {
       return (
         <div>
           {this.renderChainActivationNotification()}
-          <div className="row" data-extcoin="COIN" style={{margin: '-20px 0px 10px 0px'}}>
+          <div className="row" style={{margin: '-20px 0px 10px 0px'}}>
             <div className="col-xs-12" data-extcoin="COIN" id="extcoin-progressbars">
               <div className="progress">
                 {this.renderSyncPercentagePlaceholder()}

react/src/components/dashboard/walletsNativeTxHistory.js

@@ -148,7 +148,7 @@ class WalletsNativeTxHistory extends React.Component {
       return (
         <div className="row unselectable">
           <div className="col-sm-5">
-            <div className="dataTables_info" id="kmd-tx-history-tbl_info" role="status" aria-live="polite">{translate('INDEX.SHOWING')} {((this.state.activePage - 1) * this.state.itemsPerPage) + 1} {translate('INDEX.TO')} {this.state.activePage * this.state.itemsPerPage} {translate('INDEX.OF')} {this.props.ActiveCoin.txhistory.length} entries</div>
+            <div className="dataTables_info" id="kmd-tx-history-tbl_info" role="status" aria-live="polite">{translate('INDEX.SHOWING')} {((this.state.activePage - 1) * this.state.itemsPerPage) + 1} {translate('INDEX.TO')} {this.state.activePage * this.state.itemsPerPage} {translate('INDEX.OF')} {this.props.ActiveCoin.txhistory.length} {translate('INDEX.ENTRIES_SM')}</div>
           </div>
           <div className="col-sm-7">
             <div className="dataTables_paginate paging_simple_numbers" id="kmd-tx-history-tbl_paginate">
@@ -175,7 +175,9 @@ class WalletsNativeTxHistory extends React.Component {
       return 'no data';
     } else if (this.props.ActiveCoin.txhistory && this.props.ActiveCoin.txhistory === 'loading') {
       return 'loading history...';
-    } else if (this.props.ActiveCoin.txhistory && (this.props.ActiveCoin.txhistory !== 'loading' && this.props.ActiveCoin.txhistory !== 'no data')) {
+    } else if (
+      this.props.ActiveCoin.txhistory &&
+      (this.props.ActiveCoin.txhistory !== 'loading' && this.props.ActiveCoin.txhistory !== 'no data')) {
       if (this.state.itemsList && this.state.itemsList.length && this.props.ActiveCoin.nativeActiveSection === 'default') {
         return this.state.itemsList.map((tx, index) =>
           <tr key={tx.txid + tx.amount}>
@@ -221,13 +223,13 @@ class WalletsNativeTxHistory extends React.Component {
                           <div className="col-sm-6">
                             <div id="kmd-tx-history-tbl_filter" className="dataTables_filter">
                               <label>
-                                Search: <input type="search" className="form-control input-sm" placeholder="" aria-controls="kmd-tx-history-tbl" disabled="true" />
+                                {translate('INDEX.SEARCH')}: <input type="search" className="form-control input-sm" aria-controls="kmd-tx-history-tbl" disabled="true" />
                               </label>
                             </div>
                           </div>
                         </div>
                         <div className="row">
-                          <table className="table table-hover dataTable table-striped" data-extcoin="COIN" id="kmd-tx-history-tbl" width="100%">
+                          <table className="table table-hover dataTable table-striped" id="kmd-tx-history-tbl" width="100%">
                             <thead>
                               <tr>
                                 <th>{translate('INDEX.TYPE')}</th>

react/src/translate/en.js

@@ -8,9 +8,12 @@ export const _lang = {
       'SHOWING': 'Showing',
       'OF': 'of',
       'TO': 'to',
+      'SEARCH': 'Search',
       'PREVIOUS': 'Previous',
       'NEXT': 'Next',
       'ENTRIES_SM': 'entries',
+      'SYNC_ERR_LONGESTCHAIN': 'Unable to get current sync progress. Err: no longestchain param in response',
+      'SYNC_ERR_BLOCKS': 'Unable to get current sync progress. Err: no blocks param in response',
       'COIN_IS_BUSY': 'Coin is busy processing',
       'REFRESHING_BASILISK_NET': 'Refreshing Basilisk Network Connections',
       'SELECT_A_COIN': 'Select Coin to add to EasyDEX',