RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put loading flag back in; readded click on denomination selection

Browse Source
This commit is contained in:
Darren Nelsen 2018-03-16 17:54:35 -04:00
parent 82d5641468
commit a345269a8d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/package.json
View File

@ -67,4 +67,4 @@
"node": ">=8" "node": ">=8"
}, },
"license": "MIT" "license": "MIT"
} }

2
app/src/components/denomination/denomination.html
View File

@ -16,6 +16,6 @@
<ion-item *ngFor="let unit of units"> <ion-item *ngFor="let unit of units">
<ion-label color="dark">{{ unit }}</ion-label> <ion-label color="dark">{{ unit }}</ion-label>
<ion-radio value="{{ unit }}"></ion-radio> <ion-radio value="{{ unit }}" (click)="close()"></ion-radio>
</ion-item> </ion-item>
</ion-list> </ion-list>

6
app/src/providers/currency/currency.ts
View File

@ -17,12 +17,12 @@ export class CurrencyProvider {
public factor: number = 1; public factor: number = 1;
private bitstamp: number; private bitstamp: number;
private kraken: number; private kraken: number;
private loading: boolean;
constructor(public http: Http, private api: ApiProvider) { constructor(public http: Http, private api: ApiProvider) {
// TODO Make this an API call // TODO Make this an API call
this.defaultCurrency = 'BTC'; this.defaultCurrency = 'BTC';
this.currencySymbol = this.defaultCurrency; this.currencySymbol = this.defaultCurrency;
} }
public roundFloat(aFloat: number, decimalPlaces: number): number { public roundFloat(aFloat: number, decimalPlaces: number): number {
@ -87,9 +87,11 @@ export class CurrencyProvider {
} else if (currencyParsed.data.kraken) { } else if (currencyParsed.data.kraken) {
this.factor = this.kraken = currencyParsed.data.kraken; this.factor = this.kraken = currencyParsed.data.kraken;
} }
this.loading = false;
}, },
(err) => { (err) => {
console.log('err is', err); this.loading = false;
console.error('err getting currency', err);
} }
); );
} else if (currency === 'm' + this.defaultCurrency) { } else if (currency === 'm' + this.defaultCurrency) {