From 471a9ba4aeb8ad35f729b1932a91086c80e1774c Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Wed, 29 Aug 2018 17:39:04 +1200
Subject: [PATCH] Treating BitPay address like cashAddr.

---
 src/js/services/incomingData.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index c7677ed0a..cde485264 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -168,14 +168,21 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS
         }
         return true;
     // Cash URI
-    } else if (allParsed.isValid && allParsed.publicAddress && allParsed.publicAddress.cashAddr) {
+    } else if (allParsed.isValid && allParsed.publicAddress && (allParsed.publicAddress.cashAddr || allParsed.publicAddress.bitpay)) {
         var coin = 'bch';
-        
-        var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
-        addr = bitcoinCashJsService.readAddress(prefix + allParsed.publicAddress.cashAddr).legacy;
-        var message = parsed.message;
 
-        var amount = parsed.amount ? parsed.amount : '';
+        var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
+        var addrIn = prefix + allParsed.publicAddress.cashAddr;
+
+        if (allParsed.publicAddress.bitpay) {
+          addrIn = allParsed.publicAddress.bitpay;
+          originalAddress = allParsed.publicAddress.bitpay;
+        }
+
+        addr = bitcoinCashJsService.readAddress(addrIn).legacy;
+        var message = allParsed.message;
+
+        var amount = allParsed.amount ? allParsed.amount : '';
 
         // paypro not yet supported on cash
         if (allParsed.url) {