diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index 8a90ef9..6535a4e 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -237,9 +237,10 @@ var Dashboard = function() { var tmp_sendtoaddr_output = EDEXSendToAddr(tmp_json_data); //console.log(tmp_sendtoaddr_output); //console.log(tmp_sendtoaddr_output[0]); - - getCoinBalance(active_edexcoin); - //clearEdexSendFieldData(); + $('#SendCoinModelStep2').modal('hide') + var edexcoin_sendto_result_tbl = ''; + edexcoin_sendto_result_tbl += 'InfoThe transaction submitted is processing. Once processed the transaction details will be displayed here.'; + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); }); NProgress.done(); } diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index 154ae63..744e584 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -659,7 +659,7 @@ function EDEXSendToAddr(data) { console.log(sendtoaddrvalues); console.log(sendtoaddrvalues.params); $.ajax({ - async: false, + //async: false, type: 'POST', data: JSON.stringify(sendtoaddrvalues), url: 'http://127.0.0.1:7778', @@ -674,13 +674,15 @@ function EDEXSendToAddr(data) { var edexcoin_sendto_result_tbl = ''; if ( SendToAddrData.error !== undefined ) { //console.log(SendToAddrData.error); + toastr.error("Sent Transaction failed. Please check send Transaction page for details.", "Wallet Notification"); edexcoin_sendto_result_tbl += 'error' + SendToAddrData.error + ''; } if ( SendToAddrData.complete !== undefined ) { - edexcoin_sendto_result_tbl += 'complete' + SendToAddrData.complete + '' - edexcoin_sendto_result_tbl += 'result' + SendToAddrData.result + '' - edexcoin_sendto_result_tbl += 'sendrawtransaction' + SendToAddrData.sendrawtransaction + '' - edexcoin_sendto_result_tbl += 'signedtx' + SendToAddrData.signedtx + '' + toastr.info("Transaction sent successfully. Please check send Transaction page for details.", "Wallet Notification"); + edexcoin_sendto_result_tbl += 'complete' + SendToAddrData.complete + '' + edexcoin_sendto_result_tbl += 'result' + SendToAddrData.result + '' + edexcoin_sendto_result_tbl += 'sendrawtransaction' + SendToAddrData.sendrawtransaction + '' + edexcoin_sendto_result_tbl += 'signedtx' + SendToAddrData.signedtx + '' } $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); @@ -713,7 +715,7 @@ function EDEXSendToAddr(data) { console.log(error); } }); - $('#SendCoinModelStep2').modal('hide') + //$('#SendCoinModelStep2').modal('hide') //$( "#btn_edexcoin_dashboard" ).trigger( "click" ); //$('#edexcoin_sendto_result tbody').html(''); return result;