From 24153c159c6d9c9b629b0166bc1d2e16437bcb52 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 11 Aug 2017 15:12:00 +0300 Subject: [PATCH 1/3] fixed outdated ac supply params --- react/src/components/addcoin/payload.js | 31 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 11 deletions(-) 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}) } }; From 31a5aa2e42793b5568a7f9d02741f9030146bcb1 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 11 Aug 2017 15:12:51 +0300 Subject: [PATCH 2/3] added coqui chain --- react/src/assets/images/cryptologo/coqui.png | Bin 0 -> 5725 bytes react/src/components/addcoin/addcoinOptionsAC.js | 1 + 2 files changed, 1 insertion(+) create mode 100644 react/src/assets/images/cryptologo/coqui.png diff --git a/react/src/assets/images/cryptologo/coqui.png b/react/src/assets/images/cryptologo/coqui.png new file mode 100644 index 0000000000000000000000000000000000000000..59f61a8bd62dd537a792fc5f9962a2d6331f131e GIT binary patch literal 5725 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 (BET) + From 6d6c95a71a7c95a61e81c99092037d31ce0752b9 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 11 Aug 2017 15:13:34 +0300 Subject: [PATCH 3/3] minor wallet header refactoring --- .../images/cryptologo/{AUD.png => aud.png} | Bin .../images/cryptologo/{BET.png => bet.png} | Bin .../images/cryptologo/{BGN.png => bgn.png} | Bin .../images/cryptologo/{BOTS.png => bots.png} | Bin .../images/cryptologo/{BRL.png => brl.png} | Bin .../images/cryptologo/{CAD.png => cad.png} | Bin .../images/cryptologo/{CEAL.png => ceal.png} | Bin .../images/cryptologo/{CHF.png => chf.png} | Bin .../images/cryptologo/{CNY.png => cny.png} | Bin .../cryptologo/{CRYPTO.png => crypto.png} | Bin .../images/cryptologo/{CZK.png => czk.png} | Bin .../images/cryptologo/{DKK.png => dkk.png} | Bin .../images/cryptologo/{EUR.png => eur.png} | Bin .../images/cryptologo/{GAME.png => game.png} | Bin .../images/cryptologo/{GBP.png => gbp.png} | Bin .../images/cryptologo/{HKD.png => hkd.png} | Bin .../images/cryptologo/{HODL.png => hodl.png} | Bin .../images/cryptologo/{HRK.png => hrk.png} | Bin .../images/cryptologo/{HUF.png => huf.png} | Bin .../images/cryptologo/{IDR.png => idr.png} | Bin .../images/cryptologo/{ILS.png => ils.png} | Bin .../images/cryptologo/{INR.png => inr.png} | Bin .../images/cryptologo/{JPY.png => jpy.png} | Bin .../cryptologo/{JUMBLR.png => jumblr.png} | Bin .../images/cryptologo/{komodo.png => kmd.png} | Bin .../images/cryptologo/{KRW.png => krw.png} | Bin .../images/cryptologo/{KV.png => kv.png} | Bin .../images/cryptologo/{MESH.png => mesh.png} | Bin .../images/cryptologo/{MGW.png => mgw.png} | Bin .../images/cryptologo/{MVP.png => mvp.png} | Bin .../images/cryptologo/{MXN.png => mxn.png} | Bin .../images/cryptologo/{MYR.png => myr.png} | Bin .../images/cryptologo/{NOK.png => nok.png} | Bin .../images/cryptologo/{NZD.png => nzd.png} | Bin .../cryptologo/{PANGEA.png => pangea.png} | Bin .../images/cryptologo/{PHP.png => php.png} | Bin .../images/cryptologo/{PLN.png => pln.png} | Bin .../images/cryptologo/{REVS.png => revs.png} | Bin .../images/cryptologo/{RON.png => ron.png} | Bin .../images/cryptologo/{RUB.png => rub.png} | Bin .../images/cryptologo/{SEK.png => sek.png} | Bin .../images/cryptologo/{SGD.png => sgd.png} | Bin .../cryptologo/{SHARK.png => shark.png} | Bin .../cryptologo/{SUPERNET.png => supernet.png} | Bin .../images/cryptologo/{THB.png => thb.png} | Bin .../images/cryptologo/{TRY.png => try.png} | Bin .../images/cryptologo/{WLC.png => wlc.png} | Bin .../images/cryptologo/{ZAR.png => zar.png} | Bin .../dashboard/coinTile/coinTileItem.render.js | 2 +- .../dashboard/walletsNative/walletsNative.js | 25 ++++- .../walletsNative/walletsNative.render.js | 10 +- .../dashboard/walletsNav/walletsNav.render.js | 4 +- react/src/components/overrides.scss | 54 +++++++++++ react/src/util/coinHelper.js | 91 ++++++++++++++++-- 54 files changed, 167 insertions(+), 19 deletions(-) rename react/src/assets/images/cryptologo/{AUD.png => aud.png} (100%) rename react/src/assets/images/cryptologo/{BET.png => bet.png} (100%) rename react/src/assets/images/cryptologo/{BGN.png => bgn.png} (100%) rename react/src/assets/images/cryptologo/{BOTS.png => bots.png} (100%) rename react/src/assets/images/cryptologo/{BRL.png => brl.png} (100%) rename react/src/assets/images/cryptologo/{CAD.png => cad.png} (100%) rename react/src/assets/images/cryptologo/{CEAL.png => ceal.png} (100%) rename react/src/assets/images/cryptologo/{CHF.png => chf.png} (100%) rename react/src/assets/images/cryptologo/{CNY.png => cny.png} (100%) rename react/src/assets/images/cryptologo/{CRYPTO.png => crypto.png} (100%) rename react/src/assets/images/cryptologo/{CZK.png => czk.png} (100%) rename react/src/assets/images/cryptologo/{DKK.png => dkk.png} (100%) rename react/src/assets/images/cryptologo/{EUR.png => eur.png} (100%) rename react/src/assets/images/cryptologo/{GAME.png => game.png} (100%) rename react/src/assets/images/cryptologo/{GBP.png => gbp.png} (100%) rename react/src/assets/images/cryptologo/{HKD.png => hkd.png} (100%) rename react/src/assets/images/cryptologo/{HODL.png => hodl.png} (100%) rename react/src/assets/images/cryptologo/{HRK.png => hrk.png} (100%) rename react/src/assets/images/cryptologo/{HUF.png => huf.png} (100%) rename react/src/assets/images/cryptologo/{IDR.png => idr.png} (100%) rename react/src/assets/images/cryptologo/{ILS.png => ils.png} (100%) rename react/src/assets/images/cryptologo/{INR.png => inr.png} (100%) rename react/src/assets/images/cryptologo/{JPY.png => jpy.png} (100%) rename react/src/assets/images/cryptologo/{JUMBLR.png => jumblr.png} (100%) rename react/src/assets/images/cryptologo/{komodo.png => kmd.png} (100%) rename react/src/assets/images/cryptologo/{KRW.png => krw.png} (100%) rename react/src/assets/images/cryptologo/{KV.png => kv.png} (100%) rename react/src/assets/images/cryptologo/{MESH.png => mesh.png} (100%) rename react/src/assets/images/cryptologo/{MGW.png => mgw.png} (100%) rename react/src/assets/images/cryptologo/{MVP.png => mvp.png} (100%) rename react/src/assets/images/cryptologo/{MXN.png => mxn.png} (100%) rename react/src/assets/images/cryptologo/{MYR.png => myr.png} (100%) rename react/src/assets/images/cryptologo/{NOK.png => nok.png} (100%) rename react/src/assets/images/cryptologo/{NZD.png => nzd.png} (100%) rename react/src/assets/images/cryptologo/{PANGEA.png => pangea.png} (100%) rename react/src/assets/images/cryptologo/{PHP.png => php.png} (100%) rename react/src/assets/images/cryptologo/{PLN.png => pln.png} (100%) rename react/src/assets/images/cryptologo/{REVS.png => revs.png} (100%) rename react/src/assets/images/cryptologo/{RON.png => ron.png} (100%) rename react/src/assets/images/cryptologo/{RUB.png => rub.png} (100%) rename react/src/assets/images/cryptologo/{SEK.png => sek.png} (100%) rename react/src/assets/images/cryptologo/{SGD.png => sgd.png} (100%) rename react/src/assets/images/cryptologo/{SHARK.png => shark.png} (100%) rename react/src/assets/images/cryptologo/{SUPERNET.png => supernet.png} (100%) rename react/src/assets/images/cryptologo/{THB.png => thb.png} (100%) rename react/src/assets/images/cryptologo/{TRY.png => try.png} (100%) rename react/src/assets/images/cryptologo/{WLC.png => wlc.png} (100%) rename react/src/assets/images/cryptologo/{ZAR.png => zar.png} (100%) 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/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/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 67d43a7..7c79dad 100644 --- a/react/src/components/dashboard/walletsNav/walletsNav.render.js +++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js @@ -24,9 +24,9 @@ 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 && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' } diff --git a/react/src/components/overrides.scss b/react/src/components/overrides.scss index a3cb152..94eff32 100644 --- a/react/src/components/overrides.scss +++ b/react/src/components/overrides.scss @@ -684,4 +684,58 @@ select{ } } } +} + +.breadcrumb { + padding: 8px 30px 0; + position: relative; + top: -10px; +} + +.header-easydex-section { + img { + max-width: 60px; + } +} + +.coin-logo-wide { + padding: 8px 30px 0; + position: relative; + top: 0; + + .header-easydex-section { + img { + width: inherit; + max-width: inherit; + position: relative; + top: -5px; + } + } +} + +.native-coin-logo { + float: left; + position: absolute; + top: -105px; + z-index: 100; + + .header-easydex-section { + img { + width: 60px; + } + } +} + +.coin-logo-wide { + &.native-coin-logo { + top: -93px; + + .header-easydex-section img { + width: inherit; + } + } +} + +.page-header--native { + height: 75px; } \ No newline at end of file diff --git a/react/src/util/coinHelper.js b/react/src/util/coinHelper.js index 216795f..9ee30c1 100644 --- a/react/src/util/coinHelper.js +++ b/react/src/util/coinHelper.js @@ -1,6 +1,9 @@ export function getCoinTitle(coin) { - let coinlogo, - coinname; + let coinlogo; + let coinname; + let transparentBG = false; + let titleBG = false; + let hideTitle = false; switch (coin) { case 'BTC': @@ -56,7 +59,10 @@ export function getCoinTitle(coin) { coinname = 'Zetacoin'; break; case 'KMD': - coinlogo = 'komodo'; + hideTitle = true; + titleBG = true; + transparentBG = true; + coinlogo = 'kmd'; coinname = 'Komodo'; break; case 'BTM': @@ -80,6 +86,7 @@ export function getCoinTitle(coin) { coinname = 'GameCredits'; break; case 'SUPERNET': + titleBG = true; coinlogo = 'SUPERNET'; coinname = 'SUPERNET'; break; @@ -88,14 +95,20 @@ export function getCoinTitle(coin) { coinname = 'REVS'; break; case 'WLC': + titleBG = true; + transparentBG = true; coinlogo = 'WLC'; coinname = 'WIRELESS'; break; case 'PANGEA': + titleBG = true; coinlogo = 'PANGEA'; coinname = 'PANGEA'; break; case 'JUMBLR': + titleBG = true; + transparentBG = true; + hideTitle = true; coinlogo = 'JUMBLR'; coinname = 'JUMBLR'; break; @@ -124,6 +137,9 @@ export function getCoinTitle(coin) { coinname = 'MultiGateway'; break; case 'MVP': + hideTitle = true; + titleBG = true; + transparentBG = true; coinlogo = 'MVP'; coinname = 'MVP Lineup'; break; @@ -132,138 +148,197 @@ export function getCoinTitle(coin) { coinname = 'KV'; break; case 'CEAL': + titleBG = true; + transparentBG = true; coinlogo = 'CEAL'; coinname = 'CEAL NET'; break; + case 'COQUI': + coinlogo = 'COQUI'; + coinname = 'COQUI'; + break; case 'MESH': + hideTitle = true; + titleBG = true; + transparentBG = true; coinlogo = 'MESH'; coinname = 'SpaceMesh'; break; case 'USD': + titleBG = true; + transparentBG = true; coinlogo = 'usd'; coinname = 'US Dollar'; break; case 'RON': + titleBG = true; + transparentBG = true; coinlogo = 'RON'; coinname = 'Romanian Leu'; break; case 'EUR': + titleBG = true; + transparentBG = true; coinlogo = 'EUR'; coinname = 'Euro'; break; case 'JPY': + titleBG = true; + transparentBG = true; coinlogo = 'JPY'; coinname = 'Japanese Yen'; break; case 'GBP': + titleBG = true; + transparentBG = true; coinlogo = 'GBP'; coinname = 'British Pound'; break; case 'AUD': + titleBG = true; + transparentBG = true; coinlogo = 'AUD'; coinname = 'Australian Dollar'; break; case 'CAD': + titleBG = true; + transparentBG = true; coinlogo = 'CAD'; coinname = 'Canadian Dollar'; break; case 'CHF': + titleBG = true; + transparentBG = true; coinlogo = 'CHF'; coinname = 'Swiss Franc'; break; case 'NZD': + titleBG = true; + transparentBG = true; coinlogo = 'NZD'; coinname = 'New Zealand Dollar'; break; case 'CNY': + titleBG = true; + transparentBG = true; coinlogo = 'CNY'; coinname = 'Chinese Yuan'; break; case 'RUB': + titleBG = true; + transparentBG = true; coinlogo = 'RUB'; coinname = 'Russian Ruble'; break; case 'MXN': + titleBG = true; + transparentBG = true; coinlogo = 'MXN'; coinname = 'Mexican peso'; break; case 'BRL': + titleBG = true; + transparentBG = true; coinlogo = 'BRL'; coinname = 'Brazilian Real'; break; case 'INR': + titleBG = true; + transparentBG = true; coinlogo = 'INR'; coinname = 'Indian Rupee'; break; case 'HKD': + titleBG = true; + transparentBG = true; coinlogo = 'HKD'; coinname = 'Hong Kong Dollar'; break; case 'TRY': + titleBG = true; + transparentBG = true; coinlogo = 'TRY'; coinname = 'Turkish Lira'; break; case 'ZAR': + titleBG = true; + transparentBG = true; coinlogo = 'ZAR'; coinname = 'South African Rand'; break; case 'PLN': + titleBG = true; + transparentBG = true; coinlogo = 'PLN'; coinname = 'Polish Zloty'; break; case 'NOK': + titleBG = true; coinlogo = 'NOK'; coinname = 'Norwegian Krone'; break; case 'SEK': + titleBG = true; coinlogo = 'SEK'; coinname = 'Swedish Krona'; break; case 'DKK': + titleBG = true; coinlogo = 'DKK'; coinname = 'Danish Krone'; break; case 'CZK': + titleBG = true; coinlogo = 'CZK'; coinname = 'Czech Koruna'; break; case 'HUF': + titleBG = true; coinlogo = 'HUF'; coinname = 'Hungarian Forint'; break; case 'ILS': + titleBG = true; coinlogo = 'ILS'; coinname = 'Israeli Shekel'; break; case 'KRW': + titleBG = true; coinlogo = 'KRW'; coinname = 'Korean Won'; break; case 'MYR': + titleBG = true; coinlogo = 'MYR'; coinname = 'Malaysian Ringgit'; break; case 'PHP': + titleBG = true; coinlogo = 'PHP'; coinname = 'Philippine Peso'; break; case 'SGD': + titleBG = true; coinlogo = 'SGD'; coinname = 'Singapore Dollar'; break; case 'THB': + titleBG = true; coinlogo = 'THB'; coinname = 'Thai Baht'; break; case 'BGN': + titleBG = true; coinlogo = 'BGN'; coinname = 'Bulgarian Lev'; break; case 'IDR': + titleBG = true; coinlogo = 'IDR'; coinname = 'Indonesian Rupiah'; break; case 'HRK': + titleBG = true; coinlogo = 'HRK'; coinname = 'Croatian Kuna'; break; @@ -271,14 +346,16 @@ export function getCoinTitle(coin) { return { 'logo': coinlogo, - 'name': coinname + 'name': coinname, + titleBG, + transparentBG, }; } export function getModeInfo(mode) { - let modecode, - modetip, - modecolor; + let modecode; + let modetip; + let modecolor; switch (mode) { case 'native':