diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js index f76f6a4..09f0cea 100644 --- a/src/app/screens/PluviometerSharingDataScreen.js +++ b/src/app/screens/PluviometerSharingDataScreen.js @@ -48,9 +48,10 @@ function PluviometerSharingDataScreen() { pluviometer: "", images: [], }} - onSubmit={(values) => - insertPluviometerData({ ...values, date, location }) - } + onSubmit={(values) => { + insertPluviometerData({ ...values, date, location }); + props.navigation.goBack(null); + }} validationSchema={validationSchema} > diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index 559e41c..7426faf 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -44,7 +44,10 @@ function RainSharingDataScreen() { initialValues={{ images: [], }} - onSubmit={(values) => insertRainData({ ...values, rain, location })} + onSubmit={(values) => { + insertRainData({ ...values, rain, location }); + props.navigation.goBack(null); + }} validationSchema={validationSchema} > diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js index 63b02a1..13ec016 100644 --- a/src/app/screens/RiverFloodSharingDataScreen.js +++ b/src/app/screens/RiverFloodSharingDataScreen.js @@ -17,7 +17,7 @@ const validationSchema = Yup.object().shape({ const borderWidth = 4; -function RiverFloodSharingDataScreen() { +function RiverFloodSharingDataScreen(props) { const [riverScale, setRiverScale] = useState(0); const location = useLocation(); @@ -38,9 +38,10 @@ function RiverFloodSharingDataScreen() { initialValues={{ images: [], }} - onSubmit={(values) => - insertRiverData({ ...values, riverScale, location }) - } + onSubmit={(values) => { + insertRiverData({ ...values, riverScale, location }); + props.navigation.goBack(null); + }} validationSchema={validationSchema} > @@ -106,7 +107,11 @@ function RiverFloodSharingDataScreen() { - + props.navigation.pop()} + /> ); diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js index f36814f..52bd538 100644 --- a/src/app/screens/SharingFloodZonesScreen.js +++ b/src/app/screens/SharingFloodZonesScreen.js @@ -54,7 +54,10 @@ function SharingFloodZonesScreen() { images: [], description: "", }} - onSubmit={(values) => submitForm({ ...values, passable, location })} + onSubmit={(values) => { + submitForm({ ...values, passable, location }); + props.navigation.goBack(null); + }} validationSchema={validationSchema} >