Merge branch 'master' of https://github.com/SuperNETorg/EasyDEX-GUI

assets/scripts/dashboard.js

@@ -665,9 +665,9 @@ var Dashboard = function() {
 									coinlogo = 'franko';
 									coinname = 'Franko';
 									break;
-								case 'GMC':
+								case 'GAME':
-									coinlogo = 'gamerscoin';
+									coinlogo = 'GAME';
-									coinname = 'Gamerscoin';
+									coinname = 'GameCredits';
 									break;
 								case 'SUPERNET':
 									coinlogo = 'SUPERNET';
@@ -677,8 +677,8 @@ var Dashboard = function() {
 									coinlogo = 'REVS';
 									coinname = 'REVS';
 									break;
-								case 'WIRELESS':
+								case 'WLC':
-									coinlogo = 'WIRELESS';
+									coinlogo = 'WLC';
 									coinname = 'WIRELESS';
 									break;
 								case 'PANGEA':
@@ -939,6 +939,13 @@ var Dashboard = function() {
 				$('#addcoin_mdl_native_mode').prop('disabled', true);
 				$('#addcoin_mdl_full_mode').prop('disabled', false);
 			}
+			if (tmp_coin_val == 'ZEC') {
+				$('#addcoin_mdl_basilisk_mode').prop('disabled', true);
+				$('#addcoin_mdl_native_mode')
+					.prop('disabled', false)
+					.prop('checked', true);
+				$('#addcoin_mdl_full_mode').prop('disabled', true);
+			}
 		});
 	}
 

assets/scripts/iguana_api.js

