From 7f7c64b2efd0dbddeb4d70639bb77e113e57c572 Mon Sep 17 00:00:00 2001
From: al-rosenthal <alfred.k.rosenthal@gmail.com>
Date: Fri, 10 Jan 2025 12:00:55 -0800
Subject: [PATCH] fix: added missing back buttons to settings pages

updated header for biometry, update pin, terms and push notifications screens in the settings stack

Signed-off-by: al-rosenthal <alfred.k.rosenthal@gmail.com>
---
 .../legacy/core/App/navigators/SettingStack.tsx  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/legacy/core/App/navigators/SettingStack.tsx b/packages/legacy/core/App/navigators/SettingStack.tsx
index c8ecd715b..2fdb3d224 100644
--- a/packages/legacy/core/App/navigators/SettingStack.tsx
+++ b/packages/legacy/core/App/navigators/SettingStack.tsx
@@ -25,7 +25,6 @@ import AutoLock from '../screens/AutoLock'
 const SettingStack: React.FC = () => {
   const Stack = createStackNavigator<SettingStackParams>()
   const theme = useTheme()
-  const [biometryUpdatePending, setBiometryUpdatePending] = useState<boolean>(false)
   const { t } = useTranslation()
   const [pages, { screen: terms }, UseBiometry, developer, ScreenOptionsDictionary] = useServices([
     TOKENS.SCREEN_ONBOARDING_PAGES,
@@ -38,16 +37,6 @@ const SettingStack: React.FC = () => {
   const OnboardingTheme = theme.OnboardingTheme
   const carousel = createCarouselStyle(OnboardingTheme)
 
-  useEffect(() => {
-    const handleBiometry = DeviceEventEmitter.addListener(EventTypes.BIOMETRY_UPDATE, (value: boolean) => {
-      setBiometryUpdatePending(value)
-    })
-
-    return () => {
-      handleBiometry.remove()
-    }
-  }, [])
-
   return (
     <Stack.Navigator screenOptions={{ ...defaultStackOptions }}>
       <Stack.Screen
@@ -109,9 +98,9 @@ const SettingStack: React.FC = () => {
         component={UseBiometry}
         options={{
           title: t('Screens.Biometry'),
-          headerLeft: biometryUpdatePending ? () => null : undefined,
           headerBackTestID: testIdWithKey('Back'),
           ...ScreenOptionsDictionary[Screens.UseBiometry],
+          headerLeft: undefined,
         }}
       />
       <Stack.Screen
@@ -121,6 +110,7 @@ const SettingStack: React.FC = () => {
           title: t('Screens.ChangePIN'),
           headerBackTestID: testIdWithKey('Back'),
           ...ScreenOptionsDictionary[Screens.CreatePIN],
+          headerLeft: undefined,
         }}
       />
       <Stack.Screen
@@ -130,6 +120,7 @@ const SettingStack: React.FC = () => {
           title: t('Screens.UsePushNotifications'),
           headerBackTestID: testIdWithKey('Back'),
           ...ScreenOptionsDictionary[Screens.UsePushNotifications],
+          headerLeft: undefined,
         }}
       />
       <Stack.Screen
@@ -139,6 +130,7 @@ const SettingStack: React.FC = () => {
           title: t('Screens.Terms'),
           headerBackTestID: testIdWithKey('Back'),
           ...ScreenOptionsDictionary[Screens.Terms],
+          headerLeft: undefined,
         }}
       />
       <Stack.Screen