From f463b71ef8844918dc55d5455ff29505ba8cf899 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 8 Apr 2019 11:11:30 -0300 Subject: [PATCH] refactor cache -> cachedStatus --- .ignore | 2 ++ src/pages/add/copayers/copayers.ts | 6 +++--- src/pages/home/home.html | 14 +++++++------- src/pages/home/home.ts | 10 +++++----- src/pages/paper-wallet/paper-wallet.html | 4 ++-- src/pages/receive/receive.html | 10 +++++----- src/pages/send/amount/amount.html | 8 ++++---- src/pages/send/amount/amount.spec.ts | 2 +- src/pages/send/amount/amount.ts | 2 +- src/pages/send/confirm/confirm.ts | 2 +- src/pages/send/multi-send/multi-send.html | 8 ++++---- src/pages/send/send.html | 8 ++++---- src/pages/send/send.ts | 2 +- src/pages/txp-details/txp-details.ts | 2 +- 14 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 .ignore diff --git a/.ignore b/.ignore new file mode 100644 index 0000000000..346077acd1 --- /dev/null +++ b/.ignore @@ -0,0 +1,2 @@ +platforms +test diff --git a/src/pages/add/copayers/copayers.ts b/src/pages/add/copayers/copayers.ts index 90529d2105..0ee18bc318 100644 --- a/src/pages/add/copayers/copayers.ts +++ b/src/pages/add/copayers/copayers.ts @@ -115,9 +115,9 @@ export class CopayersPage { this.walletProvider .getStatus(this.wallet, {}) .then(status => { - this.wallet.status = status; - this.copayers = this.wallet.status.wallet.copayers; - this.secret = this.wallet.status.wallet.secret; + this.wallet.cachedStatus = status; + this.copayers = this.wallet.cachedStatus.wallet.copayers; + this.secret = this.wallet.cachedStatus.wallet.secret; if (status.wallet.status == 'complete') { this.wallet.openWallet(err => { if (err) this.logger.error(err); diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 352789cccf..db1b208331 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -118,7 +118,7 @@ - {{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) : @@ -128,7 +128,7 @@ [ Balance Hidden] {{wallet.credentials.m}}-of-{{wallet.credentials.n}} - +
{{wallet.error}}
 @@ -170,7 +170,7 @@ - {{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) : @@ -180,7 +180,7 @@ [ Balance Hidden] {{wallet.credentials.m}}-of-{{wallet.credentials.n}} - +
{{wallet.error}}
 @@ -222,7 +222,7 @@ - {{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] {{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}} {{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 @@ -
- {{wallet.status && wallet.status.totalBalanceStr}} - +
+ {{wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr}} +
[Balance Hidden] @@ -53,7 +53,7 @@ {{ address }}
-

- \ 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)}} -
- {{wallet.status && wallet.status.totalBalanceStr}} - +
+ {{wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr}} +
[Balance Hidden] @@ -56,4 +56,4 @@
- \ No newline at end of file + diff --git a/src/pages/send/amount/amount.spec.ts b/src/pages/send/amount/amount.spec.ts index e7f2337fcd..824b0826cc 100644 --- a/src/pages/send/amount/amount.spec.ts +++ b/src/pages/send/amount/amount.spec.ts @@ -38,7 +38,7 @@ describe('AmountPage', () => { instance.ionViewDidLoad(); instance.sendMax(); expect(instance.expression).toBe( - instance.wallet.status.availableBalanceSat / 1e8 + instance.wallet.cachedStatus.availableBalanceSat / 1e8 ); }); diff --git a/src/pages/send/amount/amount.ts b/src/pages/send/amount/amount.ts index 710f67c367..821253617a 100644 --- a/src/pages/send/amount/amount.ts +++ b/src/pages/send/amount/amount.ts @@ -326,7 +326,7 @@ export class AmountPage extends WalletTabsChild { return this.finish(); } const maxAmount = this.txFormatProvider.satToUnit( - this.wallet.status.availableBalanceSat + this.wallet.cachedStatus.availableBalanceSat ); this.zone.run(() => { this.expression = this.availableUnits[this.unitIndex].isFiat diff --git a/src/pages/send/confirm/confirm.ts b/src/pages/send/confirm/confirm.ts index 7d39e0242e..10e3ca59f3 100644 --- a/src/pages/send/confirm/confirm.ts +++ b/src/pages/send/confirm/confirm.ts @@ -289,7 +289,7 @@ export class ConfirmPage extends WalletTabsChild { .getStatus(wallet, {}) .then(status => { walletsUpdated++; - wallet.status = status; + wallet.cachedStatus = status; if (!status.availableBalanceSat) { this.logger.debug('No balance available in: ' + wallet.name); diff --git a/src/pages/send/multi-send/multi-send.html b/src/pages/send/multi-send/multi-send.html index dd2c38c652..cb9027d20c 100644 --- a/src/pages/send/multi-send/multi-send.html +++ b/src/pages/send/multi-send/multi-send.html @@ -3,9 +3,9 @@ {{wallet && wallet.name || ('Amount' | translate)}} -
- {{wallet.status && wallet.status.totalBalanceStr}} - +
+ {{wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr}} +
[Balance Hidden] @@ -86,4 +86,4 @@ To get started, you'll need to enter a valid address, contact or wallet.
- \ No newline at end of file + diff --git a/src/pages/send/send.html b/src/pages/send/send.html index a0c6c82961..d9891717aa 100644 --- a/src/pages/send/send.html +++ b/src/pages/send/send.html @@ -8,9 +8,9 @@ {{wallet && wallet.name || ('Amount' | translate)}} -
- {{wallet.status && wallet.status.totalBalanceStr}} - +
+ {{wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr}} +
[Balance Hidden] @@ -71,4 +71,4 @@ To get started, you'll need to create a bitcoin wallet and get some bitcoin.
- \ No newline at end of file + diff --git a/src/pages/send/send.ts b/src/pages/send/send.ts index 73b9f716ab..c92f952fef 100644 --- a/src/pages/send/send.ts +++ b/src/pages/send/send.ts @@ -83,7 +83,7 @@ export class SendPage extends WalletTabsChild { public shouldShowZeroState() { return ( - this.wallet && this.wallet.status && !this.wallet.status.totalBalanceSat + this.wallet && this.wallet.cachedStatus && !this.wallet.cachedStatus.totalBalanceSat ); } diff --git a/src/pages/txp-details/txp-details.ts b/src/pages/txp-details/txp-details.ts index 1a6dc05aa8..1be6c65ca5 100644 --- a/src/pages/txp-details/txp-details.ts +++ b/src/pages/txp-details/txp-details.ts @@ -91,7 +91,7 @@ export class TxpDetailsPage { this.currentSpendUnconfirmed = config.spendUnconfirmed; this.loading = false; this.isCordova = this.platformProvider.isCordova; - this.copayers = this.wallet.status.wallet.copayers; + this.copayers = this.wallet.cachedStatus.wallet.copayers; this.copayerId = this.wallet.credentials.copayerId; this.isShared = this.wallet.credentials.n > 1; this.canSign = this.wallet.canSign() || this.wallet.isPrivKeyExternal();