From e7ffbe0c335f365e562fa31096105510951f217e Mon Sep 17 00:00:00 2001 From: JDonadio Date: Tue, 7 Nov 2017 16:17:43 -0300 Subject: [PATCH] use the correct format for alternative balance --- src/pages/wallet-details/wallet-details.html | 2 +- src/pages/wallet-details/wallet-details.scss | 2 +- src/pages/wallet-details/wallet-details.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html index ab9623ea8..09da5cfd2 100644 --- a/src/pages/wallet-details/wallet-details.html +++ b/src/pages/wallet-details/wallet-details.html @@ -7,7 +7,7 @@
{{wallet.status.availableBalanceStr}}
-
{{alternativeBalanceStr}}
+
{{alternativeBalanceStr || '...'}}
diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index b9baf404c..e8b08dcce 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -24,7 +24,7 @@ page-wallet-details { font-weight: 600; } .balance-alt-str { - font-size: 25px; + font-size: 20px; font-weight: 500; } .label { diff --git a/src/pages/wallet-details/wallet-details.ts b/src/pages/wallet-details/wallet-details.ts index 987513be9..fda9c8f0b 100644 --- a/src/pages/wallet-details/wallet-details.ts +++ b/src/pages/wallet-details/wallet-details.ts @@ -22,7 +22,7 @@ export class WalletDetailsPage { console.log('Wallet incomplete'); return; }; - + this.alternativeBalanceStr = this.wallet.status.totalBalanceAlternative + ' ' + this.wallet.status.alternativeIsoCode; this.getTxHistory(); } @@ -31,9 +31,9 @@ export class WalletDetailsPage { } getTxHistory(force?: boolean) { + let self = this; this.walletProvider.getTxHistory_(this.wallet, {force: force}).then((txh) => { - this.wallet.completeHistory = txh; - this.alternativeBalanceStr = this.wallet.status.totalBalanceAlternative || '0.00' + ' USD'; //TODO use tx-format provider + self.wallet.completeHistory = txh; }).catch((err) => { console.log(err); });