From a6d2799510849606d2a88942979ef1e73a78c37f Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Wed, 13 Jun 2018 15:56:39 +1200
Subject: [PATCH] Display fiat on Payment Received screen, according to
 preferences.

---
 src/js/controllers/tab-receive.js | 6 ++++++
 www/views/tab-receive.html        | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index c9fa46de9..4d048e22e 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -125,6 +125,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       for (var i = 0; i < data.x.out.length; i++) {
         if (data.x.out[i].addr == watchAddress) {
           $scope.paymentReceivedAmount = txFormatService.formatAmount(data.x.out[i].value, 'full');
+          $scope.paymentReceivedAlternativeAmount = null;  // For when a subsequent payment is received.
+          txFormatService.formatAlternativeStr($scope.wallet.coin, data.x.out[i].value, function(alternativeStr){
+            if (alternativeStr) {
+              $scope.paymentReceivedAlternativeAmount = alternativeStr;
+            }
+          });
         }
       }
       $scope.paymentReceivedCoin = $scope.wallet.coin;
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 0eb598096..a6b94b74e 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -61,7 +61,8 @@
           </svg>
           <p class="success animated fadeIn">
             <br/>Payment Received!
-            <span class="payment-received-amount">{{ paymentReceivedAmount }} <span class="payment-received-currency">{{ paymentReceivedCoin }}</span></span>
+            <span ng-if="!(displayBalanceAsFiat && paymentReceivedAlternativeAmount)" class="payment-received-amount">{{ paymentReceivedAmount }} <span class="payment-received-currency">{{ paymentReceivedCoin }}</span></span>
+            <span ng-if="displayBalanceAsFiat && paymentReceivedAlternativeAmount" class="payment-received-amount">{{ paymentReceivedAlternativeAmount }}</span></span>
             Return To Address<br/>
           </p>
         </div>