From a8400cbb4fa72d1d2413a75d5706420aec877cac Mon Sep 17 00:00:00 2001
From: Petr Balashov <p.balashov@slicecrowd.com>
Date: Mon, 24 Apr 2017 02:03:53 -0700
Subject: [PATCH 01/14] props check in native wallet tx history

---
 .../dashboard/walletsNativeTxHistory.js          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/react/src/components/dashboard/walletsNativeTxHistory.js b/react/src/components/dashboard/walletsNativeTxHistory.js
index 860827e..f90e2a6 100644
--- a/react/src/components/dashboard/walletsNativeTxHistory.js
+++ b/react/src/components/dashboard/walletsNativeTxHistory.js
@@ -80,12 +80,14 @@ class WalletsNativeTxHistory extends React.Component {
 
   componentWillReceiveProps(props) {
     if (!this.state.itemsList || (this.state.itemsList && !this.state.itemsList.length) || (props.ActiveCoin.txhistory !== this.props.ActiveCoin.txhistory)) {
-      let historyToSplit = this.props.ActiveCoin.txhistory;
-      historyToSplit = historyToSplit.slice((this.state.activePage - 1) * this.state.itemsPerPage, this.state.activePage * this.state.itemsPerPage);
+      if (this.props.ActiveCoin.txhistory) {
+        let historyToSplit = this.props.ActiveCoin.txhistory;
+        historyToSplit = historyToSplit.slice((this.state.activePage - 1) * this.state.itemsPerPage, this.state.activePage * this.state.itemsPerPage);
 
-      this.setState(Object.assign({}, this.state, {
-        itemsList: historyToSplit,
-      }));
+        this.setState(Object.assign({}, this.state, {
+          itemsList: historyToSplit,
+        }));
+      }
     }
   }
 
@@ -114,7 +116,7 @@ class WalletsNativeTxHistory extends React.Component {
   }
 
   renderPaginationItemsPerPageSelector() {
-    if (this.props.ActiveCoin.txhistory.length > 10) {
+    if (this.props.ActiveCoin.txhistory && this.props.ActiveCoin.txhistory.length > 10) {
       return (
         <div className="dataTables_length" id="kmd-tx-history-tbl_length">
           <label>
@@ -135,7 +137,7 @@ class WalletsNativeTxHistory extends React.Component {
   }
 
   renderPagination() {
-    if (this.props.ActiveCoin.txhistory.length > 10) {
+    if (this.props.ActiveCoin.txhistory && this.props.ActiveCoin.txhistory.length > 10) {
       return (
         <div className="row unselectable">
           <div className="col-sm-5">

From 18161b14d275f3ef3fcf14c65692d70f4a5afad2 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 24 Apr 2017 17:08:59 +0300
Subject: [PATCH 02/14] experimental dex iguana instance code

---
 react/src/actions/actionCreators.js           | 20 ++++++++++---------
 react/src/components/dashboard/walletsData.js | 17 +++++++++++-----
 react/src/config.js                           |  2 ++
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 71c1dbe..03b5687 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -701,7 +701,7 @@ export function getBasiliskTransactionsList(coin, address) {
   };
 
   return dispatch => {
-    return fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+    return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
       method: 'POST',
       body: JSON.stringify(payload),
     })
@@ -1002,7 +1002,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
         };
       }
 
-      fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+      fetch('http://127.0.0.1:' + (Config.useBasiliskInstance && mode === 'basilisk' ? Config.basiliskPort : Config.iguanaCorePort), {
         method: 'POST',
         body: JSON.stringify(payload),
       })
@@ -1272,7 +1272,7 @@ export function getDexBalance(coin, addr) {
     };
     console.log('addr', _addr);
     return new Promise((resolve, reject) => {
-      fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+      fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
         method: 'POST',
         body: JSON.stringify(payload),
       })
@@ -1640,7 +1640,7 @@ export function checkAddressBasilisk(coin, address) {
   };
 
   return dispatch => {
-    return fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+    return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
       method: 'POST',
       body: JSON.stringify(payload),
     })
@@ -1680,7 +1680,7 @@ export function validateAddressBasilisk(coin, address) {
   };
 
   return dispatch => {
-    return fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+    return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
       method: 'POST',
       body: JSON.stringify(payload),
     })
@@ -1715,7 +1715,7 @@ export function getDexNotaries(coin) {
   };
 
   return dispatch => {
-    return fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+    return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
       method: 'POST',
       body: JSON.stringify(payload),
     })
@@ -1785,10 +1785,12 @@ export function fetchNewCacheData(_payload) {
         _pubkey = '&pubkey=' + _payload.pubkey,
         _route = _payload.allcoins ? 'cache-all' : 'cache-one',
         _coin = '&coin=' + _payload.coin,
-        _calls = '&calls=' + _payload.calls;
+        _calls = '&calls=' + _payload.calls,
+        _iguanaInstancePort = Config.useBasiliskInstance ? '&port=' + Config.basiliskPort : '';
 
+  console.log('fetchNewCacheData', 'http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls + _iguanaInstancePort);
   return dispatch => {
-    return fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls, {
+    return fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls + _iguanaInstancePort, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -1814,7 +1816,7 @@ function initNotaryNodesConSequence(nodes) {
       };
 
       return new Promise((resolve, reject) => {
-        fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+        fetch('http://127.0.0.1:' + Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort, {
           method: 'POST',
           body: JSON.stringify(payload),
         })
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 2c32ee9..9ba06be 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -12,7 +12,8 @@ import {
   displayNotariesModal,
   deleteCacheFile,
   connectNotaries,
-  toggleViewCacheModal
+  toggleViewCacheModal,
+  fetchNewCacheData
 } from '../../actions/actionCreators';
 import Store from '../../store';
 
@@ -91,9 +92,15 @@ class WalletsData extends React.Component {
   }
 
   basiliskRefreshAction() {
-    if (this.props.Dashboard) {
+    /*if (this.props.Dashboard) {
       Store.dispatch(basiliskRefresh(!this.props.Dashboard.basiliskRefresh));
-    }
+    }*/
+    Store.dispatch(fetchNewCacheData({
+      'pubkey': this.props.Dashboard.activeHandle.pubkey,
+      'allcoins': false,
+      'coin': this.props.ActiveCoin.coin,
+      'calls': 'listtransactions:getbalance',
+    }));
   }
 
   basiliskConnectionAction() {
@@ -392,12 +399,12 @@ class WalletsData extends React.Component {
                               </li>
                               <li data-edexcoin="COIN" role="presentation">
                                 <a className="btn_edexcoin_dashboard_fetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this.basiliskRefreshAction}>
-                                  <i className="icon fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.FETCH_WALLET_DATA')}
+                                  <i className="icon  fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.FETCH_WALLET_DATA')}
                                 </a>
                               </li>
                               <li data-edexcoin="COIN" role="presentation">
                                 <a className="btn_edexcoin_dashboard_refetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_refetchdata" role="menuitem" onClick={this.removeAndFetchNewCache}>
-                                  <i className="icon fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.REFETCH_WALLET_DATA')}
+                                  <i className="icon fa-history" aria-hidden="true"></i> {translate('INDEX.REFETCH_WALLET_DATA')}
                                 </a>
                               </li>
                               <li data-edexcoin="COIN" role="presentation">
diff --git a/react/src/config.js b/react/src/config.js
index e2553a8..85bef3c 100644
--- a/react/src/config.js
+++ b/react/src/config.js
@@ -1,5 +1,7 @@
 module.exports = {
   iguanaCorePort: 7778,
+  basiliskPort: 7779,
   agamaPort: 17777,
   enableCacheApi: false,
+  useBasiliskInstance: true,
 };

From 5d1335d9e3a8d8e3a019764a8b4371d0af62d9e4 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 24 Apr 2017 18:04:56 +0300
Subject: [PATCH 03/14] fixed wrong obj key to val mapping in view cache

---
 react/src/components/dashboard/walletsCacheData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/src/components/dashboard/walletsCacheData.js b/react/src/components/dashboard/walletsCacheData.js
index 887367f..5f3cf42 100644
--- a/react/src/components/dashboard/walletsCacheData.js
+++ b/react/src/components/dashboard/walletsCacheData.js
@@ -39,7 +39,7 @@ class WalletsCacheData extends React.Component {
           {this.renderArrayNode(`${pre}-array-${value}`, key)}
         </TreeNode>);
     } else {
-      return Object.keys(_sourceObj.data).map((key, value) => this.renderKeyValue(pre, key, value));
+      return Object.keys(_sourceObj.data).map((key, value) => this.renderKeyValue(pre, key, _sourceObj.data[key]));
     }
   }
 

From 5329bb7801f022fa18da5243eb5d37abfa36a67e Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 24 Apr 2017 20:21:11 +0300
Subject: [PATCH 04/14] partial cache file basilisk support

---
 react/src/actions/actionCreators.js           | 153 ++++++++++++++----
 .../src/components/dashboard/coinTileItem.js  |  16 +-
 react/src/components/dashboard/walletsData.js |  22 ++-
 react/src/config.js                           |   2 +-
 react/src/translate/en.js                     |   4 +-
 5 files changed, 157 insertions(+), 40 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 03b5687..812c474 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -700,17 +700,41 @@ export function getBasiliskTransactionsList(coin, address) {
     'symbol': coin
   };
 
-  return dispatch => {
-    return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
-      method: 'POST',
-      body: JSON.stringify(payload),
-    })
-    .catch(function(error) {
-      console.log(error);
-      dispatch(triggerToaster(true, 'getBasiliskTransactionsList', 'Error', 'error'));
-    })
-    .then(response => response.json())
-    .then(json => dispatch(getNativeTxHistoryState(json)))
+  if (sessionStorage.getItem('useCache')) {
+    const pubkey = JSON.parse(sessionStorage.getItem('IguanaActiveAccount')).pubkey;
+
+    return dispatch => {
+      return fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/cache?pubkey=' + pubkey, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      })
+      .catch(function(error) {
+        console.log(error);
+        dispatch(triggerToaster(true, 'getBasiliskTransactionsList+cache', 'Error', 'error'));
+      })
+      .then(response => response.json())
+      .then(function(json) {
+        json = json.result.basilisk;
+        if (json[coin][address].listtransactions) {
+          dispatch(getNativeTxHistoryState({ 'result': json[coin][address].listtransactions.data }));
+        }
+      })
+    }
+  } else {
+    return dispatch => {
+      return fetch('http://127.0.0.1:' + (Config.useBasiliskInstance ? Config.basiliskPort : Config.iguanaCorePort), {
+        method: 'POST',
+        body: JSON.stringify(payload),
+      })
+      .catch(function(error) {
+        console.log(error);
+        dispatch(triggerToaster(true, 'getBasiliskTransactionsList', 'Error', 'error'));
+      })
+      .then(response => response.json())
+      .then(json => dispatch(getNativeTxHistoryState(json)))
+    }
   }
 }
 
@@ -942,16 +966,38 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           };
         }
 
-        fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
-          method: 'POST',
-          body: JSON.stringify(payload),
-        })
-        .catch(function(error) {
-          console.log(error);
-          dispatch(triggerToaster(true, 'getKMDAddressesNative', 'Error', 'error'));
-        })
-        .then(response => response.json())
-        .then(json => resolve(json))
+        if (sessionStorage.getItem('useCache') && mode === 'basilisk') {
+          const pubkey = JSON.parse(sessionStorage.getItem('IguanaActiveAccount')).pubkey;
+
+          fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/cache?pubkey=' + pubkey, {
+            method: 'GET',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+          })
+          .catch(function(error) {
+            console.log(error);
+            dispatch(triggerToaster(true, 'getKMDAddressesNative+addresslist+cache', 'Error', 'error'));
+          })
+          .then(response => response.json())
+          .then(function(json) {
+            json = json.result.basilisk;
+            if (json[coin].addresses) {
+              resolve({ 'result': json[coin].addresses });
+            }
+          })
+        } else {
+          fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
+            method: 'POST',
+            body: JSON.stringify(payload),
+          })
+          .catch(function(error) {
+            console.log(error);
+            dispatch(triggerToaster(true, 'getKMDAddressesNative', 'Error', 'error'));
+          })
+          .then(response => response.json())
+          .then(json => resolve(json))
+        }
       });
     }))
     .then(result => {
@@ -1002,16 +1048,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
         };
       }
 
