diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 044130e51..c002c4ce6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -26,6 +26,7 @@ import { CopayApp } from './app.component'; /* Pages */ import { AddPage } from '../pages/add/add'; import { CreateWalletPage } from '../pages/add/create-wallet/create-wallet'; +import { ImportWalletPage } from '../pages/add/import-wallet/import-wallet'; import { BackupRequestPage } from '../pages/onboarding/backup-request/backup-request'; import { DisclaimerPage } from '../pages/onboarding/disclaimer/disclaimer'; import { EmailPage } from '../pages/onboarding/email/email'; @@ -69,6 +70,7 @@ import { TouchIdProvider } from '../providers/touchid/touchid'; import { TxFormatProvider } from '../providers/tx-format/tx-format'; import { WalletProvider } from '../providers/wallet/wallet'; import { ReleaseProvider } from '../providers/release/release'; +import { DerivationPathHelperProvider } from '../providers/derivationPathHelper/derivationPathHelper'; export function createTranslateLoader(http: Http) { return new TranslatePoHttpLoader(http, 'assets/i18n', '.po'); @@ -77,6 +79,7 @@ export function createTranslateLoader(http: Http) { let pages: any = [ AddPage, CreateWalletPage, + ImportWalletPage, AboutPage, AdvancedPage, AltCurrencyPage, @@ -121,6 +124,7 @@ let providers: any = [ TxFormatProvider, WalletProvider, ReleaseProvider, + DerivationPathHelperProvider, { provide: ErrorHandler, useClass: IonicErrorHandler diff --git a/src/pages/add/add.ts b/src/pages/add/add.ts index 021d332bc..9360f4483 100644 --- a/src/pages/add/add.ts +++ b/src/pages/add/add.ts @@ -1,6 +1,7 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; import { CreateWalletPage } from "./create-wallet/create-wallet"; +import { ImportWalletPage } from "./import-wallet/import-wallet"; @Component({ selector: 'page-add', @@ -22,6 +23,6 @@ export class AddPage { } goToImportWallet() { - // this.navCtrl.push(); + this.navCtrl.push(ImportWalletPage); } } diff --git a/src/pages/add/import-wallet/import-wallet.html b/src/pages/add/import-wallet/import-wallet.html new file mode 100644 index 000000000..d3da44e2d --- /dev/null +++ b/src/pages/add/import-wallet/import-wallet.html @@ -0,0 +1,63 @@ + + + Import wallet + + + + +
+
Recovery phrase
+
File/Text
+
+ +
+ + Type the recovery phrase (usually 12 words) + + + +
+ + Choose a backup file from your computer + + + + + Password + + +
+ + + + + Show advanced options + Hide advanced options + + +
+
+ + Password + + + + + Derivation path + + + + + Testnet + + +
+ + + Wallet service URL + + +
+ +
+
\ No newline at end of file diff --git a/src/pages/add/import-wallet/import-wallet.scss b/src/pages/add/import-wallet/import-wallet.scss new file mode 100644 index 000000000..4b6cb4371 --- /dev/null +++ b/src/pages/add/import-wallet/import-wallet.scss @@ -0,0 +1,14 @@ +.tabs { + display: flex; + text-align: center; + padding-top: 13px; + padding-bottom: 13px; +} + +.tab { + width: 100%; +} + +.selected { + border-bottom: 2px solid; +} \ No newline at end of file diff --git a/src/pages/add/import-wallet/import-wallet.ts b/src/pages/add/import-wallet/import-wallet.ts new file mode 100644 index 000000000..8454056d7 --- /dev/null +++ b/src/pages/add/import-wallet/import-wallet.ts @@ -0,0 +1,100 @@ +import { Component, OnInit } from '@angular/core'; +import { NavController } from 'ionic-angular'; +import { Validators, FormBuilder, FormGroup } from '@angular/forms'; + +import { BwcProvider } from '../../../providers/bwc/bwc'; +import { WalletProvider } from '../../../providers/wallet/wallet'; +import { DerivationPathHelperProvider } from '../../../providers/derivationPathHelper/derivationPathHelper'; +import { ConfigProvider } from '../../../providers/config/config'; + +@Component({ + selector: 'page-import-wallet', + templateUrl: 'import-wallet.html' +}) +export class ImportWalletPage implements OnInit{ + public formData: any; + public showAdvOpts: boolean; + public selectedTab: string; + public seedOptions: any; + + private derivationPathByDefault: string; + private derivationPathForTestnet: string; + private importForm: FormGroup; + + constructor( + public navCtrl: NavController, + private form: FormBuilder, + private bwc: BwcProvider, + private pathHelper: DerivationPathHelperProvider, + private walletProvider: WalletProvider, + private configProvider: ConfigProvider, + ) { + this.selectedTab = 'words'; + this.derivationPathByDefault = this.pathHelper.default; + this.derivationPathForTestnet = this.pathHelper.defaultTestnet; + this.showAdvOpts = false; + this.formData = { + words: null, + mnemonicPassword: null, + file: null, + filePassword: null, + derivationPath: this.derivationPathByDefault, + testnet: false, + bwsURL: this.configProvider.get()['bws']['url'], + }; + } + + ngOnInit() { + this.importForm = this.form.group({ + words: ['', Validators.required], + mnemonicPassword: [''], + file: [''], + filePassword: [''], + derivationPath: [''], + testnet: [''], + bwsURL: [''], + }); + } + + selectTab(tab: string) { + this.selectedTab = tab; + + switch (tab) { + case 'words': + this.importForm.get('words').setValidators([Validators.required]); + this.importForm.get('file').clearValidators(); + this.importForm.get('filePassword').clearValidators(); + break; + case 'file': + this.importForm.get('file').setValidators([Validators.required]); + this.importForm.get('filePassword').setValidators([Validators.required]); + this.importForm.get('words').clearValidators(); + break; + + default: + this.importForm.get('words').clearValidators(); + this.importForm.get('file').clearValidators(); + this.importForm.get('filePassword').clearValidators(); + break; + } + this.importForm.get('words').updateValueAndValidity(); + this.importForm.get('file').updateValueAndValidity(); + this.importForm.get('filePassword').updateValueAndValidity(); + } + + setDerivationPath() { + this.formData.derivationPath = this.formData.testnet ? this.derivationPathForTestnet : this.derivationPathByDefault; + } + + normalizeMnemonic(words: string) { + if (!words || !words.indexOf) return words; + var isJA = words.indexOf('\u3000') > -1; + var wordList = words.split(/[\u3000\s]+/); + + return wordList.join(isJA ? '\u3000' : ' '); + }; + + import() { + console.log(this.formData); + } +} diff --git a/src/providers/derivationPathHelper/derivationPathHelper.ts b/src/providers/derivationPathHelper/derivationPathHelper.ts new file mode 100644 index 000000000..763a33306 --- /dev/null +++ b/src/providers/derivationPathHelper/derivationPathHelper.ts @@ -0,0 +1,59 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class DerivationPathHelperProvider { + public default: string; + public defaultTestnet: string; + + public constructor() { + this.default = "m/44'/0'/0'"; + this.defaultTestnet = "m/44'/1'/0'"; + } + + parse(str: string) { + var arr = str.split('/'); + var ret = { + derivationStrategy: '', + networkName: '', + account: 0 + }; + + if (arr[0] != 'm') + return false; + + switch (arr[1]) { + case "44'": + ret.derivationStrategy = 'BIP44'; + break; + case "45'": + return { + derivationStrategy: 'BIP45', + networkName: 'livenet', + account: 0, + } + case "48'": + ret.derivationStrategy = 'BIP48'; + break; + default: + return false; + }; + + switch (arr[2]) { + case "0'": + ret.networkName = 'livenet'; + break; + case "1'": + ret.networkName = 'testnet'; + break; + default: + return false; + }; + + var match = arr[3].match(/(\d+)'/); + if (!match) + return false; + ret.account = +match[1] + + return ret; + }; +} \ No newline at end of file