From 3527e070a0ba236e0d81b1ea3dc0dde6fa0e8b55 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Fri, 8 Mar 2024 15:18:18 +0800
Subject: [PATCH] Fix my account page UI

---
 web/src/UserEditPage.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js
index 1bdd8d31..fe50c1d2 100644
--- a/web/src/UserEditPage.js
+++ b/web/src/UserEditPage.js
@@ -999,7 +999,7 @@ class UserEditPage extends React.Component {
       <Card size="small" title={
         (this.props.account === null) ? i18next.t("user:User Profile") : (
           <div>
-            {this.state.mode === "add" ? i18next.t("user:New User") : i18next.t("user:Edit User")}&nbsp;&nbsp;&nbsp;&nbsp;
+            {this.state.mode === "add" ? i18next.t("user:New User") : (this.isSelf() ? i18next.t("account:My Account") : i18next.t("user:Edit User"))}&nbsp;&nbsp;&nbsp;&nbsp;
             <Button onClick={() => this.submitUserEdit(false)}>{i18next.t("general:Save")}</Button>
             <Button style={{marginLeft: "20px"}} type="primary" onClick={() => this.submitUserEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
             {this.state.mode === "add" ? <Button style={{marginLeft: "20px"}} onClick={() => this.deleteUser()}>{i18next.t("general:Cancel")}</Button> : null}
@@ -1094,7 +1094,9 @@ class UserEditPage extends React.Component {
                 }
               }
             } else {
-              this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`);
+              if (location.pathname !== "/account") {
+                this.props.history.push(`/users/${this.state.user.owner}/${this.state.user.name}`);
+              }
             }
           } else {
             if (exitAfterSave) {