anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Display fiat on Payment Received screen, according to preferences.

Browse source
This commit is contained in:
Brendon Duncan 2018-06-13 15:56:39 +12:00
commit a6d2799510
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/tab-receive.js
View file

@ -125,6 +125,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
for (var i = 0; i < data.x.out.length; i++) { for (var i = 0; i < data.x.out.length; i++) {
if (data.x.out[i].addr == watchAddress) { if (data.x.out[i].addr == watchAddress) {
$scope.paymentReceivedAmount = txFormatService.formatAmount(data.x.out[i].value, 'full'); $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; $scope.paymentReceivedCoin = $scope.wallet.coin;

3
www/views/tab-receive.html
View file

@ -61,7 +61,8 @@
</svg> </svg>
<p class="success animated fadeIn"> <p class="success animated fadeIn">
<br/>Payment Received! <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/> Return To Address<br/>
</p> </p>
</div> </div>