From 014175f1b668fe035a75fa8f917a4a4c2be03091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 27 Oct 2016 10:28:46 -0300
Subject: [PATCH] formatted locked amounts and addressbook backward
 compatibility

---
 src/sass/views/walletDetails.scss | 6 ++++++
 www/views/includes/txp.html       | 4 ++--
 www/views/walletDetails.html      | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index e54502fb7..37438bc1d 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -61,6 +61,12 @@
   .tx-search:before {
     font-size: 22px !important;
   }
+  .description {
+    background-color: #f2f2f2;
+    text-align: center;
+    font-size: 13px;
+    color: $mid-gray;
+  }
 }
 
 .wallet-details-wallet-info {
diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html
index c37274878..107c0046c 100644
--- a/www/views/includes/txp.html
+++ b/www/views/includes/txp.html
@@ -4,8 +4,8 @@
     {{tx.amountStr}}
   </div>
   <span ng-show="!tx.merchant">
-    <span ng-show="addressbook[tx.toAddress] && addressbook[tx.toAddress].name && !tx.message">
-      {{addressbook[tx.toAddress].name}}
+    <span ng-show="addressbook[tx.toAddress] && !tx.message">
+      {{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}
     </span>
     <span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
       {{tx.message}}
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 315f43901..8c56d4be6 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -99,7 +99,7 @@
         <div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
           <span ng-include="'views/includes/txp.html'"></span>
         </div>
-        <div class="item item-footer" ng-show="status.lockedBalanceSat">
+        <div class="item item-footer description" ng-show="status.lockedBalanceSat">
           <span translate>Total Locked Balance</span>:
           <b>{{status.lockedBalanceStr}} </b>
           <span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
@@ -158,10 +158,10 @@
             <div ng-show="btx.action == 'sent'" class="ellipsis">
               <div ng-if="btx.message">{{btx.message}}</div>
               <div ng-if="!btx.message && btx.note.body">{{btx.note.body}}</div>
-              <div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo] && addressbook[btx.addressTo].name">
-                {{addressbook[btx.addressTo].name}}
+              <div ng-if="!btx.message && !btx.note.body && addressbook[btx.addressTo]">
+                {{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}}
               </div>
-              <div ng-if="!btx.message && !btx.note.body && !(addressbook[btx.addressTo] && addressbook[btx.addressTo].name)" translate>Sent</div>
+              <div ng-if="!btx.message && !btx.note.body && !addressbook[btx.addressTo]" translate>Sent</div>
             </div>
 
             <div ng-show="btx.action == 'moved'" class="ellipsis">