skip dashboard section render

react/change.log

@@ -13,6 +13,7 @@ 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
 
 v0.2.0.21a-beta
 --------------

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

@@ -36,21 +36,21 @@ const DashboardRender = function() {
           <WalletsTxInfo {...this.props} />
           <WalletsNative {...this.props} />
         </div>
-        <div className={ this.isSectionActive('edex') ? 'show' : 'hide' }>
+        { this.isSectionActive('edex') &&
           <EDEX {...this.props} />
-        </div>
+        }
-        <div className={ this.isSectionActive('atomic') ? 'show full-height' : 'hide' }>
+        { this.isSectionActive('atomic') &&
           <Atomic {...this.props} />
-        </div>
+        }
-        <div className={ this.isSectionActive('jumblr') ? 'show' : 'hide' }>
+        { this.isSectionActive('jumblr') &&
           <Jumblr {...this.props} />
-        </div>
+        }
-        <div className={ this.isSectionActive('settings') ? 'show' : 'hide' }>
+        { this.isSectionActive('settings') &&
           <Settings {...this.props} />
-        </div>
+        }
-        <div className={ this.isSectionActive('about') ? 'show' : 'hide' }>
+        { this.isSectionActive('about') &&
           <About {...this.props} />
-        </div>
+        }
       </div>
     </div>
   );

react/src/components/dashboard/receiveCoin/receiveCoin.js

@@ -123,15 +123,15 @@ class ReceiveCoin extends React.Component {
 
         if (this.isBasiliskMode() &&
             this.hasNoAmount(address)) {
-          address.amount = _cache && _cache[_coin][address.address]
+          address.amount = _cache && _cache[_coin][address.address] &&
-          && _cache[_coin][address.address].getbalance.data
+            _cache[_coin][address.address].getbalance.data &&
-          && _cache[_coin][address.address].getbalance.data.balance ? _cache[_coin][address.address].getbalance.data.balance : 'N/A';
+            _cache[_coin][address.address].getbalance.data.balance ? _cache[_coin][address.address].getbalance.data.balance : 'N/A';
         }
         if (this.isBasiliskMode() &&
             this.hasNoInterest(address)) {
-          address.interest = _cache && _cache[_coin][address.address]
+          address.interest = _cache && _cache[_coin][address.address] &&
-          && _cache[_coin][address.address].getbalance.data
+            _cache[_coin][address.address].getbalance.data &&
-          && _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
+            _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
         }
 
         items.push(

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

@@ -9,10 +9,10 @@ export const UTXOCacheInfoRender = function(refreshCacheData, isReadyToUpdate, w
   return (
     <div className="col-lg-12">
       <hr />
-      { translate('SEND.TOTAL_UTXO_AVAILABLE') }: 
+      { translate('SEND.TOTAL_UTXO_AVAILABLE') }:
       { refreshCacheData ? refreshCacheData.data && refreshCacheData.data.length : translate('SEND.PRESS_UPDATE_BTN') }<br />
       <div className={ !timestamp ? 'hide' : '' }>
-        { translate('SEND.LAST_UPDATED') } @ 
+        { translate('SEND.LAST_UPDATED') } @
         { secondsToString(refreshCacheData ? refreshCacheData.timestamp : 0, true) }&nbsp;|&nbsp;
         { secondsElapsedToString(timestamp || 0) }&nbps;
         { translate('SEND.AGO') }<br />
@@ -38,7 +38,7 @@ export const UTXOCacheInfoRender = function(refreshCacheData, isReadyToUpdate, w
   );
 };
 
-export const SendCoinResponseRender = function () {
+export const SendCoinResponseRender = function() {
   if (this.props.ActiveCoin.lastSendToResponse) {
     let items = [];
     const _response = this.props.ActiveCoin.lastSendToResponse;
@@ -105,7 +105,7 @@ export const SendCoinResponseRender = function () {
   }
 }
 
-export const OASendUIRender = function () {
+export const OASendUIRender = function() {
   return (
     <div className="row">
       <div className="col-lg-6 form-group form-material">
@@ -134,7 +134,7 @@ export const OASendUIRender = function () {
   );
 };
 
-export const SendApiTypeSelectorRender = function () {
+export const SendApiTypeSelectorRender = function() {
   return (
     <div className="row">
       <div className="col-lg-10 margin-bottom-10">
@@ -158,7 +158,7 @@ export const SendApiTypeSelectorRender = function () {
   );
 };
 
-export const SendCoinRender = function () {
+export const SendCoinRender = function() {
   return (
     <div className="col-sm-12 padding-top-10">
       <div className="col-xlg-12 col-md-12 col-sm-12 col-xs-12">

react/src/components/dashboard/settings/settings.js

@@ -207,23 +207,27 @@ class Settings extends React.Component {
 
     for (let i = 0; i < this.state.updateLog.length; i++) {
       items.push(
-        <div>{ this.state.updateLog[i] }</div>
+        <div key={ `settings-update-log-${i}` }>{ this.state.updateLog[i] }</div>
       );
     }
 
-    return (
+    if (this.state.updateLog.length) {
-      <div style={{ minHeight: '200px' }}>
+      return (
-        <hr />
+        <div style={{ minHeight: '200px' }}>
-        <h5>Progress:</h5>
+          <hr />
-        <div className="padding-bottom-15">{ items }</div>
+          <h5>Progress:</h5>
-        <div className={ updateProgressBar.patch > -1 ? 'progress progress-sm' : 'hide' }>
+          <div className="padding-bottom-15">{ items }</div>
-          <div
+          <div className={ updateProgressBar.patch > -1 ? 'progress progress-sm' : 'hide' }>
-            className="progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success font-size-80-percent"
+            <div
-            style={{ width: updateProgressBar.patch + '%' }}>
+              className="progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success font-size-80-percent"
+              style={{ width: updateProgressBar.patch + '%' }}>
+            </div>
           </div>
         </div>
-      </div>
+      );
-    );
+    } else {
+      return null;
+    }
   }
 
   toggleSeedInputVisibility() {

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

@@ -24,7 +24,7 @@ export const AppUpdateTabRender = function() {
             <div className="padding-top-15">
               <button
                 type="button"
-                className="btn btn-primary waves-effect waves-light"
+                className="btn btn-info waves-effect waves-light"
                 onClick={ this._checkForUpdateUIPromise }>{ translate('INDEX.CHECK_FOR_UPDATE') }</button>
               <button
                 type="button"
@@ -38,7 +38,7 @@ export const AppUpdateTabRender = function() {
             <div className="padding-top-15">
               <button
                 type="button"
-                className="btn btn-primary waves-effect waves-light"
+                className="btn btn-info waves-effect waves-light"
                 onClick={ this._checkForUpdateUIPromise }>{ translate('INDEX.CHECK_FOR_UPDATE') }</button>
               <button
                 type="button"
@@ -144,9 +144,9 @@ export const AppInfoTabRender = function() {
 
 export const SettingsRender = function() {
   return (
-    <div className="margin-left-0">
+    <div className="margin-left-0 full-height">
       <div
-        className="page-content"
+        className="page-content full-height"
         id="section-iguana-wallet-settings">
         <div className="row">
           <div className="col-xlg-12 col-md-12">