diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index cf5c18d..e791a36 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -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 += ''; - $.each(edexcoin_addr_list_with_balance, function(index) { - tmpoptions += ''; - $('#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 += ''; + $.each(edexcoin_addr_list_with_balance, function(index) { + tmpoptions += ''; + $('#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 = ' OUT'; + tmp_category = ' OUT'; } if ( result_data[index].type == 'received' ) { - tmp_category = ' IN'; + tmp_category = ' IN'; } if ( result_data[index].type == 'generate' ) { tmp_category = ' 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 = ' OUT'; + tmp_category = ' OUT'; } if ( result_data[index].type == 'received' ) { - tmp_category = ' IN'; + tmp_category = ' IN'; } if ( result_data[index].type == 'generate' ) { tmp_category = ' Mined'; diff --git a/index.html b/index.html index d4a6516..0ec6b31 100755 --- a/index.html +++ b/index.html @@ -983,7 +983,7 @@
-
+