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

Renamed directive and replaced old variable references with new ones.

Browse source
This commit is contained in:
Brendon Duncan 2018-09-18 15:26:30 -07:00
commit 4d6aeb4f91
2 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/directives/walletBalanceDirective.js → src/js/directives/wallet-balance.directive.js
View file

@ -12,6 +12,7 @@
totalBalanceSat: '@', totalBalanceSat: '@',
// The Wallet object is sometimes not stringify()-able, so not interpolatable, // The Wallet object is sometimes not stringify()-able, so not interpolatable,
// so can't be passed to a directive. // so can't be passed to a directive.
walletCoin: '@',
walletStatus: '@', walletStatus: '@',
walletCachedBalance: '@', walletCachedBalance: '@',
walletCachedBalanceUpdatedOn: '@', walletCachedBalanceUpdatedOn: '@',
@ -31,7 +32,6 @@
}); });
function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) { function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) {
console.log('displayCryptoBalance()');
if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) { if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) {
setDisplay(walletStatus.totalBalanceStr, ''); setDisplay(walletStatus.totalBalanceStr, '');
@ -52,7 +52,7 @@
setDisplay('', ''); setDisplay('', '');
} }
function displayFiatBalance(walletStatus, walletCachedStatus) { function displayFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
var displayAmount = ''; var displayAmount = '';
if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) { if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) {
displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode; displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode;
@ -66,7 +66,7 @@
return; return;
} }
getFiatBalance(wallet); getFiatBalance(walletStatus, walletCachedStatus, walletCoin);
} }
function formatBalance() { function formatBalance() {
@ -94,19 +94,30 @@
} }
if (displayAsFiat) { if (displayAsFiat) {
displayFiatBalance(walletStatusObj, walletCachedStatusObj); displayFiatBalance(walletStatusObj, walletCachedStatusObj, $scope.walletCoin);
} }
} }
function getFiatBalance(wallet) { function getFiatBalance(walletStatus, walletCachedStatus, walletCoin) {
if (!(wallet.status && wallet.status.isValid)) { var totalBalanceSat = null;
$log.warn('Abandoning call to get fiat balance, because no valid wallet status.');
if (walletStatus && walletStatus.isValid) {
totalBalanceSat = walletStatus.totalBalanceSat
} else if (walletCachedStatus && walletCachedStatus.isValid) {
totalBalanceSat = walletCachedStatus.totalBalanceSat
}
// 0 is valid
if (totalBalanceSat === null) {
$log.warn('Abandoning call to get fiat balance, because no valid wallet status (cached or otherwise).');
return; return;
} }
txFormatService.formatAlternativeStr(wallet.coin, wallet.status.totalBalanceSat, function onFormatAlernativeStr(formatted) { txFormatService.formatAlternativeStr(walletCoin, totalBalanceSat, function onFormatAlernativeStr(formatted) {
if (formatted) { if (formatted) {
setDisplay(formatted, ''); setDisplay(formatted, '');
} else {
$log.error('Failed to format fiat balance of wallet.');
} }
}); });
} }

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

@ -17,14 +17,13 @@
</i> </i>
<h2>{{fromWallet.name}}</h2> <h2>{{fromWallet.name}}</h2>
<wallet-balance <wallet-balance
display-as-fiat="{{displayBalanceAsFiat}}" display-as-fiat="{{displayBalanceAsFiat}}"
wallet-coin="{{fromWallet.coin}}"
wallet-status="{{fromWallet.status}}" wallet-status="{{fromWallet.status}}"
wallet-cached-balance="{{fromWallet.cachedBalance}}" wallet-cached-balance="{{fromWallet.cachedBalance}}"
wallet-cached-balance-updated-on="{{fromWallet.cachedBalanceUpdatedOn}}" wallet-cached-balance-updated-on="{{fromWallet.cachedBalanceUpdatedOn}}"
wallet-cached-status="{{fromWallet.cachedStatus}}" wallet-cached-status="{{fromWallet.cachedStatus}}"
total-balance-sat="{{fromWallet.status.totalBalanceSat}}"></wallet-balance> total-balance-sat="{{fromWallet.status.totalBalanceSat}}"></wallet-balance>
<!--<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>-->
</div> </div>
</div> </div>
</div> </div>