Merge branch 'redux' into feature/prop-refactor

# Conflicts:
#	react/src/components/dashboard/walletsNav/walletsNav.render.js

react/src/components/addcoin/addcoinOptionsAC.js

@@ -8,6 +8,7 @@ class AddCoinOptionsAC extends React.Component {
         <option value="BET|basilisk|native">BET (BET)</option>
         <option value="BOTS|basilisk|native">BOTS (BOTS)</option>
         <option value="CEAL|basilisk|native">CEAL NET (CEAL)</option>
+        <option value="COQUI|basilisk|native">COQUI (COQUI)</option>
         <option value="CRYPTO|basilisk|native">CRYPTO (CRYPTO)</option>
         <option value="HOD|basilisk|native">HODL (HODL)</option>
         <option value="DEX|basilisk|native">InstantDEX (DEX)</option>

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})
 		}
 	};
 

react/src/components/dashboard/coinTile/coinTileItem.render.js

@@ -12,7 +12,7 @@ const CoinTileItemRender = function() {
           <a className="avatar margin-bottom-5">
             <img
               className="img-responsive"
-              src={ `assets/images/cryptologo/${item.coinlogo}.png` }
+              src={ `assets/images/cryptologo/${item.coinlogo.toLowerCase()}.png` }
               alt={ item.coinname }/>
             <span className={ `badge up badge-${item.modecolor}` }>
               { item.modecode }

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;
     }
   }
 

react/src/components/dashboard/walletsNative/walletsNative.render.js

@@ -13,12 +13,14 @@ const WalletsNativeRender = function() {
         <div
           id="easydex-header-div"
           className="background-color-white"
-          style={{ 'backgroundImage': `url("assets/images/bg/${this.defaultBG()}_transparent_header_bg.png")` }}>
-          <ol className="breadcrumb">
+          style={ this.getCoinStyle('transparent') }>
+          <ol className={ (!this.state.nativeOnly ? 'breadcrumb breadcrumb--normal' : 'breadcrumb') + (this.props.ActiveCoin.coin === 'KMD' || this.props.ActiveCoin.coin === 'JUMBLR' || this.props.ActiveCoin.coin === 'MESH' || this.props.ActiveCoin.coin === 'MVP' ? ' coin-logo-wide' : '') + (this.state.nativeOnly ? ' native-coin-logo' : '') }>
             <li className="header-easydex-section">
-              <img src={ `assets/images/native/${this.defaultBG()}_header_title_logo.png` } />
+              { this.getCoinStyle('title') &&
+                <img src={ this.getCoinStyle('title') } />
+              }
               <span
-                className={ `easydex-section-image ${(this.props.ActiveCoin.coin === 'KMD' ? 'hide' : '')}` }
+                className={ `easydex-section-image ${(this.props.ActiveCoin.coin === 'KMD' || this.props.ActiveCoin.coin === 'JUMBLR' || this.props.ActiveCoin.coin === 'MESH' || this.props.ActiveCoin.coin === 'MVP' ? 'hide' : '')}` }
                 style={{ marginLeft: '20px' }}>
                 { this.props.ActiveCoin.coin }
               </span>

react/src/components/dashboard/walletsNav/walletsNav.render.js

@@ -24,10 +24,10 @@ export const WalletsNavWithWalletRender = function() {
   return (
     <div>
       <div
-        className={ 'page-header page-header-bordered header-easydex padding-bottom-' + (this.props.nativeOnly ? '40' : '20') }
+        className={ 'page-header page-header-bordered header-easydex padding-bottom-' + (this.state.nativeOnly ? '40 page-header--native' : '20') }
         id="header-dashboard"
-        style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : '0' }}>
-        <ol className={ this.props.nativeOnly ? 'hide' : 'breadcrumb' }>
+        style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : (this.state.nativeOnly ? '30' : '0') }}>
+        <ol className={ this.state.nativeOnly ? 'hide' : 'breadcrumb' }>
           <strong>{ translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: </strong>
           { this.props.activeHandle ? this.props.activeHandle[this.props.ActiveCoin.coin] : '-' }
           <button

react/src/components/overrides.scss

@@ -685,3 +685,57 @@ 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;
+}

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':