Merge 203680b into 8fea5f4

particl · Jan 18, 2018 · f5c1c6f · f5c1c6f
2 parents 8fea5f4 + 203680b
commit f5c1c6f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/app/modals/createwallet/createwallet.component.ts b/src/app/modals/createwallet/createwallet.component.ts
@@ -36,7 +36,8 @@ export class CreateWalletComponent {
   words: string[];
   toggleShowPass: boolean = false;
 
-  @ViewChild('passphraseComponent') passphraseComponent: ComponentRef<PassphraseComponent>;
+  @ViewChild('passphraseComponent')
+    passphraseComponent: ComponentRef<PassphraseComponent>;
   @ViewChild('passwordElement') passwordElement: PasswordComponent;
   @ViewChild('passwordElementVerify') passwordElementVerify: PasswordComponent;
   @ViewChild('passwordRestoreElement') passwordRestoreElement: PasswordComponent;
@@ -127,7 +128,9 @@ export class CreateWalletComponent {
         this.passwordVerify = undefined;
         break;
       case 3:
-        this._passphraseService.generateMnemonic(this.mnemonicCallback.bind(this), this.password);
+        this._passphraseService.generateMnemonic(
+          this.mnemonicCallback.bind(this), this.password
+        );
         this.flashNotification.open(
           'Please remember to write down your recovery passphrase',
           'warning');
@@ -228,8 +231,9 @@ export class CreateWalletComponent {
   passwordFromEmitter(pass: IPassword, verify?: boolean) {
     this[verify ? 'passwordVerify' : 'password'] = pass.password;
     this.log.d(`passwordFromEmitter: ${this.password} ${verify}`);
-    if (!!this[verify ? 'password' : 'passwordVerify'] ||
-      this.password === '' && this.passwordVerify === '') {
+    if (!!this[verify ? 'password' : 'passwordVerify']
+      || this.password === '' && this.passwordVerify === ''
+      || this.password === undefined && this.passwordVerify === undefined) {
       this.verifyPasswords();
     }
   }