From 955db5fcfc37c9d68658fb3e631a23688bfbfff5 Mon Sep 17 00:00:00 2001
From: Sonata Green <sonatagreen@yahoo.com>
Date: Sat, 20 Aug 2016 16:52:31 -0500
Subject: [PATCH] fix double transactions

---
 js/page/wallet.js | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/js/page/wallet.js b/js/page/wallet.js
index f5c760a62..34041411b 100644
--- a/js/page/wallet.js
+++ b/js/page/wallet.js
@@ -131,6 +131,7 @@ var WalletPage = React.createClass({
       if (results.length == 0) {
         out = 'No transactions yet.';
       } else {
+        var condensedTransactions = {};
         var rows = [];
         rows.push(<tr className="transaction_history">
                     <th className="transaction_history">Amount</th>
@@ -139,18 +140,29 @@ var WalletPage = React.createClass({
                     <th className="transaction_history">Transaction</th>
                   </tr>);
         results.forEach(function(tx) {
-          rows.push(<tr className="transaction_history">
-                      <td className="transaction_history">{ (tx["amount"]>0 ? '+' : '' ) + tx["amount"] }</td>
-                      <td className="transaction_history">{ (new Date(parseInt(tx["time"])*1000)).toLocaleTimeString() }</td>
-                      <td className="transaction_history">{ (new Date(parseInt(tx["time"])*1000)).toLocaleDateString() }</td>
-                      <td className="transaction_history">
-                        <a className="transaction_explorer_link" href={"https://explorer.lbry.io/tx/"+tx["txid"]}>
-                          { tx["txid"] }
-                        </a>
-                      </td>
-                    </tr>)
+          var txid = tx["txid"];
+          if (!(txid in condensedTransactions)) {
+            condensedTransactions[txid] = 0;
+          }
+          condensedTransactions[txid] += parseFloat(tx["amount"]);
         });
-        out = <table className="transaction_history">{rows}</table>
+        results.forEach(function(tx) {
+          var txid = tx["txid"];
+          var txval = condensedTransactions[txid];
+          var txdate = new Date(parseInt(tx["time"])*1000);
+          if (txid in condensedTransactions && txval != 0) {
+            rows.push(<tr key={txid} className="transaction_history">
+                        <td className="transaction_history">{ (txval>0 ? '+' : '' ) + txval }</td>
+                        <td className="transaction_history">{ txdate.toLocaleTimeString() }</td>
+                        <td className="transaction_history">{ txdate.toLocaleDateString() }</td>
+                        <td className="transaction_history">
+                          <a className="transaction_explorer_link" href={"https://explorer.lbry.io/tx/"+txid}>{txid}</a>
+                        </td>
+                      </tr>);
+            delete condensedTransactions[tx["txid"]];
+          }
+        });
+        out = <table className="transaction_history"><tbody>{rows}</tbody></table>
       }
       this.setState({
         txlog: out,