From 730a3269c9718aff4bc9dca63ee025ec44dfd375 Mon Sep 17 00:00:00 2001
From: Gregg Zigler <gregg@bitpay.com>
Date: Tue, 28 Jul 2015 09:25:05 -0700
Subject: [PATCH] include proposal type, exclude decorations, in txhistory
 results

---
 lib/server.js              | 4 +++-
 test/integration/server.js | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/server.js b/lib/server.js
index 9a959ec..f57a42d 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1532,6 +1532,7 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
         amount = 0;
       }
 
+      function outputMap(o) { return { amount: o.amount, address: o.address } };
       var newTx = {
         txid: tx.txid,
         action: action,
@@ -1539,13 +1540,14 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
         fees: tx.fees,
         time: tx.time,
         addressTo: addressTo,
-        outputs: _.filter(outputs, { isChange: false }),
+        outputs: _.map(_.filter(outputs, { isChange: false }), outputMap),
         confirmations: tx.confirmations,
       };
 
       var proposal = indexedProposals[tx.txid];
       if (proposal) {
         newTx.proposalId = proposal.id;
+        newTx.proposalType = proposal.type;
         newTx.creatorName = proposal.creatorName;
         newTx.message = proposal.message;
         newTx.actions = _.map(proposal.actions, function(action) {
diff --git a/test/integration/server.js b/test/integration/server.js
index 78b9a9d..05a25c5 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -3657,9 +3657,12 @@ describe('Wallet service', function() {
                 tx.actions.length.should.equal(1);
                 tx.actions[0].type.should.equal('accept');
                 tx.actions[0].copayerName.should.equal('copayer 1');
+                tx.proposalType.should.equal(Model.TxProposal.Types.MULTIPLEOUTPUTS);
                 tx.outputs[0].address.should.equal(external);
                 tx.outputs[0].amount.should.equal(helpers.toSatoshi(50));
                 should.not.exist(tx.outputs[0].message);
+                should.not.exist(tx.outputs[0]['isMine']);
+                should.not.exist(tx.outputs[0]['isChange']);
                 tx.outputs[1].address.should.equal(external);
                 tx.outputs[1].amount.should.equal(helpers.toSatoshi(30));
                 should.exist(tx.outputs[1].message);