-      fetch('http://127.0.0.1:' + (Config.useBasiliskInstance && mode === 'basilisk' ? Config.basiliskPort : Config.iguanaCorePort), {
-        method: 'POST',
-        body: JSON.stringify(payload),
-      })
-      .catch(function(error) {
-        console.log(error);
-        dispatch(triggerToaster(true, 'getKMDAddressesNative+Balance', 'Error', 'error'));
-      })
-      .then(response => response.json())
-      .then(function(json) {
+      function calcBalance(result, json, dispatch, mode) {
         if (mode === 'full' || mode === 'basilisk') {
           result[0] = result[0].result;
         }
@@ -1072,7 +1109,58 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           'public': newAddressArray[0],
           'private': newAddressArray[1]
         }));
-      })
+      }
+
+      if (sessionStorage.getItem('useCache') && mode === 'basilisk') {
+        const pubkey = JSON.parse(sessionStorage.getItem('IguanaActiveAccount')).pubkey;
+
+        fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/cache?pubkey=' + pubkey, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        })
+        .catch(function(error) {
+          console.log(error);
+          dispatch(triggerToaster(true, 'getKMDAddressesNative+addresslist+cache', 'Error', 'error'));
+        })
+        .then(response => response.json())
+        .then(function(json) {
+          json = json.result.basilisk;
+          // if listunspent is not in cache file retrieve new copy
+          // otherwise read from cache data
+          // TODO: save listunspent to cache file(?)
+          if (json[coin][currentAddress].listunspent) {
+            calcBalance(result, json[coin][currentAddress].listunspent, dispatch, mode);
+          } else {
+            fetch('http://127.0.0.1:' + (Config.useBasiliskInstance && mode === 'basilisk' ? Config.basiliskPort : Config.iguanaCorePort), {
+              method: 'POST',
+              body: JSON.stringify(payload),
+            })
+            .catch(function(error) {
+              console.log(error);
+              dispatch(triggerToaster(true, 'getKMDAddressesNative+Balance', 'Error', 'error'));
+            })
+            .then(response => response.json())
+            .then(function(json) {
+              calcBalance(result, json, dispatch, mode);
+            })
+          }
+        })
+      } else {
+        fetch('http://127.0.0.1:' + (Config.useBasiliskInstance && mode === 'basilisk' ? Config.basiliskPort : Config.iguanaCorePort), {
+          method: 'POST',
+          body: JSON.stringify(payload),
+        })
+        .catch(function(error) {
+          console.log(error);
+          dispatch(triggerToaster(true, 'getKMDAddressesNative+Balance', 'Error', 'error'));
+        })
+        .then(response => response.json())
+        .then(function(json) {
+          calcBalance(result, json, dispatch, mode);
+        })
+      }
     })
   }
 }
