From 0c67f02754ffe0a1c2a47b460a15b35471d1225a Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Sat, 9 Sep 2017 19:23:46 -0300
Subject: [PATCH] Fix regex

---
 src/js/controllers/addressbookAdd.js | 2 +-
 src/js/services/incomingData.js      | 8 ++++----
 src/js/services/openURL.js           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/controllers/addressbookAdd.js b/src/js/controllers/addressbookAdd.js
index 92a5a4287..267acc154 100644
--- a/src/js/controllers/addressbookAdd.js
+++ b/src/js/controllers/addressbookAdd.js
@@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
     $timeout(function() {
       var form = addressbookForm;
       if (data && form) {
-        data = data.replace(/^bitcoin[cash]*:/, '');
+        data = data.replace(/^bitcoin(cash)?:/, '');
         form.address.$setViewValue(data);
         form.address.$isValid = true;
         form.address.$render();
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 817d42da4..6afbef5d3 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -69,8 +69,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       }, 100);
     }
     // data extensions for Payment Protocol with non-backwards-compatible request
-    if ((/^bitcoin[cash]*:\?r=[\w+]/).exec(data)) {
-      data = decodeURIComponent(data.replace(/bitcoin[cash]*:?r=/, ''));
+    if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) {
+      data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
       $state.go('tabs.send', {}, {
         'reload': true,
         'notify': $state.current.name == 'tabs.send' ? false : true
@@ -85,9 +85,9 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
     data = sanitizeUri(data);
 
     // Bitcoin or Bitcoin Cash URL
-    if ((/^bitcoin[cash]*:/).exec(data)) {
+    if ((/^bitcoin(cash)?:/).exec(data)) {
       var coin = 'btc';
-      if ((/^bitcoincash*:/).exec(data)) {
+      if ((/^bitcoincash:/).exec(data)) {
         coin = 'bch';
         data = data.replace(/bitcoincash*:/, 'bitcoin:');
       }
diff --git a/src/js/services/openURL.js b/src/js/services/openURL.js
index 120070e5f..b03f4b16a 100644
--- a/src/js/services/openURL.js
+++ b/src/js/services/openURL.js
@@ -57,10 +57,10 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop
 
       // This event is sent to an existent instance of Copay (only for standalone apps)
       gui.App.on('open', function(pathData) {
-        if (pathData.indexOf(/^bitcoin[cash]*:/) != -1) {
+        if (pathData.indexOf(/^bitcoin(cash)?:/) != -1) {
           $log.debug('Bitcoin URL found');
           handleOpenURL({
-            url: pathData.substring(pathData.indexOf(/^bitcoin[cash]*:/))
+            url: pathData.substring(pathData.indexOf(/^bitcoin(cash)?:/))
           });
         } else if (pathData.indexOf(appConfigService.name + '://') != -1) {
           $log.debug(appConfigService.name + ' URL found');