upstream merge fix

assets/scripts/atomicexplorer.js

@@ -89,6 +89,13 @@ var AtomicExplorer = function() {
 						'method': 'getbestblockhash'
 					};
 					break;
+				case 'activehandle':
+					ExplorerInputData = {
+						'userpass': tmpIguanaRPCAuth,
+						'agent': 'SuperNET',
+						'method': 'activehandle'
+					};
+					break;
 				case 'gettransaction':
 					ExplorerInputData = {
 						'userpass': tmpIguanaRPCAuth,
@@ -291,6 +298,13 @@ var AtomicExplorer = function() {
 						'timeout': 600000
 					};
 					break;
+				case 'jumblr_status':
+					ExplorerInputData = {
+						'userpass': tmpIguanaRPCAuth,
+						'agent': 'jumblr',
+						'method': 'status'
+					};
+					break;
 			}
 			console.log(ExplorerInputData);
 

assets/scripts/jumblr.js

@@ -0,0 +1,148 @@
+var Jumblr = function() {
+
+	var handleJumblr = function() {
+		if ( sessionStorage.getItem('IguanaActiveAccount') === null ) {
+			//clearInterval(CheckIfIguanaRunning);
+			//console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
+		} else {
+			Jumblr_CheckIfConnected().then(function(result){
+				console.log(result)
+				if (result == 'connected') {
+					Jumblr_DisplayAddresses();
+					Jumblr_DisplayStatus();
+					Jumblr_ShowHideAlert();
+				}
+			})
+		}
+		
+		$('#jumblr_actions_header').click(function(){
+			Jumblr_CheckIfConnected().then(function(result){
+				console.log(result)
+				if (result == 'connected') {
+					Jumblr_DisplayAddresses();
+					Jumblr_DisplayStatus();
+					Jumblr_ShowHideAlert();
+				}
+			})
+		})
+	};
+
+	return {
+		//main function to initiate the module
+		init: function() {
+			handleJumblr();
+		}
+	};
+}();
+
+function Jumblr_ShowHideAlert() {
+	Jumblr_LookforNativeKomodo().then(function(result){
+		//console.log(result)
+		if (result === 'isnative') {
+			$('#jumblr_no_native_kmd_alert').hide()
+		} else {
+			$('#jumblr_no_native_kmd_alert').show()
+		}
+	})
+}
+
+function Jumblr_DisplayAddresses() {
+	var jumblr_session_data = JSON.parse(JSON.parse(sessionStorage.getItem('IguanaActiveAccount')));
+	//console.log(jumblr_session_data);
+	$('#jumblr_BTCdeposit').text(jumblr_session_data.BTCdeposit)
+	$('#jumblr_BTCjumblr').text(jumblr_session_data.BTCjumblr)
+	$('#jumblr_KMDdeposit').text(jumblr_session_data.KMDdeposit)
+	$('#jumblr_KMDjumblr').text(jumblr_session_data.KMDjumblr)
+}
+
+function Jumblr_DisplayStatus() {
+	Iguana_Jumblr_Status().then(function(result){
+		//console.log(result)
+		$('#jumblr_status_BTCdeposit').text(result.BTCdeposit)
+		$('#jumblr_status_BTCjumblr').text(result.BTCjumblr)
+		$('#jumblr_status_KMDdeposit').text(result.KMDdeposit)
+		$('#jumblr_status_KMDjumblr').text(result.KMDjumblr)
+		$('#jumblr_status_result').text(result.result)
+		$('#jumblr_status_deposited').text(result.deposited)
+		$('#jumblr_status_t_to_z').text(result.t_to_z)
+		$('#jumblr_status_z_to_z').text(result.z_to_z)
+		$('#jumblr_status_z_to_t').text(result.z_to_t)
+		$('#jumblr_status_finished').text(result.finished)
+		$('#jumblr_status_pending').text(result.pending)
+	})
+}
+
+function Jumblr_LookforNativeKomodo() {
+	return new Promise((resolve) => {
+		var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
+				ajax_data = {
+					'userpass': tmpIguanaRPCAuth,
+					'agent': 'InstantDEX',
+					'method': 'allcoins'
+				},
+				AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
+					AjaxOutputData = JSON.parse(AjaxOutputData.responseText);
+					if (AjaxOutputData['native'].length !== 0 ) {
+						$.each(AjaxOutputData.native, function( index, value ) {
+						//console.log(index)
+						//console.log(value)
+								if (value !== 'KMD') {
+									console.log('Native KMD not found')
+									resolve('notfound');
+								} else {
+									console.log('Native KMD found')
+									resolve('isnative');
+								}
+						});
+					} else {
+						resolve('notnative');
+					}
+		}).fail(function(xhr, textStatus, error) {
+				// handle request failures
+				console.log(xhr.statusText);
+				if ( xhr.readyState == 0 ) {
+				}
+				console.log(textStatus);
+				console.log(error);
+		})
+	});
+}
+
+
+function Jumblr_CheckIfConnected() {
+	return new Promise((resolve) => {
+		var extcoin = $('[data-extcoin]').attr('data-extcoin'),
+			passthru_agent = getPassthruAgent(),
+			tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
+			ajax_data = {
+				'userpass': tmpIguanaRPCAuth,
+				'agent': passthru_agent,
+				'method': 'passthru',
+				'function': 'getinfo',
+				'hex': ''
+			};
+		
+		//console.log(ajax_data);
+		$.ajax({
+			type: 'POST',
+			data: JSON.stringify(ajax_data),
+			url: 'http://127.0.0.1:7778'
+		}).done(function(data){
+			data = JSON.parse(data)
+			if ( data.errors != undefined ) {
+				resolve('connected');
+			} else if (data.errors == '' ) {
+				resolve('connected');
+			} else if ( data.errors == undefined) {
+				resolve('not active');
+			} else {
+				resolve(data.errors);
+			}
+		})
+	})
+}
+
+
+jQuery(document).ready(function() {
+	Jumblr.init();
+});

