fix handling of Change Password button

elastic · Apr 15, 2019 · 08b0ac5 · 08b0ac5
1 parent 670a28a
commit 08b0ac5
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...ugins/security/public/components/management/change_password_form/change_password_form.tsx b/...ugins/security/public/components/management/change_password_form/change_password_form.tsx
@@ -173,15 +173,14 @@ export class ChangePasswordForm extends Component<Props, State> {
   };
 
   private onChangePasswordClick = async () => {
-    const { isInvalid } = this.validateForm();
+    this.setState({ shouldValidate: true, currentPasswordError: false }, () => {
+      const { isInvalid } = this.validateForm();
+      if (isInvalid) {
+        return;
+      }
 
-    this.setState({ shouldValidate: true, currentPasswordError: false });
-
-    if (isInvalid) {
-      return;
-    }
-
-    this.setState({ changeInProgress: true }, () => this.performPasswordChange());
+      this.setState({ changeInProgress: true }, () => this.performPasswordChange());
+    });
   };
 
   private validateCurrentPassword = (shouldValidate = this.state.shouldValidate) => {