Fix Conflicts:
views/unsupported.html
This commit is contained in:
commit
0c2141c380
53 changed files with 1983 additions and 1297 deletions
|
|
@ -9,5 +9,5 @@ angular.module('copayApp.controllers').controller('HomeController',
|
|||
if ($rootScope.pendingPayment) {
|
||||
notification.info('Login Required', 'Please open wallet to complete payment');
|
||||
}
|
||||
$scope.hasWallets = walletFactory.getWallets().length > 0 ? true : false;
|
||||
$scope.hasWallets = (walletFactory.getWallets() && walletFactory.getWallets().length > 0) ? true : false;
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue