karangupta-dev
diff --git a/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.html‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.html
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.html‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.html
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.ts‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.ts
+19-2Lines changed: 19 additions & 2 deletions b/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.ts‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.ts
+19-2Lines changed: 19 additions & 2 deletions
@@ -43,7 +43,7 @@ <h3 class="panel-title">Signup to {{title}}</h3>
               <div class="register-input-item">
                 <input type="password" class="register-user-input-password register-user-input" name="password_confirmation" formControlName="password_confirmation"
                   placeholder="Confirm Password" autocomplete="off">
-                <div *ngIf="signUpForm.get('password_confirmation').errors && signUpForm.get('password_confirmation').touched">
+                <div *ngIf="(signUpForm.get('password_confirmation').errors || signUpForm.hasError('mismatchedPasswords')) && signUpForm.get('password_confirmation').touched">
                   <span class="register-error-icon">!</span>
                   <p class="register-error-message">{{signUpForm.get('password_confirmation').errors.msg || 'Password must match'}}</p>
                 </div>
 
@@ -73,8 +73,9 @@ export class SignUpComponent implements OnInit, OnDestroy {
       'password': [password, Validators.compose([Validators.required, Validators.minLength(6)]) ],
       'password_confirmation': [password_confirmation, Validators.compose([Validators.required, Validators.minLength(6)]) ],
       'mobile': [mobile, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10),Validators.pattern('[0-9]{10}')]) ],    
-      'gender': [gender, Validators.required],
-    });
+      'gender': [gender, Validators.required]
+    },{validator: this.matchingPasswords('password', 'password_confirmation')}
+	);
   }
 
   redirectIfUserLoggedIn() {
@@ -88,4 +89,20 @@ export class SignUpComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     if (this.registerSubs) { this.registerSubs.unsubscribe(); }
   }
+  
+  matchingPasswords(passwordKey: string, confirmPasswordKey: string) {
+  return (group: FormGroup): {[key: string]: any} => {
+    let password = group.controls[passwordKey];
+    let confirmPassword = group.controls[confirmPasswordKey];
+    
+    if (password.value !== confirmPassword.value) {
+      return {
+        mismatchedPasswords: true		
+      };
+    }
+  }
+}
+
+  
+  
 }