renamed dashboard label to transactions; added native wallet info btn

react/change.log

@@ -13,7 +13,8 @@ UI:
 - reset app setting to default
 - manual balance / transactions list refresh
 - quick access dropdown on login to open settings / about / sync only modals
-- qr code
+- qr code generator / scan
+- basilisk send form reset fix
 
 v0.2.0.21a-beta
 --------------

react/src/components/dashboard/coinTile/coinTileItem.js

@@ -110,16 +110,13 @@ class CoinTileItem extends React.Component {
     if (coin !== this.props.ActiveCoin.coin) {
       if (!this.props.ActiveCoin.coins[this.props.ActiveCoin.coin]) {
         coinInitDataFetchInterval = setInterval(() => {
-          console.warn('dispatch', 'coinInitDataFetchInterval');
           this.dispatchCoinActions(coin, mode);
 
-          if (mode === 'native' && this.props.Dashboard.progress) {
+          if ((mode === 'native' || mode === 'full') && this.props.Dashboard.progress) {
-            console.warn('clearInterval', 'native');
             clearInterval(coinInitDataFetchInterval);
           }
 
           if (mode === 'basilisk' && (this.props.ActiveCoin.txhistory && this.props.ActiveCoin.txhistory !== 'loading') && this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] && JSON.parse(sessionStorage.getItem('IguanaActiveAccount'))[this.props.ActiveCoin.coin]) {
-            console.warn('clearInterval', 'basilisk');
             clearInterval(coinInitDataFetchInterval);
           }
         }, 500);
@@ -141,8 +138,6 @@ class CoinTileItem extends React.Component {
 
       Store.dispatch(dashboardChangeActiveCoin(coin, mode));
 
-      console.warn('first load');
-
       if (mode === 'full') {
         const _iguanaActiveHandle = setInterval(() => {
           this.dispatchCoinActions(coin, mode);
@@ -160,32 +155,12 @@ class CoinTileItem extends React.Component {
           this.dispatchCoinActions(coin, mode);
         }, coin === 'KMD' ? IGUNA_ACTIVE_HANDLE_TIMEOUT_KMD_NATIVE : IGUNA_ACTIVE_HANDLE_TIMEOUT);
 
-        /*if (!this.props.Dashboard.progress) {
-          Store.dispatch(getSyncInfoNative(coin, true));
-          Store.dispatch(getKMDBalanceTotal(coin));
-          Store.dispatch(getNativeTxHistory(coin));
-          Store.dispatch(getKMDAddressesNative(coin, mode));
-          Store.dispatch(getKMDOPID(null, coin));
-
-          setTimeout(() => {
-            Store.dispatch(getSyncInfoNative(coin, true));
-            Store.dispatch(getKMDBalanceTotal(coin));
-            Store.dispatch(getNativeTxHistory(coin));
-            Store.dispatch(getKMDAddressesNative(coin, mode));
-            Store.dispatch(getKMDOPID(null, coin));
-          }, 100);
-        }*/
-
         Store.dispatch(startInterval('sync', _iguanaActiveHandle));
       }
       if (mode === 'basilisk') {
         const _activeHandle = this.props.Dashboard.activeHandle;
         const _basiliskMainAddress = _activeHandle[coin] || JSON.parse(sessionStorage.getItem('IguanaActiveAccount'))[coin];
 
-        /*setTimeout(() => {
-          this.dispatchCoinActions(coin, mode);
-        }, 100);*/
-
         Store.dispatch(changeActiveAddress(_basiliskMainAddress));
 
         if (_basiliskMainAddress) {

react/src/components/dashboard/sendCoin/sendCoin.render.js

@@ -163,7 +163,7 @@ export const SendApiTypeSelectorRender = function() {
           </div>
         </span>
       </div>
-      { this.stateisCameraFeatureDetected &&
+      { this.state.isCameraFeatureDetected &&
         <div className="col-lg-4 text-right">
           <QRModal
             mode="scan"

react/src/components/dashboard/walletsNav/walletsNav.js

@@ -21,6 +21,8 @@ class WalletsNav extends React.Component {
       nativeOnly: Config.iguanaLessMode,
     };
     this.toggleSendReceiveCoinForms = this.toggleSendReceiveCoinForms.bind(this);
+    this.toggleNativeWalletInfo = this.toggleNativeWalletInfo.bind(this);
+    this.toggleNativeWalletTransactions = this.toggleNativeWalletTransactions.bind(this);
   }
 
   componentWillMount() {
@@ -43,6 +45,14 @@ class WalletsNav extends React.Component {
     }
   }
 
+  toggleNativeWalletInfo() {
+    Store.dispatch(toggleDashboardActiveSection('settings'));
+  }
+
+  toggleNativeWalletTransactions() {
+    Store.dispatch(toggleDashboardActiveSection('default'));
+  }
+
   toggleSendCoinForm(display) {
     if (this.props.ActiveCoin.mode === 'native') {
       Store.dispatch(

react/src/components/dashboard/walletsNav/walletsNav.render.js

@@ -28,8 +28,8 @@ export const WalletsNavWithWalletRender = function() {
         id="header-dashboard"
         style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : '0' }}>
         <ol className={ this.state.nativeOnly ? 'hide' : 'breadcrumb' }>
-          <strong>{ translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: </strong> 
+          <strong>{ translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: </strong>
-          { this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' } 
+          { this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' }
           <button
             className="btn btn-default btn-xs clipboard-edexaddr"
             onClick={ () => this.copyMyAddress(this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin]) }>
@@ -38,11 +38,19 @@ export const WalletsNavWithWalletRender = function() {
         </ol>
         <div className="page-header-actions">
           <div id="kmd_header_button">
+            { this.props.ActiveCoin.mode === 'native' &&
+              <button
+                type="button"
+                className="btn btn-success waves-effect waves-light"
+                onClick={ this.toggleNativeWalletInfo }>
+                <i className="icon fa-info"></i>
+              </button>
+            }
             <button
               type="button"
               className="btn btn-dark waves-effect waves-light"
-              onClick={ this.toggleSendReceiveCoinForms }>
+              onClick={ this.props.ActiveCoin.mode !== 'native' ? this.toggleSendReceiveCoinForms : this.toggleNativeWalletTransactions }>
-              <i className="icon md-view-dashboard"></i> { this.props.ActiveCoin.mode !== 'native' ? translate('INDEX.DASHBOARD') : translate('INDEX.WALLET_INFO') }
+              <i className="icon md-view-dashboard"></i> { translate('INDEX.TRANSACTIONS') }
             </button>
             <button
               type="button"

react/src/components/login/login.js

@@ -21,6 +21,8 @@ import { translate } from '../../translate/translate';
 const IGUNA_ACTIVE_HANDLE_TIMEOUT = 3000;
 const IGUNA_ACTIVE_COINS_TIMEOUT = 10000;
 
+// TODO: remove duplicate activehandle and activecoins calls
+
 class Login extends React.Component {
   constructor(props) {
     super(props);
@@ -62,7 +64,7 @@ class Login extends React.Component {
 
   toggleLoginSettingsDropdownSection(sectionName) {
     Store.dispatch(toggleLoginSettingsModal(true));
-    
+
     this.setState({
       displayLoginSettingsDropdown: false,
       displayLoginSettingsDropdownSection: sectionName,
@@ -193,14 +195,14 @@ class Login extends React.Component {
       if (this.state.seedInputVisibility) {
           document.querySelector('#loginPassphrase').style.height = '1px';
           document.querySelector('#loginPassphrase').style.height = `${(15 + document.querySelector('#loginPassphrase').scrollHeight)}px`;
-      }    
+      }
     }, 100);
   }
 
   updateLoginPassPhraseInput(e) {
     // remove any empty chars from the start/end of the string
     const newValue = e.target.value;
-    
+
     clearTimeout(this.state.trimPassphraseTimer);
 
     const _trimPassphraseTimer = setTimeout(() => {
@@ -211,7 +213,7 @@ class Login extends React.Component {
     }, 2000);
 
     this.resizeLoginTextarea();
-    
+
     this.setState({
       trimPassphraseTimer: _trimPassphraseTimer,
       [e.target.name]: newValue,
@@ -350,7 +352,7 @@ class Login extends React.Component {
   copyPassPhraseToClipboard() {
     const passPhrase = this.state.randomSeed;
     const textField = document.createElement('textarea');
-    
+
     textField.innerText = passPhrase;
     document.body.appendChild(textField);
     textField.select();