From 05a8952f877f750d185caf09954c26aab7f19151 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 24 May 2018 14:36:51 -0700
Subject: [PATCH] Displaying fiat amounts in wallet selector in Receive tab.

---
 src/js/directives/walletSelector.js    | 6 +++++-
 www/views/includes/walletSelector.html | 9 ++++++---
 www/views/tab-receive.html             | 3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/js/directives/walletSelector.js b/src/js/directives/walletSelector.js
index 256a2c20d..d747ef3e4 100644
--- a/src/js/directives/walletSelector.js
+++ b/src/js/directives/walletSelector.js
@@ -2,6 +2,9 @@
 
 angular.module('copayApp.directives')
   .directive('walletSelector', function($rootScope, $timeout, configService) {
+
+    console.log("walletSelector");
+
     return {
       restrict: 'E',
       templateUrl: 'views/includes/walletSelector.html',
@@ -11,7 +14,8 @@ angular.module('copayApp.directives')
         show: '=walletSelectorShow',
         wallets: '=walletSelectorWallets',
         selectedWallet: '=walletSelectorSelectedWallet',
-        onSelect: '=walletSelectorOnSelect'
+        onSelect: '=walletSelectorOnSelect',
+        displayBalanceAsFiat : '=walletSelectorDisplayBalanceAsFiat'
       },
       link: function(scope, element, attrs) {
         scope.hide = function() {
diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html
index a53d1c7f1..71ca11a8b 100644
--- a/www/views/includes/walletSelector.html
+++ b/www/views/includes/walletSelector.html
@@ -2,7 +2,8 @@
   <img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
 
   <span ng-repeat="wallet in wallets track by $index"
-    ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)"></span>
+    ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)">
+  </span>
 
   <div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
 
@@ -26,7 +27,8 @@
               Incomplete
             </span>
             <span ng-if="wallet.isComplete()">
-              <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+              <span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
+              <span ng-if="(!displayBalanceAsFiat) && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
               <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
             </span>
           </span>
@@ -57,7 +59,8 @@
               Incomplete
             </span>
             <span ng-if="wallet.isComplete()">
-              <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+              <span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
+              <span ng-if="(!displayBalanceAsFiat) && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
               <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
             </span>
           </span>
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 23e61b069..cb53dc8e9 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -114,6 +114,7 @@
   wallet-selector-wallets="wallets"
   wallet-selector-selected-wallet="wallet"
   wallet-selector-show="showWallets"
-  wallet-selector-on-select="onWalletSelect">
+  wallet-selector-on-select="onWalletSelect"
+  wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
 </wallet-selector>
 </ion-view>