From 01b678457d024b531b8fe15aa149d3fe6b90ba34 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sun, 30 Nov 2014 11:18:25 -0300
Subject: [PATCH] fix pending

---
 js/models/Wallet.js              | 32 +++++++++++++++++++++++++++++---
 js/services/pendingTxsService.js |  4 ++--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index e2382ef10..29393387b 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -1383,6 +1383,35 @@ Wallet.prototype._getActionList = function(txp) {
   return peers;
 };
 
+/**
+ * @desc Retrieve Pendings Transaction proposals (see {@link TxProposals})
+ * @return {Object[]} each object returned represents a transaction proposal
+ */
+Wallet.prototype.getPendingTxProposalsCount = function() {
+  var self = this;
+  var txps = this.txProposals.txps;
+  var maxRejectCount = this.maxRejectCount();
+  var myId = this.getMyCopayerId();
+  var pending =0, pendingForUs = 0;
+
+  _.each(txps, function(inTxp, ntxid) {
+    if (!inTxp.isPending(maxRejectCount))
+      return;
+
+    pending++;
+
+    if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId]  )
+      pendingForUs++
+  });
+
+
+  return {
+    pending: pending,
+    pendingForUs: pendingForUs,
+  };
+};
+
+
 /**
  * @desc Retrieve Pendings Transaction proposals (see {@link TxProposals})
  * @return {Object[]} each object returned represents a transaction proposal
@@ -1391,7 +1420,6 @@ Wallet.prototype.getPendingTxProposals = function() {
   var self = this;
   var ret = [];
   ret.txs = [];
-  var pendingForUs = 0;
   var txps = this.txProposals.txps;
   var maxRejectCount = this.maxRejectCount();
   var satToUnit = 1 / this.settings.unitToSatoshi;
@@ -1403,7 +1431,6 @@ Wallet.prototype.getPendingTxProposals = function() {
     var txp = _.clone(inTxp);
     txp.ntxid = ntxid;
 
-    pendingForUs++;
     var addresses = {};
     var outs = JSON.parse(txp.builder.vanilla.outs);
     outs.forEach(function(o) {
@@ -1426,7 +1453,6 @@ Wallet.prototype.getPendingTxProposals = function() {
     ret.txs.push(txp);
   });
 
-  ret.pendingForUs = pendingForUs;
   return ret;
 };
 
diff --git a/js/services/pendingTxsService.js b/js/services/pendingTxsService.js
index 59a60409a..0b8d5812d 100644
--- a/js/services/pendingTxsService.js
+++ b/js/services/pendingTxsService.js
@@ -8,8 +8,8 @@ angular.module('copayApp.services')
       var w = $rootScope.wallet;
       if (!w) return;
 
-      var res = w.getPendingTxProposals();
-      $rootScope.pendingTxCount = res.pendingForUs;
+      var ret = w.getPendingTxProposalsCount();
+      $rootScope.pendingTxCount = ret.pendingForUs;
     };
     return root;
   });