From 56a59093ee006b6df45e57405cc4bf42fb494f8c Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <spasma@gmail.com>
Date: Mon, 21 May 2018 17:37:21 +0200
Subject: [PATCH 1/2] Improvement - 339 - "Payment received" screen is skipped
 after first transaction

---
 src/js/controllers/tab-receive.js | 6 +++++-
 www/views/tab-receive.html        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 1eef60954..fa5237090 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -126,7 +126,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         }
       }
       $scope.paymentReceivedCoin = $scope.wallet.coin;
-      $scope.showingPaymentReceived = true
+      $scope.showingPaymentReceived = true;
       $scope.$apply();
     }
   }
@@ -248,6 +248,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     $scope.setAddress();
   };
 
+  $scope.togglePaymentScreen = function() {
+    $scope.showingPaymentReceived = !$scope.showingPaymentReceived;
+  };
+
   $scope.showWalletSelector = function() {
     if ($scope.singleWallet) return;
     $scope.walletSelectorTitle = gettextCatalog.getString('Select a wallet');
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index d15088e47..4098c69b3 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -54,7 +54,7 @@
           </div>
         </div>
         <!-- animation for payment received -->
-        <div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false">
+        <div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="togglePaymentScreen()">
           <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
             <circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
             <polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>

From c5ae87e89874da89c5d59710cce7a16ba6ee0c20 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Dominguez <jb@bitcoin.com>
Date: Tue, 22 May 2018 11:27:10 +0900
Subject: [PATCH 2/2] Fix - 339 - receive is executed by an event out of
 angular, apply.

---
 src/js/controllers/tab-receive.js | 9 +++++----
 www/views/tab-receive.html        | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index fa5237090..95f9a6610 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -126,8 +126,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         }
       }
       $scope.paymentReceivedCoin = $scope.wallet.coin;
-      $scope.showingPaymentReceived = true;
-      $scope.$apply();
+      $scope.$apply(function () {
+        $scope.showingPaymentReceived = true;
+      });
     }
   }
 
@@ -248,8 +249,8 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     $scope.setAddress();
   };
 
-  $scope.togglePaymentScreen = function() {
-    $scope.showingPaymentReceived = !$scope.showingPaymentReceived;
+  $scope.hidePaymentScreen = function() {
+    $scope.showingPaymentReceived = false;
   };
 
   $scope.showWalletSelector = function() {
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 4098c69b3..51f671cee 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -54,7 +54,7 @@
           </div>
         </div>
         <!-- animation for payment received -->
-        <div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="togglePaymentScreen()">
+        <div class="payment-received-container" ng-show="showingPaymentReceived" ng-click="hidePaymentScreen()">
           <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
             <circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
             <polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>