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

fixes https://github.com/bitpay/copay/issues/2016

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-06 15:30:32 -03:00
commit de54f3aac8
6 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/controllers/home.js
View file

@ -56,21 +56,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
}
});
$scope.done = function() {
$rootScope.starting = false;
$rootScope.$digest();
};
$scope.$on("$destroy", function() {
var iden = $rootScope.iden;
if (iden) {
iden.removeListener('newWallet', $scope.done);
iden.removeListener('noWallets', $scope.done);
}
});
$scope.openWithPin = function(pin) {
if (!pin) {
@ -92,11 +77,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$scope.openWallets = function() {
preconditions.checkState($rootScope.iden);
var iden = $rootScope.iden;
$rootScope.hideNavigation = false;
$rootScope.starting = true;
iden.on('newWallet', $scope.done);
iden.on('noWallets', $scope.done);
iden.openWallets();
};
@ -169,7 +151,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
// mobile
if ($scope.isMobile && !$rootScope.hasPin) {
$scope.done();
_credentials = {
email: email,
password: password,

2
js/controllers/homeWallet.js
View file

@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
removeWatch();
w.removeListener('txProposalEvent', _updateTxs);
};
});
});
$scope.setAlternativeAmount = function(w, tx, cb) {
rateService.whenAvailable(function() {