From e8005c9ea6c7b63741c1a62d7eca1fff0cd51ad3 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Tue, 28 Aug 2018 17:10:15 +1200
Subject: [PATCH] Legacy addresses with bitcoincash: prefix.

---
 src/js/services/bitcoin-uri.service.js      |  4 ++--
 src/js/services/bitcoin-uri.service.spec.js | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/js/services/bitcoin-uri.service.js b/src/js/services/bitcoin-uri.service.js
index f6f91ddce..d8498ec53 100644
--- a/src/js/services/bitcoin-uri.service.js
+++ b/src/js/services/bitcoin-uri.service.js
@@ -311,12 +311,12 @@
           parsed.legacyAddress = cashAddrMainnet.toString();
           parsed.testnet = false;  
 
-        } else if (bitcore.Address.isValid(address, 'livenet') && parsed.coin !== 'bch') {
+        } else if (bitcore.Address.isValid(address, 'livenet')) {
           parsed.address = address;
           parsed.legacyAddress = address;
           parsed.testnet = false;
 
-        } else if (bitcore.Address.isValid(address, 'testnet')  && parsed.coin !== 'bch') {
+        } else if (bitcore.Address.isValid(address, 'testnet')) {
           parsed.address = address;
           parsed.legacyAddress = address;
           parsed.testnet = true;
diff --git a/src/js/services/bitcoin-uri.service.spec.js b/src/js/services/bitcoin-uri.service.spec.js
index d72ce8b20..b956cccc6 100644
--- a/src/js/services/bitcoin-uri.service.spec.js
+++ b/src/js/services/bitcoin-uri.service.spec.js
@@ -17,7 +17,7 @@ fdescribe('bitcoinUriService', function() {
     var parsed = bitcoinUriService.parse('bitcoin:?r=https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr');
 
     expect(parsed.isValid).toBe(true);
-    expect(parsed.address).toBeUndefined()
+    expect(parsed.address).toBeUndefined();
     expect(parsed.coin).toBe('btc');
     expect(parsed.legacyAddress).toBeUndefined();
     expect(parsed.testnet).toBeUndefined();
@@ -29,7 +29,7 @@ fdescribe('bitcoinUriService', function() {
     var parsed = bitcoinUriService.parse('bitcoincash:?r=https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu');
 
     expect(parsed.isValid).toBe(true);
-    expect(parsed.address).toBeUndefined()
+    expect(parsed.address).toBeUndefined();
     expect(parsed.coin).toBe('bch');
     expect(parsed.legacyAddress).toBeUndefined();
     expect(parsed.testnet).toBeUndefined();
@@ -40,7 +40,22 @@ fdescribe('bitcoinUriService', function() {
 
     var parsed = bitcoinUriService.parse('bitcoincash:1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
 
-    expect(parsed.isValid).toBe(false);
+    expect(parsed.isValid).toBe(true);
+    expect(parsed.address).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
+    expect(parsed.coin).toBe('bch');
+    expect(parsed.legacyAddress).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
+    expect(parsed.testnet).toBe(false);
+  });
+
+  it('Bitcoin Cash prefix with legacy address on testnet', function() {
+
+    var parsed = bitcoinUriService.parse('bitcoincash:mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
+
+    expect(parsed.isValid).toBe(true);
+    expect(parsed.address).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
+    expect(parsed.coin).toBe('bch');
+    expect(parsed.legacyAddress).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
+    expect(parsed.testnet).toBe(true);
   });
 
   it('Bitcoin Cash uri with extended params', function() {