From e73091ae469e29d5a3ce61c180a710b59621688f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 31 Aug 2016 11:49:28 -0300 Subject: [PATCH] hidden balance feature refactor --- public/views/tab-home.html | 5 ++++- public/views/walletDetails.html | 4 ++-- src/js/controllers/walletDetails.js | 11 +---------- src/js/services/profileService.js | 4 ++++ 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/public/views/tab-home.html b/public/views/tab-home.html index dad46a8b3..d74cebb31 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -50,9 +50,12 @@ Incomplete - + {{item.status.availableBalanceStr}} + + [Balance Hidden] + BitPay Card diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index c69b571a6..498be236f 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -44,7 +44,7 @@ -
+
{{status.totalBalanceStr}}
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
@@ -52,7 +52,7 @@
-
+
[Balance Hidden]
Tap and hold to show diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index 91222f9e3..ce4deae08 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -175,16 +175,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.updateTxHistory(cb); } - var hideBalance = function() { - storageService.getHideBalanceFlag(wallet.credentials.walletId, function(err, shouldHideBalance) { - if (err) $scope.shouldHideBalance = false; - else $scope.shouldHideBalance = (shouldHideBalance == 'true') ? true : false; - }); - } - $scope.hideToggle = function() { - $scope.shouldHideBalance = !$scope.shouldHideBalance; - storageService.setHideBalanceFlag(wallet.credentials.walletId, $scope.shouldHideBalance.toString(), function() {}); + profileService.setHideBalanceFlag(wallet.credentials.walletId); } var currentTxHistoryPage; @@ -204,7 +196,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.requiresMultipleSignatures = wallet.credentials.m > 1; $scope.newTx = false; - hideBalance(); $ionicNavBarDelegate.title(wallet.name); $scope.updateAll(function() { diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 7085baa34..6ab120752 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -727,5 +727,9 @@ angular.module('copayApp.services') }, 'createdOn']); }; + root.setHideBalanceFlag = function(walletId) { + root.wallet[walletId].balanceHidden = !root.wallet[walletId].balanceHidden; + } + return root; });