From f83bb046bf8e4b491c7b796c1629abd13b0498ea Mon Sep 17 00:00:00 2001
From: emergent-agent-e1 <github@emergent.sh>
Date: Sun, 9 Nov 2025 08:10:39 +0000
Subject: [PATCH] auto-commit for ff01f44c-1f35-4867-bff3-f736a451f7ec

---
 frontend/src/screens/SettingsScreen.tsx | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frontend/src/screens/SettingsScreen.tsx b/frontend/src/screens/SettingsScreen.tsx
index 6389177d..819d3780 100644
--- a/frontend/src/screens/SettingsScreen.tsx
+++ b/frontend/src/screens/SettingsScreen.tsx
@@ -37,8 +37,27 @@ export default function SettingsScreen({ navigation }: any) {
   useEffect(() => {
     checkBiometricAvailability();
     loadBiometricSetting();
+    loadCurrentLanguage();
   }, []);
 
+  useEffect(() => {
+    // Reload language when screen gains focus
+    const unsubscribe = navigation.addListener('focus', () => {
+      loadCurrentLanguage();
+    });
+    return unsubscribe;
+  }, [navigation]);
+
+  const loadCurrentLanguage = async () => {
+    try {
+      const savedLang = await AsyncStorage.getItem('appLanguage');
+      const langName = savedLang ? LANGUAGE_NAMES[savedLang] || 'English' : 'English';
+      setCurrentLanguage(langName);
+    } catch (error) {
+      console.error('Error loading language:', error);
+    }
+  };
+
   const checkBiometricAvailability = async () => {
     const compatible = await LocalAuthentication.hasHardwareAsync();
     const enrolled = await LocalAuthentication.isEnrolledAsync();