From 6a68d73e3ab1ce0c18ae6102fa1eb5c9b85eadd5 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 30 Aug 2018 20:20:51 +1200
Subject: [PATCH] Now handles spaces after address prefix.

---
 src/js/services/bitcoin-uri.service.js      |  8 +++---
 src/js/services/bitcoin-uri.service.spec.js | 31 +++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/js/services/bitcoin-uri.service.js b/src/js/services/bitcoin-uri.service.js
index 25d6cbfb0..f2f17fd9d 100644
--- a/src/js/services/bitcoin-uri.service.js
+++ b/src/js/services/bitcoin-uri.service.js
@@ -144,24 +144,24 @@
       var preColonLower = colonSplit[1].toLowerCase();
       if (preColonLower === 'bitcoin') {
         parsed.coin = 'btc';
-        addressAndParams = colonSplit[2];
+        addressAndParams = colonSplit[2].trim();
         console.log('Is btc');
 
       } else if (/^(?:bitcoincash)|(?:bitcoin-cash)$/.test(preColonLower)) {
         parsed.coin = 'bch';
         parsed.test = false;
-        addressAndParams = colonSplit[2];
+        addressAndParams = colonSplit[2].trim();
         console.log('Is bch');
 
       } else if (/^(?:bchtest)$/.test(preColonLower)) {
         parsed.coin = 'bch';
         parsed.testnet = true;
-        addressAndParams = colonSplit[2];
+        addressAndParams = colonSplit[2].trim();
         console.log('Is bch');
 
       } else if (colonSplit[2] === '') {
         // No colon and no coin specifier.
-        addressAndParams = colonSplit[1];
+        addressAndParams = colonSplit[1].trim();
         console.log('No prefix.');
 
       } else if (/^https?$/.test(colonSplit[1])) {
diff --git a/src/js/services/bitcoin-uri.service.spec.js b/src/js/services/bitcoin-uri.service.spec.js
index 85554df0e..61c6f6fa3 100644
--- a/src/js/services/bitcoin-uri.service.spec.js
+++ b/src/js/services/bitcoin-uri.service.spec.js
@@ -140,6 +140,16 @@ fdescribe('bitcoinUriService', function() {
     expect(parsed.testnet).toBe(false);
   });
 
+  it('Bitcoin uri with space', function() {
+
+    var parsed = bitcoinUriService.parse('bitcoin: 19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d');
+
+    expect(parsed.isValid).toBe(true);
+    expect(parsed.coin).toBe('btc');
+    expect(parsed.publicAddress.legacy).toBe('19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d');
+    expect(parsed.testnet).toBe(false);
+  });
+
   it('Bitpay without prefix', function() {
 
     var parsed = bitcoinUriService.parse('CJoRov8TirekvajiimQpb5Hk95evA7H2Yz');
@@ -220,6 +230,27 @@ fdescribe('bitcoinUriService', function() {
     expect(parsed.testnet).toBe(false);
   });
 
+  it('cashAddr with space', function() {
+
+    var parsed = bitcoinUriService.parse('bitcoincash: qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce');
+
+    expect(parsed.isValid).toBe(true);
+    expect(parsed.coin).toBe('bch');
+    expect(parsed.publicAddress.cashAddr).toBe('qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce');
+    expect(parsed.testnet).toBe(false);
+  });
+
+
+  it('cashAddr with space on testnet', function() {
+
+    var parsed = bitcoinUriService.parse('bchtest: qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j');
+
+    expect(parsed.isValid).toBe(true);
+    expect(parsed.coin).toBe('bch');
+    expect(parsed.publicAddress.cashAddr).toBe('qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j');
+    expect(parsed.testnet).toBe(true);
+  });
+
   it('cashAddr without prefix', function() {
 
     var parsed = bitcoinUriService.parse('qqen2y3l28dpk0dzsag8w027ds96u7z4pc0uxtl0nq');