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

Merged error handling for wallet-balance.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-10 16:23:39 +12:00
commit 38b2d84f2e
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,11 @@
function formatBalance() { function formatBalance() {
var displayAsFiat = $scope.displayAsFiat === 'true'; var displayAsFiat = $scope.displayAsFiat === 'true';
if (!$scope.wallet) {
setDisplay('', '');
return;
}
var wallet = null; var wallet = null;
try { try {
wallet = JSON.parse($scope.wallet); wallet = JSON.parse($scope.wallet);

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>