From 8775c79256381dbe6e71a1cf19125a12d57cbc92 Mon Sep 17 00:00:00 2001
From: Miika Turunen <miika.turunen@gmail.com>
Date: Mon, 31 Jul 2017 21:15:20 +0300
Subject: [PATCH 1/3] Toggle visibility of Zero balance addresses on receive
 page

---
 .../dashboard/receiveCoin/receiveCoin.js      | 22 ++++++++++++++++---
 .../receiveCoin/receiveCoin.render.js         | 15 +++++++++++++
 react/src/translate/en.js                     |  3 ++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index 9193512..e2a6c58 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -22,9 +22,11 @@ class ReceiveCoin extends React.Component {
 
     this.state = {
       openDropMenu: false,
+      hideZeroAdresses: false,
     };
     this.openDropMenu = this.openDropMenu.bind(this);
     this.handleClickOutside = this.handleClickOutside.bind(this);
+    this.toggleVisibleAddress = this.toggleVisibleAddress.bind(this);
   }
 
   componentWillMount() {
@@ -108,6 +110,12 @@ class ReceiveCoin extends React.Component {
     Store.dispatch(getNewKMDAddresses(this.props.coin, type));
   }
 
+  toggleVisibleAddress() {
+    this.setState(Object.assign({}, this.state, {
+      hideZeroAdresses: !this.state.hideZeroAdresses,
+    }));
+  }
+  
   renderAddressList(type) {
     const _addresses = this.props.addresses;
     const _cache = this.props.cache;
@@ -134,9 +142,17 @@ class ReceiveCoin extends React.Component {
           && _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
         }
 
-        items.push(
-          AddressItemRender.call(this, address, type)
-        );
+        if (this.state.hideZeroAdresses) {
+          if (!this.hasNoAmount) {
+            items.push(
+              AddressItemRender.call(this, address, type)
+            );
+          }
+        } else {
+          items.push(
+            AddressItemRender.call(this, address, type)
+          );
+        }
       }
 
       return items;
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 108fb88..1d82e70 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -101,6 +101,21 @@ export const ReceiveCoinRender = function() {
                   <h4 className="panel-title">{ translate('INDEX.RECEIVING_ADDRESS') }</h4>
                 </header>
                 <div className="panel-body">
+                  <div className="text-right">
+                    <div
+                      className="toggle-label margin-right-15 pointer"
+                      onClick={ this.toggleVisibleAddress }>
+                      { translate('INDEX.TOGGLE_ZERO_ADDRESSES') }
+                    </div>
+                    <label className="switch">
+                      <input
+                        type="checkbox"
+                        checked={ this.state.hideZeroAdresses } />
+                      <div
+                        className="slider"
+                        onClick={ this.toggleVisibleAddress }></div>
+                    </label>
+                  </div>
                   <table className="table table-hover dataTable table-striped">
                     <thead>
                     { this.isNativeMode() ?
diff --git a/react/src/translate/en.js b/react/src/translate/en.js
index 4d5937c..1832b9b 100644
--- a/react/src/translate/en.js
+++ b/react/src/translate/en.js
@@ -252,7 +252,8 @@ export const _lang = {
       'ACTIVATING': 'Activating',
       'QRCODE': 'Show QR code',
       'SCAN_QR_CODE': 'Scan QR Code',
-      'SCAN_QRCODE_WEBCAM': 'Scan QR Code with webcam'
+      'SCAN_QRCODE_WEBCAM': 'Scan QR Code with webcam',
+      'TOGGLE_ZERO_ADDRESSES': 'Toggle empty addresses'
     },
     'ATOMIC': {
       'RAW_OUTPUT': 'Raw Output',

From 544e2c1469f27a8d271235d9cba49474d7c8448f Mon Sep 17 00:00:00 2001
From: Miika Turunen <miika.turunen@gmail.com>
Date: Mon, 31 Jul 2017 22:40:06 +0300
Subject: [PATCH 2/3] Fixed a typo

---
 react/src/components/dashboard/receiveCoin/receiveCoin.js     | 4 ++--
 .../components/dashboard/receiveCoin/receiveCoin.render.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index e2a6c58..e3712bb 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -112,7 +112,7 @@ class ReceiveCoin extends React.Component {
 
   toggleVisibleAddress() {
     this.setState(Object.assign({}, this.state, {
-      hideZeroAdresses: !this.state.hideZeroAdresses,
+      hideZeroAddresses: !this.state.hideZeroAddresses,
     }));
   }
   
@@ -142,7 +142,7 @@ class ReceiveCoin extends React.Component {
           && _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
         }
 
-        if (this.state.hideZeroAdresses) {
+        if (this.state.hideZeroAddresses) {
           if (!this.hasNoAmount) {
             items.push(
               AddressItemRender.call(this, address, type)
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 1d82e70..5054347 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -110,7 +110,7 @@ export const ReceiveCoinRender = function() {
                     <label className="switch">
                       <input
                         type="checkbox"
-                        checked={ this.state.hideZeroAdresses } />
+                        checked={ this.state.hideZeroAddresses } />
                       <div
                         className="slider"
                         onClick={ this.toggleVisibleAddress }></div>

From 1a71c93f2b21831286a39e03611a1af6bca81157 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Wed, 2 Aug 2017 17:43:49 +0300
Subject: [PATCH 3/3] receive hide zero-balance toggle if balance is 0

---
 .../dashboard/receiveCoin/receiveCoin.js      | 38 ++++++++++++++++++-
 .../receiveCoin/receiveCoin.render.js         | 35 +++++++++--------
 .../walletsNative/walletsNative.render.js     |  2 +-
 3 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index e3712bb..34303a6 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -27,6 +27,7 @@ class ReceiveCoin extends React.Component {
     this.openDropMenu = this.openDropMenu.bind(this);
     this.handleClickOutside = this.handleClickOutside.bind(this);
     this.toggleVisibleAddress = this.toggleVisibleAddress.bind(this);
+    this.checkTotalBalance = this.checkTotalBalance.bind(this);
   }
 
   componentWillMount() {
@@ -115,7 +116,42 @@ class ReceiveCoin extends React.Component {
       hideZeroAddresses: !this.state.hideZeroAddresses,
     }));
   }
-  
+
+  checkTotalBalance() {
+    let _balance = '0';
+    const _mode = this.props.mode;
+
+    if (_mode === 'full') {
+      _balance = this.props.balance || 0;
+    } else if (_mode === 'basilisk') {
+      if (this.props.cache) {
+        const _cache = this.props.cache;
+        const _coin = this.props.coin;
+        const _address = this.props.activeAddress;
+
+        if (_address &&
+            _cache[_coin] &&
+            _cache[_coin][_address] &&
+            _cache[_coin][_address].getbalance &&
+            _cache[_coin][_address].getbalance.data &&
+            (_cache[_coin][_address].getbalance.data.balance ||
+             _cache[_coin][_address].getbalance.data.interest)) {
+          const _regBalance = _cache[_coin][_address].getbalance.data.balance ? _cache[_coin][_address].getbalance.data.balance : 0;
+          const _regInterest = _cache[_coin][_address].getbalance.data.interest ? _cache[_coin][_address].getbalance.data.interest : 0;
+
+          _balance = _regBalance + _regInterest;
+        }
+      }
+    } else if (_mode === 'native') {
+      if (this.props.balance &&
+          this.props.balance.total) {
+        _balance = this.props.balance.total;
+      }
+    }
+
+    return _balance;
+  }
+
   renderAddressList(type) {
     const _addresses = this.props.addresses;
     const _cache = this.props.cache;
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 5054347..de187d2 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -76,8 +76,9 @@ export const ReceiveCoinRender = function() {
                 <header className="panel-heading">
                   {this.isNativeMode() &&
                     <div className="panel-actions">
-                      <div className={ 'dropdown' + (this.state.openDropMenu ? ' open' : '') }
-                           onClick={ this.openDropMenu }>
+                      <div
+                        className={ 'dropdown' + (this.state.openDropMenu ? ' open' : '') }
+                        onClick={ this.openDropMenu }>
                         <a className="dropdown-toggle white btn btn-warning">
                           <i className="icon md-arrows margin-right-10"></i> { translate('INDEX.GET_NEW_ADDRESS') }
                           <span className="caret"></span>
@@ -101,21 +102,23 @@ export const ReceiveCoinRender = function() {
                   <h4 className="panel-title">{ translate('INDEX.RECEIVING_ADDRESS') }</h4>
                 </header>
                 <div className="panel-body">
-                  <div className="text-right">
-                    <div
-                      className="toggle-label margin-right-15 pointer"
-                      onClick={ this.toggleVisibleAddress }>
-                      { translate('INDEX.TOGGLE_ZERO_ADDRESSES') }
-                    </div>
-                    <label className="switch">
-                      <input
-                        type="checkbox"
-                        checked={ this.state.hideZeroAddresses } />
+                  { this.checkTotalBalance() === 0 &&
+                    <div className="text-left padding-top-10 padding-bottom-10">
                       <div
-                        className="slider"
-                        onClick={ this.toggleVisibleAddress }></div>
-                    </label>
-                  </div>
+                        className="toggle-label margin-right-15 pointer"
+                        onClick={ this.toggleVisibleAddress }>
+                        { translate('INDEX.TOGGLE_ZERO_ADDRESSES') }
+                      </div>
+                      <label className="switch">
+                        <input
+                          type="checkbox"
+                          checked={ this.state.hideZeroAddresses } />
+                        <div
+                          className="slider"
+                          onClick={ this.toggleVisibleAddress }></div>
+                      </label>
+                    </div>
+                  }
                   <table className="table table-hover dataTable table-striped">
                     <thead>
                     { this.isNativeMode() ?
diff --git a/react/src/components/dashboard/walletsNative/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js
index 72ecaaf..15d5be5 100644
--- a/react/src/components/dashboard/walletsNative/walletsNative.render.js
+++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js
@@ -16,7 +16,7 @@ const WalletsNativeRender = function() {
           style={{ 'backgroundImage': `url("assets/images/bg/${this.defaultBG()}_transparent_header_bg.png")` }}>
           <ol className="breadcrumb">
             <li className="header-easydex-section">
-              <img src={ `assets/images/native/${this.defaultBG()}_header_title_logo.png` } /> 
+              <img src={ `assets/images/native/${this.defaultBG()}_header_title_logo.png` } />
               <span
                 className={ `easydex-section-image ${(this.props.ActiveCoin.coin === 'KMD' ? 'hide' : '')}` }
                 style={{ marginLeft: '20px' }}>