From 5ad5eb2ad9ef0cabefb6386ca1d84456f17dc547 Mon Sep 17 00:00:00 2001
From: Charles Zhao <charleszhao@silverhand.io>
Date: Fri, 8 Jul 2022 17:32:11 +0800
Subject: [PATCH] fix(console): provide fallback value for language field in
 settings

---
 packages/console/src/pages/Settings/index.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/console/src/pages/Settings/index.tsx b/packages/console/src/pages/Settings/index.tsx
index 2a2b8c907..2a7955add 100644
--- a/packages/console/src/pages/Settings/index.tsx
+++ b/packages/console/src/pages/Settings/index.tsx
@@ -19,7 +19,10 @@ import ChangePassword from './components/ChangePassword';
 import * as styles from './index.module.scss';
 
 const Settings = () => {
-  const { t } = useTranslation(undefined, { keyPrefix: 'admin_console' });
+  const {
+    t,
+    i18n: { language },
+  } = useTranslation(undefined, { keyPrefix: 'admin_console' });
   const { data, error, update, isLoading, isLoaded } = useUserPreferences();
   const {
     handleSubmit,
@@ -53,7 +56,7 @@ const Settings = () => {
                 control={control}
                 render={({ field: { value, onChange } }) => (
                   <Select
-                    value={value}
+                    value={value ?? language}
                     options={[
                       {
                         value: Language.English,