From 3aa15b0c1b55c53da3bad6cc8397c67be4f92e69 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 24 Mar 2017 09:58:28 +0300 Subject: [PATCH 1/4] fixed wireless gfx file name --- .../cryptologo/{wireless.png => WIRELESS.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename assets/images/cryptologo/{wireless.png => WIRELESS.png} (100%) diff --git a/assets/images/cryptologo/wireless.png b/assets/images/cryptologo/WIRELESS.png similarity index 100% rename from assets/images/cryptologo/wireless.png rename to assets/images/cryptologo/WIRELESS.png From 7c5227b6e25eb9249cc0bb03872ace189a742cc1 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 24 Mar 2017 10:04:02 +0300 Subject: [PATCH 2/4] added no blocks condition to dashboard --- assets/scripts/kmd_wallet_dashboard.js | 20 +++++++++++++------- assets/scripts/sidebar.js | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 71d06e2..7e640ea 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -241,13 +241,19 @@ function KMD_ProgressBar() { if ( getinfotmp == 'activating') { $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(_lang[defaultLang].INDEX.ACTIVATING + '...'); } else { - var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10); - //console.log(sync_percent); - $('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%'); - $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%'); - $('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks); - $('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain); - $('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections); + if (getinfotmp.blocks === 0) { + $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No blocks'); + $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' }); + } else { + var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10); + //console.log(sync_percent); + console.log('getinfotmp', getinfotmp); + $('div[data-extcoin="' + extcoin + '"][id="extcoin-sync"]').width(parseFloat(sync_percent).toFixed(2) + '%'); + $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text(parseFloat(sync_percent).toFixed(2) + '%'); + $('span[data-extcoin="' + extcoin + '"][id="extcoin-synced-blocks"]').text(getinfotmp.blocks); + $('span[data-extcoin="' + extcoin + '"][id="extcoin-longestchain"]').text(getinfotmp.longestchain); + $('span[data-extcoin="' + extcoin + '"][id="extcoin-connections"]').text(getinfotmp.connections); + } $('#extcoin-wallet-activating-alert').hide(); } } diff --git a/assets/scripts/sidebar.js b/assets/scripts/sidebar.js index 7e1e6e8..fef516f 100644 --- a/assets/scripts/sidebar.js +++ b/assets/scripts/sidebar.js @@ -474,7 +474,7 @@ function assetchain_pax_menu_actions(coin) { renderAssetGFX('supernet', 'jumblr', coin); break; case 'MVP': - renderAssetGFX('mpv', 'mpv', coin); + renderAssetGFX('mvp', 'mvp', coin); break; case 'KV': renderAssetGFX('supernet', 'jumblr', coin); From 951d49a3c1c1db3557e341c7930616724754c07e Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 24 Mar 2017 10:44:42 +0300 Subject: [PATCH 3/4] fixed Infinity in native wallet progress bar --- assets/scripts/kmd_wallet_dashboard.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 7e640ea..a4915e9 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -244,6 +244,9 @@ function KMD_ProgressBar() { if (getinfotmp.blocks === 0) { $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No blocks'); $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' }); + } else if (getinfotmp.blocks > 0 && getinfotmp.longestchain === 0) { + $('span[data-extcoin="' + extcoin + '"][id="extcoin-sync-percent"]').text('No longestchain'); + $('#extcoin-progressbars .progress-bar').css({ 'width': '100%' }); } else { var sync_percent = parseFloat(parseInt(getinfotmp.blocks, 10) * 100) / parseInt(getinfotmp.longestchain, 10); //console.log(sync_percent); From 1bcdbe96af83ef4b9ace72b55fa1bcba1ad069a6 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 24 Mar 2017 10:56:18 +0300 Subject: [PATCH 4/4] remove top menu Wallets active state --- assets/scripts/dashboard/DashboardEDEX.js | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/dashboard/DashboardEDEX.js b/assets/scripts/dashboard/DashboardEDEX.js index 62ae7cc..e4eb43a 100644 --- a/assets/scripts/dashboard/DashboardEDEX.js +++ b/assets/scripts/dashboard/DashboardEDEX.js @@ -719,6 +719,7 @@ function EdexListAllAddr(coin) { function edexCoinBtnAction() { $('.edexcoin-logo').click(function() { + $.each($('.nav-top-menu'), function(index, value) { $(value).removeClass('active'); }); $( '#edexcoin_send_coins_back_btn' ).trigger( 'click' ); $('#btn_edexcoin_dashboard').hide(); $(