From e7e578f20c4fbb314f7e5b5ca5e0d0ee570dbc07 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 24 May 2018 18:36:20 -0700
Subject: [PATCH 1/3] Manually reversing 2 commits.

---
 src/js/controllers/tab-scan.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js
index c29be53ad..4908a6f65 100644
--- a/src/js/controllers/tab-scan.js
+++ b/src/js/controllers/tab-scan.js
@@ -61,7 +61,10 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
 
   $scope.$on("$ionicView.afterEnter", function() {
     // try initializing and refreshing status any time the view is entered
-    scannerService.gentleInitialize();
+    if(!scannerService.isInitialized()) {
+      scannerService.gentleInitialize();
+    }
+    activate();
   });
 
   function activate(){

From 6ec9a3af688ce4e555c4ca028d7b2732a267f62c Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 24 May 2018 18:43:14 -0700
Subject: [PATCH 2/3] Fix for reading QR code.

---
 src/js/services/incomingData.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index b912c3233..846e7a6db 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -12,6 +12,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
     var originalAddress = null;
     var noPrefixInAddress = 0;
 
+    // Sometimes (testing in Chrome, when reading QR Code) data is an object
+    // that has a string data.result.
+    data = data.result || data;
+    
     if (data.toLowerCase().indexOf('bitcoin') < 0) {
       noPrefixInAddress = 1;
     }

From 576bb2098a8a43f67198c434fbb9957251e03d03 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 24 May 2018 18:56:05 -0700
Subject: [PATCH 3/3] Moved the fix for reading the QR code higher up the call
 stack, so it would only be used when needed.

---
 src/js/controllers/tab-scan.js  | 3 +++
 src/js/services/incomingData.js | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js
index 4908a6f65..83d6f733e 100644
--- a/src/js/controllers/tab-scan.js
+++ b/src/js/controllers/tab-scan.js
@@ -105,6 +105,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
   function handleSuccessfulScan(contents){
     $log.debug('Scan returned: "' + contents + '"');
     scannerService.pausePreview();
+    // Sometimes (testing in Chrome, when reading QR Code) data is an object
+    // that has a string data.result.
+    contents = contents.result || contents;
     incomingData.redir(contents);
   }
 
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 846e7a6db..a318e1157 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -11,10 +11,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
   root.redir = function(data, shapeshiftData) {
     var originalAddress = null;
     var noPrefixInAddress = 0;
-
-    // Sometimes (testing in Chrome, when reading QR Code) data is an object
-    // that has a string data.result.
-    data = data.result || data;
     
     if (data.toLowerCase().indexOf('bitcoin') < 0) {
       noPrefixInAddress = 1;