From f8f06ab5569ed3537733afa67db0b5f3f39ce797 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Oct 2014 18:36:12 -0300 Subject: [PATCH 1/2] fixes the scan of QR code with bitcoin url --- js/controllers/send.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/controllers/send.js b/js/controllers/send.js index ad6ab7093..b670cceff 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -288,9 +288,8 @@ angular.module('copayApp.controllers').controller('SendController', qrcode.callback = function(data) { _scanStop(); - var str = (data.indexOf('bitcoin:') === 0) ? data.substring(8) : data; $scope.$apply(function() { - $scope.address = str; + $scope.sendForm.address.$setViewValue(data); }); }; From cec0e2c4de8160797287599d2fac53c8b25c05be Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 17 Oct 2014 18:36:44 -0300 Subject: [PATCH 2/2] fixes paypro url in chrome extension --- browser-extensions/chrome/manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/browser-extensions/chrome/manifest.json b/browser-extensions/chrome/manifest.json index d180e02f4..7b8e6517f 100644 --- a/browser-extensions/chrome/manifest.json +++ b/browser-extensions/chrome/manifest.json @@ -9,6 +9,7 @@ "default_icon": "img/icons/icon.png", "default_popup": "popup.html" }, + "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'", "permissions": [ "tabs", "storage", "notifications" ],