assets/scripts/kmd_wallet_dashboard.js

@@ -2,8 +2,8 @@ var KMDWalletDashboard = function() {
 	var handle_KMD_Dashboard = function() {
 		var action_btn_code = getHeaderActionMenuButtonCoinCode();
 		$('#btn_' + action_btn_code + '_wallet_dashboard').click(function() {
-			console.log('kmd wallet dashbaord button clicked...');
+			//console.log('kmd wallet dashbaord button clicked...');
-			console.log($(this).data());
+			//console.log($(this).data());
 			if ( sessionStorage.getItem('edexTmpMode') === 'Native') {
 				sessionStorage.setItem('edexTmpRefresh', 'start');
 			}
@@ -488,7 +488,7 @@ function getTotalKMDBalance() {
 				'hex': '3000'
 			};
 
-	console.log(ajax_data);
+	//console.log(ajax_data);
 	$.ajax({
 		type: 'POST',
 		data: JSON.stringify(ajax_data),
@@ -845,7 +845,7 @@ function KMDGetPublicTransactions() {
 		url: 'http://127.0.0.1:7778',
 		success: function(data, textStatus, jqXHR) {
 			var AjaxOutputData = JSON.parse(data); // Ajax output gets the whole list of unspent coin with addresses
-			console.log(AjaxOutputData);
+			//console.log(AjaxOutputData);
 
 			$.each(AjaxOutputData, function(index, value) {
 				var tmp_category = '',
@@ -1029,13 +1029,13 @@ function KMDListAddresses(pubpriv) {
 	NProgress.start();
 
 	var result = [],
-			ajax_data_to_hex = '""',
+			ajax_data_to_hex = '',
 			ajax_function_input = '',
 			tmplistaddr_hex_input = '';
 
 	if ( pubpriv === 'public' ) {
 		ajax_function_input = 'getaddressesbyaccount';
-		tmplistaddr_hex_input = Iguana_HashHex(ajax_data_to_hex);
+		tmplistaddr_hex_input = '222200';
 	}
 	if ( pubpriv === 'private' ) {
 		ajax_function_input = 'z_listaddresses';
@@ -1051,7 +1051,6 @@ function KMDListAddresses(pubpriv) {
 				'function': ajax_function_input,
 				'hex': tmplistaddr_hex_input
 			};
-
 	$.ajax({
 		async: false,
 		type: 'POST',
@@ -1418,9 +1417,9 @@ function CheckIfConnected() {
 		url: 'http://127.0.0.1:7778',
 		success: function(data, textStatus, jqXHR) {
 			var AjaxOutputData = JSON.parse(data);
-			console.log('== Data OutPut ==');
+			//console.log('== Data OutPut ==');
-			console.log(AjaxOutputData);
+			//console.log(AjaxOutputData);
-			console.log(AjaxOutputData.error);
+			//console.log(AjaxOutputData.error);
 
 			if ( AjaxOutputData.errors != undefined ) {
 				result.push('connected');

assets/scripts/lang/en.js

@@ -159,6 +159,9 @@ const _lang = {
       'DEBUG_LOG_LINES': 'Input number of lines to read',
       'TARGET': 'Target',
       'LOAD_DEBUG_LOG': 'Load debug log'
+    },
+    'DASHBOARD': {
+      'SELECT_ADDRESS': '- Select Address -'
     }
   }
 };

assets/scripts/login.js

@@ -49,6 +49,11 @@ var Login = function() {
       },
 
       submitHandler: function(form) {
+        var jumblr_setpassphrase_val = 'jumblr '+$('#password').val()
+        console.log(jumblr_setpassphrase_val)
+        Iguana_Jumblr_SetPassphrase({'passphrase':jumblr_setpassphrase_val}).then(function(result){
+          console.log(result)
+        }).then(function(){
           var tmpIguanaRPCAuth = 'tmpIgRPCUser@' + sessionStorage.getItem('IguanaRPCAuth'),
               ajax_data = {
                 'userpass': tmpIguanaRPCAuth,
@@ -68,7 +73,6 @@ var Login = function() {
               var LoginOutput = JSON.parse(data);
                   LoginDataToStore = JSON.stringify(data),
               sessionStorage.setItem('IguanaActiveAccount', LoginDataToStore);
-
               if (LoginOutput.result === 'success') {
                 console.log('Success');
                 toastr.success('Login Successfull', 'Account Notification')
@@ -135,6 +139,7 @@ var Login = function() {
               console.log(error);
             }
           });
+        })
 
         $('#section-dashboard').show();
         $('#section-easydex').hide();

assets/scripts/sidebar.js

@@ -2,6 +2,7 @@
 $(document).ready(function() {
   $('#section-dashboard').show();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-iguana-atomic-explorer').hide();
@@ -9,6 +10,7 @@ $(document).ready(function() {
 	$('#section-about-iguana').hide();
 	$('#nav-dashboard').removeClass( '' ).addClass( 'active open' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
@@ -18,6 +20,7 @@ $(document).ready(function() {
 
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	CommonSidebarActionsSet01();
 	applyDashboardStyle();
 });
@@ -29,6 +32,7 @@ $('#nav-dashboard').on('click', function() {
 		$('#header-dashboard').show();
 	}
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-iguana-atomic-explorer').hide();
@@ -36,6 +40,7 @@ $('#nav-dashboard').on('click', function() {
 	$('#section-about-iguana').hide();
 	$('#nav-dashboard').removeClass( '' ).addClass( 'active open' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
@@ -46,6 +51,7 @@ $('#nav-dashboard').on('click', function() {
 	$(this.parentElement).addClass('active');
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	CommonSidebarActionsSet011();
 	applyDashboardStyle();
 });
@@ -54,6 +60,7 @@ $('#nav-easydex').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').show();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-about-iguana').hide();
@@ -66,19 +73,51 @@ $('#nav-easydex').on('click', function() {
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
 	$('#nav-iguana-wallet-settings').removeClass( 'active open' ).addClass( '' );
 	$('#nav-about-iguana').removeClass( 'active open' ).addClass( '' );
-	$(".header-easydex-section").text('EasyDEX');
+	$('.page-header-bordered h1').text('EasyDEX')
+	$(".header-easydex-section").text('Most Secure, Easy and Native Decentralised Exchange');
 	$.each($('.nav-top-menu'), function(index, value) { $(value).removeClass('active'); });
 	$(this.parentElement).addClass('active')
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
 });
 
+$('#nav-jumblr').on('click', function() {
+	$('#section-dashboard').hide();
+	$('#header-dashboard').hide();
+	$('#section-easydex').hide();
+	$('#section-jumblr').show();
+	$('#section-extcoin').hide();
+	$('#section-zcash').hide();
+	$('#section-about-iguana').hide();
+	$('#section-iguana-atomic-explorer').hide();
+	$('#section-iguana-wallet-settings').hide();
+	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
+	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( '' ).addClass( 'active open' );
+	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
+	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
+	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
+	$('#nav-iguana-wallet-settings').removeClass( 'active open' ).addClass( '' );
+	$('#nav-about-iguana').removeClass( 'active open' ).addClass( '' );
+	$('.page-header-bordered h1').text('Jumblr')
+	//$(".header-easydex-section").text('Secure, Native and Decentralised Coin Shuffling');
+	$.each($('.nav-top-menu'), function(index, value) { $(value).removeClass('active'); });
+	$(this.parentElement).addClass('active')
+	removeKMDWalletStyle();
+	removeZECWalletStyle();
+	CommonSidebarActionsSet02();
+	removeDashboardStyle();
+	applyJumblrStyle()
+});
+
 $('#nav-komodo-wallet').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').show();
 	$('#section-zcash').hide();
 	$('#section-about-iguana').hide();
@@ -86,6 +125,7 @@ $('#nav-komodo-wallet').on('click', function() {
 	$('#section-iguana-wallet-settings').hide();
 	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( '' ).addClass( 'active open' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
@@ -106,8 +146,9 @@ $('#nav-komodo-wallet').on('click', function() {
 	});
 	KMDWalletDashboard.init(); // Initiate Komodo Dashboard sript
 	RunKMDInitFunctions();
-	applyKMDWalletStyle();
+	removeJumblrStyle();
 	// removeZECWalletStyle();
+	applyKMDWalletStyle();
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
 });
@@ -124,6 +165,7 @@ $('#nav-zcash-wallet').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	// $('#section-zcash').show();
 	$('#section-extcoin').show();
@@ -132,6 +174,7 @@ $('#nav-zcash-wallet').on('click', function() {
 	$('#section-iguana-wallet-settings').hide();
 	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( '' ).addClass( 'active open' );
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
@@ -154,8 +197,8 @@ $('#nav-zcash-wallet').on('click', function() {
 	
 	KMDWalletDashboard.init(); // Initiate Komodo Dashbaord sript
 	RunKMDInitFunctions();
-	applyZECWalletStyle();
 	//removeKMDWalletStyle();
+	applyZECWalletStyle();
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
 	NProgress.done();
@@ -165,6 +208,7 @@ $('#nav-iguana-atomic-explorer').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-iguana-atomic-explorer').show();
@@ -172,6 +216,7 @@ $('#nav-iguana-atomic-explorer').on('click', function() {
 	$('#section-about-iguana').hide();
 	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-about-iguana').removeClass( 'active open' ).addClass( '' );
@@ -182,6 +227,7 @@ $('#nav-iguana-atomic-explorer').on('click', function() {
 	$(this.parentElement).addClass('active');
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
 	$('#easydex-header-div').hide();
@@ -191,6 +237,7 @@ $('#nav-iguana-wallet-settings').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-iguana-atomic-explorer').hide();
@@ -198,6 +245,7 @@ $('#nav-iguana-wallet-settings').on('click', function() {
 	$('#section-about-iguana').hide();
 	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-about-iguana').removeClass( 'active open' ).addClass( '' );
@@ -206,6 +254,7 @@ $('#nav-iguana-wallet-settings').on('click', function() {
 	// $(".header-easydex-section").text("Wallet Settings");
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	Settings_ShowWalletInfo(); // Execute this function from walletsettings.js file
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
@@ -216,6 +265,7 @@ $('#nav-about-iguana').on('click', function() {
 	$('#section-dashboard').hide();
 	$('#header-dashboard').hide();
 	$('#section-easydex').hide();
+	$('#section-jumblr').hide();
 	$('#section-extcoin').hide();
 	$('#section-zcash').hide();
 	$('#section-iguana-atomic-explorer').hide();
@@ -223,6 +273,7 @@ $('#nav-about-iguana').on('click', function() {
 	$('#section-about-iguana').show();
 	$('#nav-dashboard').removeClass( 'active open' ).addClass( '' );
 	$('#nav-easydex').removeClass( 'active open' ).addClass( '' );
+	$('#nav-jumblr').removeClass( 'active open' ).addClass( '' );
 	$('#nav-komodo-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-zcash-wallet').removeClass( 'active open' ).addClass( '' );
 	$('#nav-iguana-atomic-explorer').removeClass( 'active open' ).addClass( '' );
@@ -231,6 +282,7 @@ $('#nav-about-iguana').on('click', function() {
 	$(".header-easydex-section").text('About Iguana');
 	removeKMDWalletStyle();
 	removeZECWalletStyle();
+	removeJumblrStyle();
 	CommonSidebarActionsSet02();
 	removeDashboardStyle();
 	$('#easydex-header-div').hide();
@@ -266,6 +318,7 @@ function applyKMDWalletStyle() {
 	$('#easydex-header-div').css('background-position', '0%');
 	$('#easydex_kmd_wallet_actions_header').show();
 	$('#easydex_zec_wallet_actions_header').hide();
+	$('#jumblr_actions_header').hide();
 	$('#easydex_btc_btcd_balances_header').hide();
 	sessionStorage.setItem('NativeWalletActions', 'start');
 }
@@ -275,7 +328,8 @@ function removeKMDWalletStyle() {
 	$('#easydex-header-div').removeAttr( 'style' );
 	$('#easydex_kmd_wallet_actions_header').hide();
 	$('#easydex_zec_wallet_actions_header').hide();
-	$('#easydex_btc_btcd_balances_header').show();
+	$('#jumblr_actions_header').hide();
+	$('#easydex_btc_btcd_balances_header').hide();
 	sessionStorage.setItem('NativeWalletActions', 'stop');
 }
 
@@ -287,6 +341,7 @@ function applyZECWalletStyle() {
 	$('#easydex-header-div').css('background-position', '0%');
 	$('#easydex_kmd_wallet_actions_header').hide();
 	$('#easydex_zec_wallet_actions_header').show();
+	$('#jumblr_actions_header').hide();
 	$('#easydex_btc_btcd_balances_header').hide();
 	sessionStorage.setItem('NativeWalletActions', 'start');
 }
@@ -296,7 +351,31 @@ function removeZECWalletStyle() {
 	$('#easydex-header-div').removeAttr( 'style' );
 	$('#easydex_kmd_wallet_actions_header').hide();
 	$('#easydex_zec_wallet_actions_header').hide();
-	$('#easydex_btc_btcd_balances_header').show();
+	$('#jumblr_actions_header').hide();
+	$('#easydex_btc_btcd_balances_header').hide();
+	sessionStorage.setItem('NativeWalletActions', 'stop');
+}
+
+function applyJumblrStyle() {
+	$('.header-easydex-section').html('<img src="assets/images/jumblr_header_title_logo.png"><br>Secure, Native and Decentralised Coin Shuffling');
+	$('.page-title').hide();
+	$('#easydex-header-div').css('background-image', 'url("assets/images/bg/jumblr_transparent_header_bg.png")');
+	$('#easydex-header-div').css('background-repeat', 'no-repeat');
+	$('#easydex-header-div').css('background-position', '0%');
+	$('#easydex_kmd_wallet_actions_header').hide();
+	$('#easydex_zec_wallet_actions_header').hide();
+	$('#jumblr_actions_header').show();
+	$('#easydex_btc_btcd_balances_header').hide();
+	sessionStorage.setItem('NativeWalletActions', 'start');
+}
+
+function removeJumblrStyle() {
+	$('.page-title').show();
+	$('#easydex-header-div').removeAttr( 'style' );
+	$('#easydex_kmd_wallet_actions_header').hide();
+	$('#easydex_zec_wallet_actions_header').hide();
+	$('#jumblr_actions_header').hide();
+	$('#easydex_btc_btcd_balances_header').hide();
 	sessionStorage.setItem('NativeWalletActions', 'stop');
 }
 

index.html

@@ -488,6 +488,7 @@
           </li>
           <li class="active nav-top-menu"><a href="javascript:void(0)" id="nav-dashboard"><i class="site-menu-icon" aria-hidden="true"></i> <span data-lang="INDEX.WALLETS"></span></a></li>
           <li class="nav-top-menu"><a href="javascript:void(0)" id="nav-easydex"><i class="site-menu-icon" aria-hidden="true"></i> EasyDEX</a></li>
+          <li class="nav-top-menu"><a href="javascript:void(0)" id="nav-jumblr"><i class="site-menu-icon" aria-hidden="true"></i> Jumblr</a></li>
           <!--<li class="nav-top-menu"><a href="javascript:void(0)" id="nav-assetchains"><i class="site-menu-icon" aria-hidden="true"></i> Assetchains</a></li>
           <li class="nav-top-menu"><a href="javascript:void(0)" id="nav-pax"><i class="site-menu-icon" aria-hidden="true"></i> PAX</a></li>-->
           <li class="nav-top-menu"><a href="javascript:void(0)" id="nav-iguana-atomic-explorer"><i class="site-menu-icon" aria-hidden="true"></i> Atomic Explorer</a></li>
@@ -623,7 +624,7 @@
 
     <!-- BEGIN DASHBOARD CONTENT BODY -->
     <!-- Header with background and menus -->
-    <div class="page-header page-header-bordered header-easydex" id="easydex-header-div">
+    <div class="page-header page-header-bordered header-easydex margin-bottom-0" id="easydex-header-div">
       <h1 class="page-title">EasyDEX</h1>
       <ol class="breadcrumb">
         <li class="header-easydex-section" data-lang="INDEX.DASHBOARD"></li>
@@ -656,7 +657,12 @@
           </ul>
         </div>
         <!-- End ZEC Wallet Header button -->
-        <div class="row no-space width-350 hidden-xs" id="easydex_btc_btcd_balances_header">
+        <!-- Jumblr Header button -->
+        <div id="kmd_header_button">
+          <button type="button" id="jumblr_actions_header" class="btn white waves-effect waves-light" style="display: none;"><i class="icon fa-refresh" aria-hidden="true"></i>Refresh</button>
+        </div>
+        <!-- End Jumblr Header button -->
+        <div class="row no-space width-350 hidden-xs" id="easydex_btc_btcd_balances_header" style="display: none;">
           <div class="col-xs-6">
             <div class="counter">
               <span class="font-weight-medium" data-currency="BTC" id="header_coinname_balance"> - BTC</span>
@@ -1201,12 +1207,90 @@
   </footer>-->
 
     <!-- BEGIN EASYDEX CONTENT BODY -->
+    <div class="page animsition" data-animsition-in="fade-in" data-animsition-out="fade-out" style="margin-left: 0px;">
     <div class="page-content" id="section-easydex">
       <h2>Coming Soon!</h2>
     </div>
+    </div>
     <!-- END EASYDEX CONTENT BODY -->
 
+    <!-- BEGIN JUMBLR CONTENT BODY -->
+    <div class="page animsition" data-animsition-in="fade-in" data-animsition-out="fade-out" style="margin-left: 0px;">
+    <div class="page-content" id="section-jumblr">
+      <div class="row" id="jumblr_dashboard" data-plugin="masonry">
+
+        <div class="col-xs-12" id="jumblr_testing_alert">
+          <div class="alert alert-danger" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">×</span>
+            </button>
+            <span style="font-size:24px; text-align: center;"><i class="icon fa-paw" aria-hidden="true"></i> EXPERIMENTAL TEST VERSION ONLY</span><br>Jumblr feature is very experimental and for now, is Only enabled for testing and debugging. Please use the current version of Jumblr only with small amounts if you are participating in testing this feature.</a>
+          </div>
+        </div>
+
+        <div class="col-xs-12" id="jumblr_no_native_kmd_alert">
+          <div class="alert alert-info alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">×</span>
+            </button>
+            <span style="font-size:24px; text-align: center;"><i class="icon fa-paw" aria-hidden="true"></i> Need Native Mode Komodo</span><br>To use Jumblr feature, you need to activate Komodo in Native Mode.<br>If you are already running Komodo in either Basilisk Mode or Full Mode, close the wallet and restart again to start Komodo In Native Mode.</a>.
+          </div>
+        </div>
+        
+        <div class="col-xlg-12 col-md-12">
+          <p>This screen does not auto refresh. You will need to hit the Refresh button on the top right corner of the screen to get latest Jumblr data.</p>
+        </div>
+
+        <!-- Jumblr Tab -->
+        <div class="col-xlg-12 col-md-12">
+          <h4 class="font-size-14 text-uppercase">Jumblr Addresses</h4>
+          <div class="panel" id="projects">
+            <div class="table-responsive">
+              <table class="table table-striped">
+                <tbody>
+                  <tr><td>BTC Deposit</td><td><span id="jumblr_BTCdeposit"></span></td></tr>
+                  <tr><td>BTC Jumblr</td><td><span id="jumblr_BTCjumblr"></span></td></tr>
+                  <tr><td>KMD Deposit</td><td><span id="jumblr_KMDdeposit"></span></td></tr>
+                  <tr><td>KMD Jumblr</td><td><span id="jumblr_KMDjumblr"></span></td></tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+        <!-- End Jumblr tab -->
+
+        <!-- Jumblr Tab -->
+        <div class="col-xlg-12 col-md-12">
+          <h4 class="font-size-14 text-uppercase">Jumblr Status</h4>
+          <div class="panel" id="projects">
+            <div class="table-responsive">
+              <table class="table table-striped">
+                <tbody>
+                  <tr><td>BTC Deposit</td><td><span id="jumblr_status_BTCdeposit"></span></td></tr>
+                  <tr><td>BTC Jumblr</td><td><span id="jumblr_status_BTCjumblr"></span></td></tr>
+                  <tr><td>KMD Deposit</td><td><span id="jumblr_status_KMDdeposit"></span></td></tr>
+                  <tr><td>KMD Jumblr</td><td><span id="jumblr_status_KMDjumblr"></span></td></tr>
+                  <tr><td>Result</td><td><span id="jumblr_status_result"></span></td></tr>
+                  <tr><td>Deposited</td><td><span id="jumblr_status_deposited"></span></td></tr>
+                  <tr><td>Public to Private</td><td><span id="jumblr_status_t_to_z"></span></td></tr>
+                  <tr><td>Private to Private</td><td><span id="jumblr_status_z_to_z"></span></td></tr>
+                  <tr><td>Private to Public</td><td><span id="jumblr_status_z_to_t"></span></td></tr>
+                  <tr><td>Finished</td><td><span id="jumblr_status_finished"></span></td></tr>
+                  <tr><td>Pending</td><td><span id="jumblr_status_pending"></span></td></tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+        <!-- End Jumblr tab -->
+
+      </div>
+    </div>
+    </div>
+    <!-- END JUMBLR CONTENT BODY -->
+
     <!-- BEGIN KOMODO WALLET CONTENT BODY -->
+    <div class="page animsition" data-animsition-in="fade-in" data-animsition-out="fade-out" style="margin-left: 0px;">
     <div class="page-content" data-extcoin="COIN" id="section-extcoin">
       <div role="alert" class="alert alert-danger alert-dismissible" data-extcoin="COIN" id="extcoin-wallet-connection-alert" style="display: none">
         <button aria-label="Close" data-dismiss="alert" class="close" type="button"><span aria-hidden="true">×</span></button>
@@ -1615,6 +1699,7 @@
       </div>
       <!-- End Modal -->
     </div>
+    </div>
     <!-- END KOMODO WALLET CONTENT BODY -->
 
     <!-- BEGIN ZCASH WALLET CONTENT BODY -->
@@ -1670,6 +1755,7 @@
                     <option value="txid">Transaction ID</option>
                     <option value="blockash">Block Hash</option>
                     <option value="chaintip">Chain Tip</option>
+                    <option value="activehandle">Active Handle</option>
                     <option value="gettransaction">Get Transaction</option>
                     <option value="dex_alladdresses">DEX All Addresses</option>
                     <option value="dex_importaddress">DEX Import Address</option>
@@ -1692,6 +1778,7 @@
                     <option value="dex_listunspent2">DEX List Unspent 2</option>
                     <option value="dex_sendrawtransaction">DEX Send Raw Transaction</option>
                     <option value="basilisk_refresh">Basilisk Refresh</option>
+                    <option value="jumblr_status">Jumbler Status</option>
                   </select>
                 </div>
                 <div class="col-sm-4 col-xs-12" style="text-align: center">
@@ -2106,6 +2193,7 @@
     <!-- End Dashboard Scripts -->  
     
     <!--<script src="assets/scripts/coinwallets.js"></script>-->
+    <script src="assets/scripts/jumblr.js"></script>
     <script src="assets/scripts/sidebar.js"></script>
     <script src="assets/scripts/walletsettings.js"></script>
     <script src="assets/scripts/atomicexplorer.js"></script>
@@ -2147,8 +2235,6 @@
       jQuery(document).ready(function() {
         jQuery('.scrollbar-dynamic').scrollbar();
       });
-      
-      if (window.module) module = window.module;
     </script>
   </body>
 </html>