diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a3115d54c..f6fff74bd 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService, feeService, appConfigService) { +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService, feeService, appConfigService, rateService) { var HISTORY_SHOW_LIMIT = 10; var currentTxHistoryPage = 0; @@ -182,7 +182,16 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun } applyCurrencyAliases(txHistory); - $scope.completeTxHistory = txHistory; + + var config = configService.getSync(); + var fiatCode = config.wallet.settings.alternativeIsoCode; + lodash.each(txHistory, function(t) { + var r = rateService.toFiat(t.amount, fiatCode, $scope.wallet.coin); + t.alternativeAmountStr = r.toFixed(2) + ' ' + fiatCode; + }); + + $scope.completeTxHistory = txHistory; + $scope.showHistory(); $timeout(function() { $scope.$apply(); diff --git a/www/views/includes/walletHistory.html b/www/views/includes/walletHistory.html index ac6db0f72..85537663d 100644 --- a/www/views/includes/walletHistory.html +++ b/www/views/includes/walletHistory.html @@ -22,6 +22,10 @@
{{btx.note.body}}
Received
+ +
Low fees @@ -40,6 +44,10 @@ {{addressbook[btx.addressTo].name || addressbook[btx.addressTo]}}
Sent
+ +
@@ -64,15 +72,14 @@ (possible double spend) - + {{btx.amountValueStr}} {{btx.amountUnitStr}}
- - + + {{btx.alternativeAmountStr}} +