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(
Amount |
@@ -139,18 +140,29 @@ var WalletPage = React.createClass({
Transaction |
);
results.forEach(function(tx) {
- rows.push(
- { (tx["amount"]>0 ? '+' : '' ) + tx["amount"] } |
- { (new Date(parseInt(tx["time"])*1000)).toLocaleTimeString() } |
- { (new Date(parseInt(tx["time"])*1000)).toLocaleDateString() } |
-
-
- { tx["txid"] }
-
- |
-
)
+ var txid = tx["txid"];
+ if (!(txid in condensedTransactions)) {
+ condensedTransactions[txid] = 0;
+ }
+ condensedTransactions[txid] += parseFloat(tx["amount"]);
});
- out =
+ 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(
+ { (txval>0 ? '+' : '' ) + txval } |
+ { txdate.toLocaleTimeString() } |
+ { txdate.toLocaleDateString() } |
+
+ {txid}
+ |
+
);
+ delete condensedTransactions[tx["txid"]];
+ }
+ });
+ out =
}
this.setState({
txlog: out,