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 0000000..bf38d87 Binary files /dev/null and b/react/src/assets/images/cryptologo/ninja.png differ 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' && - + + + + } { this.renderCoinConError(item) && !this.props.ActiveCoin.rescanInProgress && - + + + + } - ); }; 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',