anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #219 from gabrielbazan7/feat/hideToggle

Browse source 
hidden balance feature
This commit is contained in:
Matias Alejo Garcia 2016-08-23 16:33:16 -03:00 • committed by GitHub
commit c696935710
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/walletDetails.html
View file

@ -45,7 +45,7 @@
</div> </div>
<div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !hideBalance" on-hold="hideToggle()"> <div ng-click='updateAll()' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !shouldHideBalance" on-hold="hideToggle()">
<strong class="size-36">{{status.totalBalanceStr}}</strong> <strong class="size-36">{{status.totalBalanceStr}}</strong>
<div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div> <div class="size-14" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14" ng-if="status.pendingAmount"> <div class="size-14" ng-if="status.pendingAmount">

17
src/js/controllers/walletDetails.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService) { angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $ionicNavBarDelegate, $state, $stateParams, bwcError, profileService, lodash, configService, gettext, gettextCatalog, platformInfo, walletService, storageService) {
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;
var isWP = platformInfo.isWP; var isWP = platformInfo.isWP;
@ -11,9 +11,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var HISTORY_SHOW_LIMIT = 10; var HISTORY_SHOW_LIMIT = 10;
$scope.openSearchModal = function() { $scope.openSearchModal = function() {
var wallet = profileService.getWallet($stateParams.walletId);
$scope.color = wallet.color; $scope.color = wallet.color;
$ionicModal.fromTemplateUrl('views/modals/search.html', { $ionicModal.fromTemplateUrl('views/modals/search.html', {
@ -113,9 +111,17 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.updateTxHistory(); $scope.updateTxHistory();
} }
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.hideToggle = function() {
console.log('[walletDetails.js.70:hideToogle:] TODO'); //TODO $scope.shouldHideBalance = !$scope.shouldHideBalance;
}; storageService.setHideBalanceFlag(wallet.credentials.walletId, $scope.shouldHideBalance.toString(), function() {});
}
var currentTxHistoryPage; var currentTxHistoryPage;
var wallet; var wallet;
@ -129,6 +135,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.requiresMultipleSignatures = wallet.credentials.m > 1; $scope.requiresMultipleSignatures = wallet.credentials.m > 1;
$scope.newTx = false; $scope.newTx = false;
hideBalance();
$ionicNavBarDelegate.title(wallet.name); $ionicNavBarDelegate.title(wallet.name);
$scope.updateAll(); $scope.updateAll();