diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index df1aaf62d..d20157d50 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -364,7 +364,7 @@ angular.module('copayApp.controllers').controller('importController', }, 10); }; - $scope.$on("$ionicView.beforeEnter", function(event, data) { + $scope.$on("$ionicView.afterEnter", function(event, data) { $scope.init(); }); diff --git a/src/js/directives/qrScanner.js b/src/js/directives/qrScanner.js index 131e48fde..8a144bc2b 100644 --- a/src/js/directives/qrScanner.js +++ b/src/js/directives/qrScanner.js @@ -20,12 +20,17 @@ angular.module('copayApp.directives') $state.go('scanner', { passthroughMode: 1 }); }; - $rootScope.$on('$ionicView.afterEnter', function() { + var afterEnter = $rootScope.$on('$ionicView.afterEnter', function() { if($rootScope.scanResult) { scope.onScan({ data: $rootScope.scanResult }); $rootScope.scanResult = null; } }); + + // Destroy event + scope.$on('$destroy', function(){ + afterEnter(); + }); } } }); diff --git a/src/js/routes.js b/src/js/routes.js index 138c12ba2..6472b17c4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -336,7 +336,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/import', views: { 'tab-home@tabs': { - templateUrl: 'views/import.html' + templateUrl: 'views/import.html', + controller: 'importController' }, }, }) @@ -788,7 +789,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr url: '/import', views: { 'onboarding': { - templateUrl: 'views/import.html' + templateUrl: 'views/import.html', + controller: 'importController' }, }, params: { diff --git a/www/views/import.html b/www/views/import.html index e3a7af0c7..4be88c393 100644 --- a/www/views/import.html +++ b/www/views/import.html @@ -1,11 +1,11 @@ - + {{'Import Wallet' | translate}} - +