From a345269a8d3baaa9986a26f1360e36762b4acba1 Mon Sep 17 00:00:00 2001 From: Darren Nelsen Date: Fri, 16 Mar 2018 17:54:35 -0400 Subject: [PATCH] put loading flag back in; readded click on denomination selection --- app/package.json | 2 +- app/src/components/denomination/denomination.html | 2 +- app/src/providers/currency/currency.ts | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/package.json b/app/package.json index 7cbe5da..b65e0b3 100644 --- a/app/package.json +++ b/app/package.json @@ -67,4 +67,4 @@ "node": ">=8" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/app/src/components/denomination/denomination.html b/app/src/components/denomination/denomination.html index 95b29fa..b3f0a8f 100644 --- a/app/src/components/denomination/denomination.html +++ b/app/src/components/denomination/denomination.html @@ -16,6 +16,6 @@ {{ unit }} - + diff --git a/app/src/providers/currency/currency.ts b/app/src/providers/currency/currency.ts index 4ff2505..e0f4680 100644 --- a/app/src/providers/currency/currency.ts +++ b/app/src/providers/currency/currency.ts @@ -17,12 +17,12 @@ export class CurrencyProvider { public factor: number = 1; private bitstamp: number; private kraken: number; + private loading: boolean; constructor(public http: Http, private api: ApiProvider) { // TODO Make this an API call this.defaultCurrency = 'BTC'; this.currencySymbol = this.defaultCurrency; - } public roundFloat(aFloat: number, decimalPlaces: number): number { @@ -87,9 +87,11 @@ export class CurrencyProvider { } else if (currencyParsed.data.kraken) { this.factor = this.kraken = currencyParsed.data.kraken; } + this.loading = false; }, (err) => { - console.log('err is', err); + this.loading = false; + console.error('err getting currency', err); } ); } else if (currency === 'm' + this.defaultCurrency) {