BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: config provider

This commit is contained in:
Gabriel Masclef 2017-09-27 15:09:15 -03:00
parent 6111439ef0
commit bd96b2cdae
No known key found for this signature in database
GPG Key ID: DD6D7EAADE12280D
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/providers/tx-format/tx-format.ts
View File

@ -11,23 +11,21 @@ import * as _ from "lodash";
export class TxFormatProvider { export class TxFormatProvider {
// TODO: implement configService // TODO: implement configService
public config: any;
public pendingTxProposalsCountForUs: number public pendingTxProposalsCountForUs: number
constructor( constructor(
public http: Http, public http: Http,
private bwc: BwcProvider, private bwc: BwcProvider,
private rate: RateProvider, private rate: RateProvider,
private configProvider: ConfigProvider, private config: ConfigProvider,
private filter: FilterProvider private filter: FilterProvider
) { ) {
console.log('Hello TxFormatProvider Provider'); console.log('Hello TxFormatProvider Provider');
console.log("configProvider", this.configProvider.get()); console.log("configProvider", this.config.get());
} }
formatAmount(satoshis: number, fullPrecision?: boolean) { formatAmount(satoshis: number, fullPrecision?: boolean) {
this.config = this.configProvider.get(); let settings = this.config.get()['wallet']['settings']; // TODO
var settings = this.config.wallet.settings;
if (settings.unitCode == 'sat') return satoshis; if (settings.unitCode == 'sat') return satoshis;
@ -66,8 +64,7 @@ export class TxFormatProvider {
formatAlternativeStr(coin: string, satoshis: number) { formatAlternativeStr(coin: string, satoshis: number) {
return new Promise ((resolve, reject) => { return new Promise ((resolve, reject) => {
if (isNaN(satoshis)) resolve(); if (isNaN(satoshis)) resolve();
this.config = this.configProvider.get(); let settings = this.config.get()['wallet']['settings']; // TODO
var settings = this.config.wallet.settings;
var v1 = parseFloat((this.rate.toFiat(satoshis, settings.alternativeIsoCode, coin)).toFixed(2)); var v1 = parseFloat((this.rate.toFiat(satoshis, settings.alternativeIsoCode, coin)).toFixed(2));
var v1FormatFiat = this.filter.formatFiatAmount(v1); var v1FormatFiat = this.filter.formatFiatAmount(v1);
@ -146,6 +143,7 @@ export class TxFormatProvider {
coin: "btc", coin: "btc",
copayerId: "asdasdasdasd" copayerId: "asdasdasdasd"
} }
// hardcoded tx.wallet ^
if (!tx.wallet) { if (!tx.wallet) {
@ -179,8 +177,7 @@ export class TxFormatProvider {
}; };
parseAmount(coin: string, amount: any, currency: string) { parseAmount(coin: string, amount: any, currency: string) {
this.config = this.configProvider.get(); let settings = this.config.get()['wallet']['settings']; // TODO
var settings = this.config.wallet.settings;
var satToBtc = 1 / 100000000; var satToBtc = 1 / 100000000;
var unitToSatoshi = settings.unitToSatoshi; var unitToSatoshi = settings.unitToSatoshi;
@ -216,8 +213,7 @@ export class TxFormatProvider {
}; };
satToUnit(amount: any) { satToUnit(amount: any) {
this.config = this.configProvider.get(); let settings = this.config.get()['wallet']['settings']; // TODO
var settings = this.config.wallet.settings;
var unitToSatoshi = settings.unitToSatoshi; var unitToSatoshi = settings.unitToSatoshi;
var satToUnit = 1 / unitToSatoshi; var satToUnit = 1 / unitToSatoshi;