From 6631f12e10cc6ffcd34544a03e42a4e3ae1031bf Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Fri, 14 Jul 2017 21:39:21 +0300
Subject: [PATCH] cli render fix

---
 .../components/dashboard/settings/settings.js | 27 ++++++++++++++-----
 .../dashboard/settings/settings.render.js     |  2 +-
 .../walletsProgress/walletsProgress.js        |  3 ++-
 react/src/translate/en.js                     |  2 ++
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/react/src/components/dashboard/settings/settings.js b/react/src/components/dashboard/settings/settings.js
index a7aa827..386b3e7 100644
--- a/react/src/components/dashboard/settings/settings.js
+++ b/react/src/components/dashboard/settings/settings.js
@@ -103,7 +103,7 @@ class Settings extends React.Component {
       if (this.state.seedInputVisibility) {
           document.querySelector('#wifkeysPassphraseTextarea').style.height = '1px';
           document.querySelector('#wifkeysPassphraseTextarea').style.height = `${(15 + document.querySelector('#wifkeysPassphraseTextarea').scrollHeight)}px`;
-      }    
+      }
     }, 100);
   }
 
@@ -416,11 +416,10 @@ class Settings extends React.Component {
   }
 
   updateInput(e) {
-    console.log(e.target.name);
     if (e.target.name === 'wifkeysPassphrase') {
       // remove any empty chars from the start/end of the string
       const newValue = e.target.value;
-      
+
       clearTimeout(this.state.trimPassphraseTimer);
 
       const _trimPassphraseTimer = setTimeout(() => {
@@ -430,7 +429,7 @@ class Settings extends React.Component {
       }, 2000);
 
       this.resizeLoginTextarea();
-      
+
       this.setState({
         trimPassphraseTimer: _trimPassphraseTimer,
         [e.target.name]: newValue,
@@ -486,12 +485,26 @@ class Settings extends React.Component {
         _cliResponseParsed = _cliResponse.result;
       }
 
-      const __cliResponseParsed = _cliResponseParsed.split('\r\n');
+      let __cliResponseParsed;
+      if (_cliResponseParsed.indexOf('\r\n') > -1) {
+        _cliResponseParsed = _cliResponseParsed.split('\r\n') ;
+      } else if (_cliResponseParsed.indexOf('\n') > -1) {
+        __cliResponseParsed = _cliResponseParsed.split('\n') ;
+      } else {
+        __cliResponseParsed = _cliResponseParsed;
+      }
+
       let _items = [];
 
-      for (let i = 0; i < __cliResponseParsed.length; i++) {
+      if (__cliResponseParsed.length) {
+        for (let i = 0; i < __cliResponseParsed.length; i++) {
+          _items.push(
+            <div key={ `cli-response-${Math.random(0, 9) * 10}` }>{ typeof __cliResponseParsed[i] === 'object' ? JSON.stringify(__cliResponseParsed[i], null, '\t') : __cliResponseParsed[i] }</div>
+          );
+        }
+      } else {
         _items.push(
-          <div key={ `cli-response-${Math.random(0, 9) * 10}` }>{ __cliResponseParsed[i] }</div>
+          translate('INDEX.NO_DATA_AVAILABLE')
         );
       }
 
diff --git a/react/src/components/dashboard/settings/settings.render.js b/react/src/components/dashboard/settings/settings.render.js
index 319f4dc..9b40e82 100644
--- a/react/src/components/dashboard/settings/settings.render.js
+++ b/react/src/components/dashboard/settings/settings.render.js
@@ -570,7 +570,7 @@ export const SettingsRender = function() {
                               name="cliCoin"
                               id="settingsCliOptions"
                               onChange={ this.updateInput }>
-                              <option value="">{ translate('INDEX.CLI_SELECT_A_COIN') }</option>
+                              <option value="">{ translate('INDEX.CLI_NATIVE_COIN') }</option>
                               { this.renderActiveCoinsList('native') }
                             </select>
                             <label
diff --git a/react/src/components/dashboard/walletsProgress/walletsProgress.js b/react/src/components/dashboard/walletsProgress/walletsProgress.js
index bbc7e32..af97464 100644
--- a/react/src/components/dashboard/walletsProgress/walletsProgress.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { translate } from '../../../translate/translate';
 import {
   SyncErrorLongestChainRender,
   SyncErrorBlocksRender,
@@ -124,7 +125,7 @@ class WalletsProgress extends React.Component {
         );
       } else if (
           this.props.Settings.debugLog.indexOf('LoadExternalBlockFile:') > -1 ||
-          this.props.Settings.debugLog.indexOf('Reindexing block file') > -1 
+          this.props.Settings.debugLog.indexOf('Reindexing block file') > -1
         ) {
         return (
           `: ({ translate('INDEX.REINDEX') })`
diff --git a/react/src/translate/en.js b/react/src/translate/en.js
index 445ce3b..8a47b93 100644
--- a/react/src/translate/en.js
+++ b/react/src/translate/en.js
@@ -17,6 +17,7 @@ export const _lang = {
       'NO_ACTIVE_COIN': 'No active coin',
     },
     'INDEX': {
+      'NO_DATA_AVAILABLE': 'No data available',
       'LOADING': 'Loading',
       'ACTIVATING_SM': 'activating',
       'DL_BLOCKS': 'downloading blocks',
@@ -40,6 +41,7 @@ export const _lang = {
       'BINS_UPDATE': 'Binaries update',
       'UPDATE_BINS_NOW': 'Update binaries now',
       'CLI_SELECT_A_COIN': 'Select a coin and type in CLI compatible command',
+      'CLI_NATIVE_COIN': 'Select native coin',
       'IMPORT': 'Import',
       'CHECK': 'Check',
       'VALIDATE': 'Validate',