diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 2edadc079..fdc60b08d 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -1363,30 +1363,28 @@ Wallet.prototype.getPendingTxProposals = function() {
   var txps = this.getTxProposals();
   var satToUnit = 1 / this.settings.unitToSatoshi;
 
-  _.find(txps, function(txp) {
-    if (txp.isPending) {
-      pendingForUs++;
-      var addresses = {};
-      var outs = JSON.parse(txp.builder.vanilla.outs);
-      outs.forEach(function(o) {
-        if (!self.publicKeyRing.addressToPath[o.Straddress]) {
-          if (!addresses[o.address]) addresses[o.address] = 0;
-          addresses[o.address] += (o.amountSatStr || Math.round(o.amount * bitcore.util.COIN));
-        };
+  _.each(_.where(txps, 'isPending'), function(txp) {
+    pendingForUs++;
+    var addresses = {};
+    var outs = JSON.parse(txp.builder.vanilla.outs);
+    outs.forEach(function(o) {
+      if (!self.publicKeyRing.addressToPath[o.Straddress]) {
+        if (!addresses[o.address]) addresses[o.address] = 0;
+        addresses[o.address] += (o.amountSatStr || Math.round(o.amount * bitcore.util.COIN));
+      };
+    });
+    txp.outs = [];
+    _.each(addresses, function(value, address) {
+      txp.outs.push({
+        address: address,
+        value: value * satToUnit
       });
-      txp.outs = [];
-      _.each(addresses, function(value, address) {
-        txp.outs.push({
-          address: address,
-          value: value * satToUnit
-        });
-      });
-      // extra fields
-      txp.fee = txp.builder.feeSat * satToUnit;
-      txp.missingSignatures = txp.builder.build().countInputMissingSignatures(0);
-      txp.actionList = self._getActionList(txp.peerActions);
-      ret.txs.push(txp);
-    }
+    });
+    // extra fields
+    txp.fee = txp.builder.feeSat * satToUnit;
+    txp.missingSignatures = txp.builder.build().countInputMissingSignatures(0);
+    txp.actionList = self._getActionList(txp.peerActions);
+    ret.txs.push(txp);
   });
 
   ret.pendingForUs = pendingForUs;
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 48a626e81..5eb2084d0 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -65,7 +65,7 @@ angular.module('copayApp.services')
 
 
     root.updateTxsAndBalance = function(w) {
-      root.updateTxs();
+      root.updateTxs(w);
       root.updateBalance(w, function() {
         $rootScope.$digest();
       });
@@ -356,8 +356,8 @@ angular.module('copayApp.services')
       });
     };
 
-    root.updateTxs = function() {
-      var w = $rootScope.wallet;
+    root.updateTxs = function(w) {
+      w = w || $rootScope.wallet;
       if (!w) return root.onErrorDigest(); 
       var res = w.getPendingTxProposals();
       _.each(res.txs, function(tx) {
diff --git a/views/history.html b/views/history.html
index da3e73091..9336d8639 100644
--- a/views/history.html
+++ b/views/history.html
@@ -120,5 +120,4 @@
       </div>
     </div>
   </div>
-  </div>
 </div>