From 98db768924737287b713f41d5a490d8a8d1548ba Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 8 Sep 2014 17:36:47 -0700 Subject: [PATCH] paypro: fix tx broadcasting with domains as paypro addresses. --- js/controllers/send.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/js/controllers/send.js b/js/controllers/send.js index e0ee33c8a..e5cce0c59 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -103,7 +103,7 @@ angular.module('copayApp.controllers').controller('SendController', window.URL = window.URL || window.webkitURL || window.mozURL || window.msURL; $scope.isMobile = isMobile.any(); - if (!window.cordova && !navigator.getUserMedia) + if (!window.cordova && !navigator.getUserMedia) $scope.disableScanner =1; $scope.submitForm = function(form) { @@ -178,6 +178,15 @@ angular.module('copayApp.controllers').controller('SendController', }; } + // If we're setting the domain, ignore the change. + if ($rootScope.merchant + && $rootScope.merchant.domain + && address === $rootScope.merchant.domain) { + uri = { + merchant: $rootScope.merchant.request_url + }; + } + if (uri && uri.merchant) { w.createPaymentTx({ uri: uri.merchant,