From 5bb12a30d4a833d3f7e51d98901f7b65344e9661 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sat, 13 Jan 2024 15:58:35 +0800
Subject: [PATCH] Don't show two errors in verificationCode login page

---
 web/src/ApplicationEditPage.js | 2 +-
 web/src/auth/LoginPage.js      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js
index 0c67af6b..66829e0f 100644
--- a/web/src/ApplicationEditPage.js
+++ b/web/src/ApplicationEditPage.js
@@ -797,7 +797,7 @@ class ApplicationEditPage extends React.Component {
           </Col>
           <Col span={22} >
             <Row style={{marginTop: "20px"}} >
-              <Radio.Group onChange={e => {this.updateApplicationField("formOffset", e.target.value);}} value={this.state.application.formOffset}>
+              <Radio.Group buttonStyle="solid" onChange={e => {this.updateApplicationField("formOffset", e.target.value);}} value={this.state.application.formOffset}>
                 <Radio.Button value={1}>{i18next.t("application:Left")}</Radio.Button>
                 <Radio.Button value={2}>{i18next.t("application:Center")}</Radio.Button>
                 <Radio.Button value={3}>{i18next.t("application:Right")}</Radio.Button>
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index 58e80171..7a1416eb 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -588,6 +588,10 @@ class LoginPage extends React.Component {
                   },
                   {
                     validator: (_, value) => {
+                      if (value === "") {
+                        return Promise.resolve();
+                      }
+
                       if (this.state.loginMethod === "verificationCode") {
                         if (!Setting.isValidEmail(value) && !Setting.isValidPhone(value)) {
                           this.setState({validEmailOrPhone: false});