diff --git a/assets/bin/osx/marketmaker b/assets/bin/osx/marketmaker index e3e5789..545373f 100755 Binary files a/assets/bin/osx/marketmaker and b/assets/bin/osx/marketmaker differ diff --git a/gui/img/cryptologo/btg.png b/gui/img/cryptologo/btg.png new file mode 100644 index 0000000..6a5bec4 Binary files /dev/null and b/gui/img/cryptologo/btg.png differ diff --git a/gui/js/barterdexcharts.js b/gui/js/barterdexcharts.js index f97f4d7..4738c36 100644 --- a/gui/js/barterdexcharts.js +++ b/gui/js/barterdexcharts.js @@ -273,5 +273,5 @@ function Refresh_active_StockChart(sig) { } else { console.log('Refreshing active StockCharts every minute.'); } - UpdateDexChart($('.trading_pair_coin').selectpicker('val'), $('.trading_pair_coin2').selectpicker('val')); + UpdateDexChart($('.trading_pair_coin2').selectpicker('val'),$('.trading_pair_coin').selectpicker('val')); } \ No newline at end of file diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js index 7b9985d..0c231e7 100644 --- a/gui/js/simpledexactions.js +++ b/gui/js/simpledexactions.js @@ -2631,6 +2631,19 @@ function manual_buy_sell(mt_data) { if (!mt_output_data.error === false) { toastr.error(mt_output_data.error, 'Trade Info'); + if (mt_output_data.error == 'cant find a deposit that is close enough in size. make another deposit that is just a bit larger than what you want to trade') { + if (mt_data.action == 'buy') { + var deposit = {}; + deposit.amount = mt_data.volume.toFixed(8); + deposit.coin = rel_coin; + } + if (mt_data.action == 'sell') { + var deposit = {}; + deposit.amount = mt_data.volume; + deposit.coin = base_coin; + } + DepositOnError(deposit); + } if (mt_output_data.error == 'not enough funds') { //toastr.info(mt_output_data.error + '
Balance: ' + mt_output_data.balance + ' ' + mt_output_data.coin, 'Bot Info'); bootbox.alert({ @@ -2671,6 +2684,121 @@ function manual_buy_sell(mt_data) { /* Manual Tradeing END */ +function DepositOnError(deposit_data) { + console.log(deposit_data); + + var coin_name = return_coin_details(deposit_data.coin).name; + + var userpass = sessionStorage.getItem('mm_userpass'); + var ajax_data = {"userpass":userpass,"method":"getcoin","coin": deposit_data.coin}; + var url = "http://127.0.0.1:7783"; + + + $.ajax({ + async: true, + data: JSON.stringify(ajax_data), + dataType: 'json', + type: 'POST', + url: url + }).done(function(data) { + // If successful + console.log(data); + + if (deposit_data.amount > data.coin.balance) { + var blockquote_text = `Looks like your required trade is over your total balance. If you want to try with same trade, then please send the following ammount to the displayed address
+ ${deposit_data.amount} ${deposit_data.coin}`; + var show_table = ``; + var make_deposit_btn_state = 'hidden'; + } else { + var blockquote_text = `Want to make a relevant despoit and try again?`; + var show_table = ` + + + + + + + + + + + + + + + + + + + + +
From${data.coin.smartaddress}
To${data.coin.smartaddress}
Amount${deposit_data.amount} ${deposit_data.coin}
Fees${data.coin.txfee / 100000000} ${deposit_data.coin}
Total${parseFloat(deposit_data.amount) + parseFloat(data.coin.txfee / 100000000)} ${deposit_data.coin}
`; + var make_deposit_btn_state = 'shown'; + } + + var deposit_size_error_bootbox = bootbox.dialog({ + onEscape: true, + backdrop: true, + message: `
+ +
+
+
+ 
${data.coin.smartaddress}
+
System did not find matching change to use from your full balance.
${blockquote_text}
+ ${show_table} +
`, + closeButton: false, + size: 'medium', + className: 'deposit_size_error_class_bootbox', + + buttons: { + cancel: { + label: "Cancel", + className: 'btn-default', + callback: function(){ + + } + }, + ok: { + label: "Make Deposit", + className: 'btn-primary deposit_size_error_send_action', + callback: function(){ + var to_addr = data.coin.smartaddress; + console.log(to_addr); + + var output_data = {}; + output_data[to_addr] = parseFloat(deposit_data.amount) + parseFloat(data.coin.txfee / 100000000); + console.log(output_data); + + console.log(deposit_data.coin); + create_sendtx(deposit_data.coin, output_data); + + } + } + } + }); + deposit_size_error_bootbox.init(function(){ + console.log('deposit_size_error_bootbox dialog opened.') + var qrcode = new QRCode("receive_addr_qrcode", {width: 128,height: 128}); + qrcode.makeCode(data.coin.smartaddress); // make another code. + $('#receive_addr_qrcode > img').removeAttr('style'); + $('#receive_addr_qrcode > img').css('display', 'initial'); + $('#receive_addr_qrcode > img').css('border', '9px solid #f1f1f1','border-radius','5px','margin', '5px'); + $('#receive_addr_qrcode > img').css('border-radius','5px'); + $('#receive_addr_qrcode > img').css('margin', '5px'); + + if (make_deposit_btn_state == 'hidden') { + $('.deposit_size_error_send_action').hide(); + } + }); + + }).fail(function(jqXHR, textStatus, errorThrown) { + // If fail + console.log(textStatus + ': ' + errorThrown); + }); +} + /* Auto Trading Bot */ @@ -5329,7 +5457,35 @@ $('.btn_zeroconf_deposit').click(function(e){ var deposit_amount = $('.zeroconf_deposit_amount').val(); console.log(deposit_weeks); console.log(deposit_amount); - ZeroConfDeposit(deposit_weeks,deposit_amount); + var zeroconf_deposit_confirm_bootbox = bootbox.dialog({ + onEscape: true, + backdrop: true, + message: `Please confirm you want to send and lock ${deposit_amount} KMD for ${deposit_weeks} week(s)?`, + closeButton: false, + size: 'medium', + className: 'zeroconf_deposit_confirm_class_bootbox', + + buttons: { + cancel: { + label: "Cancel", + className: 'btn-default', + callback: function(){ + toastr.info('Sending Speed Deposit fund is canceled.','Speed Deposit Notification') + } + }, + ok: { + label: "Yes, I confirm", + className: 'btn-primary zeroconf_deposit_confirm_make_despoit', + callback: function(){ + ZeroConfDeposit(deposit_weeks,deposit_amount); + } + } + } + }); + zeroconf_deposit_confirm_bootbox.init(function(){ + console.log('zeroconf_deposit_confirm_bootbox dialog opened.') + + }); }); $('.zeroconf_deposit_amount').keyup(function(){