This commit is contained in:
Gabriel Bazán 2016-09-26 14:16:17 -03:00
commit 82211a5812

View file

@ -34,14 +34,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.addr = null; $scope.addr = null;
$scope.generatingAddress = true; $scope.generatingAddress = true;
$timeout(function() { walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
walletService.getAddress($scope.wallet, forceNew, function(err, addr) { $scope.generatingAddress = false;
$scope.generatingAddress = false; if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
if (err) popupService.showAlert(gettextCatalog.getString('Error'), err); $scope.addr = addr;
$scope.addr = addr; });
$scope.$apply();
});
}, 1);
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {
@ -52,9 +49,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$log.debug('No wallet provided'); $log.debug('No wallet provided');
return; return;
} }
$scope.wallet = wallet; $timeout(function() {
$log.debug('Wallet changed: ' + wallet.name); $scope.wallet = wallet;
$scope.setAddress(); $log.debug('Wallet changed: ' + wallet.name);
$scope.setAddress();
$scope.$apply();
});
}); });
}); });