From f0ccee8a0a0cff8c9e7da7fd9f1a169cd03a7ff7 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Mon, 30 Jul 2018 18:28:27 +1200
Subject: [PATCH] Refining the display of available funds.

---
 src/js/controllers/amount.js  | 8 ++++++--
 src/sass/views/amountNew.scss | 2 +-
 www/views/amountNew.html      | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index c7ffb02ad..3cf93b4c9 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -316,6 +316,7 @@ function amountController(configService, $filter, $ionicHistory, $ionicModal, $i
       });
     }
 
+    updateAvailableFundsStringIfNeeded();
     updateUnitUI();
   };
 
@@ -663,18 +664,21 @@ function amountController(configService, $filter, $ionicHistory, $ionicModal, $i
       availableUnits[altUnitIndex].name = newAltCurrency.isoCode;
       availableUnits[altUnitIndex].shortName = newAltCurrency.isoCode;
       fiatCode = newAltCurrency.isoCode;
-      updateAvailableFiatIfNeeded();
+      updateAvailableFundsStringIfNeeded();
       updateUnitUI();
       close();
     });
   };
   
-  function updateAvailableFiatIfNeeded() {
+  function updateAvailableFundsStringIfNeeded() {
+    console.log('updateAvailableFundsStringIfNeeded()');
     if (vm.fromWalletId && availableSatoshis !== null) {
+      console.log('updating');
       availableFundsInFiat = '';
       vm.availableFunds = availableFundsInCrypto;
       var coin = availableUnits[altUnitIndex].isFiat ? availableUnits[unitIndex].id : availableUnits[altUnitIndex].id;
       txFormatService.formatAlternativeStr(coin, availableSatoshis, function formatCallback(formatted){
+        console.log('txFormatService returned');
         if (formatted) {
           availableFundsInFiat = formatted;
           if (availableUnits[unitIndex].isFiat) {
diff --git a/src/sass/views/amountNew.scss b/src/sass/views/amountNew.scss
index 9dad8b045..0e1d183b6 100644
--- a/src/sass/views/amountNew.scss
+++ b/src/sass/views/amountNew.scss
@@ -387,7 +387,7 @@
 
       .extra,
       button.extra {
-        display: flex;
+        /*display: flex;*/
         flex: 0 1 auto;
       }
 
diff --git a/www/views/amountNew.html b/www/views/amountNew.html
index b23a34fbf..b67757f5e 100644
--- a/www/views/amountNew.html
+++ b/www/views/amountNew.html
@@ -44,8 +44,10 @@
               <span translate>Change Currency</span>
             </span>
           </button>
-          <div class="extra available-funds" ng-class="{warning: vm.fundsAreInsufficient}" translate>
-            Available Funds: {{vm.availableFunds}}</span>
+          <div class="extra available-funds" 
+            ng-class="{warning: vm.fundsAreInsufficient}"
+            ng-if="!vm.isRequestingSpecificAmount" translate>
+            <span>Available Funds:</span>&ensp;<span>{{vm.availableFunds}}</span>
           </div>  
         </div>
       </div>