From 428fa8240e649edede9e6b2ce37de98e02b6b8db Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Fri, 9 Mar 2018 21:22:50 +0300
Subject: [PATCH 1/7] spv login enter key fix

---
 react/src/components/login/login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/react/src/components/login/login.js b/react/src/components/login/login.js
index c1bfbbe..e302a2e 100644
--- a/react/src/components/login/login.js
+++ b/react/src/components/login/login.js
@@ -465,7 +465,8 @@ class Login extends React.Component {
   handleKeydown(e) {
     this.updateLoginPassPhraseInput(e);
 
-    if (e.key === 'Enter') {
+    if (e.key === 'Enter' &&
+        this.state.loginPassphrase) {
       this.loginSeed();
     }
   }

From 681273f7d59dc75bc85630e04cb3b5b5af7bc9b1 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Mar 2018 14:49:17 +0300
Subject: [PATCH 2/7] elections modal fixes

---
 .../dashboard/notaryElectionsModal/notaryElectionsModal.js   | 5 +++--
 .../dashboard/notaryElectionsModal/notaryElectionsModal.scss | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.js b/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.js
index 87509f6..43e2ae4 100755
--- a/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.js
+++ b/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.js
@@ -535,7 +535,7 @@ class NotaryElectionsModal extends React.Component {
                         <i className="fa fa-power-off margin-right-5"></i>Logout
                       </button>
                     }
-                    <div className="elections-user-type">
+                    {/*<div className="elections-user-type">
                       <a
                         className={ this.state.userType === 'voter' ? 'active' : '' }
                         onClick={ () => this.setUserType('voter') }><i className="fa fa-file margin-right-10"></i>I'm a voter</a>
@@ -543,7 +543,7 @@ class NotaryElectionsModal extends React.Component {
                       <a
                         className={ this.state.userType === 'candidate' ? 'active' : '' }
                         onClick={ () => this.setUserType('candidate') }><i className="fa fa-user-o margin-right-10"></i>I'm a candidate</a>
-                    </div>
+                    </div>*/}
                     { !this.state.isAuth &&
                       <div className="elections-login">
                         <label
@@ -633,6 +633,7 @@ class NotaryElectionsModal extends React.Component {
                     }
                     { this.state.isAuth &&
                       this.state.userType === 'voter' &&
+                      this.state.balance > 0 &&
                       <div className={ 'elections-user-type' + (this.state.voteType === 'single' ? ' margin-bottom-30' : '') }>
                         <a
                           className={ this.state.voteType === 'multi' ? 'active' : '' }
diff --git a/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.scss b/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.scss
index f5ecf35..c15c4f9 100644
--- a/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.scss
+++ b/react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.scss
@@ -53,7 +53,7 @@
   }
 
   .elections-login {
-    margin-top: 15px;
+    margin-top: 35px;
   }
 
   .elections-login-btn {

From fc35f3f02f091365e8a69a15a5bfd56bc1b1ba57 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Mar 2018 14:49:41 +0300
Subject: [PATCH 3/7] spv reconnect missing check

---
 .../dashboard/walletsData/walletsData.js      | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/react/src/components/dashboard/walletsData/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js
index 48c8196..e827abd 100644
--- a/react/src/components/dashboard/walletsData/walletsData.js
+++ b/react/src/components/dashboard/walletsData/walletsData.js
@@ -332,37 +332,39 @@ class WalletsData extends React.Component {
   }
 
   spvAutoReconnect() {
-    let _spvServers = this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].serverList;
-    let _server = [
-      this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].server.ip,
-      this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].server.port
-    ];
-    const _randomServer = getRandomElectrumServer(_spvServers, _server.join(':'));
-
-    shepherdElectrumCheckServerConnection(_randomServer.ip, _randomServer.port)
-    .then((res) => {
-      if (res.result) {
-        shepherdElectrumSetServer(this.props.ActiveCoin.coin, _randomServer.ip, _randomServer.port)
-        .then((serverSetRes) => {
+    if (this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].serverList !== 'none') {
+      let _spvServers = this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].serverList;
+      let _server = [
+        this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].server.ip,
+        this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].server.port
+      ];
+      const _randomServer = getRandomElectrumServer(_spvServers, _server.join(':'));
+
+      shepherdElectrumCheckServerConnection(_randomServer.ip, _randomServer.port)
+      .then((res) => {
+        if (res.result) {
+          shepherdElectrumSetServer(this.props.ActiveCoin.coin, _randomServer.ip, _randomServer.port)
+          .then((serverSetRes) => {
+            Store.dispatch(
+              triggerToaster(
+                `${this.props.ActiveCoin.coin} SPV ${translate('DASHBOARD.SERVER_SET_TO')} ${_randomServer.ip}:${_randomServer.port}`,
+                translate('TOASTR.WALLET_NOTIFICATION'),
+                'success'
+              )
+            );
+            Store.dispatch(electrumServerChanged(true));
+          });
+        } else {
           Store.dispatch(
             triggerToaster(
-              `${this.props.ActiveCoin.coin} SPV ${translate('DASHBOARD.SERVER_SET_TO')} ${_randomServer.ip}:${_randomServer.port}`,
+              `${this.props.ActiveCoin.coin} SPV ${translate('DASHBOARD.SERVER_SM')} ${_randomServer.ip}:${_randomServer.port} ${translate('DASHBOARD.IS_UNREACHABLE')}!`,
               translate('TOASTR.WALLET_NOTIFICATION'),
-              'success'
+              'error'
             )
           );
-          Store.dispatch(electrumServerChanged(true));
-        });
-      } else {
-        Store.dispatch(
-          triggerToaster(
-            `${this.props.ActiveCoin.coin} SPV ${translate('DASHBOARD.SERVER_SM')} ${_randomServer.ip}:${_randomServer.port} ${translate('DASHBOARD.IS_UNREACHABLE')}!`,
-            translate('TOASTR.WALLET_NOTIFICATION'),
-            'error'
-          )
-        );
-      }
-    });
+        }
+      });
+    }
   }
 
   isFullySynced() {

From c35916c20d659a0a51aef5bcde3f022450a29791 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Mar 2018 17:48:05 +0300
Subject: [PATCH 4/7] assets vote2018, ninja

---
 react/src/actions/actions/addCoin.js          |  11 ++++++-
 react/src/assets/images/cryptologo/ninja.png  | Bin 0 -> 7880 bytes
 .../cryptologo/{vote.png => vote2018.png}     | Bin
 .../components/addcoin/addcoinOptionsAC.js    |   4 +--
 react/src/components/addcoin/payload.js       |   9 ++++--
 .../dashboard/coinTile/coinTileItem.render.js |  27 +++++++++++-------
 react/src/components/overrides.scss           |  12 ++++----
 react/src/translate/en.js                     |   3 +-
 react/src/util/coinHelper.js                  |  10 +++++--
 react/src/util/explorerList.js                |   2 ++
 10 files changed, 51 insertions(+), 27 deletions(-)
 create mode 100644 react/src/assets/images/cryptologo/ninja.png
 rename react/src/assets/images/cryptologo/{vote.png => vote2018.png} (100%)

diff --git a/react/src/actions/actions/addCoin.js b/react/src/actions/actions/addCoin.js
index 7e7b483..9ee368f 100644
--- a/react/src/actions/actions/addCoin.js
+++ b/react/src/actions/actions/addCoin.js
@@ -149,10 +149,19 @@ export function shepherdHerd(coin, mode, path, startupParams) {
       '-daemon=0',
       '-server',
       `-ac_name=${coin}`,
-      coin === 'BEER' || coin === 'PIZZA' ? '-addnode=24.54.206.138' : '-addnode=78.47.196.146',
+      '-addnode=78.47.196.146',
     ],
   };
 
