- {{wallet.status && wallet.status.totalBalanceStr ? (wallet.status.totalBalanceStr) : (
+ {{wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr ? (wallet.cachedStatus.totalBalanceStr) : (
wallet.cachedBalance ? wallet.cachedBalance
+ (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo)
:
@@ -232,7 +232,7 @@
[
Balance Hidden]
1">{{wallet.credentials.m}}-of-{{wallet.credentials.n}}
-
+
{{wallet.error}}
@@ -289,4 +289,4 @@
-
\ No newline at end of file
+
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
index 7aa5bc7681..372e15e951 100644
--- a/src/pages/home/home.ts
+++ b/src/pages/home/home.ts
@@ -473,11 +473,11 @@ console.log('[home.ts.130:ionViewDidEnter:]'); // TODO
this.walletProvider
.getStatus(wallet, opts)
.then(status => {
- wallet.status = status;
+ wallet.cachedStatus = status;
wallet.error = null;
this.profileProvider.setLastKnownBalance(
wallet.id,
- wallet.status.availableBalanceStr
+ wallet.cachedStatus.availableBalanceStr
);
// Update txps
@@ -489,7 +489,7 @@ console.log('[home.ts.130:ionViewDidEnter:]'); // TODO
//
} else {
wallet.error = err;
- wallet.status = null;
+ wallet.cachedStatus = null;
this.logger.error(err);
}
@@ -519,7 +519,7 @@ console.log('[home.ts.130:ionViewDidEnter:]'); // TODO
return this.walletProvider
.getStatus(wallet, {})
.then(async status => {
- wallet.status = status;
+ wallet.cachedStatus = status;
wallet.error = null;
if (!foundMessage && !_.isEmpty(status.serverMessages)) {
@@ -536,7 +536,7 @@ console.log('[home.ts.130:ionViewDidEnter:]'); // TODO
this.profileProvider.setLastKnownBalance(
wallet.id,
- wallet.status.availableBalanceStr
+ wallet.cachedStatus.availableBalanceStr
);
return Promise.resolve();
})
diff --git a/src/pages/paper-wallet/paper-wallet.html b/src/pages/paper-wallet/paper-wallet.html
index 3f30658e5f..449b989f0c 100644
--- a/src/pages/paper-wallet/paper-wallet.html
+++ b/src/pages/paper-wallet/paper-wallet.html
@@ -24,7 +24,7 @@
{{wallet.name}}
1">{{wallet.credentials.m}}-{{wallet.credentials.n}}
- {{wallet.status.totalBalanceStr}}
+ {{wallet.cachedStatus.totalBalanceStr}}
[Balance Hidden]
{{error}}
@@ -43,4 +43,4 @@
{{wallet.name}}
{{'Sweep' | translate}}
-
\ No newline at end of file
+
diff --git a/src/pages/receive/receive.html b/src/pages/receive/receive.html
index de45171fe4..665a613d2a 100644
--- a/src/pages/receive/receive.html
+++ b/src/pages/receive/receive.html
@@ -13,9 +13,9 @@
-
-
\ No newline at end of file
+
diff --git a/src/pages/send/amount/amount.html b/src/pages/send/amount/amount.html
index b3fecf48ec..90487408d2 100644
--- a/src/pages/send/amount/amount.html
+++ b/src/pages/send/amount/amount.html
@@ -8,9 +8,9 @@
{{wallet && wallet.name || ('Amount' | translate)}}
-