rename providers - use default values

This commit is contained in:
JDonadio 2017-10-12 15:05:46 -03:00
parent 3fe3e93073
commit 8233aae013
No known key found for this signature in database
GPG Key ID: EC1F4E04B2BFA730
1 changed files with 9 additions and 9 deletions

View File

@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
import { NavController } from 'ionic-angular'; import { NavController } from 'ionic-angular';
import { Validators, FormBuilder, FormGroup } from '@angular/forms'; import { Validators, FormBuilder, FormGroup } from '@angular/forms';
import { AppProvider } from '../../../providers/app/app'; import { DerivationPathHelperProvider } from '../../../providers/derivationPathHelper/derivationPathHelper';
import * as _ from 'lodash'; import { ConfigProvider } from '../../../providers/config/config';
@Component({ @Component({
selector: 'page-join-wallet', selector: 'page-join-wallet',
@ -14,23 +14,23 @@ export class JoinWalletPage implements OnInit{
public showAdvOpts: boolean; public showAdvOpts: boolean;
public seedOptions: any; public seedOptions: any;
private appName: string;
private derivationPathByDefault: string; private derivationPathByDefault: string;
private derivationPathForTestnet: string; private derivationPathForTestnet: string;
private joinForm: FormGroup; private joinForm: FormGroup;
constructor( constructor(
public navCtrl: NavController, public navCtrl: NavController,
private app: AppProvider, private form: FormBuilder,
private fb: FormBuilder private pathHelper: DerivationPathHelperProvider,
private configProvider: ConfigProvider,
) { ) {
this.derivationPathByDefault = "m/44'/0'/0'"; this.derivationPathByDefault = this.pathHelper.default;
this.derivationPathForTestnet = "m/44'/1'/0'"; this.derivationPathForTestnet = this.pathHelper.defaultTestnet;
this.showAdvOpts = false; this.showAdvOpts = false;
this.formData = { this.formData = {
copayerName: null, copayerName: null,
invitationCode: null, invitationCode: null,
bwsURL: 'https://bws.bitpay.com/bws/api', bwsURL: this.configProvider.get()['bws']['url'],
recoveryPhrase: null, recoveryPhrase: null,
addPassword: false, addPassword: false,
password: null, password: null,
@ -53,7 +53,7 @@ export class JoinWalletPage implements OnInit{
} }
ngOnInit() { ngOnInit() {
this.joinForm = this.fb.group({ this.joinForm = this.form.group({
copayerName: ['', Validators.required], copayerName: ['', Validators.required],
invitationCode: ['', Validators.required], invitationCode: ['', Validators.required],
bwsURL: [''], bwsURL: [''],