@@ -1788,7 +1876,6 @@ export function fetchNewCacheData(_payload) {
         _calls = '&calls=' + _payload.calls,
         _iguanaInstancePort = Config.useBasiliskInstance ? '&port=' + Config.basiliskPort : '';
 
-  console.log('fetchNewCacheData', 'http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls + _iguanaInstancePort);
   return dispatch => {
     return fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls + _iguanaInstancePort, {
       method: 'GET',
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js
index 9e551c7..648be93 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTileItem.js
@@ -15,7 +15,8 @@ import {
   getKMDOPID,
   getFullTransactionsList,
   getBasiliskTransactionsList,
-  getShepherdCache
+  getShepherdCache,
+  fetchNewCacheData
 } from '../../actions/actionCreators';
 import Store from '../../store';
 
@@ -34,6 +35,7 @@ class CoinTileItem extends React.Component {
   dashboardChangeActiveCoin(coin, mode) {
     if (coin !== this.props.ActiveCoin.coin) {
       Store.dispatch(stopInterval('sync', this.props.Interval.interval));
+      Store.dispatch(stopInterval('basilisk', this.props.Interval.interval));
       Store.dispatch(dashboardChangeActiveCoin(coin, mode));
 
       if (mode === 'full') {
@@ -67,7 +69,19 @@ class CoinTileItem extends React.Component {
             Store.dispatch(iguanaEdexBalance(coin, mode));
           }
         }.bind(this), 3000);
+
+        var _basiliskCache = setInterval(function() {
+          if (sessionStorage.getItem('useCache')) {
+            Store.dispatch(fetchNewCacheData({
+              'pubkey': this.props.Dashboard.activeHandle.pubkey,
+              'allcoins': false,
+              'coin': this.props.ActiveCoin.coin,
+              'calls': 'listtransactions:getbalance',
+            }));
+          }
+        }.bind(this), 60000);
         Store.dispatch(startInterval('sync', _iguanaActiveHandle));
+        Store.dispatch(startInterval('basilisk', _basiliskCache));
         // basilisk
       }
     }
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 9ba06be..07b800c 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -39,6 +39,7 @@ class WalletsData extends React.Component {
       addressSelectorOpen: false,
       currentStackLength: 0,
       totalStackLength: 0,
+      useCache: sessionStorage.getItem('useCache'),
     };
     this.updateInput = this.updateInput.bind(this);
     this.toggleBasiliskActionsMenu = this.toggleBasiliskActionsMenu.bind(this);
@@ -49,9 +50,18 @@ class WalletsData extends React.Component {
     this.refreshTxList = this.refreshTxList.bind(this);
     this.removeAndFetchNewCache = this.removeAndFetchNewCache.bind(this);
     this._toggleViewCacheModal = this._toggleViewCacheModal.bind(this);
+    this.toggleCacheApi = this.toggleCacheApi.bind(this);
     socket.on('messages', msg => this.updateSocketsData(msg));
   }
 
+  toggleCacheApi() {
+    console.log('useCache is set to', !this.state.useCache);
+    sessionStorage.setItem('useCache', !this.state.useCache);
+    this.setState(Object.assign({}, this.state, {
+      useCache: !this.state.useCache,
+    }));
+  }
+
   _toggleViewCacheModal() {
     Store.dispatch(toggleViewCacheModal(!this.props.Dashboard.displayViewCacheModal));
   }
@@ -397,17 +407,17 @@ class WalletsData extends React.Component {
                                   <i className="icon wb-refresh" aria-hidden="true"></i> {translate('INDEX.REFRESH_BASILISK_CONNECTIONS')}
                                 </a>
                               </li>
-                              <li data-edexcoin="COIN" role="presentation">
+                              <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_fetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this.basiliskRefreshAction}>
                                   <i className="icon  fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.FETCH_WALLET_DATA')}
                                 </a>
                               </li>
-                              <li data-edexcoin="COIN" role="presentation">
+                              <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_refetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_refetchdata" role="menuitem" onClick={this.removeAndFetchNewCache}>
                                   <i className="icon fa-history" aria-hidden="true"></i> {translate('INDEX.REFETCH_WALLET_DATA')}
                                 </a>
                               </li>
-                              <li data-edexcoin="COIN" role="presentation">
+                              <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this._toggleViewCacheModal}>
                                   <i className="icon fa-list-alt" aria-hidden="true"></i> {translate('INDEX.VIEW_CACHE_DATA')}
                                 </a>
@@ -422,6 +432,12 @@ class WalletsData extends React.Component {
                           <div className="col-sm-6">
                           {this.renderAddressList()}
                           </div>
+                          <div className="col-sm-2">
+                            <div className="pull-left margin-right-10">
+                              <input type="checkbox" id="edexcoin_cache_api" checked={this.state.useCache} data-plugin="switchery" data-size="small" />
+                            </div>
+                            <label className="padding-top-3" htmlFor="edexcoin_cache_api" onClick={this.toggleCacheApi}>Use cache</label>
+                          </div>
                         </div>
                         <div className="row">
                           <div className="col-sm-6">
diff --git a/react/src/config.js b/react/src/config.js
index 85bef3c..700a203 100644
--- a/react/src/config.js
+++ b/react/src/config.js
@@ -2,6 +2,6 @@ module.exports = {
   iguanaCorePort: 7778,
   basiliskPort: 7779,
   agamaPort: 17777,
-  enableCacheApi: false,
+  enableCacheApi: true,
   useBasiliskInstance: true,
 };
diff --git a/react/src/translate/en.js b/react/src/translate/en.js
index b2ee234..85f5a5f 100644
--- a/react/src/translate/en.js
+++ b/react/src/translate/en.js
@@ -81,8 +81,8 @@ export const _lang = {
       'GET_NOTARY_NODES_LIST': 'Get Notary Nodes List',
       'REFRESH_BASILISK_CONNECTIONS': 'Refresh Basilisk Connections',
       'FETCH_WALLET_DATA': 'Fetch Wallet Data',
-      'REFETCH_WALLET_DATA': 'Reset cache data',
-      'VIEW_CACHE_DATA': 'View cache data',
+      'REFETCH_WALLET_DATA': 'Reset Cache Data',
+      'VIEW_CACHE_DATA': 'View Cache Data',
       'TRANSACTION_HISTORY': 'Transactions History',
       'DIRECTION': 'Direction',
       'CONFIRMATIONS': 'Confirmations',

From ad7554b29cd01f81e0032e7f25b07976a894e948 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 24 Apr 2017 11:08:36 -0700
Subject: [PATCH 05/14] sidebar overflow scroll

---
 react/src/styles/index.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/react/src/styles/index.scss b/react/src/styles/index.scss
index c051f74..d3ded81 100644
--- a/react/src/styles/index.scss
+++ b/react/src/styles/index.scss
@@ -149,6 +149,11 @@ body {
   right: 15px;
 }
 
+.page-aside-inner .wallet-widgets-list {
+  overflow-y: auto;
+  height: 100%;
+}
+
 /*.toaster .single-toast:nth-child(0) {
   bottom: 12px;
 }

From 4a0a31e9a821910d0c4646d969fd8c179fd999e5 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Tue, 25 Apr 2017 08:21:34 +0300
Subject: [PATCH 06/14] load coin data on tile click

---
 .../src/components/dashboard/coinTileItem.js  | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js
index 648be93..1b59b84 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTileItem.js
@@ -32,42 +32,55 @@ class CoinTileItem extends React.Component {
   //       3) limit req in basilisk as much as possible incl. activehandle
   //       4) add pending requests store
 
+  dispatchCoinActions(coin, mode) {
+    if (mode === 'native') {
+      Store.dispatch(getSyncInfoNative(coin));
+      Store.dispatch(getKMDBalanceTotal(coin));
+      Store.dispatch(getNativeTxHistory(coin));
+      Store.dispatch(getKMDAddressesNative(coin));
+      Store.dispatch(getKMDOPID(null, coin));
+    }
+    if (mode === 'full') {
+      Store.dispatch(getSyncInfo(coin));
+      Store.dispatch(iguanaEdexBalance(coin, mode));
+      Store.dispatch(getKMDAddressesNative(coin, mode)); //getAddressesByAccount(coin));
+      Store.dispatch(getFullTransactionsList(coin));
+    }
+    if (mode === 'basilisk') {
+      const useAddress = this.props.ActiveCoin.mainBasiliskAddress ? this.props.ActiveCoin.mainBasiliskAddress : this.props.Dashboard.activeHandle[coin];
+
+      if (this.props && this.props.Dashboard && this.props.Dashboard.activeHandle && this.props.Dashboard.activeHandle[coin]) {
+        Store.dispatch(getBasiliskTransactionsList(coin, useAddress));
+        Store.dispatch(getKMDAddressesNative(coin, mode, useAddress));
+        Store.dispatch(getShepherdCache(this.props.Dashboard.activeHandle.pubkey));
+        Store.dispatch(iguanaEdexBalance(coin, mode));
+      }
+    }
+  }
+
   dashboardChangeActiveCoin(coin, mode) {
     if (coin !== this.props.ActiveCoin.coin) {
       Store.dispatch(stopInterval('sync', this.props.Interval.interval));
       Store.dispatch(stopInterval('basilisk', this.props.Interval.interval));
       Store.dispatch(dashboardChangeActiveCoin(coin, mode));
 
+      this.dispatchCoinActions(coin, mode);
       if (mode === 'full') {
         var _iguanaActiveHandle = setInterval(function() {
-          Store.dispatch(getSyncInfo(coin));
-          Store.dispatch(iguanaEdexBalance(coin, mode));
-          Store.dispatch(getKMDAddressesNative(coin, mode)); //getAddressesByAccount(coin));
-          Store.dispatch(getFullTransactionsList(coin));
-        }, 3000);
+          this.dispatchCoinActions(coin, mode);
+        }.bind(this), 3000);
         Store.dispatch(startInterval('sync', _iguanaActiveHandle));
       }
       if (mode === 'native') {
         // TODO: add conditions to skip txhistory, balances, addresses while "activating best chain"
         var _iguanaActiveHandle = setInterval(function() {
-          Store.dispatch(getSyncInfoNative(coin));
-          Store.dispatch(getKMDBalanceTotal(coin));
-          Store.dispatch(getNativeTxHistory(coin));
-          Store.dispatch(getKMDAddressesNative(coin));
-          Store.dispatch(getKMDOPID(null, coin));
-        }, coin === 'KMD' ? 15000 : 3000);
+          this.dispatchCoinActions(coin, mode);
+        }.bind(this), coin === 'KMD' ? 15000 : 3000);
         Store.dispatch(startInterval('sync', _iguanaActiveHandle));
       }
       if (mode === 'basilisk') {
         var _iguanaActiveHandle = setInterval(function() {
-          const useAddress = this.props.ActiveCoin.mainBasiliskAddress ? this.props.ActiveCoin.mainBasiliskAddress : this.props.Dashboard.activeHandle[coin];
-
-          if (this.props && this.props.Dashboard && this.props.Dashboard.activeHandle && this.props.Dashboard.activeHandle[coin]) {
-            Store.dispatch(getBasiliskTransactionsList(coin, useAddress));
-            Store.dispatch(getKMDAddressesNative(coin, mode, useAddress));
-            Store.dispatch(getShepherdCache(this.props.Dashboard.activeHandle.pubkey));
-            Store.dispatch(iguanaEdexBalance(coin, mode));
-          }
+          this.dispatchCoinActions(coin, mode);
         }.bind(this), 3000);
 
         var _basiliskCache = setInterval(function() {

From d9688bc8ad5b994b9639727897e4eca141645f2a Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Tue, 25 Apr 2017 08:39:49 +0300
Subject: [PATCH 07/14] bugfix

---
 react/src/actions/actionCreators.js            | 5 ++++-
 react/src/components/dashboard/coinTileItem.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 812c474..e896da7 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -956,7 +956,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           };
         }
 
-        if (mode !== 'native' || mode !== 'basilisk') {
+        if (mode !== 'native' && mode !== 'basilisk') {
           payload = {
             'userpass': 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
             'coin': coin,
@@ -965,6 +965,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
             'account': '*'
           };
         }
+        console.log('pl', payload);
 
         if (sessionStorage.getItem('useCache') && mode === 'basilisk') {
           const pubkey = JSON.parse(sessionStorage.getItem('IguanaActiveAccount')).pubkey;
@@ -1053,6 +1054,8 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           result[0] = result[0].result;
         }
 
+        console.log('calcBalance', result);
+
         if (mode !== 'basilisk') {
           const allAddrArray = json.map(res => res.address).filter((x, i, a) => a.indexOf(x) == i);
           for (let a=0; a < allAddrArray.length; a++) {
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js
index 1b59b84..b718c19 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTileItem.js
@@ -37,7 +37,7 @@ class CoinTileItem extends React.Component {
       Store.dispatch(getSyncInfoNative(coin));
       Store.dispatch(getKMDBalanceTotal(coin));
       Store.dispatch(getNativeTxHistory(coin));
-      Store.dispatch(getKMDAddressesNative(coin));
+      Store.dispatch(getKMDAddressesNative(coin, mode));
       Store.dispatch(getKMDOPID(null, coin));
     }
     if (mode === 'full') {

From e306aa0cf2789cd76693965235c6ea4134ce6e89 Mon Sep 17 00:00:00 2001
From: Petr Balashov <pbca26@gmail.com>
Date: Tue, 25 Apr 2017 09:05:57 +0200
Subject: [PATCH 08/14] moved activehandle interval to login component

---
 react/src/components/dashboard/coinTileItem.js |  2 --
 react/src/components/login/login.js            | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js
index b718c19..e54e382 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTileItem.js
@@ -98,8 +98,6 @@ class CoinTileItem extends React.Component {
         // basilisk
       }
     }
-
-    Store.dispatch(iguanaActiveHandle(true));
   }
 
   render() {
diff --git a/react/src/components/login/login.js b/react/src/components/login/login.js
index 03ccccd..93c645c 100644
--- a/react/src/components/login/login.js
+++ b/react/src/components/login/login.js
@@ -1,6 +1,11 @@
 import React from 'react';
 import { translate } from '../../translate/translate';
-import { toggleAddcoinModal, iguanaWalletPassphrase, createNewWallet } from '../../actions/actionCreators';
+import {
+  toggleAddcoinModal,
+  iguanaWalletPassphrase,
+  createNewWallet,
+  iguanaActiveHandle
+} from '../../actions/actionCreators';
 import Store from '../../store';
 import { PassPhraseGenerator } from '../../util/crypto/passphrasegenerator';
 
@@ -24,6 +29,10 @@ class Login extends React.Component {
     this.handleRegisterWallet = this.handleRegisterWallet.bind(this);
   }
 
+  componentDidMount() {
+    Store.dispatch(iguanaActiveHandle(true));
+  }
+
   toggleSeedInputVisibility() {
     this.setState({
       seedInputVisibility: !this.state.seedInputVisibility,

From 7f8b41abb67012ced7ef236b309fc18b99cdc5d5 Mon Sep 17 00:00:00 2001
From: Petr Balashov <pbca26@gmail.com>
Date: Tue, 25 Apr 2017 17:36:13 +0200
Subject: [PATCH 09/14] bugfix basilisk

---
 react/src/actions/actionCreators.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index e896da7..52bb0f2 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -956,7 +956,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           };
         }
 
-        if (mode !== 'native' && mode !== 'basilisk') {
+        if (mode === 'native' || mode === 'basilisk') {
           payload = {
             'userpass': 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
             'coin': coin,
@@ -1054,7 +1054,8 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
           result[0] = result[0].result;
         }
 
-        console.log('calcBalance', result);
+        console.log('calc result', result);
+        console.log('calc json', json);
 
         if (mode !== 'basilisk') {
           const allAddrArray = json.map(res => res.address).filter((x, i, a) => a.indexOf(x) == i);

From f53426cd43bfc73a1752f541080f1eeb560f2b79 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Wed, 26 Apr 2017 08:41:37 +0300
Subject: [PATCH 10/14] bugfix

---
 react/src/actions/actionCreators.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 52bb0f2..42080a2 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -1050,8 +1050,12 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
       }
 
       function calcBalance(result, json, dispatch, mode) {
+        console.log('result', result);
         if (mode === 'full' || mode === 'basilisk') {
           result[0] = result[0].result;
+        } else {
+          result[0] = result[0].result;
+          result[1] = result[1].result;
         }
 
         console.log('calc result', result);
@@ -1095,6 +1099,8 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
             } else {
               filteredArray = json.filter(res => res.address === result[a][b]).map(res => res.amount);
             }
+            console.log('filteredArray', filteredArray);
+            console.log('addr', result[a][b]);
 
             let sum = 0;
 

From 6c96c74e04295d332b9537f9ca17811282b0949a Mon Sep 17 00:00:00 2001
From: Petr Balashov <pbca26@gmail.com>
Date: Wed, 26 Apr 2017 08:55:13 +0200
Subject: [PATCH 11/14] store useCache settings in localstorage

---
 react/src/components/dashboard/walletsData.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 07b800c..1a5b466 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -39,7 +39,7 @@ class WalletsData extends React.Component {
       addressSelectorOpen: false,
       currentStackLength: 0,
       totalStackLength: 0,
-      useCache: sessionStorage.getItem('useCache'),
+      useCache: sessionStorage.getItem('useCache') ? true : false,
     };
     this.updateInput = this.updateInput.bind(this);
     this.toggleBasiliskActionsMenu = this.toggleBasiliskActionsMenu.bind(this);
@@ -54,11 +54,16 @@ class WalletsData extends React.Component {
     socket.on('messages', msg => this.updateSocketsData(msg));
   }
 
+  componentDidMount() {
+    console.log('use cache = ', this.state.useCache);    
+  }
+
   toggleCacheApi() {
-    console.log('useCache is set to', !this.state.useCache);
-    sessionStorage.setItem('useCache', !this.state.useCache);
+    const _useCache = !this.state.useCache;
+    console.log('useCache is set to', _useCache);
+    sessionStorage.setItem('useCache', _useCache);
     this.setState(Object.assign({}, this.state, {
-      useCache: !this.state.useCache,
+      useCache: _useCache,
     }));
   }
 

From 76cc1e4368e33a3086cc074b8e5390dbf98477ca Mon Sep 17 00:00:00 2001
From: Petr Balashov <pbca26@gmail.com>
Date: Wed, 26 Apr 2017 17:35:21 +0200
Subject: [PATCH 12/14] fetch utxo manually

---
 react/src/actions/actionCreators.js           | 25 +++++++++++++++++++
 react/src/components/dashboard/dashboard.js   |  2 +-
 react/src/components/dashboard/walletsData.js | 19 +++++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 42080a2..a9edf11 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -1175,6 +1175,31 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
   }
 }
 
+export function fetchUtxoCache(_payload) {
+  const _userpass = '?userpass=tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
+        _pubkey = '&pubkey=' + _payload.pubkey,
+        _route = _payload.allcoins ? 'cache-all' : 'cache-one',
+        _coin = '&coin=' + _payload.coin,
+        _calls = '&calls=' + _payload.calls,
+        _address = '&address' + _payload.address,
+        _iguanaInstancePort = Config.useBasiliskInstance ? '&port=' + Config.basiliskPort : '';
+
+  return dispatch => {
+    return fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/' + _route + _userpass + _pubkey + _coin + _calls + _address + _iguanaInstancePort, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+    .catch(function(error) {
+      console.log(error);
+      dispatch(triggerToaster(true, 'fetchNewCacheData', 'Error', 'error'));
+    })
+    .then(response => response.json())
+    .then(json => dispatch(getShepherdCache(_pubkey)))
+  }
+}
+
 function getShepherdCacheState(json) {
   return {
     type: DASHBOARD_ACTIVE_COIN_GET_CACHE,
diff --git a/react/src/components/dashboard/dashboard.js b/react/src/components/dashboard/dashboard.js
index 1e89a36..2362f8b 100644
--- a/react/src/components/dashboard/dashboard.js
+++ b/react/src/components/dashboard/dashboard.js
@@ -36,7 +36,7 @@ class Dashboard extends React.Component {
             <CoinTile {...this.props} />
             <WalletsNav {...this.props} />
             <WalletsProgress {...this.props} />
-            <WalletsBalance {...this.props.ActiveCoin} />
+            <WalletsBalance {...this.props} />
             <SendCoin {...this.props} />
             <ReceiveCoin {...this.props.ActiveCoin} />
             <WalletsData {...this.props} />
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 1a5b466..96c9ba6 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -13,7 +13,8 @@ import {
   deleteCacheFile,
   connectNotaries,
   toggleViewCacheModal,
-  fetchNewCacheData
+  fetchNewCacheData,
+  fetchUtxoCache
 } from '../../actions/actionCreators';
 import Store from '../../store';
 
@@ -51,6 +52,7 @@ class WalletsData extends React.Component {
     this.removeAndFetchNewCache = this.removeAndFetchNewCache.bind(this);
     this._toggleViewCacheModal = this._toggleViewCacheModal.bind(this);
     this.toggleCacheApi = this.toggleCacheApi.bind(this);
+    this._fetchUtxoCache = this._fetchUtxoCache.bind(this);
     socket.on('messages', msg => this.updateSocketsData(msg));
   }
 
@@ -100,6 +102,16 @@ class WalletsData extends React.Component {
     }));
   }
 
+  _fetchUtxoCache() {
+    Store.dispatch(fetchUtxoCache({
+      'pubkey': this.props.Dashboard.activeHandle.pubkey,
+      'allcoins': false,
+      'coin': this.props.ActiveCoin.coin,
+      'calls': 'refresh',
+      'address': this.state.currentAddress,
+    }));    
+  }
+
   toggleBasiliskActionsMenu() {
     this.setState(Object.assign({}, this.state, {
       basiliskActionsMenu: !this.state.basiliskActionsMenu,
@@ -422,6 +434,11 @@ class WalletsData extends React.Component {
                                   <i className="icon fa-history" aria-hidden="true"></i> {translate('INDEX.REFETCH_WALLET_DATA')}
                                 </a>
                               </li>
+                              <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
+                                <a className="btn_edexcoin_dashboard_refetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_refetchdata" role="menuitem" onClick={this._fetchUtxoCache}>
+                                  <i className="icon fa-history" aria-hidden="true"></i> Update UTXO
+                                </a>
+                              </li>
                               <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this._toggleViewCacheModal}>
                                   <i className="icon fa-list-alt" aria-hidden="true"></i> {translate('INDEX.VIEW_CACHE_DATA')}

From 5e5497c312160a7bfb1d7923eff7febc484c4a5e Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Thu, 27 Apr 2017 19:20:25 +0300
Subject: [PATCH 13/14] start basilisk instance on add coin

---
 react/src/actions/actionCreators.js           | 40 +++++++++++++++++--
 react/src/components/dashboard/walletsData.js |  6 +--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index a9edf11..f0ca216 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -332,7 +332,7 @@ export function addCoin(coin, mode) {
 }
 
 export function iguanaAddCoin(coin, mode, acData) {
-  return dispatch => {
+  function _iguanaAddCoin(dispatch) {
     return fetch('http://127.0.0.1:' + Config.iguanaCorePort, {
       method: 'POST',
       body: JSON.stringify(acData),
@@ -344,6 +344,19 @@ export function iguanaAddCoin(coin, mode, acData) {
     .then(response => response.json())
     .then(json => dispatch(addCoinResult(coin, mode, acData)));
   }
+
+  if (mode === 0) {
+    return dispatch => {
+      startIguanaInstance('basilisk', 'basilisk')
+      .then(function(json) {
+        _iguanaAddCoin(dispatch);
+      });
+    }
+  } else {
+    return dispatch => {
+      return _iguanaAddCoin(dispatch);
+    }
+  }
 }
 
 export function shepherdHerd(coin, mode, path) {
@@ -653,6 +666,7 @@ export function getPeersListState(json) {
   }
 }
 
+export function getFullTransactionsList(coin) {
 /*params = {
   'userpass': tmpIguanaRPCAuth,
   'agent': 'dex',
@@ -662,8 +676,6 @@ export function getPeersListState(json) {
   'skip': 0,
   'symbol': coin
 };*/
-
-export function getFullTransactionsList(coin) {
   const payload = {
     'userpass': 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
     'coin': coin,
@@ -1991,6 +2003,28 @@ function connectAllNotaryNodes(json, dispatch) {
   }
 }
 
+export function startIguanaInstance(mode, coin) {
+  console.log('startIguanaInstance', mode + ' ' + coin);
+  return new Promise((resolve, reject) => {
+    fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/forks', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        mode,
+        coin
+      }),
+    })
+    .catch(function(error) {
+      console.log(error);
+      dispatch(triggerToaster(true, 'startIguanaInstance', 'Error', 'error'));
+    })
+    .then(response => response.json())
+    .then(json => resolve(json))
+  });
+}
+
 export function connectNotaries() {
   const payload = {
     'userpass': 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 96c9ba6..985e9a2 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -57,7 +57,7 @@ class WalletsData extends React.Component {
   }
 
   componentDidMount() {
-    console.log('use cache = ', this.state.useCache);    
+    console.log('use cache = ', this.state.useCache);
   }
 
   toggleCacheApi() {
@@ -109,7 +109,7 @@ class WalletsData extends React.Component {
       'coin': this.props.ActiveCoin.coin,
       'calls': 'refresh',
       'address': this.state.currentAddress,
-    }));    
+    }));
   }
 
   toggleBasiliskActionsMenu() {
@@ -461,7 +461,7 @@ class WalletsData extends React.Component {
                             <label className="padding-top-3" htmlFor="edexcoin_cache_api" onClick={this.toggleCacheApi}>Use cache</label>
                           </div>
                         </div>
-                        <div className="row">
+                        <div className="row" style={{padding: '20px 0 10px 0'}}>
                           <div className="col-sm-6">
                             {this.renderPaginationItemsPerPageSelector()}
                           </div>

From 3556c353d5a513ed55af3d8a4443c150a215855e Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Thu, 27 Apr 2017 20:00:58 +0300
Subject: [PATCH 14/14] coin data load bugfix; restart basilisk instance

---
 react/src/actions/actionCreators.js           | 44 +++++++++++++++++--
 .../src/components/dashboard/coinTileItem.js  |  6 ++-
 react/src/components/dashboard/walletsData.js | 26 +++++++++--
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index f0ca216..266050d 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -347,10 +347,11 @@ export function iguanaAddCoin(coin, mode, acData) {
 
   if (mode === 0) {
     return dispatch => {
-      startIguanaInstance('basilisk', 'basilisk')
+      return _iguanaAddCoin(dispatch);
+      /*startIguanaInstance('basilisk', 'basilisk')
       .then(function(json) {
         _iguanaAddCoin(dispatch);
-      });
+      });*/
     }
   } else {
     return dispatch => {
@@ -2004,7 +2005,6 @@ function connectAllNotaryNodes(json, dispatch) {
 }
 
 export function startIguanaInstance(mode, coin) {
-  console.log('startIguanaInstance', mode + ' ' + coin);
   return new Promise((resolve, reject) => {
     fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/forks', {
       method: 'POST',
@@ -2025,6 +2025,44 @@ export function startIguanaInstance(mode, coin) {
   });
 }
 
+export function getIguanaInstancesList() {
+  return new Promise((resolve, reject) => {
+    fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/forks', {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+    .catch(function(error) {
+      console.log(error);
+      dispatch(triggerToaster(true, 'getIguanaInstanceList', 'Error', 'error'));
+    })
+    .then(response => response.json())
+    .then(json => resolve(json))
+  });
+}
+
+export function restartIguanaInstance(pmid) {
+  return new Promise((resolve, reject) => {
+    fetch('http://127.0.0.1:' + Config.agamaPort + '/shepherd/forks/restart?pmid=' + pmid, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      /*body: JSON.stringify({
+        mode,
+        coin
+      }),*/
+    })
+    .catch(function(error) {
+      console.log(error);
+      dispatch(triggerToaster(true, 'restartIguanaInstance', 'Error', 'error'));
+    })
+    .then(response => response.json())
+    .then(json => resolve(json))
+  });
+}
+
 export function connectNotaries() {
   const payload = {
     'userpass': 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js
index e54e382..3b6d051 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTileItem.js
@@ -34,6 +34,7 @@ class CoinTileItem extends React.Component {
 
   dispatchCoinActions(coin, mode) {
     if (mode === 'native') {
+      Store.dispatch(iguanaActiveHandle(true));
       Store.dispatch(getSyncInfoNative(coin));
       Store.dispatch(getKMDBalanceTotal(coin));
       Store.dispatch(getNativeTxHistory(coin));
@@ -41,18 +42,21 @@ class CoinTileItem extends React.Component {
       Store.dispatch(getKMDOPID(null, coin));
     }
     if (mode === 'full') {
+      Store.dispatch(iguanaActiveHandle(true));
       Store.dispatch(getSyncInfo(coin));
       Store.dispatch(iguanaEdexBalance(coin, mode));
       Store.dispatch(getKMDAddressesNative(coin, mode)); //getAddressesByAccount(coin));
       Store.dispatch(getFullTransactionsList(coin));
     }
     if (mode === 'basilisk') {
+      console.log('dispatchCoinActions', mode);
       const useAddress = this.props.ActiveCoin.mainBasiliskAddress ? this.props.ActiveCoin.mainBasiliskAddress : this.props.Dashboard.activeHandle[coin];
+      Store.dispatch(iguanaActiveHandle(true));
 
       if (this.props && this.props.Dashboard && this.props.Dashboard.activeHandle && this.props.Dashboard.activeHandle[coin]) {
+        Store.dispatch(getShepherdCache(this.props.Dashboard.activeHandle.pubkey));
         Store.dispatch(getBasiliskTransactionsList(coin, useAddress));
         Store.dispatch(getKMDAddressesNative(coin, mode, useAddress));
-        Store.dispatch(getShepherdCache(this.props.Dashboard.activeHandle.pubkey));
         Store.dispatch(iguanaEdexBalance(coin, mode));
       }
     }
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData.js
index 985e9a2..7337ef6 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData.js
@@ -14,7 +14,9 @@ import {
   connectNotaries,
   toggleViewCacheModal,
   fetchNewCacheData,
-  fetchUtxoCache
+  fetchUtxoCache,
+  getIguanaInstancesList,
+  restartIguanaInstance
 } from '../../actions/actionCreators';
 import Store from '../../store';
 
@@ -53,6 +55,7 @@ class WalletsData extends React.Component {
     this._toggleViewCacheModal = this._toggleViewCacheModal.bind(this);
     this.toggleCacheApi = this.toggleCacheApi.bind(this);
     this._fetchUtxoCache = this._fetchUtxoCache.bind(this);
+    this.restartBasiliskInstance = this.restartBasiliskInstance.bind(this);
     socket.on('messages', msg => this.updateSocketsData(msg));
   }
 
@@ -93,6 +96,18 @@ class WalletsData extends React.Component {
     }
   }
 
+  restartBasiliskInstance() {
+    getIguanaInstancesList().then(function(json) {
+      for (let port in json.result) {
+        if (json.result[port].mode === 'basilisk') {
+          restartIguanaInstance(json.result[port].pmid).then(function(json) {
+            console.log('restartBasiliskInstance', json);
+          });
+        }
+      }
+    });
+  }
+
   removeAndFetchNewCache() {
     Store.dispatch(deleteCacheFile({
       'pubkey': this.props.Dashboard.activeHandle.pubkey,
@@ -426,7 +441,7 @@ class WalletsData extends React.Component {
                               </li>
                               <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_fetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this.basiliskRefreshAction}>
-                                  <i className="icon  fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.FETCH_WALLET_DATA')}
+                                  <i className="icon fa-cloud-download" aria-hidden="true"></i> {translate('INDEX.FETCH_WALLET_DATA')}
                                 </a>
                               </li>
                               <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
@@ -435,10 +450,15 @@ class WalletsData extends React.Component {
                                 </a>
                               </li>
                               <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
-                                <a className="btn_edexcoin_dashboard_refetchdata" data-edexcoin="COIN" id="btn_edexcoin_dashboard_refetchdata" role="menuitem" onClick={this._fetchUtxoCache}>
+                                <a role="menuitem" onClick={this._fetchUtxoCache}>
                                   <i className="icon fa-history" aria-hidden="true"></i> Update UTXO
                                 </a>
                               </li>
+                              <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
+                                <a role="menuitem" onClick={this.restartBasiliskInstance}>
+                                  <i className="icon fa-refresh" aria-hidden="true"></i> Restart Basilisk Instance
+                                </a>
+                              </li>
                               <li data-edexcoin="COIN" role="presentation" className={!this.state.useCache ? 'hide' : ''}>
                                 <a className="btn_edexcoin_dashboard_fetchdata" role="menuitem" onClick={this._toggleViewCacheModal}>
                                   <i className="icon fa-list-alt" aria-hidden="true"></i> {translate('INDEX.VIEW_CACHE_DATA')}