From e69ceffb593b0d564b32f42524d401a242286f9d Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Wed, 14 Sep 2016 11:03:43 -0300 Subject: [PATCH] filter unavailable wallets --- src/js/controllers/confirm.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index b8929324f..486f35a79 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -120,12 +120,14 @@ angular.module('copayApp.controllers').controller('confirmController', function( lodash.each(wallets, function(w) { walletService.getStatus(w, {}, function(err, status) { - if (err) $log.error(err); - if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name); - if (status.availableBalanceSat > amount) filteredWallets.push(w); + if (err || !status) { + $log.error(err); + } else { + if (!status.availableBalanceSat) $log.debug('No balance available in: ' + w.name); + if (status.availableBalanceSat > amount) filteredWallets.push(w); + } if (++index == wallets.length) { - if (!lodash.isEmpty(filteredWallets)) { $scope.wallets = lodash.clone(filteredWallets); $scope.notAvailable = false; @@ -136,7 +138,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $timeout(function() { $scope.$apply(); - }, 10); + }); return; } });