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

Merge pull request #1643 from isocolsky/fixes

Browse source 
Fixes
This commit is contained in:
Matias Alejo Garcia 2014-10-31 12:25:07 -03:00
commit b6f9a45dd9
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/controllers/sidebar.js
View file

@ -67,12 +67,7 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
if (controllerUtils.isFocusedWallet(wid)) return;
var w = $rootScope.iden.getWalletById(wid);
$scope.wallets.push(w);
controllerUtils.updateBalance(w, function(err, res) {
if (err) return;
setTimeout(function() {
$scope.$digest();
}, 1);
});
controllerUtils.updateTxsAndBalance(w);
});
};
});

2
js/services/controllerUtils.js
View file

@ -64,7 +64,7 @@ angular.module('copayApp.services')
root.isFocusedWallet = function(wid) {
return wid === $rootScope.wallet.getId();
return $rootScope.wallet && wid === $rootScope.wallet.getId();
};