From aa5e90786b64ff4870c7f21e0b3f3c41b90adccb Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Mon, 15 Sep 2014 16:37:36 -0700 Subject: [PATCH] paypro: fix - check for merchant_data existence. --- js/models/core/Wallet.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 815ee3fa0..63ffebafa 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -1408,7 +1408,10 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) { expires: expires, memo: memo || 'This server would like some BTC from you.', payment_url: payment_url, - merchant_data: merchant_data.toString('hex') + merchant_data: merchant_data + ? merchant_data.toString('hex') + // : new Buffer('none', 'utf8').toString('hex') + : '00' }, signature: sig.toString('hex'), ca: trust.caName,