From 775766f585f69b4b961c37c2f6649454cbdc399f Mon Sep 17 00:00:00 2001
From: Kadir Sekha <sekhakadir@gmail.com>
Date: Thu, 1 Mar 2018 16:17:08 +0500
Subject: [PATCH] fixed bug which would stop bitcoincash bitpay urls working

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

diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index a7bb15a8c..b4043ad8d 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -16,7 +16,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       noPrefixInAddress = 1;
     }
 
-    if (typeof(data) == 'string' && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
+    if (typeof(data) == 'string' && !(/^bitcoin(cash)?:\?r=[\w+]/).exec(data) && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
       try {
         noPrefixInAddress = 0;
 
@@ -109,7 +109,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
     }
     // data extensions for Payment Protocol with non-backwards-compatible request
     if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) {
-      var c = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
+      var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
       data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
       payproService.getPayProDetails(data, coin, function(err, details) {
         if (err) {
@@ -136,7 +136,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
             if (err) {
               if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData);
               else popupService.showAlert(gettextCatalog.getString('Error'), err);
-            } else handlePayPro(details);
+            } else handlePayPro(details, coin);
           });
         } else {
           goSend(addr, amount, message, coin, shapeshiftData);
@@ -214,7 +214,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       return true;
       // Plain URL
     } else if (/^https?:\/\//.test(data)) {
-
       payproService.getPayProDetails(data, coin, function(err, details) {
         if (err) {
           root.showMenu({