upstream merge fix #2

assets/scripts/dashboard/DashboardEDEX.js

@@ -96,8 +96,7 @@ function EdexGetTxList(coin) {
 			let params = '';
 
 			Promise.all(data.result.map((coinaddr_value,coinaddr_index) => {
-			if ( active_edexcoinmodecode == 'Basilisk' ) {
-<<<<<<< HEAD
+				if ( active_edexcoinmodecode == 'Basilisk' ) {
 					params = {
 						'userpass': tmpIguanaRPCAuth,
 						'agent': 'dex',
@@ -107,53 +106,17 @@ function EdexGetTxList(coin) {
 						'skip': 0,
 						'symbol': coin
 					};
-=======
-				if ( coin == 'BTC' ||
-						 coin == 'BTCD' ||
-						 coin == 'LTC' ||
-						 coin == 'DOGE' ||
-						 coin == 'DGB' ||
-						 coin == 'SYS' ||
-						 coin == 'MZC' ||
-						 coin == 'UNO' ||
-						 coin == 'ZET' ||
-						 coin == 'BTM' ||
-						 coin == 'CARB' ||
-						 coin == 'ANC' ||
-						 coin == 'FRK' ||
-						 coin == 'GMC') {
-							params = {
-								'userpass': tmpIguanaRPCAuth,
-								'agent': 'dex',
-								'method': 'listtransactions',
-								'address': coinaddr_value,
-								'count': 100,
-								'skip': 0,
-								'symbol': coin
-							};
-						} else {
-							params = {
-								'userpass': tmpIguanaRPCAuth,
-								'agent': 'dex',
-								'method': 'listtransactions',
-								'address': coinaddr_value,
-								'count': 100,
-								'skip': 0,
-								'symbol': coin
-							};
-						}
->>>>>>> d475756a78197001cd4caa6c3b31b3ea19728b4d
 				} else {
-						params = {
-							'userpass': tmpIguanaRPCAuth,
-							'coin': coin,
-							'method': 'listtransactions',
-							'params': [
-								0,
-								9999999,
-								[]
-							]
-						};
+					params = {
+						'userpass': tmpIguanaRPCAuth,
+						'coin': coin,
+						'method': 'listtransactions',
+						'params': [
+							0,
+							9999999,
+							[]
+						]
+					};
 				}
 
 				return new Promise((resolve, reject) => {

assets/scripts/iguana_api/IguanaAddcoin.js

@@ -269,10 +269,7 @@ 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,"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"}
 	}
-<<<<<<< HEAD
 
-=======
->>>>>>> d475756a78197001cd4caa6c3b31b3ea19728b4d
 	if ( addcoin_data.coin == 'GMC' ) {
 		logincoinfullname = 'Gamerscoin';