From d477c7270c90b190ed82b13f48f39a05d83503d2 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 21 Sep 2023 23:49:12 +0800
Subject: Fix #1394.

---
 FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx |  5 ++---
 FrontEnd/src/pages/setting/index.tsx              | 15 ++++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'FrontEnd/src/pages/setting')

diff --git a/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx b/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx
index 4cdecbbb..9ede593e 100644
--- a/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx
+++ b/FrontEnd/src/pages/setting/ChangeAvatarDialog.tsx
@@ -1,11 +1,10 @@
 import { useState, ChangeEvent, ComponentPropsWithoutRef } from "react";
 
-import { useC, Text, UiLogicError } from "~src/common";
-
 import { useUser } from "~src/services/user";
 
 import { getHttpUserClient } from "~src/http/user";
 
+import { useC, I18nText, UiLogicError } from "~src/components/common";
 import { ImageCropper, useImageCrop } from "~src/components/ImageCropper";
 import BlobImage from "~src/components/BlobImage";
 import { ButtonRowV2 } from "~src/components/button";
@@ -43,7 +42,7 @@ export default function ChangeAvatarDialog({
   });
 
   const [resultBlob, setResultBlob] = useState<Blob | null>(null);
-  const [message, setMessage] = useState<Text>(
+  const [message, setMessage] = useState<I18nText>(
     "settings.dialogChangeAvatar.prompt.select",
   );
 
diff --git a/FrontEnd/src/pages/setting/index.tsx b/FrontEnd/src/pages/setting/index.tsx
index 3fb18e24..70df1b32 100644
--- a/FrontEnd/src/pages/setting/index.tsx
+++ b/FrontEnd/src/pages/setting/index.tsx
@@ -11,8 +11,7 @@ import classNames from "classnames";
 import { useUser, userService } from "~src/services/user";
 import { getHttpUserClient } from "~src/http/user";
 
-import { useC, Text } from "~src/common";
-
+import { useC, I18nText } from "~src/components/common";
 import { pushAlert } from "~src/components/alert";
 import { useDialog, ConfirmDialog } from "~src/components/dialog";
 import Card from "~src/components/Card";
@@ -27,7 +26,7 @@ import "./index.css";
 
 interface SettingSectionProps
   extends Omit<ComponentPropsWithoutRef<typeof Card>, "title"> {
-  title: Text;
+  title: I18nText;
   children?: ReactNode;
 }
 
@@ -49,8 +48,8 @@ function SettingSection({
 
 interface SettingItemContainerProps
   extends Omit<ComponentPropsWithoutRef<"div">, "title"> {
-  title: Text;
-  description?: Text;
+  title: I18nText;
+  description?: I18nText;
   danger?: boolean;
   extraClassName?: string;
 }
@@ -78,7 +77,9 @@ function SettingItemContainer({
     >
       <div className="setting-item-label-area">
         <div className="setting-item-label-title">{c(title)}</div>
-        <small className="setting-item-label-sub">{c(description)}</small>
+        {description && (
+          <small className="setting-item-label-sub">{c(description)}</small>
+        )}
       </div>
       <div className="setting-item-value-area">{children}</div>
     </div>
@@ -97,7 +98,7 @@ interface SelectSettingItemProps
   extends Omit<SettingItemContainerProps, "onSelect" | "extraClassName"> {
   options: {
     value: string;
-    label: Text;
+    label: I18nText;
   }[];
   value?: string | null;
   onSelect: (value: string) => void;
-- 
cgit v1.2.3