From ceb81580af48b5ef9e45fdc26c3b146dff6bec4e Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Wed, 19 Apr 2017 14:19:05 -0300
Subject: [PATCH 1/2] fix label and icon size

---
 www/views/includes/txp.html | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html
index 779869454..baea9c1a1 100644
--- a/www/views/includes/txp.html
+++ b/www/views/includes/txp.html
@@ -1,33 +1,29 @@
 <div class="wallet-details__item__marker"></div>
-<img class="wallet-details__tx-icon" src="img/icon-proposal-pending.svg" width="40">
+<div style="padding-right: 25px">
+  <img src="img/icon-proposal-pending.svg" width="40">
+</div>
 
 <div class="wallet-details__tx-content" ng-class="{'no-border': $last}">
 
   <div class="wallet-details__tx-title">
     <span ng-show="!tx.merchant">
-      <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}}
-      </span>
-      <span ng-show="!addressbook[tx.toAddress] && !tx.message" translate>
-        Sending
-      </span>
+      <span ng-if="tx.message" class="ellipsis">{{tx.message}}</span>
+      <span ng-if="!tx.message && addressbook[tx.toAddress]"  class="ellipsis">{{addressbook[tx.toAddress].name || addressbook[tx.toAddress]}}</span>
+      <span ng-if="!tx.message && !addressbook[tx.toAddress]"  class="ellipsis" translate>Sending</span>
     </span>
     <span ng-show="tx.merchant">
-      <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
-      <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
+      <span ng-show="tx.merchant.pr.ca" class="ellipsis"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
+      <span ng-show="!tx.merchant.pr.ca" class="ellipsis"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
     </span>
   </div>
 
   <span class="item-note text-right wallet-details__tx-amount">
     <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>
+      <span class="size-12" ng-if="tx.action == 'invalid'" translate>
       (possible double spend)
       </span>
-      <span  ng-if="tx.action != 'invalid'">
+      <span ng-if="tx.action != 'invalid'">
       – {{tx.amountStr}}
       </span>
     </span>

From 5237f3ff6a22f9ae3b6ebb36e218ca574baf2e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 20 Apr 2017 12:37:04 -0300
Subject: [PATCH 2/2] fix css details

---
 src/sass/views/walletDetails.scss | 1 +
 www/views/modals/txp-details.html | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index b726710f9..fe68b1d40 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -13,6 +13,7 @@
     }
   }
   &__tx-time {
+    white-space: nowrap;
     color: $v-light-gray;
     font-size: 12.5px;
   }
diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html
index ef9beb604..d18128132 100644
--- a/www/views/modals/txp-details.html
+++ b/www/views/modals/txp-details.html
@@ -78,7 +78,7 @@
             </i>
             <div>{{wallet.name}}</div>
           </div>
-        </div> 
+        </div>
         <div class="item single-line" ng-if="isShared">
           <span class="label" translate>Created by</span>
           <span class="item-note">
@@ -90,10 +90,10 @@
           <span class="item-note">
             <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
           </span>
-        </div> 
+        </div>
         <div class="item single-line" ng-show="tx.message">
           <span class="label" translate>Memo</span>
-          <span class="item-note">
+          <span class="m15l item-note">
             {{tx.message}}
           </span>
         </div>