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

fix display tx history and debug issue, hide setgoals button if experimental feature is disaled.

This commit is contained in:
satindergrewal 2017-12-18 17:05:27 +13:00
parent 5f00ce8294
commit de8e420d88
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/index.html
View File

@ -462,7 +462,7 @@
<span style="font-size: 18px;"><span>Max</span> Amount to <span class="trading_pair_lable_text_two">Buy</span></span>
</div>
<div class="input-group col-sm-12">
<p class="portfolio_info_text" style="font-size: 20px; font-weight: 200;"></p>
<p class="portfolio_info_text" style="font-size: 120%; font-weight: 200;"></p>
</div>
<div class="input-group col-sm-12 buy_sell_button_div">
<!--<span class="input-group-addon coin_ticker" id="trading_pair_coin_ticker" style="font-size: 20px;"></span>-->
@ -482,7 +482,7 @@
</div>
<div class="form-group coingoal_label_div" style="margin-top: 15px; margin-bottom: 0px; display: none;">
<span style="font-size: 18px;">Set <span class="coingoal_label_coin_name"></span> Goal percentage for your portfolio</span>
<span style="font-size: 118%;">Set <span class="coingoal_label_coin_name"></span> Goal percentage for your portfolio</span>
</div>
<div class="input-group col-sm-12 coingoal_div" style="display: none;">
<span class="input-group-addon coin_ticker" id="coingoal_coin_ticker" style="font-size: 20px;"></span>

4
gui/js/ipc-actions.js
View File

@ -85,6 +85,7 @@ $('.dextradeshistory-btn').click(function(e) {
$('.screen-portfolio').hide();
$('.screen-coindashboard').hide();
$('.screen-exchange').hide();
$('.screen-inventory').hide();
$('.dexdebug').hide();
$('.dextradeshistory').show();
@ -152,6 +153,7 @@ $('.dexdebug-btn').click(function(e) {
$('.screen-portfolio').hide();
$('.screen-coindashboard').hide();
$('.screen-exchange').hide();
$('.screen-inventory').hide();
$('.navbar-right').children().removeClass('active');
$('.dexdebug-btn').parent().addClass( "active" );
@ -625,12 +627,14 @@ function BarterDEXSettingsFn() {
$('.trading_method_options').hide();
$('#portfolio_chart_current').addClass(' col-sm-offset-3');
$('#portfolio_chart_target').hide();
$('.btn_portfolio_coingoal').hide();
$("a[href='#exchange_botlist']").parent().hide()
} else {
$('.btn-autogoalall').show();
$('.trading_method_options').show();
$('#portfolio_chart_current').removeClass('col-sm-offset-3');
$('#portfolio_chart_target').show();
$('.btn_portfolio_coingoal').show();
$("a[href='#exchange_botlist']").parent().show();
}

24
gui/js/simpledexactions.js
View File

@ -1988,6 +1988,14 @@ function PortfolioTblDataFn(portfolio_tbl_data) {
$('.portfolio_rel').html(portfolio_tbl_data.rel);
$('.portfolio_relvolume').html(portfolio_tbl_data.relvolume);
var barterDEX_settings = ShepherdIPC({"command":"read_settings"});
//console.log(barterDEX_settings);
if (barterDEX_settings.experimentalFeatures == false) {
var coingoal_style_showhide = 'display: none;';
} else {
var coingoal_style_showhide = '';
}
$('.dex_portfolio_coins_tbl tbody').empty();
$('.porfolio_coins_list tbody').empty();
@ -2008,7 +2016,7 @@ function PortfolioTblDataFn(portfolio_tbl_data) {
dex_portfolio_coins_tbl_tr += '<td>' + val.goalperc + '</td>';
dex_portfolio_coins_tbl_tr += '<td>' + val.kmd_equiv + '</td>';
dex_portfolio_coins_tbl_tr += `<td>
<button class="btn btn-sm btn-default btn_portfolio_coingoal" data-coin="` + val.coin + `" data-auto=false>Set Goal <span class="glyphicon glyphicon-export" aria-hidden="true"></span></button>
<button class="btn btn-sm btn-default btn_portfolio_coingoal" data-coin="` + val.coin + `" data-auto=false style="${coingoal_style_showhide}">Set Goal <span class="glyphicon glyphicon-export" aria-hidden="true"></span></button>
<button class="btn btn-sm btn-default btn-portfoliogo" data-coin="` + val.coin + `" data-coinname="` + coin_name + `" data-addr="` + val.address + `" data-balance="` + val.amount + `">Exchange <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></button>
</td>`
//dex_portfolio_coins_tbl_tr += '<td>' + val.perc + '</td>';
@ -3539,6 +3547,8 @@ $('.your_coins_balance_info').on('click', '.coin_balance_inventory', function()
$('.screen-exchange').hide()
$('.screen-inventory').show();
$('.dextradeshistory').hide();
$('.dexdebug').hide();
CheckOrderBookFn(false);
check_swap_status(false);
check_bot_list(false);
@ -4665,6 +4675,14 @@ $('.exchange_swap_status_tbl tbody').on('click', '.swapstatus_details', function
function check_swap_status_details(swap_status_data) {
console.log(swap_status_data);
CheckOrderBookFn(false);
check_swap_status(false);
check_bot_list(false);
check_my_prices(false);
Refresh_active_StockChart(false);
//bot_screen_coin_balance(false);
//bot_screen_sellcoin_balance(false);
var options_holdon = {
theme:"sk-bounce",
message:'Please wait while getting swap status detail data...',
@ -4871,13 +4889,13 @@ function check_swap_status_details(swap_status_data) {
}*/
});
swap_status_details_bootbox.init(function(){
CheckOrderBookFn(false);
/*CheckOrderBookFn(false);
check_swap_status(false);
check_bot_list(false);
check_my_prices(false);
Refresh_active_StockChart(false);
//bot_screen_coin_balance(false);
//bot_screen_sellcoin_balance(false);
//bot_screen_sellcoin_balance(false);*/
$('.btn_kickstart_stuck_trade').click(function(e) {
e.preventDefault();