diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index 1108a83..8a90ef9 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -227,6 +227,7 @@ var Dashboard = function() { $('.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) @@ -234,20 +235,9 @@ var Dashboard = function() { 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]); - var edexcoin_sendto_result_tbl = ''; - if ( tmp_sendtoaddr_output[0].error !== undefined ) { - //console.log(tmp_sendtoaddr_output[0].error); - edexcoin_sendto_result_tbl += 'error' + tmp_sendtoaddr_output[0].error + ''; - } - if ( tmp_sendtoaddr_output[0].complete !== undefined ) { - edexcoin_sendto_result_tbl += 'complete' + tmp_sendtoaddr_output[0].complete + '' - edexcoin_sendto_result_tbl += 'result' + tmp_sendtoaddr_output[0].result + '' - edexcoin_sendto_result_tbl += 'sendrawtransaction' + tmp_sendtoaddr_output[0].sendrawtransaction + '' - edexcoin_sendto_result_tbl += 'signedtx' + tmp_sendtoaddr_output[0].signedtx + '' - } - $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + //console.log(tmp_sendtoaddr_output); + //console.log(tmp_sendtoaddr_output[0]); + getCoinBalance(active_edexcoin); //clearEdexSendFieldData(); }); diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index d71e97c..154ae63 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -666,9 +666,43 @@ function EDEXSendToAddr(data) { //dataType: 'text', success: function(data, textStatus, jqXHR) { var SendToAddrData = JSON.parse(data); - console.log('== Data OutPut =='); + //console.log('== Data OutPut =='); //console.log(SendToAddrData); + //console.log(SendToAddrData.error); result.push(SendToAddrData); + + var edexcoin_sendto_result_tbl = ''; + if ( SendToAddrData.error !== undefined ) { + //console.log(SendToAddrData.error); + 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 + '' + } + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + + var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin"); + var selected_coinmode = sessionStorage.getItem('edexTmpMode') + if ( selected_coinmode == 'Basilisk' ) { + var coinwalletbalance = getDEXCoinBalance(active_edexcoin) + console.log(coinwalletbalance) + //coinwalletbalance = coinwalletbalance.total + $('#edex_total_balance').text(coinwalletbalance.total); + } else { + var tmp_get_coin_balance = EDEXlistunspent(active_edexcoin) + if (tmp_get_coin_balance[0] != undefined) { + //console.log(tmp_get_coin_balance[0]) + $('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8)); + //console.log(tmp_get_coin_balance[0].total) + } else { + $('#edex_total_balance').text('0'); + } + } + + $('#edexcoin_send_coins_btn').prop('disabled', false); }, error: function(xhr, textStatus, error) { console.log(xhr.statusText); diff --git a/index.html b/index.html index 8244955..10595cf 100755 --- a/index.html +++ b/index.html @@ -805,35 +805,32 @@ - -
-
-
-
- 1 -
- Shopping -

Choose what you want

-
-
-
- 2 -
- Billing -

Pay for the bill

-
-
-
- 3 -
- Getting -

Waiting for the goods

-
-
-
-
+ +
+
+ 1 +
+ Fill Send Form +

Fill sending transaction details

- +
+
+ 2 +
+ Confirming +

Confirm if detials are correct

+
+
+
+ 3 +
+ Processing Tx +

Processing and showing details

+
+
+
+ +

Send