From b075753d0f08bef40f5118349fbc74b8c5e8a841 Mon Sep 17 00:00:00 2001
From: surfdude29 <149612116+surfdude29@users.noreply.github.com>
Date: Thu, 9 Jul 2026 19:19:41 +0100
Subject: [PATCH] Fix KWS language picker silently resetting Arabic, Chinese,
 Filipino & Portuguese to English (#11082)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Eric Bailey <git@esb.lol>
---
 src/components/LanguageSelect.tsx             | 26 +++++++++++--------
 .../ageAssurance/AgeAssuranceInitDialog.tsx   |  1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/LanguageSelect.tsx b/src/components/LanguageSelect.tsx
index 30b1143091..6bcaebe539 100644
--- a/src/components/LanguageSelect.tsx
+++ b/src/components/LanguageSelect.tsx
@@ -1,4 +1,3 @@
-import {useCallback} from 'react'
 import {msg} from '@lingui/core/macro'
 import {useLingui} from '@lingui/react'
 
@@ -14,26 +13,31 @@ export function LanguageSelect({
     value: l.code2,
   })),
   label,
+  disabledBlueskySupportedLanguageSanitization = false,
 }: {
   value?: string
   onChange: (value: string) => void
   items?: {label: string; value: string}[]
   label?: string
+  disabledBlueskySupportedLanguageSanitization?: boolean
 }) {
   const {_} = useLingui()
+  const selectValue =
+    value && !disabledBlueskySupportedLanguageSanitization
+      ? sanitizeAppLanguageSetting(value)
+      : value
 
-  const handleOnChange = useCallback(
-    (value: string) => {
-      if (!value) return
-      onChange(sanitizeAppLanguageSetting(value))
-    },
-    [onChange],
-  )
+  const handleOnChange = (value: string) => {
+    if (!value) return
+    onChange(
+      disabledBlueskySupportedLanguageSanitization
+        ? value
+        : sanitizeAppLanguageSetting(value),
+    )
+  }
 
   return (
-    <Select.Root
-      value={value ? sanitizeAppLanguageSetting(value) : undefined}
-      onValueChange={handleOnChange}>
+    <Select.Root value={selectValue} onValueChange={handleOnChange}>
       <Select.Trigger label={_(msg`Select language`)}>
         <Select.ValueText placeholder={_(msg`Select language`)} />
         <Select.Icon />
diff --git a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
index 15e3a2b472..c92d43e32c 100644
--- a/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
+++ b/src/components/ageAssurance/AgeAssuranceInitDialog.tsx
@@ -296,6 +296,7 @@ function Inner() {
                     setLanguageError(false)
                   }}
                   items={KWS_SUPPORTED_LANGS}
+                  disabledBlueskySupportedLanguageSanitization
                 />
 
                 {languageError && (