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();