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

Wallet balance display on the Receive tab now adheres to the Price Display setting.

Browse source
This commit is contained in:
Brendon Duncan 2018-05-24 11:54:58 -07:00
commit e5734cf083
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

@ -13,6 +13,8 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
var currentAddressSocket = {}; var currentAddressSocket = {};
var paymentSubscriptionObj = { op:"addr_sub" } var paymentSubscriptionObj = { op:"addr_sub" }
$scope.displayBalanceAsFiat = true;
$scope.requestSpecificAmount = function() { $scope.requestSpecificAmount = function() {
$state.go('tabs.paymentRequest.amount', { $state.go('tabs.paymentRequest.amount', {
id: $scope.wallet.credentials.walletId, id: $scope.wallet.credentials.walletId,
@ -211,6 +213,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
if ($scope.wallet && walletId == $scope.wallet.id && type == 'NewIncomingTx') $scope.setAddress(true); if ($scope.wallet && walletId == $scope.wallet.id && type == 'NewIncomingTx') $scope.setAddress(true);
}) })
]; ];
configService.whenAvailable(function(config) {
$scope.displayBalanceAsFiat = config.wallet.settings.priceDisplay === 'fiat';
});
}); });
$scope.$on("$ionicView.enter", function(event, data) { $scope.$on("$ionicView.enter", function(event, data) {

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

@ -94,7 +94,8 @@
{{wallet.name || wallet.id}} {{wallet.name || wallet.id}}
</span> </span>
<p> <p>
<span ng-if="!wallet.balanceHidden"> {{wallet.status.totalBalanceStr}} </span> <span ng-if="displayBalanceAsFiat && !wallet.balanceHidden" translate> {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} </span>
<span ng-if="(!displayBalanceAsFiat) && !wallet.balanceHidden"> {{wallet.status.totalBalanceStr}} </span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span> <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1"> <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">