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

wallet-balance directive retrieves alternative amount when needed.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-10 13:26:12 +12:00
commit d7285a72e4
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,7 @@
} }
}); });
function walletBalanceController($log, $scope, $timeout, uxLanguage) { function walletBalanceController($log, $scope, txFormatService) {
console.log('walletBalanceController');
var cryptoBalanceHasBeenDisplayed = false; var cryptoBalanceHasBeenDisplayed = false;
formatBalance(); formatBalance();
@ -29,7 +28,7 @@
function displayCryptoBalance(wallet) { function displayCryptoBalance(wallet) {
console.log('displayCryptoBalance()'); console.log('displayCryptoBalance()');
if (wallet.status && wallet.status.totalBalanceStr) { if (wallet.status && wallet.status.isValid && wallet.status.totalBalanceStr) {
setDisplay(wallet.status.totalBalanceStr, ''); setDisplay(wallet.status.totalBalanceStr, '');
cryptoBalanceHasBeenDisplayed = true; cryptoBalanceHasBeenDisplayed = true;
return; return;
@ -40,7 +39,7 @@
return; return;
} }
if (wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr) { if (wallet.cachedStatus && wallet.status.isValid && wallet.cachedStatus.totalBalanceStr) {
setDisplay(wallet.cachedStatus.totalBalanceStr, ''); setDisplay(wallet.cachedStatus.totalBalanceStr, '');
return; return;
} }
@ -50,13 +49,13 @@
function displayFiatBalance(wallet) { function displayFiatBalance(wallet) {
var displayAmount = ''; var displayAmount = '';
if (wallet.status && wallet.status.alternativeBalanceAvailable) { if (wallet.status && wallet.status.isValid && wallet.status.alternativeBalanceAvailable) {
displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode; displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode;
setDisplay(displayAmount, ''); setDisplay(displayAmount, '');
return; return;
} }
if (wallet.cachedStatus && wallet.cachedStatus.alternativeBalanceAvailable) { if (wallet.cachedStatus && wallet.cachedStatus.isValid && wallet.cachedStatus.alternativeBalanceAvailable) {
displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode; displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode;
setDisplay(displayAmount, ''); setDisplay(displayAmount, '');
return; return;
@ -66,15 +65,12 @@
} }
function formatBalance() { function formatBalance() {
//console.log('formatBalance() with wallet:', $scope.wallet,);
console.log('formatBalance() with displayAsFiat: "' + $scope.displayAsFiat + '"');
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);
$scope.displayAmount = ''; setDisplay('', '');
$scope.cachedBalanceUpdatedOn = '';
} }
if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) { if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) {
@ -87,6 +83,16 @@
} }
function getFiatBalance(wallet) { function getFiatBalance(wallet) {
if (!(wallet.status && wallet.status.isValid)) {
$log.warn('Abandoning call to get fiat balance, because no valid wallet status.');
return;
}
txFormatService.formatAlternativeStr(wallet.coin, wallet.status.totalBalanceSat, function onFormatAlernativeStr(formatted) {
if (formatted) {
setDisplay(formatted, '');
}
});
} }
function setDisplay(amount, cachedBalanceUpdatedOn) { function setDisplay(amount, cachedBalanceUpdatedOn) {