diff --git a/react/src/assets/images/cryptologo/AUD.png b/react/src/assets/images/cryptologo/aud.png similarity index 100% rename from react/src/assets/images/cryptologo/AUD.png rename to react/src/assets/images/cryptologo/aud.png diff --git a/react/src/assets/images/cryptologo/BET.png b/react/src/assets/images/cryptologo/bet.png similarity index 100% rename from react/src/assets/images/cryptologo/BET.png rename to react/src/assets/images/cryptologo/bet.png diff --git a/react/src/assets/images/cryptologo/BGN.png b/react/src/assets/images/cryptologo/bgn.png similarity index 100% rename from react/src/assets/images/cryptologo/BGN.png rename to react/src/assets/images/cryptologo/bgn.png diff --git a/react/src/assets/images/cryptologo/BOTS.png b/react/src/assets/images/cryptologo/bots.png similarity index 100% rename from react/src/assets/images/cryptologo/BOTS.png rename to react/src/assets/images/cryptologo/bots.png diff --git a/react/src/assets/images/cryptologo/BRL.png b/react/src/assets/images/cryptologo/brl.png similarity index 100% rename from react/src/assets/images/cryptologo/BRL.png rename to react/src/assets/images/cryptologo/brl.png diff --git a/react/src/assets/images/cryptologo/CAD.png b/react/src/assets/images/cryptologo/cad.png similarity index 100% rename from react/src/assets/images/cryptologo/CAD.png rename to react/src/assets/images/cryptologo/cad.png diff --git a/react/src/assets/images/cryptologo/CEAL.png b/react/src/assets/images/cryptologo/ceal.png similarity index 100% rename from react/src/assets/images/cryptologo/CEAL.png rename to react/src/assets/images/cryptologo/ceal.png diff --git a/react/src/assets/images/cryptologo/CHF.png b/react/src/assets/images/cryptologo/chf.png similarity index 100% rename from react/src/assets/images/cryptologo/CHF.png rename to react/src/assets/images/cryptologo/chf.png diff --git a/react/src/assets/images/cryptologo/CNY.png b/react/src/assets/images/cryptologo/cny.png similarity index 100% rename from react/src/assets/images/cryptologo/CNY.png rename to react/src/assets/images/cryptologo/cny.png diff --git a/react/src/assets/images/cryptologo/coqui.png b/react/src/assets/images/cryptologo/coqui.png new file mode 100644 index 0000000..59f61a8 Binary files /dev/null and b/react/src/assets/images/cryptologo/coqui.png differ diff --git a/react/src/assets/images/cryptologo/CRYPTO.png b/react/src/assets/images/cryptologo/crypto.png similarity index 100% rename from react/src/assets/images/cryptologo/CRYPTO.png rename to react/src/assets/images/cryptologo/crypto.png diff --git a/react/src/assets/images/cryptologo/CZK.png b/react/src/assets/images/cryptologo/czk.png similarity index 100% rename from react/src/assets/images/cryptologo/CZK.png rename to react/src/assets/images/cryptologo/czk.png diff --git a/react/src/assets/images/cryptologo/DKK.png b/react/src/assets/images/cryptologo/dkk.png similarity index 100% rename from react/src/assets/images/cryptologo/DKK.png rename to react/src/assets/images/cryptologo/dkk.png diff --git a/react/src/assets/images/cryptologo/EUR.png b/react/src/assets/images/cryptologo/eur.png similarity index 100% rename from react/src/assets/images/cryptologo/EUR.png rename to react/src/assets/images/cryptologo/eur.png diff --git a/react/src/assets/images/cryptologo/GAME.png b/react/src/assets/images/cryptologo/game.png similarity index 100% rename from react/src/assets/images/cryptologo/GAME.png rename to react/src/assets/images/cryptologo/game.png diff --git a/react/src/assets/images/cryptologo/GBP.png b/react/src/assets/images/cryptologo/gbp.png similarity index 100% rename from react/src/assets/images/cryptologo/GBP.png rename to react/src/assets/images/cryptologo/gbp.png diff --git a/react/src/assets/images/cryptologo/HKD.png b/react/src/assets/images/cryptologo/hkd.png similarity index 100% rename from react/src/assets/images/cryptologo/HKD.png rename to react/src/assets/images/cryptologo/hkd.png diff --git a/react/src/assets/images/cryptologo/HODL.png b/react/src/assets/images/cryptologo/hodl.png similarity index 100% rename from react/src/assets/images/cryptologo/HODL.png rename to react/src/assets/images/cryptologo/hodl.png diff --git a/react/src/assets/images/cryptologo/HRK.png b/react/src/assets/images/cryptologo/hrk.png similarity index 100% rename from react/src/assets/images/cryptologo/HRK.png rename to react/src/assets/images/cryptologo/hrk.png diff --git a/react/src/assets/images/cryptologo/HUF.png b/react/src/assets/images/cryptologo/huf.png similarity index 100% rename from react/src/assets/images/cryptologo/HUF.png rename to react/src/assets/images/cryptologo/huf.png diff --git a/react/src/assets/images/cryptologo/IDR.png b/react/src/assets/images/cryptologo/idr.png similarity index 100% rename from react/src/assets/images/cryptologo/IDR.png rename to react/src/assets/images/cryptologo/idr.png diff --git a/react/src/assets/images/cryptologo/ILS.png b/react/src/assets/images/cryptologo/ils.png similarity index 100% rename from react/src/assets/images/cryptologo/ILS.png rename to react/src/assets/images/cryptologo/ils.png diff --git a/react/src/assets/images/cryptologo/INR.png b/react/src/assets/images/cryptologo/inr.png similarity index 100% rename from react/src/assets/images/cryptologo/INR.png rename to react/src/assets/images/cryptologo/inr.png diff --git a/react/src/assets/images/cryptologo/JPY.png b/react/src/assets/images/cryptologo/jpy.png similarity index 100% rename from react/src/assets/images/cryptologo/JPY.png rename to react/src/assets/images/cryptologo/jpy.png diff --git a/react/src/assets/images/cryptologo/JUMBLR.png b/react/src/assets/images/cryptologo/jumblr.png similarity index 100% rename from react/src/assets/images/cryptologo/JUMBLR.png rename to react/src/assets/images/cryptologo/jumblr.png diff --git a/react/src/assets/images/cryptologo/komodo.png b/react/src/assets/images/cryptologo/kmd.png similarity index 100% rename from react/src/assets/images/cryptologo/komodo.png rename to react/src/assets/images/cryptologo/kmd.png diff --git a/react/src/assets/images/cryptologo/KRW.png b/react/src/assets/images/cryptologo/krw.png similarity index 100% rename from react/src/assets/images/cryptologo/KRW.png rename to react/src/assets/images/cryptologo/krw.png diff --git a/react/src/assets/images/cryptologo/KV.png b/react/src/assets/images/cryptologo/kv.png similarity index 100% rename from react/src/assets/images/cryptologo/KV.png rename to react/src/assets/images/cryptologo/kv.png diff --git a/react/src/assets/images/cryptologo/MESH.png b/react/src/assets/images/cryptologo/mesh.png similarity index 100% rename from react/src/assets/images/cryptologo/MESH.png rename to react/src/assets/images/cryptologo/mesh.png diff --git a/react/src/assets/images/cryptologo/MGW.png b/react/src/assets/images/cryptologo/mgw.png similarity index 100% rename from react/src/assets/images/cryptologo/MGW.png rename to react/src/assets/images/cryptologo/mgw.png diff --git a/react/src/assets/images/cryptologo/MVP.png b/react/src/assets/images/cryptologo/mvp.png similarity index 100% rename from react/src/assets/images/cryptologo/MVP.png rename to react/src/assets/images/cryptologo/mvp.png diff --git a/react/src/assets/images/cryptologo/MXN.png b/react/src/assets/images/cryptologo/mxn.png similarity index 100% rename from react/src/assets/images/cryptologo/MXN.png rename to react/src/assets/images/cryptologo/mxn.png diff --git a/react/src/assets/images/cryptologo/MYR.png b/react/src/assets/images/cryptologo/myr.png similarity index 100% rename from react/src/assets/images/cryptologo/MYR.png rename to react/src/assets/images/cryptologo/myr.png diff --git a/react/src/assets/images/cryptologo/NOK.png b/react/src/assets/images/cryptologo/nok.png similarity index 100% rename from react/src/assets/images/cryptologo/NOK.png rename to react/src/assets/images/cryptologo/nok.png diff --git a/react/src/assets/images/cryptologo/NZD.png b/react/src/assets/images/cryptologo/nzd.png similarity index 100% rename from react/src/assets/images/cryptologo/NZD.png rename to react/src/assets/images/cryptologo/nzd.png diff --git a/react/src/assets/images/cryptologo/PANGEA.png b/react/src/assets/images/cryptologo/pangea.png similarity index 100% rename from react/src/assets/images/cryptologo/PANGEA.png rename to react/src/assets/images/cryptologo/pangea.png diff --git a/react/src/assets/images/cryptologo/PHP.png b/react/src/assets/images/cryptologo/php.png similarity index 100% rename from react/src/assets/images/cryptologo/PHP.png rename to react/src/assets/images/cryptologo/php.png diff --git a/react/src/assets/images/cryptologo/PLN.png b/react/src/assets/images/cryptologo/pln.png similarity index 100% rename from react/src/assets/images/cryptologo/PLN.png rename to react/src/assets/images/cryptologo/pln.png diff --git a/react/src/assets/images/cryptologo/REVS.png b/react/src/assets/images/cryptologo/revs.png similarity index 100% rename from react/src/assets/images/cryptologo/REVS.png rename to react/src/assets/images/cryptologo/revs.png diff --git a/react/src/assets/images/cryptologo/RON.png b/react/src/assets/images/cryptologo/ron.png similarity index 100% rename from react/src/assets/images/cryptologo/RON.png rename to react/src/assets/images/cryptologo/ron.png diff --git a/react/src/assets/images/cryptologo/RUB.png b/react/src/assets/images/cryptologo/rub.png similarity index 100% rename from react/src/assets/images/cryptologo/RUB.png rename to react/src/assets/images/cryptologo/rub.png diff --git a/react/src/assets/images/cryptologo/SEK.png b/react/src/assets/images/cryptologo/sek.png similarity index 100% rename from react/src/assets/images/cryptologo/SEK.png rename to react/src/assets/images/cryptologo/sek.png diff --git a/react/src/assets/images/cryptologo/SGD.png b/react/src/assets/images/cryptologo/sgd.png similarity index 100% rename from react/src/assets/images/cryptologo/SGD.png rename to react/src/assets/images/cryptologo/sgd.png diff --git a/react/src/assets/images/cryptologo/SHARK.png b/react/src/assets/images/cryptologo/shark.png similarity index 100% rename from react/src/assets/images/cryptologo/SHARK.png rename to react/src/assets/images/cryptologo/shark.png diff --git a/react/src/assets/images/cryptologo/SUPERNET.png b/react/src/assets/images/cryptologo/supernet.png similarity index 100% rename from react/src/assets/images/cryptologo/SUPERNET.png rename to react/src/assets/images/cryptologo/supernet.png diff --git a/react/src/assets/images/cryptologo/THB.png b/react/src/assets/images/cryptologo/thb.png similarity index 100% rename from react/src/assets/images/cryptologo/THB.png rename to react/src/assets/images/cryptologo/thb.png diff --git a/react/src/assets/images/cryptologo/TRY.png b/react/src/assets/images/cryptologo/try.png similarity index 100% rename from react/src/assets/images/cryptologo/TRY.png rename to react/src/assets/images/cryptologo/try.png diff --git a/react/src/assets/images/cryptologo/WLC.png b/react/src/assets/images/cryptologo/wlc.png similarity index 100% rename from react/src/assets/images/cryptologo/WLC.png rename to react/src/assets/images/cryptologo/wlc.png diff --git a/react/src/assets/images/cryptologo/ZAR.png b/react/src/assets/images/cryptologo/zar.png similarity index 100% rename from react/src/assets/images/cryptologo/ZAR.png rename to react/src/assets/images/cryptologo/zar.png diff --git a/react/src/components/addcoin/addcoinOptionsAC.js b/react/src/components/addcoin/addcoinOptionsAC.js index f47202c..020a097 100644 --- a/react/src/components/addcoin/addcoinOptionsAC.js +++ b/react/src/components/addcoin/addcoinOptionsAC.js @@ -8,6 +8,7 @@ class AddCoinOptionsAC extends React.Component { + diff --git a/react/src/components/addcoin/payload.js b/react/src/components/addcoin/payload.js index 7ea2ef3..7e727f6 100644 --- a/react/src/components/addcoin/payload.js +++ b/react/src/components/addcoin/payload.js @@ -1,4 +1,5 @@ // TODO: merge check functions +// move to nodejs export function checkAC(coinVal) { if (coinVal === 'SUPERNET' || @@ -9,6 +10,7 @@ export function checkAC(coinVal) { coinVal === 'JUMBLR' || coinVal === 'BET' || coinVal === 'CRYPTO' || + coinVal === 'COQUI' || coinVal === 'HODL' || coinVal === 'SHARK' || coinVal === 'BOTS' || @@ -98,6 +100,7 @@ export function checkCoinType(coin) { coin === 'JUMBLR' || coin === 'BET' || coin === 'CRYPTO' || + coin === 'COQUI' || coin === 'HODL' || coin === 'SHARK' || coin === 'BOTS' || @@ -131,10 +134,10 @@ export function checkCoinType(coin) { } export function startCrypto(confpath, coin, mode) { - let tmpinternval = 0, - AddCoinData = {}, - tmpPendValue = 1, // TODO: hook up to shepherd sysinfo - tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`; + let tmpinternval = 0; + let AddCoinData = {}; + let tmpPendValue = 1; // TODO: hook up to shepherd sysinfo + let tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`; if (coin !== 'BTC' && coin !== 'LTC' && @@ -176,9 +179,9 @@ export function startCrypto(confpath, coin, mode) { } export function startCurrencyAssetChain(confpath, coin, mode) { - let AddCoinDataPayload = {}, - tmpPendValue = 1, - tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`; + let AddCoinDataPayload = {}; + let tmpPendValue = 1; + let tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`; if (coin !== 'BTC' && coin !== 'LTC' && @@ -702,7 +705,7 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) { }, 'DEX': { 'name': 'DEX', - 'supply': 1300000, + 'supply': 999999, 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"DEX","conf":"DEX.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":9502,"rpc":9503}) : {}, 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":9502,"rpc":9503}) }, @@ -726,7 +729,7 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) { }, 'HODL': { 'name': 'HODL', - 'supply': 999999, + 'supply': 9999999, 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"HODL","conf":"HODL.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":8009,"rpc":8010}) : {}, 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":8009,"rpc":8010}) }, @@ -756,7 +759,7 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) { }, 'KV': { 'name': 'KV', - 'supply': 999999, + 'supply': 1000000, 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"KV","conf":"KV.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":9746,"rpc":9747}) : {}, 'AddCoinDataVar': Object.assign(_acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":9746,"rpc":9747}) }, @@ -768,9 +771,15 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) { }, 'MESH': { 'name': 'MESH', - 'supply': 1000000, + 'supply': 1000007, 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"MESH","conf":"MESH.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":8399,"rpc":8400}) : {}, 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":8399,"rpc":8400}) + }, + 'COQUI': { + 'name': 'COQUI', + 'supply': 72000000, + 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"COQUI","conf":"COQUI.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":14275,"rpc":14276}) : {}, + 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":14275,"rpc":14276}) } }; diff --git a/react/src/components/dashboard/coinTile/coinTileItem.render.js b/react/src/components/dashboard/coinTile/coinTileItem.render.js index 832dd4a..b669c6c 100644 --- a/react/src/components/dashboard/coinTile/coinTileItem.render.js +++ b/react/src/components/dashboard/coinTile/coinTileItem.render.js @@ -12,7 +12,7 @@ const CoinTileItemRender = function() { { { item.modecode } diff --git a/react/src/components/dashboard/walletsNative/walletsNative.js b/react/src/components/dashboard/walletsNative/walletsNative.js index 764a55e..793ff9d 100644 --- a/react/src/components/dashboard/walletsNative/walletsNative.js +++ b/react/src/components/dashboard/walletsNative/walletsNative.js @@ -2,6 +2,7 @@ import React from 'react'; import WalletsNativeRender from './walletsNative.render'; import { translate } from '../../../translate/translate'; import { triggerToaster } from '../../../actions/actionCreators'; +import { getCoinTitle } from '../../../util/coinHelper'; import Config from '../../../config'; import Store from '../../../store'; @@ -13,6 +14,10 @@ const socket = io.connect(`http://127.0.0.1:${Config.agamaPort}`); class WalletsNative extends React.Component { constructor(props) { super(props); + this.state = { + nativeOnly: Config.iguanaLessMode, + }; + this.getCoinStyle = this.getCoinStyle.bind(this); socket.on('service', msg => this.updateSocketsData(msg)); } @@ -35,11 +40,21 @@ class WalletsNative extends React.Component { } } - defaultBG() { - if (this.props.ActiveCoin.coin === 'REVS') { - return 'supernet'; - } else { - return this.props.ActiveCoin.coin.toLowerCase(); + getCoinStyle(type) { + if (type === 'transparent') { + if (getCoinTitle(this.props.ActiveCoin.coin).transparentBG && getCoinTitle().logo) { + return { 'backgroundImage': `url("assets/images/bg/${getCoinTitle().logo.toLowerCase()}_transparent_header_bg.png")` }; + } + } else if (type === 'title') { + let _iconPath; + + if (getCoinTitle(this.props.ActiveCoin.coin).titleBG) { + _iconPath = `assets/images/native/${getCoinTitle(this.props.ActiveCoin.coin).logo.toLowerCase()}_header_title_logo.png`; + } else if (!getCoinTitle(this.props.ActiveCoin.coin).titleBG && getCoinTitle(this.props.ActiveCoin.coin).logo) { + _iconPath = `assets/images/cryptologo/${getCoinTitle(this.props.ActiveCoin.coin).logo.toLowerCase()}.png`; + } + + return _iconPath; } } diff --git a/react/src/components/dashboard/walletsNative/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js index 15d5be5..f50e95b 100644 --- a/react/src/components/dashboard/walletsNative/walletsNative.render.js +++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js @@ -13,12 +13,14 @@ const WalletsNativeRender = function() {
-
    + style={ this.getCoinStyle('transparent') }> +
    1. - + { this.getCoinStyle('title') && + + } { this.props.ActiveCoin.coin } diff --git a/react/src/components/dashboard/walletsNav/walletsNav.render.js b/react/src/components/dashboard/walletsNav/walletsNav.render.js index 9b21f8b..82232fe 100644 --- a/react/src/components/dashboard/walletsNav/walletsNav.render.js +++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js @@ -24,10 +24,10 @@ export const WalletsNavWithWalletRender = function() { return (
      -
        + style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : (this.state.nativeOnly ? '30' : '0') }}> +
          { translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: { this.props.activeHandle ? this.props.activeHandle[this.props.ActiveCoin.coin] : '-' }