From dcf8a8ce099ca64f6a17698f9f4f84e493364bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?El=C3=A9onore?= <95469923+elvoisin@users.noreply.github.com>
Date: Tue, 14 Apr 2026 16:58:22 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(languages)=20fix=20currentLanguage?=
 =?UTF-8?q?=20in=20profile=20menu=20(#1108)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix currentLanguage in profile menu
---
 CHANGELOG.md                                             | 1 +
 .../apps/desk/src/features/language/LanguagePicker.tsx   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 411fb657..592c8218 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to
 
 ### Fixed
 
+- 🐛(languages) fix currentLanguage in profile menu
 - ✨(mailboxes) enforce lowercase on mailboxes
 - 🐛(i18n) fix missing translations for status tag labels
 - 🚚(route) prioritize mail domains as default landing page
diff --git a/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx b/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx
index e91c5b0b..3752c5b3 100644
--- a/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx
+++ b/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx
@@ -10,11 +10,13 @@ export const LanguagePicker = () => {
   const { i18n } = useTranslation();
   const { preload: languages } = i18n.options;
   Settings.defaultLocale = i18n.language;
+  const currentLanguage = Settings.defaultLocale;
 
   const optionsPicker = useMemo(() => {
     return (languages || []).map((lang) => ({
       value: lang,
       label: LANGUAGES_ALLOWED[lang],
+      isChecked: lang === currentLanguage,
       render: () => (
         <Box
           className="c_select__render"
@@ -29,16 +31,17 @@ export const LanguagePicker = () => {
         </Box>
       ),
     }));
-  }, [languages]);
+  }, [languages, currentLanguage]);
 
   useEffect(() => {
     if (typeof document !== 'undefined') {
-      document.documentElement.lang = i18n.language;
+      document.documentElement.lang = currentLanguage || i18n.language;
     }
-  }, [i18n.language]);
+  }, [currentLanguage, i18n.language]);
 
   return (
     <LanguagePickerUi
+      key={currentLanguage}
       languages={optionsPicker}
       size="small"
       onChange={(selected) => {