From e884b4e7d72f374f52c89ceb8fee78b82136755b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Tue, 29 Sep 2015 12:51:08 -0300 Subject: [PATCH] Ref --- src/js/controllers/walletHome.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 6078bde46..7d44d869b 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1019,21 +1019,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi return newUri; }; - function backwardCompatible(uri) { - var regex = /^bitcoin:\?r=[\w+]/; - var match = regex.exec(uri); - if (!match || match.length === 0) { - return false; - } else { - return decodeURIComponent(uri.replace('bitcoin:?r=', '')); - } - } - - var backwardCompatibleUri = backwardCompatible(uri); var satToUnit = 1 / this.unitToSatoshi; - if (backwardCompatibleUri) { - this.setFromPayPro(backwardCompatibleUri, function(err) { + // URI extensions for Payment Protocol with non-backwards-compatible request + if ((/^bitcoin:\?r=[\w+]/).exec(uri)) { + uri = decodeURIComponent(uri.replace('bitcoin:?r=', '')); + this.setFromPayPro(uri, function(err) { if (err) { return err; }