fix todo: hide recovery password box in step 3

particl · Nov 1, 2017 · e406864 · e406864
1 parent 8c5c836
commit e406864
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/src/app/modals/createwallet/createwallet.component.html b/src/app/modals/createwallet/createwallet.component.html
@@ -126,16 +126,26 @@
         <!--md-form-field class="wallet-name">
           <input mdInput [(ngModel)]="name" placeholder="Wallet name" readonly />
         </md-form-field-->
+        <div *ngIf="step === 2">
+          <app-password
+            #passwordElement
+            label="Recovery Password (optional)"
+            [emitPassword]="true"
+            (passwordEmitter)="passwordFromEmitter($event)"
+            [showStakeOnly]="false">
+          </app-password>
+        </div>
+
+        <!--
+          <app-password
+            #passwordComponent
+            label="Recovery Password (optional)"
+            [emitPassword]="true"
+            [isDisabled]="[3,4].indexOf(step) != -1"
+            (passwordEmitter)="passwordFromEmitter($event)"
+            [showStakeOnly]="false">
+          </app-password> -->
 
-        <!-- @TODO: can we hide this from step 3? -->
-        <app-password
-          #passwordComponent
-          label="Recovery Password (optional)"
-          [emitPassword]="true"
-          [isDisabled]="[3,4].indexOf(step) != -1"
-          (passwordEmitter)="passwordFromEmitter($event)"
-          [showStakeOnly]="false">
-        </app-password>
 
         <ng-template [ngIf]="[3,4].indexOf(step) != -1">
           <app-passphrase
@@ -155,7 +165,7 @@
           <button md-button (click)="prevStep()">
             Back
           </button>
-          <button md-raised-button color="primary" (click)="step === 2 && passwordComponent.sendPassword(); nextStep()"> <!-- TODO: Move sendPassword to .ts -->
+          <button md-raised-button color="primary" (click)="nextStep()"> <!-- TODO: Move sendPassword to .ts   -->
             Next
           </button>
         </div><!-- .actions -->

diff --git a/src/app/modals/createwallet/createwallet.component.scss b/src/app/modals/createwallet/createwallet.component.scss
@@ -34,7 +34,9 @@
 \* ------------------------------- */
 
 
-
+.invisible {
+  visibility: hidden;
+}
 
 
 

diff --git a/src/app/modals/createwallet/createwallet.component.ts b/src/app/modals/createwallet/createwallet.component.ts
@@ -1,6 +1,7 @@
 import { Component, Inject, forwardRef, ViewChild, ElementRef, ComponentRef, HostListener } from '@angular/core';
 import { Log } from 'ng2-logger';
 
+import { PasswordComponent } from '../shared/password/password.component';
 import { IPassword } from '../shared/password/password.interface';
 
 import { flyInOut, slideDown } from '../../core/core.animations';
@@ -37,6 +38,7 @@ export class CreateWalletComponent {
   words: string[];
 
   @ViewChild('passphraseComponent') passphraseComponent: ComponentRef<PassphraseComponent>;
+  @ViewChild('passwordElement') passwordElement: PasswordComponent;
 
   // Used for verification
   private wordsVerification: string[];
@@ -86,6 +88,11 @@ export class CreateWalletComponent {
   nextStep() {
     this.validating = true;
 
+    /* Recovery password entered */
+    if(this.step === 2) {
+      this.passwordElement.sendPassword();
+    }
+
     if (this.validate()) {
       this.animationState = 'next';
       this.validating = false;
@@ -94,6 +101,7 @@ export class CreateWalletComponent {
       this.doStep();
     }
 
+    this.log.d(`moving to step: ${this.step}`);
   }
 
   prevStep() {
@@ -180,10 +188,17 @@ export class CreateWalletComponent {
     return true;
   }
 
+  /**
+  * Triggered when the password is emitted from PasswordComponent
+  */
   passwordFromEmitter(pass: IPassword) {
     this.password = pass.password;
+    this.log.d(`passwordFromEmitter: ${this.password}`);
   }
 
+  /**
+  * Triggered when the password is emitted from PassphraseComponent
+  */
   wordsFromEmitter(words: string) {
     this.words = words.split(',');
   }

diff --git a/src/app/modals/shared/password/password.component.ts b/src/app/modals/shared/password/password.component.ts
@@ -74,10 +74,10 @@ export class PasswordComponent {
   clear() {
     this.password = undefined;
   }
-  /*
-    Emit password!
-  */
 
+  /**
+  * Emit password only!
+  */
   sendPassword() {
     const pass: IPassword = {
       password: this.password,