diff --git a/src/app/navigation/AppNavigator.js b/src/app/navigation/AppNavigator.js index e2bbbf9..3e858d7 100644 --- a/src/app/navigation/AppNavigator.js +++ b/src/app/navigation/AppNavigator.js @@ -8,8 +8,6 @@ import MessagesNavigator from "./MessagesNavigator"; import ForecastNavigator from "./ForecastNavigator"; import NewListingButton from "./NewListingButton"; import SharingDataOptionsNavigator from "./SharingDataOptionsNavigator"; -import SharingDataNavigator from "./SharingDataNavigator"; -import routes from "./routes"; const Tab = createBottomTabNavigator(); @@ -45,7 +43,12 @@ const AppNavigator = () => ( tabBarButton: () => ( - navigation.navigate(routes.SHARING_DATA)} + navigation.reset({ + index: 0, + key: "RainSharingData", + routes: [{ name: "SharingData" }], + }) + } /> ), tabBarIcon: ({ color, size }) => ( diff --git a/src/app/navigation/SharingDataOptionsNavigator.js b/src/app/navigation/SharingDataOptionsNavigator.js index 45d0b8b..619da93 100644 --- a/src/app/navigation/SharingDataOptionsNavigator.js +++ b/src/app/navigation/SharingDataOptionsNavigator.js @@ -9,6 +9,7 @@ import SharingFloodZonesScreen from '../screens/SharingFloodZonesScreen'; import PluviometerSharingDataScreen from '../screens/PluviometerSharingDataScreen'; import SharingDataNavigator from './SharingDataNavigator'; import MapFormScreen from '../screens/MapFormScreen'; +import { CommonActions } from '@react-navigation/native'; const Stack = createStackNavigator(); @@ -62,7 +63,7 @@ function SharingDataOptionsNavigator() { backgroundColor: "white", }, }} - /> + /> { + /*useEffect(() => { !isFocused && props.navigation.goBack(); - }, [isFocused]) + }, [isFocused])*/ const location = context.eventCoordinates; const address = context.eventLocation;