From 577756fd448f9675ff2bb75860ce7d0b6859f346 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Thu, 9 Aug 2018 17:14:05 +0200
Subject: [PATCH] button color + Time ago fix

---
 src/sass/buttons.scss              | 2 +-
 www/views/includes/walletList.html | 4 ++--
 www/views/walletDetails.html       | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss
index ab066b734..f1bd971bf 100644
--- a/src/sass/buttons.scss
+++ b/src/sass/buttons.scss
@@ -73,7 +73,7 @@
       color: #FFF;
     }
     &-outline {
-      @include button-style(transparent, #FFFFFF, #FAFAFA, #FFF, #FFFFFF);
+      @include button-style(transparent, #FFFFFF, #FFFFFF, #FFFFFF, #FFFFFF);
       @include button-outline(#FFFFFF);
       background: none;
       box-shadow: none;
diff --git a/www/views/includes/walletList.html b/www/views/includes/walletList.html
index d5fb65302..2ad8f3e81 100644
--- a/www/views/includes/walletList.html
+++ b/www/views/includes/walletList.html
@@ -8,10 +8,10 @@
   </span>
   <span ng-if="wallet.isComplete()">
     <span ng-if="selectedPriceDisplay == 'crypto' && !wallet.balanceHidden  && !wallet.scanning">
-      <formatted-amount value="{{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }}"></formatted-amount>
+      <formatted-amount value="{{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance : ''  ) }}"></formatted-amount> {{(!wallet.status.totalBalanceStr && wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '')}}
     </span>
     <span ng-if="selectedPriceDisplay == 'fiat' && !wallet.balanceHidden  && !wallet.scanning">
-      <formatted-amount value="{{wallet.status.totalBalanceAlternative ? wallet.status.totalBalanceAlternative : ( wallet.cachedBalance ? wallet.cachedBalance   + (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  ) }}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount>
+      <formatted-amount value="{{wallet.status.totalBalanceAlternative ? wallet.status.totalBalanceAlternative : (wallet.cachedBalance ? wallet.cachedBalance : '') }}" currency="{{wallet.status.alternativeIsoCode}}"></formatted-amount> {{( !wallet.status.totalBalanceAlternative && wallet.cachedBalance ? (wallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( wallet.cachedBalanceUpdatedOn  * 1000 | amTimeAgo) : '') : ''  )}}
     </span>
     <span ng-if="wallet.scanning" translate> Scanning funds... </span>
 
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index f10759ca6..2480099b5 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -10,6 +10,11 @@
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
+  <style type="text/css">
+    .button-white-outline.button-outline.active, .button-white-outline.button-outline.activated {
+      color: {{ wallet.color }};
+    }
+  </style>
 
   <div class="bp-content" ng-class="{'status-bar': isCordova}">