From ec46b50262e9eb96db8bf3d1807c9dfd75ba8be1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 13 Jun 2018 18:34:32 +0200 Subject: [PATCH 1/2] Remove payment received screen after changing tabs --- src/js/controllers/tab-receive.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index c9fa46de9..8100222f6 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -225,6 +225,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }); $scope.$on("$ionicView.leave", function(event, data) { + if ($scope.showingPaymentReceived) { + $scope.showingPaymentReceived = false; + } + lodash.each(listeners, function(x) { x(); }); From bbf37007695e32fe8eda8658d6ab89ab530849a2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 20 Jun 2018 14:24:37 +0200 Subject: [PATCH 2/2] Always set showingPaymentReceived to false when entering tab --- src/js/controllers/tab-receive.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 8100222f6..d143fe98f 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -221,14 +221,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi }); $scope.$on("$ionicView.enter", function(event, data) { + $scope.showingPaymentReceived = false; $ionicNavBarDelegate.showBar(true); }); $scope.$on("$ionicView.leave", function(event, data) { - if ($scope.showingPaymentReceived) { - $scope.showingPaymentReceived = false; - } - lodash.each(listeners, function(x) { x(); });