mirror of https://github.com/BTCPrivate/copay.git
Removes bitcoin unit
This commit is contained in:
parent
7693277fbe
commit
9474bf959d
|
@ -39,7 +39,6 @@ import { AppProvider } from '../providers/app/app';
|
||||||
import { PlatformProvider } from '../providers/platform/platform';
|
import { PlatformProvider } from '../providers/platform/platform';
|
||||||
import { ConfigProvider } from '../providers/config/config';
|
import { ConfigProvider } from '../providers/config/config';
|
||||||
import { LanguageProvider } from '../providers/language/language';
|
import { LanguageProvider } from '../providers/language/language';
|
||||||
import { UnitProvider } from '../providers/unit/unit';
|
|
||||||
import { ScanProvider } from '../providers/scan/scan';
|
import { ScanProvider } from '../providers/scan/scan';
|
||||||
|
|
||||||
export function createTranslateLoader(http: Http) {
|
export function createTranslateLoader(http: Http) {
|
||||||
|
@ -111,7 +110,6 @@ export function createTranslateLoader(http: Http) {
|
||||||
PlatformProvider,
|
PlatformProvider,
|
||||||
ConfigProvider,
|
ConfigProvider,
|
||||||
LanguageProvider,
|
LanguageProvider,
|
||||||
UnitProvider,
|
|
||||||
QRScanner,
|
QRScanner,
|
||||||
ScanProvider
|
ScanProvider
|
||||||
]
|
]
|
||||||
|
|
|
@ -41,15 +41,6 @@
|
||||||
<ion-option *ngFor="let lang of languages" [value]="lang.isoCode">{{ lang.name }}</ion-option>
|
<ion-option *ngFor="let lang of languages" [value]="lang.isoCode">{{ lang.name }}</ion-option>
|
||||||
</ion-select>
|
</ion-select>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item>
|
|
||||||
<ion-icon name="calculator" item-start></ion-icon>
|
|
||||||
<ion-label>
|
|
||||||
Bitcoin unit
|
|
||||||
</ion-label>
|
|
||||||
<ion-select [(ngModel)]="currentUnitCode" (ionChange)="setUnit(currentUnitCode)">
|
|
||||||
<ion-option *ngFor="let unit of unitList" [value]="unit.code">{{ unit.shortName }}</ion-option>
|
|
||||||
</ion-select>
|
|
||||||
</ion-item>
|
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-icon name="cash" item-start></ion-icon>
|
<ion-icon name="cash" item-start></ion-icon>
|
||||||
<ion-label>
|
<ion-label>
|
||||||
|
|
|
@ -3,7 +3,6 @@ import { NavController, NavParams } from 'ionic-angular';
|
||||||
|
|
||||||
import { AppProvider } from '../../providers/app/app';
|
import { AppProvider } from '../../providers/app/app';
|
||||||
import { LanguageProvider } from '../../providers/language/language';
|
import { LanguageProvider } from '../../providers/language/language';
|
||||||
import { UnitProvider } from '../../providers/unit/unit';
|
|
||||||
|
|
||||||
import { AboutPage } from './about/about';
|
import { AboutPage } from './about/about';
|
||||||
|
|
||||||
|
@ -14,23 +13,16 @@ import { AboutPage } from './about/about';
|
||||||
export class SettingsPage {
|
export class SettingsPage {
|
||||||
appName: string;
|
appName: string;
|
||||||
currentLanguage: string;
|
currentLanguage: string;
|
||||||
currentUnitCode: string;
|
|
||||||
unitList: Array<any>;
|
|
||||||
languages: Array<any>;
|
languages: Array<any>;
|
||||||
bitcoinUnit: Array<string>
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public navCtrl: NavController,
|
public navCtrl: NavController,
|
||||||
public navParams: NavParams,
|
public navParams: NavParams,
|
||||||
private app: AppProvider,
|
private app: AppProvider,
|
||||||
private language: LanguageProvider,
|
private language: LanguageProvider
|
||||||
private unit: UnitProvider
|
|
||||||
) {
|
) {
|
||||||
this.appName = this.app.info.nameCase;
|
this.appName = this.app.info.nameCase;
|
||||||
|
|
||||||
this.currentUnitCode = this.unit.getCode();
|
|
||||||
this.unitList = this.unit.getList();
|
|
||||||
|
|
||||||
this.currentLanguage = this.language.getCurrent();
|
this.currentLanguage = this.language.getCurrent();
|
||||||
this.languages = this.language.getAvailables();
|
this.languages = this.language.getAvailables();
|
||||||
}
|
}
|
||||||
|
@ -44,10 +36,6 @@ export class SettingsPage {
|
||||||
this.language.set(lang);
|
this.language.set(lang);
|
||||||
}
|
}
|
||||||
|
|
||||||
setUnit(code: string) {
|
|
||||||
this.unit.setUnit(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
openAboutPage() {
|
openAboutPage() {
|
||||||
this.navCtrl.push(AboutPage);
|
this.navCtrl.push(AboutPage);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import { Logger } from '@nsalaun/ng-logger';
|
||||||
import 'rxjs/add/operator/map';
|
import 'rxjs/add/operator/map';
|
||||||
|
|
||||||
import { LanguageProvider } from '../../providers/language/language';
|
import { LanguageProvider } from '../../providers/language/language';
|
||||||
import { UnitProvider } from '../../providers/unit/unit';
|
|
||||||
import { ConfigProvider } from '../../providers/config/config';
|
import { ConfigProvider } from '../../providers/config/config';
|
||||||
|
|
||||||
interface App {
|
interface App {
|
||||||
|
@ -52,7 +51,6 @@ export class AppProvider {
|
||||||
public http: Http,
|
public http: Http,
|
||||||
private logger: Logger,
|
private logger: Logger,
|
||||||
private language: LanguageProvider,
|
private language: LanguageProvider,
|
||||||
private unit: UnitProvider,
|
|
||||||
private config: ConfigProvider
|
private config: ConfigProvider
|
||||||
) {
|
) {
|
||||||
this.logger.info('AppProvider initialized.');
|
this.logger.info('AppProvider initialized.');
|
||||||
|
@ -64,7 +62,6 @@ export class AppProvider {
|
||||||
// storage -> config -> language -> unit -> app
|
// storage -> config -> language -> unit -> app
|
||||||
// Everything ok
|
// Everything ok
|
||||||
this.language.init(config);
|
this.language.init(config);
|
||||||
this.unit.init(config);
|
|
||||||
this.getInfo().subscribe((info) => {
|
this.getInfo().subscribe((info) => {
|
||||||
this.info = info;
|
this.info = info;
|
||||||
resolve(true);
|
resolve(true);
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
import { Injectable } from '@angular/core';
|
|
||||||
import { Logger } from '@nsalaun/ng-logger';
|
|
||||||
|
|
||||||
import { ConfigProvider } from '../../providers/config/config';
|
|
||||||
|
|
||||||
import * as _ from 'lodash';
|
|
||||||
|
|
||||||
interface Unit {
|
|
||||||
name: string;
|
|
||||||
shortName: string;
|
|
||||||
value: number;
|
|
||||||
decimals: number;
|
|
||||||
code: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class UnitProvider {
|
|
||||||
public info: Unit;
|
|
||||||
private unitList: Array<Unit> = [{
|
|
||||||
name: 'bits (1,000,000 bits = 1BTC)',
|
|
||||||
shortName: 'bits',
|
|
||||||
value: 100,
|
|
||||||
decimals: 2,
|
|
||||||
code: 'bit',
|
|
||||||
}, {
|
|
||||||
name: 'BTC',
|
|
||||||
shortName: 'BTC',
|
|
||||||
value: 100000000,
|
|
||||||
decimals: 8,
|
|
||||||
code: 'btc',
|
|
||||||
}];
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
private config: ConfigProvider,
|
|
||||||
private logger: Logger
|
|
||||||
) {
|
|
||||||
this.logger.info('UnitProvider initialized.');
|
|
||||||
}
|
|
||||||
|
|
||||||
private getItem(code: string) {
|
|
||||||
return _.find(this.unitList, {
|
|
||||||
'code': code
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
init(config: object) {
|
|
||||||
let code = config['wallet']['settings']['unitCode']; // TODO
|
|
||||||
this.info = this.getItem(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
getList() {
|
|
||||||
return this.unitList;
|
|
||||||
}
|
|
||||||
|
|
||||||
getCode() {
|
|
||||||
return this.info.code;
|
|
||||||
}
|
|
||||||
|
|
||||||
setUnit(code: string) {
|
|
||||||
this.info = this.getItem(code);
|
|
||||||
this.config.set({ wallet: { settings: this.info } });
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue