refactor: use value from meData

reearth · Oct 21, 2024 · 0358b2e · 0358b2e
1 parent 3c1b48d
commit 0358b2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/web/src/beta/features/AccountSetting/hooks.ts b/web/src/beta/features/AccountSetting/hooks.ts
@@ -7,7 +7,7 @@ type UpdatePasswordType = {
 };
 
 export default () => {
-  const { useMeQuery, useUpdatePassword, useDeleteUser, updateLanguage } =
+  const { useMeQuery, useUpdatePassword, useDeleteUser, useUpdateLanguage } =
     useMeFetcher();
   const { me: data } = useMeQuery();
 
@@ -36,12 +36,12 @@ export default () => {
   const handleUpdateUserLanguage = useCallback(
     async ({ lang }: { lang: string }) => {
       try {
-        await updateLanguage(lang);
+        await useUpdateLanguage(lang);
       } catch (error) {
         console.error("Failed to update language:", error);
       }
     },
-    [updateLanguage]
+    [useUpdateLanguage]
   );
 
   return {

diff --git a/web/src/beta/features/AccountSetting/index.tsx b/web/src/beta/features/AccountSetting/index.tsx
@@ -26,7 +26,7 @@ const AccountSetting: FC = () => {
     handleUpdateUserPassword,
     handleUpdateUserLanguage
   } = useHook();
-  const { name, email } = meData;
+  const { name, email, lang } = meData;
 
   const [currentWorkspace] = useWorkspace();
 
@@ -48,8 +48,6 @@ const AccountSetting: FC = () => {
       value: "ja"
     }
   ];
-  type LanguageOption = (typeof options)[number]["value"];
-  const [languageLabel, setLanguageLabel] = useState<LanguageOption>("und");
 
   return (
     <SettingBase tabs={tabs} tab={"account"}>
@@ -92,13 +90,10 @@ const AccountSetting: FC = () => {
               </PasswordWrapper>
               <SelectField
                 title={t("Language")}
-                value={languageLabel}
+                value={lang ?? "und"}
                 options={options}
                 onChange={(value) => {
-                  if (typeof value === "string") {
-                    setLanguageLabel(value);
-                    handleUpdateUserLanguage({ lang: value });
-                  }
+                  handleUpdateUserLanguage({ lang: value as string });
                 }}
               />
             </SettingsFields>

diff --git a/web/src/services/api/meApi.ts b/web/src/services/api/meApi.ts
@@ -77,11 +77,10 @@ export default () => {
     [deleteMeMutation, setNotification, t]
   );
 
-  const updateLanguage = useCallback(
+  const useUpdateLanguage = useCallback(
     async (lang: string) => {
       if (!lang) return;
       const { data, errors } = await updateMeMutation({ variables: { lang } });
-      console.log(data);
       if (errors || !data?.updateMe) {
         console.log("GraphQL: Failed to update language", errors);
         setNotification({
@@ -104,6 +103,6 @@ export default () => {
     useMeQuery,
     useUpdatePassword,
     useDeleteUser,
-    updateLanguage
+    useUpdateLanguage
   };
 };