From 6346ab5d80ab61c273859e9c14f09b31dbb447f9 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Mon, 16 Oct 2017 04:06:55 -0700
Subject: [PATCH] reindex blocks handling fix

---
 .../components/dashboard/walletsProgress/walletsProgress.js | 4 ++--
 .../dashboard/walletsProgress/walletsProgress.render.js     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/react/src/components/dashboard/walletsProgress/walletsProgress.js b/react/src/components/dashboard/walletsProgress/walletsProgress.js
index dcee90f..3fe640c 100644
--- a/react/src/components/dashboard/walletsProgress/walletsProgress.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.js
@@ -229,7 +229,7 @@ class WalletsProgress extends React.Component {
         _progress.code &&
         _progress.code === -28 &&
         this.props.Settings.debugLog) {
-      if (_progress.message == 'Activating best chain...') {
+      if (_progress.message === 'Activating best chain...') {
         const _parseProgress = this.parseActivatingBestChainProgress();
 
         if (_parseProgress &&
@@ -264,7 +264,7 @@ class WalletsProgress extends React.Component {
 
   renderRescanProgress() {
     if (this.props.Settings.debugLog.indexOf('Still rescanning') > -1 &&
-        this.props.ActiveCoin.rescanInProgress) {
+        ((this.props.ActiveCoin.rescanInProgress) || (this.props.ActiveCoin.progress && this.props.ActiveCoin.progress.code && this.props.ActiveCoin.progress.code === -28 && this.props.ActiveCoin.progress.message === 'Rescanning...'))) {
       const temp = this.props.Settings.debugLog.split(' ');
       let currentProgress;
 
diff --git a/react/src/components/dashboard/walletsProgress/walletsProgress.render.js b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
index ae34f8e..900a2f5 100644
--- a/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
@@ -99,16 +99,16 @@ export const ChainActivationNotificationRender = function() {
   if (this.props.ActiveCoin.coin !== 'CHIPS') {
     return (
       <div>
-        <div className={ 'alert alert-info alert-dismissible margin-bottom-' + (this.state.isWindows && !this.state.isWindowsWorkaroundEnabled && this.isWinSyncPercBelowThreshold() && this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native' && this.props.ActiveCoin.coin === 'KMD' ? 20 : 50) }>
+        <div className={ 'alert alert-info alert-dismissible margin-bottom-' + (this.state.isWindows && !this.state.isWindowsWorkaroundEnabled && this.isWinSyncPercBelowThreshold() === true && this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native' && this.props.ActiveCoin.coin === 'KMD' ? 20 : 50) }>
           <h4>
             { translate('INDEX.ACTIVATING_CHAIN') }&nbsp;
-            { this.props.ActiveCoin.rescanInProgress ? (this.renderRescanProgress() ? `: ${this.renderRescanProgress().toFixed(2)}% ${translate('INDEX.PROGRESS_RESCANNING_BLOCKS')}` : translate('INDEX.PROGRESS_RESCANNING_BLOCKS')) : this.renderActivatingBestChainProgress() }
+            { this.props.ActiveCoin.rescanInProgress || (this.props.ActiveCoin.progress && this.props.ActiveCoin.progress.code && this.props.ActiveCoin.progress.code === -28 && this.props.ActiveCoin.progress.message === 'Rescanning...') ? (this.renderRescanProgress() ? `: ${this.renderRescanProgress().toFixed(2)}% ${translate('INDEX.PROGRESS_RESCANNING_BLOCKS')}` : translate('INDEX.PROGRESS_RESCANNING_BLOCKS')) : this.renderActivatingBestChainProgress() }
           </h4>
           <p>{ this.renderLB('INDEX.KMD_STARTED') }</p>
         </div>
         { this.state.isWindows &&
           !this.state.isWindowsWorkaroundEnabled &&
-          this.isWinSyncPercBelowThreshold() &&
+          this.isWinSyncPercBelowThreshold() === true &&
           this.props.ActiveCoin &&
           this.props.ActiveCoin.mode === 'native' &&
           this.props.ActiveCoin.coin === 'KMD' &&