BTCPrivate
/
BarterDEX
mirror of https://github.com/BTCPrivate/BarterDEX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Electrum mode listunspent display fixed

This commit is contained in:
satindergrewal 2017-12-05 21:14:50 +13:00
parent 0563da00a1
commit 5594b3118a
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gui/js/simpledexactions.js
View File

@ -1245,14 +1245,22 @@ function check_coin_listunspent(coin_listunspent_data) {
}).done(function(coin_listunspent_output_data) { }).done(function(coin_listunspent_output_data) {
// If successful // If successful
console.log(coin_listunspent_output_data); console.log(coin_listunspent_output_data);
console.log(coin_listunspent_output_data[0].hasOwnProperty('account'));
$('.dex_showlist_unspents_tbl tbody').empty(); $('.dex_showlist_unspents_tbl tbody').empty();
var show_list_unspents_tbl_tr = ''; var show_list_unspents_tbl_tr = '';
show_list_unspents_tbl_tr += '<tr>'; show_list_unspents_tbl_tr += '<tr>';
show_list_unspents_tbl_tr += '<th style="width: 30px;">Index</th>'; show_list_unspents_tbl_tr += '<th style="width: 30px;">Index</th>';
show_list_unspents_tbl_tr += '<th>Coin Info</th>'; if (coin_listunspent_output_data[0].hasOwnProperty('account') == true) {
show_list_unspents_tbl_tr += '<th>Value info</th>'; show_list_unspents_tbl_tr += '<th>Coin Info</th>';
show_list_unspents_tbl_tr += '<th>Transaction Info</th>'; show_list_unspents_tbl_tr += '<th>Value info</th>';
show_list_unspents_tbl_tr += '<th>Transaction Info</th>';
} else {
show_list_unspents_tbl_tr += '<th>Height</th>';
show_list_unspents_tbl_tr += '<th>Tx Hash</th>';
show_list_unspents_tbl_tr += '<th>Tx Pos</th>';
show_list_unspents_tbl_tr += '<th>Value</th>';
}
show_list_unspents_tbl_tr += '</tr>'; show_list_unspents_tbl_tr += '</tr>';
$('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr); $('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr);
$.each(coin_listunspent_output_data, function(index, val) { $.each(coin_listunspent_output_data, function(index, val) {
@ -1268,20 +1276,28 @@ function check_coin_listunspent(coin_listunspent_data) {
show_list_unspents_tbl_tr = ''; show_list_unspents_tbl_tr = '';
show_list_unspents_tbl_tr += '<tr>'; show_list_unspents_tbl_tr += '<tr>';
show_list_unspents_tbl_tr += '<td>' + index + '</td>'; show_list_unspents_tbl_tr += '<td>' + index + '</td>';
show_list_unspents_tbl_tr += `<td> if (coin_listunspent_output_data[0].hasOwnProperty('account') == true) {
<b>Coin:</b> `+ coin_listunspent_data.coin +`<br> show_list_unspents_tbl_tr += `<td>
<b>Account:</b> `+ val.account +`<br> <b>Coin:</b> `+ coin_listunspent_data.coin +`<br>
<b>Address:</b> `+ val.address +`<br> <b>Account:</b> `+ val.account +`<br>
</td>`; <b>Address:</b> `+ val.address +`<br>
show_list_unspents_tbl_tr += `<td> </td>`;
<b>Amount:</b> `+ (parseFloat(val.amount)).toFixed(8) + ' ' + coin_listunspent_data.coin +`<br> show_list_unspents_tbl_tr += `<td>
<b>Confirmations:</b> `+ val.confirmations +`<br> <b>Amount:</b> `+ (parseFloat(val.amount)).toFixed(8) + ' ' + coin_listunspent_data.coin +`<br>
<b>Interest:</b> `+ utxo_interest +`<br> <b>Confirmations:</b> `+ val.confirmations +`<br>
</td>`; <b>Interest:</b> `+ utxo_interest +`<br>
show_list_unspents_tbl_tr += `<td> </td>`;
<b>scriptPubKey:</b> `+ val.scriptPubKey +`<br> show_list_unspents_tbl_tr += `<td>
<b>TxID:</b> `+ val.txid +`<br> <b>scriptPubKey:</b> `+ val.scriptPubKey +`<br>
</td>`; <b>TxID:</b> `+ val.txid +`<br>
</td>`;
} else {
show_list_unspents_tbl_tr += `<td>` + val.height + `</td>`;
show_list_unspents_tbl_tr += `<td>` + val.tx_hash + `</td>`;
show_list_unspents_tbl_tr += `<td>` + val.tx_pos + `</td>`;
show_list_unspents_tbl_tr += `<td>` + (parseFloat(val.value)).toFixed(8) + ' ' + coin_listunspent_data.coin + `</td>`;
}
show_list_unspents_tbl_tr += '</tr>'; show_list_unspents_tbl_tr += '</tr>';
$('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr); $('.dex_showlist_unspents_tbl tbody').append(show_list_unspents_tbl_tr);