From 90bfe4aaa2391ff8f5cd8f32c3f1186b13c8d96b Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 11 Aug 2015 17:59:41 -0300
Subject: [PATCH 1/2] Display if has unconfirmed inputs

---
 public/views/modals/txp-details.html | 4 ++--
 src/js/controllers/walletHome.js     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 6460111a2..f1a47d9b4 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -30,9 +30,9 @@
       <span class="text-gray" translate>Fee</span>:
       <span class="right">{{feeStr}}</span>
     </li>
-    <li class="line-b p10">
+    <li class="line-b p10" ng-show="!currentSpendUnconfirmed">
       <span class="text-gray" translate>Uses unconfirmed funds</span>:
-      <span class="right">{{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}}</span>
+      <span class="right">{{(tx.hasUnconfirmedInputs ? 'Yes' : 'No')|translate}}</span>
     </li>
     <li class="line-b p10">
       <span class="text-gray" translate>Time</span>:
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index ff1d59536..df7d089f9 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -184,6 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   this.openTxpModal = function(tx, copayers) {
     var fc = profileService.focusedClient;
     var refreshUntilItChanges = false;
+    var currentSpendUnconfirmed = $scope.currentSpendUnconfirmed;
     var ModalInstanceCtrl = function($scope, $modalInstance) {
       $scope.error = null;
       $scope.tx = tx;
@@ -196,6 +197,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.loading = null;
       $scope.color = fc.backgroundColor;
       refreshUntilItChanges = false;
+      $scope.currentSpendUnconfirmed = currentSpendUnconfirmed;
 
       $scope.getShortNetworkName = function() {
         return fc.credentials.networkName.substring(0, 4);

From 42cd5ba3e0a51dcfa420a66d8b92577533e37ac0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 11 Aug 2015 18:55:47 -0300
Subject: [PATCH 2/2] Fixes unconfirmed message

---
 bower.json                           | 2 +-
 public/views/modals/txp-details.html | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 93266daf7..05df61448 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "ng-lodash": "~0.2.0",
     "angular-moment": "~0.10.1",
     "moment": "~2.10.3",
-    "angular-bitcore-wallet-client": "^0.1.1",
+    "angular-bitcore-wallet-client": "^0.1.2",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index f1a47d9b4..dc8c683bd 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -29,11 +29,7 @@
     <li class="line-b p10">
       <span class="text-gray" translate>Fee</span>:
       <span class="right">{{feeStr}}</span>
-    </li>
-    <li class="line-b p10" ng-show="!currentSpendUnconfirmed">
-      <span class="text-gray" translate>Uses unconfirmed funds</span>:
-      <span class="right">{{(tx.hasUnconfirmedInputs ? 'Yes' : 'No')|translate}}</span>
-    </li>
+    </li> 
     <li class="line-b p10">
       <span class="text-gray" translate>Time</span>:
       <span class="right">
@@ -45,6 +41,9 @@
       <span class="right">{{tx.creatorName}}</span>
     </li>
   </ul>
+  <div class="p10 text-center size-12" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
+    <span class="text-warning" translate>Warning: this transaction has unconfirmed inputs</span>
+  </div>
   <div ng-if="tx.paypro">
     <h4 class="title m0" translate>Payment details</h4>
     <ul class="no-bullet size-14 m0">