From fee7034863e6dc344d27b023574d17fd3f6b8cbe Mon Sep 17 00:00:00 2001 From: Javier Date: Wed, 24 Aug 2016 11:21:07 -0300 Subject: [PATCH] fix receive wallet scope --- public/views/tab-receive.html | 2 +- src/js/controllers/tab-receive.js | 5 ++++- src/js/directives/directives.js | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html index f9aaf7d89..fd8409c8a 100644 --- a/public/views/tab-receive.html +++ b/public/views/tab-receive.html @@ -55,7 +55,7 @@ Error: {{addrError}} - + diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 01471d553..6c14d1a51 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -43,8 +43,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }; $scope.$on('Wallet/Changed', function(event, wallet) { + if (!wallet) { + $log.debug('No wallet provided'); + return; + } $log.debug('Wallet changed: ' + wallet.name); - $scope.defaultWallet = wallet; $scope.setAddress(wallet); }); diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 4a512fba5..6f12e7abb 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -163,6 +163,10 @@ angular.module('copayApp.directives') if (minBalance) filterWallet(); + else { + scope.content.wallets = wallets; + scope.$emit('Wallet/Changed', scope.content.wallets[0]); + } scope.$on("$ionicSlides.sliderInitialized", function(event, data) { scope.slider = data.slider;