From 8d96b446df95293c765945a3926c69451753373c Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Tue, 29 Jul 2014 11:52:59 -0700
Subject: [PATCH] paypro: fix some more errors.

---
 js/models/core/Wallet.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 88e816b45..fc0034e81 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -979,7 +979,6 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
     responseType: 'arraybuffer'
   })
   .success(function(data, status, headers, config) {
-    if (err) return cb(err);
     data = PayPro.PaymentACK.decode(data);
     var ack = new PayPro();
     ack = ack.makePaymentACK(data);
@@ -1007,7 +1006,7 @@ Wallet.prototype.receivePaymentRequestACK = function(tx, txp, ack, cb) {
     tx = ptx;
   }
   var txid = tx.getHash().toString('hex');
-  return cb(txid, txp.pr.ca);
+  return cb(txid, txp.merchant.pr.ca);
 };
 
 Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent) {