@@ -185,7 +185,7 @@ function Iguana_utxorawtx(data) {
 function checkAC(coinVal) {
 	if (coinVal == 'SUPERNET' ||
 			coinVal == 'REVS' ||
-			coinVal == 'WIRELESS' ||
+			coinVal == 'WLC' ||
 			coinVal == 'DEX' ||
 			coinVal == 'PANGEA' ||
 			coinVal == 'JUMBLR' ||
@@ -199,6 +199,7 @@ function checkAC(coinVal) {
 			coinVal == 'KV' ||
 			coinVal == 'CEAL' ||
 			coinVal == 'MESH' ||
+			coinVal == 'BTC' ||
 			coinVal == 'USD' ||
 			coinVal == 'RON' ||
 			coinVal == 'EUR' ||

assets/scripts/iguana_api/IguanaAddcoin.js

@@ -268,8 +268,8 @@ function Iguana_addcoin(addcoin_data) {
 				AddCoinData = {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","maxpeers":256,"newcoin":"FRK","name":"Franko","netmagic":"7defaced","p2p":7912,"rpc":7913,"pubval":35,"p2shval":5,"wifval":163,"txfee_satoshis":"0","minconfirms":2,"genesishash":"19225ae90d538561217b5949e98ca4964ac91af39090d1a4407c892293e4f44f","genesis":{"hashalgo":"scrypt","version":1,"timestamp":1368144664,"nBits":"1e0ffff0","nonce":731837,"merkle_root":"b78f79f1d10029cc45ed3d5a1db7bd423d4ee170c03baf110a62565d16a21dca"},"alertpubkey":"04d4da7a5dae4db797d9b0644d57a5cd50e05a70f36091cd62e2fc41c98ded06340be5a43a35e185690cd9cde5d72da8f6d065b499b06f51dcfba14aad859f443a"}
 	}
 
-	if ( addcoin_data.coin == 'GMC' ) {
+	if ( addcoin_data.coin == 'GAME' ) {
-		logincoinfullname = 'Gamerscoin';
+		logincoinfullname = 'GameCredits';
 
 		if ( addcoin_data.mode == '1' ) {
 			logincoinmodeinfo = 'Full';
@@ -278,11 +278,12 @@ function Iguana_addcoin(addcoin_data) {
 		}
 
 		var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth');
-				AddCoinData = {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"services":129,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","maxpeers":256,"newcoin":"GMC","name":"GameCredits","netmagic":"fbc0b6db","p2p":40002,"rpc":40001,"pubval":38,"p2shval":5,"wifval":166,"txfee_satoshis":"100000","minconfirms":2,"genesishash":"91ec5f25ee9a0ffa1af7d4da4db9a552228dd2dc77cdb15b738be4e1f55f30ee","genesis":{"hashalgo":"scrypt","version":1,"timestamp":1392757140,"nBits":"1e0ffff0","nonce":2084565393,"merkle_root":"d849db99a14164f4b4c8ad6d2d8d7e2b1ba7f89963e9f4bf9fad5ff1a4754429"},"alertpubkey":"04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284","auxpow":1,"protover":80006,"isPoS":0}
+				AddCoinData = {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"services":129,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","maxpeers":256,"newcoin":"GAME","name":"GameCredits","netmagic":"fbc0b6db","p2p":40002,"rpc":40001,"pubval":38,"p2shval":5,"wifval":166,"txfee_satoshis":"100000","minconfirms":2,"genesishash":"91ec5f25ee9a0ffa1af7d4da4db9a552228dd2dc77cdb15b738be4e1f55f30ee","genesis":{"hashalgo":"scrypt","version":1,"timestamp":1392757140,"nBits":"1e0ffff0","nonce":2084565393,"merkle_root":"d849db99a14164f4b4c8ad6d2d8d7e2b1ba7f89963e9f4bf9fad5ff1a4754429"},"alertpubkey":"04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284","auxpow":1,"protover":80006,"isPoS":0}
 	}
 
 	if ( checkCoinType() === 'ac' ) {
 		console.log('coin', addcoin_data.coin);
+		var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth');
 		logincoinfullname = addcoin_data.coin;
 
 		if ( addcoin_data.mode == '1' ) { logincoinmodeinfo = 'Full'; }
@@ -330,11 +331,11 @@ function Iguana_addcoin(addcoin_data) {
 				'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"REVS","conf":"REVS.conf","path":confpath[0].path,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":10195,"rpc":10196}) : {},
 				'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":10195,"rpc":10196})
 			},
-			'WIRELESS': {
+			'WLC': {
 				'name': 'WIRELESS',
 				'supply': 21000000,
-				'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"WIRELESS","conf":"WIRELESS.conf","path":confpath[0].path,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"WIRELESS","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667}) : {},
+				'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"WLC","conf":"WLC.conf","path":confpath[0].path,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667}) : {},
-				'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"WIRELESS","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667})
+				'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667})
 			},
 			'PANGEA': {
 				'name': 'PANGEA',
@@ -507,7 +508,7 @@ function Iguana_addcoin(addcoin_data) {
 				addcoin_data.coin === 'KV' ||
 				addcoin_data.coin === 'CEAL' ||
 				addcoin_data.coin === 'MESH' ||
-				addcoin_data.coin === 'WIRELESS') {
+				addcoin_data.coin === 'WLC') {
 			return 'ac';
 		}
 	}

assets/scripts/login.js

@@ -706,7 +706,7 @@ var Login = function() {
       }
       if (tmp_coin_val == 'SUPERNET' ||
           tmp_coin_val == 'REVS' ||
-          tmp_coin_val == 'WIRELESS' ||
+          tmp_coin_val == 'WLC' ||
           tmp_coin_val == 'DEX' ||
           tmp_coin_val == 'PANGEA' ||
           tmp_coin_val == 'JUMBLR' ||

assets/scripts/sidebar.js

@@ -436,8 +436,8 @@ function assetchain_pax_menu_actions(coin) {
     case 'REVS':
       renderAssetGFX('supernet', 'jumblr', coin);
       break;
-    case 'WIRELESS':
+    case 'WLC':
-      renderAssetGFX('wireless', 'wireless', coin);
+      renderAssetGFX('wireless', 'wireless', 'Wireless (WLC)');
       break;
     case 'PANGEA':
       renderAssetGFX('pangea', 'jumblr', coin);
@@ -449,7 +449,7 @@ function assetchain_pax_menu_actions(coin) {
       renderAssetGFX('supernet', 'jumblr', coin);
       break;
     case 'BET':
-      renderAssetGFX('wireless', 'wireless', coin);
+      renderAssetGFX('bet', 'bet', coin);
       break;
     case 'CRYPTO':
       renderAssetGFX('supernet', 'jumblr', coin);
@@ -458,7 +458,7 @@ function assetchain_pax_menu_actions(coin) {
       renderAssetGFX('supernet', 'jumblr', coin);
       break;
     case 'SHARK':
-      renderAssetGFX('wireless', 'wireless', coin);
+      renderAssetGFX('shark', 'shark', coin);
       break;
     case 'BOTS':
       renderAssetGFX('supernet', 'jumblr', coin);
@@ -476,7 +476,10 @@ function assetchain_pax_menu_actions(coin) {
       renderAssetGFX('ceal', 'ceal', coin);
       break;
     case 'MESH':
-      renderAssetGFX('mesh', 'mesh', coin);
+      renderAssetGFX('mesh', 'mesh', 'SuperMesh (MESH)');
+      break;
+    case 'BTC':
+      renderAssetGFX('btc', 'btc', '(BTC)');
       break;
     case 'USD':
       renderAssetGFX('usd', 'usd', 'US Dollar (USD)');
@@ -610,9 +613,9 @@ function applyKMDWalletStyle() {
   	'background-repeat': 'no-repeat',
   	'background-position': '0%'
   });
+  $('#easydex_kmd_wallet_actions_header').show();
   $(
   	'#easydex_acpax_wallet_actions_header,' +
-  	'#easydex_kmd_wallet_actions_header,' +
   	'#easydex_zec_wallet_actions_header,' +
   	'#jumblr_actions_header,' +
   	'#easydex_btc_btcd_balances_header'

assets/scripts/templates/addCoinOptions.js

@@ -9,7 +9,7 @@ templates.addCoinOptions =
   <option value="DGB">Digibyte (DGB)</option>
   <option value="DOGE">Dogecoin (DOGE)</option>
   <option value="FRK">Franko (FRK)</option>
-  <option value="GMC">Gamerscoin (GMC)</option>
+  <option value="GAME">GameCredits (GAME)</option>
   <option value="KMD">Komodo (KMD)</option>
   <option value="LTC">Litecoin (LTC)</option>
   <option value="MZC">MazaCoin (MZC)</option>
@@ -34,7 +34,7 @@ templates.addCoinOptions =
   <option value="SHARK">SHARK (SHARK)</option>
   <option value="MESH">SpaceMesh (MESH)</option>
   <option value="SUPERNET">SUPERNET (SUPERNET)</option>
-  <option value="WIRELESS">WIRELESS (WIRELESS)</option>
+  <option value="WLC">WIRELESS (WLC)</option>
 </optgroup>
 <optgroup label="Fiat Currencies">
   <option value="AUD">Australian Dollar (AUD)</option>

index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimal-ui">
     <meta name="description" content="bootstrap admin template">
     <meta name="author" content="">
-    <title>Agama - EasyDEX (v0.1.5.6e-beta)</title>
+    <title>Agama - EasyDEX (v0.1.6.1e-beta)</title>
     <link rel="apple-touch-icon" href="assets/images/android-chrome-192x192.png">
     <link rel="icon" type="image/png" href="assets/images/favicon-32x32.png" sizes="32x32">
     <link rel="icon" type="image/png" href="assets/images/favicon-194x194.png" sizes="194x194">