diff --git a/gui/index.html b/gui/index.html index 1356b9f..2d703c7 100644 --- a/gui/index.html +++ b/gui/index.html @@ -524,6 +524,7 @@
+

Using ZeroConf feature you can make trades on decentralised exchange in seconds instead of waiting for blockchain confirmations. Please click here to read more.

Deposit ZeroConf Security diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js index ff9feb3..533b2ad 100644 --- a/gui/js/simpledexactions.js +++ b/gui/js/simpledexactions.js @@ -2748,8 +2748,8 @@ function check_my_prices(sig){ }*/ } else { $.each(data, function(index, val) { - console.log(index); - console.log(val); + //console.log(index); + //console.log(val); var base_coin_name = return_coin_name(val.base) var rel_coin_name = return_coin_name(val.rel) @@ -4120,7 +4120,16 @@ function bot_screen_sellcoin_balance(sig) { `; $('.trading_sellcoin_ticker_name').html(' '+ return_coin_name(coin) + ' ('+coin+') ' + coin_mode + ''+button_controls); - $('.trading_sellcoin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + if (data.coin.hasOwnProperty('electrum')) { + var electrum_coin_balance_data = {}; + electrum_coin_balance_data.baserel = 'rel'; + electrum_coin_balance_data.coin = coin; + electrum_coin_balance_data.smartaddress = data.coin.smartaddress; + electrum_coin_balance(electrum_coin_balance_data); + //$('.trading_sellcoin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + } else { + $('.trading_sellcoin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + } $('#balance-spinner').hide(); $('.balance-block').show(); } @@ -4197,7 +4206,16 @@ function bot_screen_coin_balance(sig) { `; $('.trading_coin_ticker_name').html(' '+ return_coin_name(coin) + ' ('+coin+') ' + coin_mode + ''+button_controls); - $('.trading_coin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + if (data.coin.hasOwnProperty('electrum')) { + var electrum_coin_balance_data = {}; + electrum_coin_balance_data.baserel = 'base'; + electrum_coin_balance_data.coin = coin; + electrum_coin_balance_data.smartaddress = data.coin.smartaddress; + electrum_coin_balance(electrum_coin_balance_data); + //$('.trading_coin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + } else { + $('.trading_coin_balance').html(data.coin.balance + ' ' + coin + '
' + data.coin.smartaddress + ''); + } } //$('.trading_coin_ticker_name').html(' '+ return_coin_name(coin) + ' ('+coin+')'); @@ -4210,6 +4228,37 @@ function bot_screen_coin_balance(sig) { }); } + +function electrum_coin_balance(coin_balance_data) { + console.log(coin_balance_data); + + var userpass = sessionStorage.getItem('mm_userpass'); + var mypubkey = sessionStorage.getItem('mm_mypubkey'); + var ajax_data = {"userpass":userpass,"method":"balance","coin":coin_balance_data.coin,"address":coin_balance_data.smartaddress}; + var url = "http://127.0.0.1:7783/"; + + $.ajax({ + async: true, + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(coin_balance_output_data) { + // If successful + console.log(coin_balance_output_data); + if(coin_balance_data.baserel == 'base'){ + $('.trading_coin_balance').html(coin_balance_output_data.balance + ' ' + coin_balance_data.coin + '
' + coin_balance_data.smartaddress + ''); + } + if(coin_balance_data.baserel == 'rel'){ + $('.trading_sellcoin_balance').html(coin_balance_output_data.balance + ' ' + coin_balance_data.coin + '
' + coin_balance_data.smartaddress + ''); + } + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); + +} + /* Auto Trading Bot END */ @@ -5239,4 +5288,15 @@ function ZeroConfClaim(claim_address, claim_expiration) { }); } + + +$('.info_box_for_zeroconf').click(function(e){ + e.preventDefault(); + console.log('info_box_for_zeroconf clicked'); + bootbox.alert({ + title: `What is Zero Confirmations Feature?`, + message: `

To use this feature you have to deposit your KMD as security, which goes to a special multisig address. Minimum amount to deposit is 10 KMD, and minumum time to deposit is 1 week. You will get these deposits back automatically once it reaches it's expiration time. If not, then you can hit the claim button to claim your deposited KMDs back.

`, + size: 'large' + }); +}) /* ZEROCONF SETTINGS END */ \ No newline at end of file