Browse Source

experimental bug fix commit: send tx form update

master
Satinder Grewal 8 years ago
parent
commit
04426a02de
  1. 7
      assets/scripts/dashboard.js
  2. 14
      assets/scripts/iguana_api.js

7
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 += '<tr class="info"><td>Info</td><td>The transaction submitted is processing. Once processed the transaction details will be displayed here.</td></tr>';
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
});
NProgress.done();
}

14
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 += '<tr class="active"><td>error</td><td><span class="label label-danger">' + SendToAddrData.error + '</span></td></tr>';
}
if ( SendToAddrData.complete !== undefined ) {
edexcoin_sendto_result_tbl += '<tr class=""><td>complete</td><td><span class="label label-info">' + SendToAddrData.complete + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr><td>result</td><td><a href="javascript:void(0)" data-edexcoin="' + active_edexcoin + '" data-sendtotxresult="' + SendToAddrData.result + '" class="edexcoin_sendto_output_result">' + SendToAddrData.result + '</a></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>sendrawtransaction</td><td><span class="label label-primary">' + SendToAddrData.sendrawtransaction + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>signedtx</td><td><span style="display: block; width: 400px;word-wrap: break-word;">' + SendToAddrData.signedtx + '</span></td></tr>'
toastr.info("Transaction sent successfully. Please check send Transaction page for details.", "Wallet Notification");
edexcoin_sendto_result_tbl += '<tr class=""><td>complete</td><td><span class="label label-info">' + SendToAddrData.complete + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr><td>result</td><td><a href="javascript:void(0)" data-edexcoin="' + active_edexcoin + '" data-sendtotxresult="' + SendToAddrData.result + '" class="edexcoin_sendto_output_result">' + SendToAddrData.result + '</a></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>sendrawtransaction</td><td><span class="label label-primary">' + SendToAddrData.sendrawtransaction + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>signedtx</td><td><span style="display: block; width: 400px;word-wrap: break-word;">' + SendToAddrData.signedtx + '</span></td></tr>'
}
$('#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;

Loading…
Cancel
Save