SuperNETorg · pbca26 · Nov 12, 2017 · Nov 12, 2017 · Nov 12, 2017 · Nov 12, 2017
diff --git a/react/src/actions/actions/addCoin.js b/react/src/actions/actions/addCoin.js
@@ -243,7 +243,7 @@ export function shepherdHerd(coin, mode, path, startupParams) {
         console.warn(acData);
         dispatch(
           triggerToaster(
-            `Error starting ${coin} daemon. Port ${acData.rpc} is already taken!`, // translate
+            translate('TOASTR.ERROR_STARTING_DAEMON', coin) + ' ' + translate('TOASTR.PORT_IS_TAKEN', acData.rpc),
             translate('TOASTR.SERVICE_NOTIFICATION'),
             'error',
             false

diff --git a/react/src/actions/actions/coinList.js b/react/src/actions/actions/coinList.js
@@ -1,6 +1,54 @@
 import { triggerToaster } from '../actionCreators';
 import Config from '../../config';
 
+export function shepherdElectrumLock() {
+  return new Promise((resolve, reject) => {
+    fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/electrum/lock`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: '',
+    })
+    .catch((error) => {
+      console.log(error);
+      dispatch(
+        triggerToaster(
+          'shepherdElectrumLock',
+          'Error',
+          'error'
+        )
+      );
+    })
+    .then(response => response.json())
+    .then(json => resolve(json))
+  });
+}
+
+export function shepherdElectrumLogout() {
+  return new Promise((resolve, reject) => {
+    fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/electrum/logout`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: '',
+    })
+    .catch((error) => {
+      console.log(error);
+      dispatch(
+        triggerToaster(
+          'shepherdElectrumLogout',
+          'Error',
+          'error'
+        )
+      );
+    })
+    .then(response => response.json())
+    .then(json => resolve(json))
+  });
+}
+
 export function shepherdStopCoind(coin) {
   return new Promise((resolve, reject) => {
     fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/coind/stop`, {
@@ -25,14 +73,19 @@ export function shepherdStopCoind(coin) {
   });
 }
 
-export function shepherdRemoveCoin(coin) {
+export function shepherdRemoveCoin(coin, mode) {
   return new Promise((resolve, reject) => {
     fetch(`http://127.0.0.1:${Config.agamaPort}/shepherd/coins/remove`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: coin === 'KMD' ? '' : JSON.stringify({ chain: coin }),
+      body: JSON.stringify(coin === 'KMD' && mode === 'native' ? {
+        mode,
+      } : {
+        mode,
+        chain: coin,
+      }),
     })
     .catch((error) => {
       console.log(error);

diff --git a/react/src/components/addcoin/addcoin.js b/react/src/components/addcoin/addcoin.js
@@ -128,7 +128,7 @@ class AddCoin extends React.Component {
         addCoinProps.display !== this.state.display) {
       this.setState(Object.assign({}, this.state, {
         display: addCoinProps.display,
-        modalClassName: addCoinProps.display ? 'show fade' : 'show fade',
+        modalClassName: 'show fade',
       }));
 
       setTimeout(() => {

diff --git a/react/src/components/dashboard/claimInterestModal/claimInterestModal.js b/react/src/components/dashboard/claimInterestModal/claimInterestModal.js
@@ -35,7 +35,9 @@ class ClaimInterestModal extends React.Component {
   }
 
   componentWillMount() {
-    this.loadListUnspent();
+    if (this.props.ActiveCoin.mode === 'native') {
+      this.loadListUnspent();
+    }
   }
 
   loadListUnspent() {

diff --git a/react/src/components/dashboard/claimInterestModal/claimInterestModal.render.js b/react/src/components/dashboard/claimInterestModal/claimInterestModal.render.js
@@ -15,7 +15,7 @@ export const _ClaimInterestTableRender = function() {
               className="btn btn-default btn-xs clipboard-edexaddr copy-string-btn"
               title={ translate('INDEX.COPY_TO_CLIPBOARD') }
               onClick={ () => this.copyTxId(_transactionsList[i].txid) }>
-                <i className="icon wb-copy"></i> { translate('INDEX.COPY') }
+                <i className="icon wb-copy"></i> { translate('INDEX.COPY') + ' TXID' }
             </button>
           </td>
           <td>{ _transactionsList[i].address }</td>

diff --git a/react/src/components/dashboard/coinTile/coinTileItem.js b/react/src/components/dashboard/coinTile/coinTileItem.js
@@ -30,7 +30,7 @@ import Config from '../../../config';
 
 import CoinTileItemRender from './coinTileItem.render';
 
-const SPV_DASHBOARD_UPDATE_TIMEOUT = 60000;
+const SPV_DASHBOARD_UPDATE_TIMEOUT = 10000;
 const ACTIVE_HANDLE_TIMEOUT_COIND_NATIVE = 15000;
 const COIND_DOWN_MODAL_FETCH_FAILURES_THRESHOLD = window.require('electron').remote.getCurrentWindow().appConfig.failedRPCAttemptsThreshold || 10;
 
@@ -43,6 +43,28 @@ class CoinTileItem extends React.Component {
     this.autoSetActiveCoin = this.autoSetActiveCoin.bind(this);
   }
 
+  renderStopCoinButton() {
+    if (this.props.Main &&
+        this.props.Main.coins &&
+        this.props.Main.coins.native &&
+        this.props.Main.coins.native.length) {
+      return true;
+    }
+  }
+
+  renderRemoveCoinButton() {
+    if (this.props.Main &&
+        this.props.Main.coins &&
+        ((this.props.Main.coins.native &&
+        this.props.Main.coins.native.length &&
+        this.state.appConfig &&
+        !this.state.appConfig.stopNativeDaemonsOnQuit) ||
+        (this.props.Main.coins.spv &&
+        this.props.Main.coins.spv.length))) {
+      return true;
+    }
+  }
+
   autoSetActiveCoin() {
     const modes = [
       'native',
@@ -97,8 +119,8 @@ class CoinTileItem extends React.Component {
     });
   }
 
-  removeCoin(coin) {
-    shepherdRemoveCoin(coin)
+  removeCoin(coin, mode) {
+    shepherdRemoveCoin(coin, mode)
     .then((res) => {
       Store.dispatch(
         triggerToaster(
@@ -189,9 +211,7 @@ class CoinTileItem extends React.Component {
             )
           );
         }
-      }
-
-      if (mode === 'spv') {
+      } else if (mode === 'spv') {
         Store.dispatch(shepherdElectrumBalance(coin, this.props.Dashboard.electrumCoins[coin].pub));
         Store.dispatch(shepherdElectrumTransactions(coin, this.props.Dashboard.electrumCoins[coin].pub));
       }

diff --git a/react/src/components/dashboard/coinTile/coinTileItem.render.js b/react/src/components/dashboard/coinTile/coinTileItem.render.js
@@ -24,29 +24,17 @@ const CoinTileItemRender = function() {
           </div>
         </div>
       </div>
-      { item.mode === 'native' &&
-        this.props.Main &&
-        this.props.Main.coins &&
-        this.props.Main.coins.native &&
-        this.props.Main.coins.native.length &&
-        this.props.Main.coins.native.length > 1 &&
+      { this.renderStopCoinButton() &&
         <i
-          onClick={ () => this.stopCoind(item.coin) }
+          onClick={ () => this.stopCoind(item.coin, item.mode) }
           title="Stop"
           className="icon fa-stop-circle coind-stop-icon"></i>
       }
-      { item.mode === 'native' &&
-        this.props.Main &&
-        this.props.Main.coins &&
-        this.props.Main.coins.native &&
-        this.props.Main.coins.native.length &&
-        this.props.Main.coins.native.length > 1 &&
-        this.state.appConfig &&
-        !this.state.appConfig.stopNativeDaemonsOnQuit &&
+      { this.renderRemoveCoinButton() &&
         <i
-          onClick={ () => this.removeCoin(item.coin) }
+          onClick={ () => this.removeCoin(item.coin, item.mode) }
           title="Remove"
-          className="icon fa-plus-circle coind-remove-icon"></i>
+          className={ 'icon fa-plus-circle ' + (item.mode === 'spv' ? 'coind-remove-icon coind-remove-icon-spv' : 'coind-remove-icon') }></i>
       }
       { this.props.Dashboard &&
         this.props.Dashboard.electrumCoins &&

diff --git a/react/src/components/dashboard/importKeyModal/importKeyModal.js b/react/src/components/dashboard/importKeyModal/importKeyModal.js
@@ -77,11 +77,11 @@ class ImportKeyModal extends React.Component {
 
       this.setState({
         trimPassphraseTimer: _trimPassphraseTimer,
-        [e.target.name]: newValue,
+        [e.target.name === 'wifkeysPassphraseTextarea' ? 'wifkeysPassphrase' : e.target.name]: newValue,
       });
     } else {
       this.setState({
-        [e.target.name]: e.target.value,
+        [e.target.name === 'wifkeysPassphraseTextarea' ? 'wifkeysPassphrase' : e.target.name]: e.target.value,
       });
     }
   }
@@ -174,7 +174,7 @@ class ImportKeyModal extends React.Component {
             rescan ? translate('INDEX.WALLET_RESCAN_FINISHED') : translate('INDEX.ADDRESS_IMPORTED'),
             translate('TOASTR.WALLET_NOTIFICATION'),
             'success',
-            false
+            rescan ? false : true,
           )
         );
       } else {
@@ -187,6 +187,19 @@ class ImportKeyModal extends React.Component {
         );
       }
     });
+
+    this.state({
+      passphraseWif: null,
+      passphraseAddress: null,
+      wifkeysPassphrase: null,
+      wifkeysPassphraseTextarea: null,
+      importWithRescan: this.state.importWithRescan ? false : this.state.importWithRescan,
+    });
+
+    // reset input vals
+    this.refs.wif
+    this.refs.wifkeysPassphrase.value = '';
+    this.refs.wifkeysPassphraseTextarea.value = '';
   }
 
   generateKeysFromPassphrase() {

diff --git a/react/src/components/dashboard/importKeyModal/importKeyModal.render.js b/react/src/components/dashboard/importKeyModal/importKeyModal.render.js
@@ -26,23 +26,25 @@ export const ImportKeyModalRender = function() {
                   <strong>{ translate('IMPORT_KEY.NOTICE') }:</strong> { translate('IMPORT_KEY.NOTICE_DESC') }.&nbsp;
                   <span className={ this.props.ActiveCoin.coin === 'KMD' ? '' : 'hide' }>{ translate('IMPORT_KEY.KMD_RESCAN_WARNING_TIME') }.</span>
                 </p>
-                <form
+                <div
                   className="wifkeys-form"
-                  method="post"
-                  action="javascript:"
                   autoComplete="off">
                   <div className="form-group form-material floating">
                     <input
+                      autoComplete="off"
                       type="password"
                       className={ !this.state.seedInputVisibility ? 'form-control' : 'hide' }
                       name="wifkeysPassphrase"
                       id="wifkeysPassphrase"
+                      ref="wifkeysPassphrase"
                       onChange={ this.updateInput }
                       value={ this.state.wifkeysPassphrase } />
                     <textarea
+                      autoComplete="off"
                       className={ this.state.seedInputVisibility ? 'form-control' : 'hide' }
                       id="wifkeysPassphraseTextarea"
-                      name="wifkeysPassphrase"
+                      name="wifkeysPassphraseTextarea"
+                      ref="wifkeysPassphraseTextarea"
                       onChange={ this.updateInput }
                       value={ this.state.wifkeysPassphrase }></textarea>
                     <i
@@ -62,7 +64,7 @@ export const ImportKeyModalRender = function() {
                       className="btn btn-primary waves-effect waves-light"
                       onClick={ this.showPassphraseAddress }>{ translate('IMPORT_KEY.SHOW_ADDRESS_AND_WIF') }</button>
                   </div>
-                </form>
+                </div>
                 { this.state.passphraseAddress &&
                   this.state.passphraseWif &&
                   <div className="margin-top-60">
@@ -118,6 +120,7 @@ export const ImportKeyModalRender = function() {
                     type="text"
                     className="form-control"
                     name="wif"
+                    ref="wif"
                     onChange={ this.updateInput }
                     value={ this.state.wif } />
                 </div>

diff --git a/react/src/components/dashboard/navbar/navbar.js b/react/src/components/dashboard/navbar/navbar.js
@@ -6,6 +6,10 @@ import {
   stopInterval,
   startInterval,
   displayImportKeyModal,
+  shepherdElectrumLock,
+  shepherdElectrumLogout,
+  getDexCoins,
+  activeHandle,
 } from '../../../actions/actionCreators';
 import Store from '../../../store';
 import Config from '../../../config';
@@ -23,6 +27,24 @@ class Navbar extends React.Component {
     this.openDropMenu = this.openDropMenu.bind(this);
     this.handleClickOutside = this.handleClickOutside.bind(this);
     this._checkAC = this._checkAC.bind(this);
+    this.spvLock = this.spvLock.bind(this);
+    this.spvLogout = this.spvLogout.bind(this);
+  }
+
+  spvLock() {
+    shepherdElectrumLock()
+    .then((res) => {
+      Store.dispatch(getDexCoins());
+      Store.dispatch(activeHandle());
+    });
+  }
+
+  spvLogout() {
+    shepherdElectrumLogout()
+    .then((res) => {
+      Store.dispatch(getDexCoins());
+      Store.dispatch(activeHandle());
+    });
   }
 
   componentWillMount() {
@@ -106,6 +128,9 @@ const mapStateToProps = (state) => {
     Interval: {
       interval: state.Interval.interval,
     },
+    Main: {
+      isLoggedIn: state.Main.isLoggedIn,
+    },
   };
 };
 

diff --git a/react/src/components/dashboard/navbar/navbar.render.js b/react/src/components/dashboard/navbar/navbar.render.js
@@ -109,6 +109,26 @@ const NavbarRender = function() {
                     <i className="icon fa-users"></i> { translate('ABOUT.ABOUT_AGAMA') }
                   </a>
                 </li>
+                { this.props.Main &&
+                  this.props.Main.isLoggedIn &&
+                  this.props.Main.spv &&
+                  this.props.Main.spv.length &&
+                  <li>
+                    <a onClick={ this.spvLock }>
+                      <i className="icon fa-lock"></i> Lock
+                    </a>
+                  </li>
+                }
+                { this.props.Main &&
+                  this.props.Main.isLoggedIn &&
+                  this.props.Main.spv &&
+                  this.props.Main.spv.length &&
+                  <li>
+                    <a onClick={ this.spvLogout }>
+                      <i className="icon fa-power-off"></i> Logout
+                    </a>
+                  </li>
+                }
               </ul>
             </li>
           </ul>