From b7c6c5b5d45d3a1dae86e9860a08f87aaa530ffa Mon Sep 17 00:00:00 2001
From: Abbey Campbell <campbellabbeya@gmail.com>
Date: Thu, 11 Dec 2025 16:13:54 -0800
Subject: [PATCH] fix navigation issues with AddObs screens

---
 src/components/Camera/AICamera/AICamera.js | 7 ++++++-
 src/navigation/RootStackNavigator.tsx      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/Camera/AICamera/AICamera.js b/src/components/Camera/AICamera/AICamera.js
index b805a50ed..c8c7a7214 100644
--- a/src/components/Camera/AICamera/AICamera.js
+++ b/src/components/Camera/AICamera/AICamera.js
@@ -231,7 +231,12 @@ const AICamera = ( {
 
   const handleClose = async ( ) => {
     await deleteSentinelFile( sentinelFileName );
-    navigation.goBack( );
+    navigation.navigate( "TabNavigator", {
+      screen: "ObservationsTab",
+      params: {
+        screen: "ObsList"
+      }
+    } );
   };
 
   return (
diff --git a/src/navigation/RootStackNavigator.tsx b/src/navigation/RootStackNavigator.tsx
index bed9853ad..3a7916935 100644
--- a/src/navigation/RootStackNavigator.tsx
+++ b/src/navigation/RootStackNavigator.tsx
@@ -6,7 +6,7 @@ import * as React from "react";
 import { useOnboardingShown } from "sharedHelpers/installData";
 
 import BottomTabNavigator from "./BottomTabNavigator";
-import { hideHeader } from "./navigationOptions";
+import { hideHeader, preventSwipeToGoBack } from "./navigationOptions";
 
 const Stack = createNativeStackNavigator( );
 
@@ -18,7 +18,7 @@ const RootStackNavigator = ( ) => {
   const [onboardingShown] = useOnboardingShown( );
 
   return (
-    <Stack.Navigator screenOptions={{ ...hideHeader }}>
+    <Stack.Navigator screenOptions={{ ...hideHeader, ...preventSwipeToGoBack, animation: "none" }}>
       {!onboardingShown
         ? (
           <Stack.Screen