lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

2 Important Bugs fixed in send transaction screen 

- if user hit on confirm button twice the same amount of transaction
goes twice!
Even while the transaction is being processed at the time!
It is fixed.

- Second bug I found while testing is if I send a transaction and it
completes. And I’m still on that same send transaction screen. I make
second transaction. When I confirm to send this transaction, not just
this transaction is processed to send, but the previous transaction as
well!!!
It is also fixed.
master
Satinder Grewal 8 years ago
parent
04426a02de
commit
a9a9537fed
3 changed files with 103 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      assets/scripts/dashboard.js
  2. 6
      assets/scripts/iguana_api.js
  3. 53
      index.html

76
assets/scripts/dashboard.js
View File

@ -1,6 +1,11 @@
var RunTotalFiatValue = '';
var ExecuteShowCoinHistory = '';
var active_edexcoin = '';
var tmp_send_to_addr = '';
var tmp_send_total_amount = '';
var edexcoin_send_form_validator = '';
var Dashboard = function() {
@ -74,7 +79,6 @@ var Dashboard = function() {
var handle_edex_send = function() {
$('#btn_edexcoin_send').click(function() {
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
//console.log(active_edexcoin);
sessionStorage.setItem('edexTmpRefresh', "stop");
@ -154,7 +158,7 @@ var Dashboard = function() {
}
});
$('.edexcoin-send-form').validate({
edexcoin_send_form_validator = $('.edexcoin-send-form').validate({
//errorElement: 'span', //default input error message container
//errorClass: 'help-block', // default input error message class
//focusInvalid: false, // do not focus the last invalid input
@ -212,7 +216,7 @@ var Dashboard = function() {
$('#mdl_confirm_currency_sendfrom_total_dedcut').text($('#edexcoin_total_value').text());
$('#mdl_confirm_currency_coinname_total').text($('[data-edexcoin]').attr("data-edexcoin"));
$('#SendCoinModelStep2').modal('show')
//$('#SendCoinModelStep2').modal('show')
console.log('==> Before confirming tx to send')
console.log($('[data-edexcoin]').attr("data-edexcoin"))
@ -224,28 +228,58 @@ var Dashboard = function() {
//var tmp_send_from_addr = $('#edexcoin_send_from').val();
var tmp_send_to_addr = $('#edexcoin_sendto').val();
var tmp_send_total_amount = $('#edexcoin_total_value').text();
$('.edexcoin-send-form')[0].reset();
$('#edexcoin_send_coins_btn').click(function() {
$('#edexcoin_send_coins_btn').prop('disabled', true);
console.log('==> After confirming tx to send')
console.log(active_edexcoin)
console.log(tmp_send_to_addr)
console.log(tmp_send_total_amount)
var tmp_json_data = {'coin':active_edexcoin,'sendtoaddr':tmp_send_to_addr,'amount':tmp_send_total_amount};
console.log(tmp_json_data);
var tmp_sendtoaddr_output = EDEXSendToAddr(tmp_json_data);
//console.log(tmp_sendtoaddr_output);
//console.log(tmp_sendtoaddr_output[0]);
$('#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);
});
$('#edexcoin-send-screen').hide();
$('#edexcoin-send-confirm-screen').show();
NProgress.done();
}
});
$('#edexcoin_send_coins_btn').click(function() {
$('#edexcoin_send_coins_btn').prop('disabled', true);
console.log('==> After confirming tx to send')
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
//var tmp_send_from_addr = $('#edexcoin_send_from').val();
var tmp_send_to_addr = $('#edexcoin_sendto').val();
var tmp_send_total_amount = $('#edexcoin_total_value').text();
console.log(active_edexcoin)
console.log(tmp_send_to_addr)
console.log(tmp_send_total_amount)
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);
var tmp_json_data = {'coin':active_edexcoin,'sendtoaddr':tmp_send_to_addr,'amount':tmp_send_total_amount};
console.log(tmp_json_data);
EDEXSendToAddr(tmp_json_data);
//console.log(tmp_sendtoaddr_output);
//console.log(tmp_sendtoaddr_output[0]);
//$('#SendCoinModelStep2').modal('hide')
$('.edexcoin-send-form')[0].reset();
$('#edexcoin_total_value').text('0.000');
$('#edexcoin-send-confirm-screen').hide();
$('#edexcoin-send-txdetails-screen').show();
edexcoin_send_form_validator.resetForm();
});
$('#edexcoin_send_coins_back_btn').click(function() {
$('#edexcoin-send-confirm-screen').hide();
$('#edexcoin-send-txdetails-screen').hide();
$('#edexcoin-send-screen').show();
var active_edexcoin = '';
var tmp_send_to_addr = '';
var tmp_send_total_amount = '';
edexcoin_send_form_validator.resetForm();
});
$('#edexcoin_send_coins_anothertx_btn').click(function() {
$( "#edexcoin_send_coins_back_btn" ).trigger( "click" );
var active_edexcoin = '';
var tmp_send_to_addr = '';
var tmp_send_total_amount = '';
edexcoin_send_form_validator.resetForm();
});
$('.edexcoin_sendto_result').on('click', '.edexcoin_sendto_output_result', function(e){
var selected_coin = $(this).data('edexcoin')
var selected_coin_mode = sessionStorage.getItem('edexTmpMode');

6
assets/scripts/iguana_api.js
View File

@ -673,18 +673,18 @@ 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>';
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
}
if ( SendToAddrData.complete !== undefined ) {
toastr.info("Transaction sent successfully. Please check send Transaction page for details.", "Wallet Notification");
toastr.success("Transaction sent successfully. Check send section 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);
}
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var selected_coinmode = sessionStorage.getItem('edexTmpMode')

53
index.html
View File

@ -830,8 +830,8 @@
</div>
</div>
<!-- End Sending EDEXCoin Steps Default -->
<div class="panel" id="projects">
<div class="panel" id="edexcoin-send-screen">
<div class="panel-heading">
<h3 data-edexcoin="COIN" class="panel-title">Send <span data-edexcoin="COIN"></span></h3>
<!--<div class="panel-actions">
@ -874,10 +874,42 @@
</div>
<!-- EasyDEX Panel confirm send panel -->
<div class="col-xlg-12 col-md-12 col-sm-12 col-xs-12">
<div class="panel" id="edexcoin-send-confirm-screen" style="display: none;">
<div class="panel-body">
<div class="row">
<div class="col-xs-12"><b>To:</b></div>
<div class="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendto_addr">[coin-address-goes-here]</div>
<div class="col-lg-6 col-sm-6 col-xs-6"><span id="mdl_confirm_currency_send_amount">0.00000000</span> <span id="mdl_confirm_currency_coinname">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_amount_fiat">$0.00</div>-->
<div class="col-lg-6 col-sm-6 col-xs-12">Transaction Fee (Required by miners)</div>
<div class="col-lg-6 col-sm-6 col-xs-6"><span id="mdl_confirm_currency_send_fee">0.00000000</span> <span id="mdl_confirm_currency_coinname_fee">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_fee_fiat">$0.00</div>-->
</div>
<br>
<div class="row">
<div class="col-xs-12"><b>From:</b></div>
<div class="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendfrom_addr">[coin-address-goes-here]</div>
<div class="col-lg-6 col-sm-6 col-xs-6" style="color: #f44336;"><span id="mdl_confirm_currency_sendfrom_total_dedcut">-0.00000000</span> <span id="mdl_confirm_currency_coinname_total">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_sendfrom_total_deduct_fiat" style="color: #f44336;">-$0.00</div>-->
</div>
<div class="widget-body-footer">
<a class="btn btn-default waves-effect waves-light" id="edexcoin_send_coins_back_btn">Back</a>
<div class="widget-actions pull-right">
<button type="button" class="btn btn-primary" id="edexcoin_send_coins_btn">Confirm</button>
</div>
</div>
</div>
</div>
</div>
<!-- EasyDEX Panel confirm send panel -->
<!-- EasyDEX Panel send info panel -->
<div class="col-xlg-12 col-md-12 col-sm-12 col-xs-12">
<div class="panel">
<div class="panel" id="edexcoin-send-txdetails-screen" style="display: none;">
<div class="panel-body">
<h4>Transaction Result</h4>
<table class="table table-hover table-striped edexcoin_sendto_result" data-edexcoin="COIN" id="edexcoin_sendto_result">
@ -885,6 +917,11 @@
<tbody>
</tbody>
</table>
<div class="widget-body-footer">
<div class="widget-actions pull-right">
<button type="button" class="btn btn-primary" id="edexcoin_send_coins_anothertx_btn">Make Another Transaction</button>
</div>
</div>
</div>
</div>
</div>
@ -953,7 +990,7 @@
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="SendCoinModelStep2" aria-hidden="false" role="dialog"
<!--<div class="modal fade modal-3d-sign" id="SendCoinModelStep2" aria-hidden="false" role="dialog"
tabindex="-1">
<div class="modal-dialog modal-center modal-lg">
<div class="modal-content">
@ -969,10 +1006,10 @@
<div class="col-xs-12"><b>To:</b></div>
<div class="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendto_addr">[coin-address-goes-here]</div>
<div class="col-lg-6 col-sm-6 col-xs-6"><span id="mdl_confirm_currency_send_amount">0.00000000</span> <span id="mdl_confirm_currency_coinname">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_amount_fiat">$0.00</div>-->
<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_amount_fiat">$0.00</div>
<div class="col-lg-6 col-sm-6 col-xs-12">Transaction Fee (Required by miners)</div>
<div class="col-lg-6 col-sm-6 col-xs-6"><span id="mdl_confirm_currency_send_fee">0.00000000</span> <span id="mdl_confirm_currency_coinname_fee">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_fee_fiat">$0.00</div>-->
<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_send_fee_fiat">$0.00</div>
</div>
<br>
@ -980,7 +1017,7 @@
<div class="col-xs-12"><b>From:</b></div>
<div class="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendfrom_addr">[coin-address-goes-here]</div>
<div class="col-lg-6 col-sm-6 col-xs-6" style="color: #f44336;"><span id="mdl_confirm_currency_sendfrom_total_dedcut">-0.00000000</span> <span id="mdl_confirm_currency_coinname_total">[COIN]</span></div>
<!--<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_sendfrom_total_deduct_fiat" style="color: #f44336;">-$0.00</div>-->
<div class="col-lg-2 col-sm-2 col-xs-6" id="mdl_confirm_currency_sendfrom_total_deduct_fiat" style="color: #f44336;">-$0.00</div>
</div>
</div>
<div class="modal-footer">
@ -989,7 +1026,7 @@
</div>
</div>
</div>
</div>
</div>-->
<!-- End Modal -->
<!-- Modal -->
<div class="modal fade modal-3d-sign" id="ReceiveCoinModel" aria-hidden="false" role="dialog"

Write Preview
Loading…
Cancel
Save