diff --git a/src/screens/SettingsScreenNew2.tsx b/src/screens/SettingsScreenNew2.tsx index 3471dcce..94c6a9aa 100644 --- a/src/screens/SettingsScreenNew2.tsx +++ b/src/screens/SettingsScreenNew2.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; -import { View, Text, StyleSheet, ScrollView, Pressable } from 'react-native'; +import React, { useEffect, useState } from 'react'; +import { View, Text, StyleSheet, ScrollView, Pressable, BackHandler } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; import { ArrowLeft, LogOut, Settings, ChevronRight, @@ -98,6 +98,15 @@ export default function SettingsScreen({ onLogout, onBack, onTabSelect }: Settin const [selectedTab, setSelectedTab] = useState(null); const groupedTabs = groupTabs(); + useEffect(() => { + if (!selectedTab) return; + const sub = BackHandler.addEventListener('hardwareBackPress', () => { + setSelectedTab(null); + return true; + }); + return () => sub.remove(); + }, [selectedTab]); + const handleTabPress = (tab: TabDef) => { if (!tab.implemented) return; setSelectedTab(tab.id);