+  if (coin === 'BEER' ||
+      coin === 'PIZZA') {
+    herdData['ac_options'].pop();
+    herdData['ac_options'].push('-addnode=24.54.206.138');
+  } else if (coin === 'NINJA') {
+    herdData['ac_options'].pop();
+    herdData['ac_options'].push('-addnode=192.241.134.19');
+  }
+
   if (coin === 'ZEC') {
     herdData = {
       'ac_name': 'zcashd',
diff --git a/react/src/assets/images/cryptologo/ninja.png b/react/src/assets/images/cryptologo/ninja.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf38d87cedfe55ea28a7b6701349ffdb766dff3f
GIT binary patch
literal 7880
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

literal 0
HcmV?d00001

diff --git a/react/src/assets/images/cryptologo/vote.png b/react/src/assets/images/cryptologo/vote2018.png
similarity index 100%
rename from react/src/assets/images/cryptologo/vote.png
rename to react/src/assets/images/cryptologo/vote2018.png
diff --git a/react/src/components/addcoin/addcoinOptionsAC.js b/react/src/components/addcoin/addcoinOptionsAC.js
index a18f2bb..2216ca1 100644
--- a/react/src/components/addcoin/addcoinOptionsAC.js
+++ b/react/src/components/addcoin/addcoinOptionsAC.js
@@ -13,7 +13,6 @@ const addCoinOptionsAC = () => {
     'jumblr',
     'kv',
     'mgw',
-    //'mvp',
     'mnz',
     'pangea',
     'revs',
@@ -25,7 +24,8 @@ const addCoinOptionsAC = () => {
     'btch',
     'beer',
     'pizza',
-    'vote'
+    'vote2018',
+    'ninja'
   ];
   let _items = [];
 
diff --git a/react/src/components/addcoin/payload.js b/react/src/components/addcoin/payload.js
index 81bd8c9..7148b40 100644
--- a/react/src/components/addcoin/payload.js
+++ b/react/src/components/addcoin/payload.js
@@ -26,7 +26,7 @@ export function checkAC(coinVal) {
 			coinVal === 'BTCH' ||
 			coinVal === 'BEER' ||
 			coinVal === 'PIZZA' ||
-			coinVal === 'VOTE')	{
+			coinVal === 'VOTE2018')	{
 		return true;
 	} else {
 		return false;
@@ -112,8 +112,11 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) {
 		PIZZA: {
 			supply: 100000000,
 		},
-		VOTE: {
-			supply: 49999999999,
+		VOTE2018: {
+			supply: 600000000,
+		},
+		NINJA: {
+			supply: 100000000,
 		},
 	};
 
diff --git a/react/src/components/dashboard/coinTile/coinTileItem.render.js b/react/src/components/dashboard/coinTile/coinTileItem.render.js
index 259c284..e01d158 100644
--- a/react/src/components/dashboard/coinTile/coinTileItem.render.js
+++ b/react/src/components/dashboard/coinTile/coinTileItem.render.js
@@ -58,20 +58,27 @@ const CoinTileItemRender = function() {
         this.props.Dashboard.electrumCoins[item.coin] &&
         this.props.Dashboard.electrumCoins[item.coin].serverList &&
         this.props.Dashboard.electrumCoins[item.coin].serverList === 'none' &&
-        <i
-          data-tip={ translate('SETTINGS.SPV_SINGLE_SERVER_NOTICE') }
-          className="icon fa-info-circle icon-spv-connection-warning"></i>
+        <span>
+          <i
+            data-tip={ translate('SETTINGS.SPV_SINGLE_SERVER_NOTICE') }
+            className="icon fa-info-circle icon-spv-connection-warning"></i>
+          <ReactTooltip
+            effect="solid"
+            className="text-left" />
+        </span>
       }
       { this.renderCoinConError(item) &&
         !this.props.ActiveCoin.rescanInProgress &&
-        <i
-          onClick={ this.openCoindDownModal }
-          data-tip={ `${translate('DASHBOARD.RPC_CONN_FAILURE')}: ${this.props.ActiveCoin.getinfoFetchFailures}.` }
-          className="icon fa-warning icon-native-connection-warning"></i>
+        <span>
+          <i
+            onClick={ this.openCoindDownModal }
+            data-tip={ `${translate('DASHBOARD.RPC_CONN_FAILURE')}: ${this.props.ActiveCoin.getinfoFetchFailures}.` }
+            className="icon fa-warning icon-native-connection-warning"></i>
+          <ReactTooltip
+            effect="solid"
+            className="text-left" />
+        </span>
       }
-      <ReactTooltip
-        effect="solid"
-        className="text-left" />
     </div>
   );
 };
diff --git a/react/src/components/overrides.scss b/react/src/components/overrides.scss
index ad792e0..d2b6bf1 100644
--- a/react/src/components/overrides.scss
+++ b/react/src/components/overrides.scss
@@ -75,10 +75,6 @@ body {
   transition: height 0.3s ease-out;
 }
 
-.page-aside {
-  position: fixed;
-}
-
 .page-aside-inner {
   .wallet-widgets-list {
     overflow-y: auto;
@@ -369,13 +365,15 @@ select{
     bottom: -5px;
     width: 12px;
     height: 12px;
+    border-color: #dcdcdc;
   }
 
   .rc-slider-dot-active {
     border-color: #51c4f9 !important;
   }
+}
 
-  .rc-slider-dot {
-    border-color: #dcdcdc;
-  }
+.page-aside {
+  position: fixed;
+  z-index: 99;
 }
\ No newline at end of file
diff --git a/react/src/translate/en.js b/react/src/translate/en.js
index e2d8e07..d9e9d2c 100644
--- a/react/src/translate/en.js
+++ b/react/src/translate/en.js
@@ -847,7 +847,8 @@ export const LANG_EN = {
     'BTCH': 'BTCH (BTCH)',
     'BEER': 'BEER (Test coin)',
     'PIZZA': 'PIZZA (Test coin)',
-    'VOTE': 'VOTE (Notary Elections)',
+    'VOTE2018': 'VOTE2018 (Notary Elections)',
+    'NINJA': 'NINJA (NINJA)',
   },
   'DEX': {
     'GEN_NEW_PASSPHRASE': 'Generate a new passphrase',
diff --git a/react/src/util/coinHelper.js b/react/src/util/coinHelper.js
index 198c9e6..a10f2b3 100644
--- a/react/src/util/coinHelper.js
+++ b/react/src/util/coinHelper.js
@@ -6,9 +6,13 @@ export function getCoinTitle(coin) {
   let hideTitle = false;
 
   switch (coin) {
-    case 'VOTE':
-      coinlogo = 'vote';
-      coinname = 'VOTE (Notary Elections)';
+    case 'NINJA':
+      coinlogo = 'ninja';
+      coinname = 'NINJA';
+      break;
+    case 'VOTE2018':
+      coinlogo = 'vote2018';
+      coinname = 'VOTE2018';
       break;
     case 'GRS':
       coinlogo = 'grs';
diff --git a/react/src/util/explorerList.js b/react/src/util/explorerList.js
index 0cd2ef1..43a24f5 100644
--- a/react/src/util/explorerList.js
+++ b/react/src/util/explorerList.js
@@ -23,6 +23,8 @@ const explorerList = {
   HUSH: 'https://explorer.myhush.org',
   PIZZA: 'http://pizza.komodochainz.info',
   BEER: 'http://beer.komodochainz.info',
+  NINJA: 'https://explorer.fund.ninja',
+  VOTE2018: 'http://88.99.226.252',
   QTUM: 'https://explorer.qtum.org',
   LTC: 'https://live.blockcypher.com/ltc',
   DOGE: 'https://live.blockcypher.com/doge',

From 83c37b5af37d4f97fabf338a69e614d85a163721 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Mar 2018 18:20:10 +0300
Subject: [PATCH 5/7] enable dnr back

---
 react/src/components/addcoin/addcoinOptionsCrypto.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/src/components/addcoin/addcoinOptionsCrypto.js b/react/src/components/addcoin/addcoinOptionsCrypto.js
index 8039932..6c91011 100644
--- a/react/src/components/addcoin/addcoinOptionsCrypto.js
+++ b/react/src/components/addcoin/addcoinOptionsCrypto.js
@@ -36,11 +36,11 @@ const addCoinOptionsCrypto = () => {
       label: 'Dash (DASH)',
       icon: 'DASH',
       value: `DASH|spv`,
-    }, /*{
+    }, {
       label: 'Denarius (DNR)',
       icon: 'DNR',
       value: `DNR|spv`,
-    },*/ {
+    }, {
       label: 'DigiByte (DGB)',
       icon: 'DGB',
       value: `DGB|spv`,

From bf97818e67e56bafffa41c3a6a6301d8f160da54 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Mar 2018 18:24:47 +0300
Subject: [PATCH 6/7] dnr explorer

---
 react/src/util/explorerList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react/src/util/explorerList.js b/react/src/util/explorerList.js
index 43a24f5..12e1eb6 100644
--- a/react/src/util/explorerList.js
+++ b/react/src/util/explorerList.js
@@ -26,6 +26,7 @@ const explorerList = {
   NINJA: 'https://explorer.fund.ninja',
   VOTE2018: 'http://88.99.226.252',
   QTUM: 'https://explorer.qtum.org',
+  DNR: 'http://denarius.name',
   LTC: 'https://live.blockcypher.com/ltc',
   DOGE: 'https://live.blockcypher.com/doge',
   DASH: 'https://live.blockcypher.com/dash',

From e3a8bb2b5b48dcd3f26a9e21a1cacc18dfdb3283 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sun, 11 Mar 2018 12:47:36 +0300
Subject: [PATCH 7/7] atomicexplorer actions http -> https

---
 react/src/actions/actions/electrum.js | 2 +-
 react/src/actions/actions/prices.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/react/src/actions/actions/electrum.js b/react/src/actions/actions/electrum.js
index 4f08e8b..b442089 100644
--- a/react/src/actions/actions/electrum.js
+++ b/react/src/actions/actions/electrum.js
@@ -14,7 +14,7 @@ import Store from '../../store';
 // src: atomicexplorer
 export function shepherdGetRemoteBTCFees() {
   return new Promise((resolve, reject) => {
-    fetch(`http://atomicexplorer.com/api/btc/fees`, {
+    fetch(`https://atomicexplorer.com/api/btc/fees`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
diff --git a/react/src/actions/actions/prices.js b/react/src/actions/actions/prices.js
index 177f58a..48e8d21 100644
--- a/react/src/actions/actions/prices.js
+++ b/react/src/actions/actions/prices.js
@@ -4,7 +4,7 @@ import Config from '../../config';
 
 function fiatRates(pricesJson) {
   return dispatch => {
-    return fetch(`http://atomicexplorer.com/api/rates/kmd`, {
+    return fetch(`https://atomicexplorer.com/api/rates/kmd`, {
       method: 'GET',
     })
     .catch((error) => {
@@ -29,7 +29,7 @@ function fiatRates(pricesJson) {
 
 export function prices() {
   return dispatch => {
-    return fetch(`http://atomicexplorer.com/api/mm/prices`, {
+    return fetch(`https://atomicexplorer.com/api/mm/prices`, {
       method: 'GET',
     })
     .catch((error) => {