From 136b01526c4c9de4b79ea5d2cc1e7c1d7359cc5a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 13 Feb 2015 10:50:56 -0300 Subject: [PATCH] Display unsent transactions on HomeWallet --- js/models/Wallet.js | 2 +- views/homeWallet.html | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/js/models/Wallet.js b/js/models/Wallet.js index 4f272f6d4..e0b46b0bc 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -1487,7 +1487,7 @@ Wallet.prototype.getPendingTxProposals = function() { var satToUnit = 1 / this.settings.unitToSatoshi; _.each(txps, function(inTxp, ntxid) { - if (!inTxp.isPending(maxRejectCount)) + if (!inTxp.isPending(maxRejectCount) || (inTxp.sentTs && inTxp.isFullySigned())) return; var txp = _.clone(inTxp); diff --git a/views/homeWallet.html b/views/homeWallet.html index 06b5f13cb..2f571e3ed 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -52,7 +52,8 @@

Spend proposals

-
+
@@ -61,9 +62,21 @@ {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
-
-

No pending spend proposals at the moment. +

No pending spend proposals at the moment. +

+
+
+
+ + +
+
+
+
+

Unsent transactions

+