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

fixes

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-02 09:54:47 -03:00
commit 33ba69cfec
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/preferencesEmail.js
View file

@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesEmailController',
var walletId = wallet.credentials.walletId; var walletId = wallet.credentials.walletId;
var config = configService.getSync(); var config = configService.getSync();
config.amailFor = config.amailFor || {}; config.emailFor = config.emailFor || {};
$scope.email = config.emailFor && config.emailFor[walletId]; $scope.email = config.emailFor && config.emailFor[walletId];
$scope.save = function(form) { $scope.save = function(form) {

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

@ -117,7 +117,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
walletService.recreate(); walletService.recreate();
}; };
$scope.updateTxHistory = function() { $scope.updateTxHistory = function(cb) {
if ($scope.updatingTxHistory) return; if ($scope.updatingTxHistory) return;
@ -152,7 +152,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$timeout(function() { $timeout(function() {
$scope.$apply(); $scope.$apply();
}, 1); }, 1);
return; return cb();
}); });
}); });
}; };
@ -172,7 +172,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.updateAll = function(cb)  { $scope.updateAll = function(cb)  {
$scope.updateStatus(false); $scope.updateStatus(false);
$scope.updateTxHistory(); $scope.updateTxHistory(cb);
} }
$scope.hideToggle = function() { $scope.hideToggle = function() {