From 62214a9f5336f1abeec58bc1fd3a5ed4990add39 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Mon, 24 Jul 2023 15:32:34 +0700
Subject: [PATCH 1/2] fix: loading shows everytime when confirming pdf password
 even when there is form error

---
 src/components/PDFView/PDFPasswordForm.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/PDFView/PDFPasswordForm.js b/src/components/PDFView/PDFPasswordForm.js
index fbeb84521b60..73f01e7070f4 100644
--- a/src/components/PDFView/PDFPasswordForm.js
+++ b/src/components/PDFView/PDFPasswordForm.js
@@ -94,13 +94,17 @@ class PDFPasswordForm extends Component {
     }
 
     validate() {
-        if (!_.isEmpty(this.state.password)) {
-            return true;
+        if (this.props.isPasswordInvalid) {
+            return false;
+        }
+        if (_.isEmpty(this.state.password)) {
+            this.setState({
+                validationErrorText: 'attachmentView.passwordRequired',
+            });
+            return false;
         }
-        this.setState({
-            validationErrorText: 'attachmentView.passwordRequired',
-        });
-        return false;
+
+        return true;
     }
 
     validateAndNotifyPasswordBlur() {

From 77a77b39ba87b2823fe738737171ca02a78a51ab Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 25 Jul 2023 00:35:07 +0700
Subject: [PATCH 2/2] refactor return value

---
 src/components/PDFView/PDFPasswordForm.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/PDFView/PDFPasswordForm.js b/src/components/PDFView/PDFPasswordForm.js
index 73f01e7070f4..adbe3e801776 100644
--- a/src/components/PDFView/PDFPasswordForm.js
+++ b/src/components/PDFView/PDFPasswordForm.js
@@ -94,17 +94,17 @@ class PDFPasswordForm extends Component {
     }
 
     validate() {
-        if (this.props.isPasswordInvalid) {
-            return false;
+        if (!this.props.isPasswordInvalid && !_.isEmpty(this.state.password)) {
+            return true;
         }
+
         if (_.isEmpty(this.state.password)) {
             this.setState({
                 validationErrorText: 'attachmentView.passwordRequired',
             });
-            return false;
         }
 
-        return true;
+        return false;
     }
 
     validateAndNotifyPasswordBlur() {