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

paypro: deal with no unspent outputs. see #1043.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-05 14:36:38 -07:00 • committed by Manuel Araoz
commit 0a8d734e49
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/directives.js
View file

@ -17,6 +17,12 @@ angular.module('copayApp.directives')
// Is this a payment protocol URI (BIP-72)? // Is this a payment protocol URI (BIP-72)?
if (uri && uri.merchant) { if (uri && uri.merchant) {
scope.wallet.fetchPaymentTx(uri.merchant, function(err, merchantData) { scope.wallet.fetchPaymentTx(uri.merchant, function(err, merchantData) {
if ((err && err.message === 'No unspent outputs.')
|| scope.availableBalance < +merchantData.total) {
ctrl.$setValidity('validAddress', false);
return;
}
if (err) { if (err) {
if (scope._resetPayPro) scope._resetPayPro(); if (scope._resetPayPro) scope._resetPayPro();
ctrl.$setValidity('validAddress', false); ctrl.$setValidity('validAddress', false);

3
js/models/core/Wallet.js
View file

@ -937,6 +937,9 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
return this.getUnspent(function(err, unspent) { return this.getUnspent(function(err, unspent) {
if (options.fetch) { if (options.fetch) {
if (!unspent || !unspent.length) {
return cb(new Error('No unspent outputs.'));
}
self.createPaymentTxSync(options, merchantData, unspent); self.createPaymentTxSync(options, merchantData, unspent);
return cb(null, merchantData, pr); return cb(null, merchantData, pr);
} }