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

Show error when selecting a not ready wallet

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-09 09:57:40 -03:00
commit 36692f4269
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/modals/addressbook.js
View file

@ -132,9 +132,6 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
else { else {
$scope.gettingAddress = true; $scope.gettingAddress = true;
$scope.selectedWalletName = walletName; $scope.selectedWalletName = walletName;
$timeout(function() {
$scope.$apply();
});
addressService.getAddress(walletId, false, function(err, addr) { addressService.getAddress(walletId, false, function(err, addr) {
$scope.gettingAddress = false; $scope.gettingAddress = false;
@ -148,6 +145,9 @@ angular.module('copayApp.controllers').controller('addressbookController', funct
$scope.cancel(); $scope.cancel();
}); });
} }
$timeout(function() {
$scope.$apply();
});
}); });
}; };

5
src/js/controllers/modals/wallets.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('walletsController', function($scope, bwcError, profileService) { angular.module('copayApp.controllers').controller('walletsController', function($scope, $timeout, bwcError, profileService) {
$scope.selectWallet = function(walletId) { $scope.selectWallet = function(walletId) {
@ -10,6 +10,9 @@ angular.module('copayApp.controllers').controller('walletsController', function(
profileService.isReady(client, function(err) { profileService.isReady(client, function(err) {
if (err) { if (err) {
$scope.errorSelectedWallet[walletId] = bwcError.msg(err); $scope.errorSelectedWallet[walletId] = bwcError.msg(err);
$timeout(function() {
$scope.$apply();
});
return; return;
} }