From 1d8c4bc5a1e3c446ee91e6cc3b6b96a1e05e5ca0 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Wed, 16 Nov 2016 12:42:42 +1300 Subject: [PATCH] bug fixed to switch API from komodo to zcash gui, and added interest to show in komodo GUI --- assets/scripts/kmd_wallet_dashboard.js | 28 ++++++++++++++++++++++---- assets/scripts/sidebar.js | 1 + index.html | 22 +++++++++++++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 89dde50..9dec4d8 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -260,7 +260,7 @@ function RunInitFunctions() { function getHeaderActionMenuButtonCoinCode() { - var extcoin = $('#extcoin-wallet').data('extcoin'); + var extcoin = $('[data-extcoin]').attr("data-extcoin"); var action_menu_button_code = ''; if ( extcoin == 'KMD') { action_menu_button_code = 'kmd'; }; if ( extcoin == 'ZEC') { action_menu_button_code = 'zec'; }; @@ -268,7 +268,7 @@ function getHeaderActionMenuButtonCoinCode() { } function getPassthruAgent() { - var extcoin = $('#extcoin-wallet').data('extcoin'); + var extcoin = $('[data-extcoin]').attr("data-extcoin"); var passthru_agent = ''; if ( extcoin == 'KMD') { passthru_agent = 'komodo'; }; if ( extcoin == 'ZEC') { passthru_agent = 'zcash'; }; @@ -276,8 +276,8 @@ function getPassthruAgent() { } function getTotalKMDBalance() { - console.log($('#extcoin-wallet').data('extcoin')); - var extcoin = $('#extcoin-wallet').data('extcoin'); + console.log($('[data-extcoin]').attr("data-extcoin")); + var extcoin = $('[data-extcoin]').attr("data-extcoin"); var passthru_agent = ''; if ( extcoin == 'KMD') { passthru_agent = 'komodo'; }; if ( extcoin == 'ZEC') { passthru_agent = 'zcash'; }; @@ -293,6 +293,26 @@ function getTotalKMDBalance() { var AjaxOutputData = JSON.parse(data); //console.log('== Data OutPut =='); //console.log(AjaxOutputData); + if (AjaxOutputData.interest != undefined) { + console.log('show interest..'); + $('#kmd_total_interest_balance').text(AjaxOutputData.interest); + $('#kmd_widget_get_total_balance_i').show(); + $('#kmd_widget_get_total_balance_t').addClass(' col-lg-3'); + $('#kmd_widget_get_total_balance_t').removeClass('col-lg-4'); + $('#kmd_widget_get_total_balance_z').addClass(' col-lg-3'); + $('#kmd_widget_get_total_balance_z').removeClass(' col-lg-4'); + $('#kmd_widget_get_total_balance_tzi').addClass(' col-lg-3'); + $('#kmd_widget_get_total_balance_tzi').removeClass(' col-lg-4'); + } else { + console.log('do not show interest...'); + $('#kmd_widget_get_total_balance_i').hide(); + $('#kmd_widget_get_total_balance_t').addClass(' col-lg-4'); + $('#kmd_widget_get_total_balance_t').removeClass(' col-lg-3'); + $('#kmd_widget_get_total_balance_z').addClass(' col-lg-4'); + $('#kmd_widget_get_total_balance_z').removeClass(' col-lg-3'); + $('#kmd_widget_get_total_balance_tzi').addClass(' col-lg-4'); + $('#kmd_widget_get_total_balance_tzi').removeClass(' col-lg-3'); + } $('#kmd_transparent_balance').text(AjaxOutputData.transparent); $('#kmd_private_balance').text(AjaxOutputData.private); $('#kmd_total_tz_balance').text(AjaxOutputData.total); diff --git a/assets/scripts/sidebar.js b/assets/scripts/sidebar.js index 355c23d..bb486b1 100644 --- a/assets/scripts/sidebar.js +++ b/assets/scripts/sidebar.js @@ -116,6 +116,7 @@ $('#nav-zcash-wallet').on('click', function() { $('#nav-iguana-wallet-settings').removeClass( " active open" ).addClass( "" ); $('#nav-about-iguana').removeClass( " active open" ).addClass( "" ); $(".header-easydex-section").text("Zcash Wallet"); + console.log('changing to zcash') $.each($('[data-extcoin]'), function(index, value) {$('[data-extcoin]').attr("data-extcoin","ZEC"); $('[data-extcoin="ZEC"]')}); $.each($('[data-extcoinname]'), function(index, value) {$('[data-extcoinname]').text("ZEC"); $('[data-extcoinname="ZEC"]')}); $.each($('[data-extcointitle]'), function(index, value) {$('[data-extcointitle]').text("Zcash"); $('[data-extcointitle="Zcash"]')}); diff --git a/index.html b/index.html index ff977d9..d1a8f92 100755 --- a/index.html +++ b/index.html @@ -620,7 +620,7 @@
-
+
@@ -636,7 +636,7 @@
-
+
@@ -652,7 +652,23 @@
-
+
+ +
+
+
+
+
+ Interest Earned +
+ - +
+
+
+
+ +
+