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

wallet-balance directive uses formatted-amount.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-10 13:48:59 +12:00
commit 82c0746ff8
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/directives/walletBalanceDirective.js
View file

@ -65,19 +65,21 @@
} }
function formatBalance() { function formatBalance() {
var displayAsFiat = $scope.displayAsFiat === 'true';
var wallet = null; var wallet = null;
try { try {
wallet = JSON.parse($scope.wallet); wallet = JSON.parse($scope.wallet);
} catch (e) { } catch (e) {
$log.error('Error parsing wallet to display balance.', e); $log.error('Error parsing wallet to display balance.', e);
setDisplay('', ''); setDisplay('', '');
return;
} }
if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) { if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
displayCryptoBalance(wallet); displayCryptoBalance(wallet);
} }
if ($scope.displayAsFiat) { if (displayAsFiat) {
displayFiatBalance(wallet); displayFiatBalance(wallet);
} }
} }

2
www/views/includes/wallet-balance.html
View file

@ -1,3 +1,3 @@
<div class="wallet-balance-directive"> <div class="wallet-balance-directive">
<span>{{displayAmount}}</span><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn * 1000 | amTimeAgo)}}</span> <formatted-amount value="{{displayAmount}}"></formatted-amount><span ng-if="age">{{&middot; (cachedBalanceUpdatedOn * 1000 | amTimeAgo)}}</span>
</div> </div>

2
www/views/tab-send.html
View file

@ -16,7 +16,7 @@
></div> ></div>
</i> </i>
<h2>{{fromWallet.name}}</h2> <h2>{{fromWallet.name}}</h2>
<wallet-balance display-as-fiat="{{displayBalanceAsFiat}}" wallet="{{fromWallet}}" total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance> <wallet-balance display-as-fiat={{displayBalanceAsFiat}} wallet={{fromWallet}} total-balance-sat={{fromWallet.status.totalBalanceSat}}></wallet-balance>
<!--<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>--> <!--<p ng-show="vm.origin.balanceAmount">{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}</p>-->
<!--<formatted-amount value="{{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}"></formatted-amount>--> <!--<formatted-amount value="{{fromWallet.status.totalBalanceStr ? fromWallet.status.totalBalanceStr : ( fromWallet.cachedBalance ? fromWallet.cachedBalance + (fromWallet.cachedBalanceUpdatedOn ? ' &middot; ' + ( fromWallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }}"></formatted-amount>-->
</div> </div>