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

fix conflict

Browse source
This commit is contained in:
Mario Colque 2014-04-21 11:41:49 -03:00
commit ded325af46
6 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/addresses.js
View file

@ -11,9 +11,10 @@ angular.module('copay.addresses').controller('AddressesController',
var _updateBalance = function () {
controllerUtils.setSocketHandlers();
w.getBalance(function (balance, balanceByAddr) {
w.getBalance(function (balance, balanceByAddr, isMain) {
if (balanceByAddr && Object.keys(balanceByAddr).length) {
$rootScope.balanceByAddr = balanceByAddr;
$scope.isMain = isMain;
$scope.addrs = Object.keys(balanceByAddr);
$scope.selectedAddr = $scope.addrs[0];
$rootScope.$digest();