Merge pull request #4607 from mananjadhav/fix/password-confirm-valida…

…tion Hide Password mismatch incase both the passwords are empty
Expensify · Aug 16, 2021 · 10a422a · 10a422a
2 parents f975fbd + a2c7678
commit 10a422a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
@@ -71,15 +71,15 @@ class PasswordPage extends Component {
 
         if (this.state.newPassword && this.state.confirmNewPassword && !this.doPasswordsMatch()) {
             stateToUpdate.shouldShowPasswordConfirmError = true;
+        } else {
+            stateToUpdate.shouldShowPasswordConfirmError = false;
         }
 
-        if (!isEmpty(stateToUpdate)) {
-            this.setState(stateToUpdate);
-        }
+        this.setState(stateToUpdate);
     }
 
     onBlurConfirmPassword() {
-        if (!this.state.confirmNewPassword || !this.doPasswordsMatch()) {
+        if ((this.state.newPassword && !this.state.confirmNewPassword) || !this.doPasswordsMatch()) {
             this.setState({shouldShowPasswordConfirmError: true});
         } else {
             this.setState({shouldShowPasswordConfirmError: false});