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

basilisk send screen conditioned to show from select menu for all basilisk coins except BTC and SYS

master
Satinder Grewal 8 years ago
parent
2c742be0be
commit
3a4ed804ac
2 changed files with 28 additions and 19 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. 45
      assets/scripts/dashboard.js
  2. 2
      index.html

45
assets/scripts/dashboard.js
View File

@ -133,23 +133,32 @@ var Dashboard = function() {
$('#edexcoin_recieve_section').hide();
$('#edexcoin_settings').hide();
//Disabled dropdown list address in EasyDEX's main send option, as it's using sendtoaddress at the moment.
//This option can be enabled later for other section where user can select particular address to send funds from.
/*var edexcoin_addr_list_with_balance = EDEXlistunspent(active_edexcoin);
console.log(edexcoin_addr_list_with_balance);
var tmpoptions = '';
tmpoptions += '<option> - Select Address - </option>';
$.each(edexcoin_addr_list_with_balance, function(index) {
tmpoptions += '<option value="' + edexcoin_addr_list_with_balance[index].addr + '" data-total="' + edexcoin_addr_list_with_balance[index].total.toFixed(8) + '">[ ' + edexcoin_addr_list_with_balance[index].total.toFixed(8) + ' KMD ] &emsp;' + edexcoin_addr_list_with_balance[index].addr + '</option>';
$('#edexcoin_send_from').html(tmpoptions);
});
var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin');
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
// This send from part is only enabled now for Basilisk coins except BTC and SYS.
if (selected_coinmode == 'Basilisk' && active_edexcoin !== 'BTC' && active_edexcoin !== 'SYS' ) {
$('.edexcoin_send_from_for_basilisk').show()
EDEXgetaddrbyaccount_cache(active_edexcoin).then(function(result){
//console.log(result)
edexcoin_addr_list_with_balance = result
console.log(edexcoin_addr_list_with_balance);
var tmpoptions = '';
tmpoptions += '<option> - Select Address - </option>';
$.each(edexcoin_addr_list_with_balance, function(index) {
tmpoptions += '<option value="' + edexcoin_addr_list_with_balance[index].addr + '" data-total="' + edexcoin_addr_list_with_balance[index].total + '">[ ' + edexcoin_addr_list_with_balance[index].total + ' KMD ] &emsp;' + edexcoin_addr_list_with_balance[index].addr + '</option>';
$('#edexcoin_send_from').html(tmpoptions);
});
$('.showedexcoinaddrs').selectpicker({ style: 'btn-info' });
$('.showedexcoinaddrs').selectpicker('refresh');
})
} else {
$('.edexcoin_send_from_for_basilisk').hide()
}
$('.showedexcoinaddrs').selectpicker({ style: 'btn-info' });
$('.showedexcoinaddrs').selectpicker('refresh');*/
//clearEdexSendFieldData();
$('.edexcoin-send-form')[0].reset();
var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin');
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Full' ) {
EDEXgetinfo(active_edexcoin).then(function(result) {
$('#edexcoin_fee').val(result.kbfee);
@ -2013,10 +2022,10 @@ function EdexGetTxList(coin) {
var tmp_secondsToString = secondsToString(result_data[index].timestamp);
if ( result_data[index].type == 'sent' ) {
tmp_category = '<i class="icon fa-arrow-circle-left"></i> OUT';
tmp_category = '<span class="label label-danger"><i class="icon fa-arrow-circle-left"></i> OUT</span>';
}
if ( result_data[index].type == 'received' ) {
tmp_category = '<i class="icon fa-arrow-circle-right"></i> IN';
tmp_category = '<span class="label label-success"><i class="icon fa-arrow-circle-right"></i> IN</span>';
}
if ( result_data[index].type == 'generate' ) {
tmp_category = '<i class="icon fa-cogs"></i> Mined';
@ -2105,10 +2114,10 @@ function EdexGetTxList_cache(coin) {
var tmp_secondsToString = secondsToString(result_data[index].timestamp);
if ( result_data[index].type == 'sent' ) {
tmp_category = '<i class="icon fa-arrow-circle-left"></i> OUT';
tmp_category = '<span class="label label-danger"><i class="icon fa-arrow-circle-left"></i> OUT</span>';
}
if ( result_data[index].type == 'received' ) {
tmp_category = '<i class="icon fa-arrow-circle-right"></i> IN';
tmp_category = '<span class="label label-success"><i class="icon fa-arrow-circle-right"></i> IN</span>';
}
if ( result_data[index].type == 'generate' ) {
tmp_category = '<i class="icon fa-cogs"></i> Mined';

2
index.html
View File

@ -983,7 +983,7 @@
<div class="panel-body container-fluid">
<form class="edexcoin-send-form" data-edexcoin="COIN" method="post" role="form" autocomplete="off" onsubmit="return false;">
<div class="row">
<div class="col-xlg-12 form-group form-material edexcoin_send_from_for_basilisk">
<div class="col-xlg-12 form-group form-material edexcoin_send_from_for_basilisk" style="display: none;">
<label class="control-label" data-edexcoin="COIN" for="edexcoin_send_from">Send From</label>
<select class="form-control form-material showedexcoinaddrs show-tick" data-edexcoin="COIN" id="edexcoin_send_from" title="Select Transparent or Private Address" data-size="5">
</select>

Write Preview
Loading…
Cancel
Save