From 8233aae013cea6e0488578913c1ce7d065a829e0 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Thu, 12 Oct 2017 15:05:46 -0300 Subject: [PATCH] rename providers - use default values --- src/pages/add/join-wallet/join-wallet.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/add/join-wallet/join-wallet.ts b/src/pages/add/join-wallet/join-wallet.ts index 7aabe0cf1..ffc08550d 100644 --- a/src/pages/add/join-wallet/join-wallet.ts +++ b/src/pages/add/join-wallet/join-wallet.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { NavController } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { AppProvider } from '../../../providers/app/app'; -import * as _ from 'lodash'; +import { DerivationPathHelperProvider } from '../../../providers/derivationPathHelper/derivationPathHelper'; +import { ConfigProvider } from '../../../providers/config/config'; @Component({ selector: 'page-join-wallet', @@ -14,23 +14,23 @@ export class JoinWalletPage implements OnInit{ public showAdvOpts: boolean; public seedOptions: any; - private appName: string; private derivationPathByDefault: string; private derivationPathForTestnet: string; private joinForm: FormGroup; constructor( public navCtrl: NavController, - private app: AppProvider, - private fb: FormBuilder + private form: FormBuilder, + private pathHelper: DerivationPathHelperProvider, + private configProvider: ConfigProvider, ) { - this.derivationPathByDefault = "m/44'/0'/0'"; - this.derivationPathForTestnet = "m/44'/1'/0'"; + this.derivationPathByDefault = this.pathHelper.default; + this.derivationPathForTestnet = this.pathHelper.defaultTestnet; this.showAdvOpts = false; this.formData = { copayerName: null, invitationCode: null, - bwsURL: 'https://bws.bitpay.com/bws/api', + bwsURL: this.configProvider.get()['bws']['url'], recoveryPhrase: null, addPassword: false, password: null, @@ -53,7 +53,7 @@ export class JoinWalletPage implements OnInit{ } ngOnInit() { - this.joinForm = this.fb.group({ + this.joinForm = this.form.group({ copayerName: ['', Validators.required], invitationCode: ['', Validators.required], bwsURL: [''],