From 610d42caae61225ab7017d199aa58c81d142588f Mon Sep 17 00:00:00 2001
From: Marty Alcala <marty@bitpay.com>
Date: Mon, 7 Nov 2016 15:32:28 -0500
Subject: [PATCH] better proposal styling and fix confirming status on wallet
 master view

---
 src/js/controllers/walletDetails.js |  2 +-
 www/views/includes/txp.html         | 15 ++-------------
 www/views/walletDetails.html        |  7 +------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 6d508d423..382c870e0 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -196,7 +196,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   }
 
   $scope.isUnconfirmed = function(tx) {
-    return !tx.time && (!tx.confirmations || tx.confirmations === 0);
+    return !tx.confirmations || tx.confirmations === 0;
   };
 
   $scope.showMore = function() {
diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html
index 048680023..6576549bf 100644
--- a/www/views/includes/txp.html
+++ b/www/views/includes/txp.html
@@ -48,30 +48,19 @@
           </span>
         </div>
 
-        <div class="wallet-details__tx-title" ng-if="tx.confirmations === 0">
-          <div class="ellipsis" style="color: #B4B4B4;">
-            Confirming
-          </div>
-        </div>
-
         <span class="item-note text-right wallet-details__tx-amount">
-          <span class="wallet-details__tx-amount" ng-class="{'wallet-details__tx-amount--recent': tx.recent, 'wallet-details__tx-amount--received': tx.action == 'received', 'wallet-details__tx-amount--sent': tx.action == 'sent'}">
+          <span class="wallet-details__tx-amount wallet-details__tx-amount--sent">
             <span ng-if="tx.action == 'sent'">–</span>
             <span  class="size-12" ng-if="tx.action == 'invalid'" translate>
             (possible double spend)
             </span>
             <span  ng-if="tx.action != 'invalid'">
-            {{tx.amountStr}}
+            – {{tx.amountStr}}
             </span>
           </span>
           <div>
             <time class="wallet-details__tx-time" ng-if="tx.createdOn && createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
             <time class="wallet-details__tx-time" ng-if="tx.createdOn && !createdWithinPastDay(tx.createdOn)">{{tx.createdOn * 1000 | date:'MMMM d, y'}}</time>
-
-            <!-- <span translate class="text-warning"
-              ng-show="!tx.time && (!tx.confirmations || tx.confirmations == 0)">
-              Unconfirmed
-            </span> -->
           </div>
         </span>
       </div>
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 5e2967e58..6dfe8d9de 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -104,7 +104,7 @@
         <div ng-repeat="tx in txps" ng-click="openTxpModal(tx)">
           <div class="wallet-details__item proposal" ng-include="'views/includes/txp.html'"></div>
         </div>
-        <div class="item item-footer description" ng-show="status.lockedBalanceSat">
+        <div class="item item-footer description" ng-show="status.lockedBalanceSat" style="background: white;">
           <span translate>Total Locked Balance</span>:
           <b>{{status.lockedBalanceStr}} </b>
           <span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
@@ -241,11 +241,6 @@
                 <div>
                   <time class="wallet-details__tx-time" ng-if="btx.time && createdWithinPastDay(btx.time)">{{btx.time * 1000 | amTimeAgo}}</time>
                   <time class="wallet-details__tx-time" ng-if="btx.time && !createdWithinPastDay(btx.time)">{{btx.time * 1000 | date:'MMMM d, y'}}</time>
-
-                  <!-- <span translate class="text-warning"
-                    ng-show="!btx.time && (!btx.confirmations || btx.confirmations == 0)">
-                    Unconfirmed
-                  </span> -->
                 </div>
               </span>
             </div>