anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

paypro: fix tx broadcasting with domains as paypro addresses.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-09-08 17:36:47 -07:00
commit 98db768924
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/controllers/send.js
View file

@ -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,