From 5d45d3357208baa137920ca916c3daf15645084a Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Mon, 6 Nov 2023 14:29:00 +1300
Subject: [PATCH] Fix dev bug for navigation after adding a set

The previous code worked fine in production,
but gave a development error in the logs.
---
 EditSet.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/EditSet.tsx b/EditSet.tsx
index 38d440f..54464ec 100644
--- a/EditSet.tsx
+++ b/EditSet.tsx
@@ -18,9 +18,12 @@ import {
   TouchableRipple,
 } from "react-native-paper";
 import AppInput from "./AppInput";
+import { StackParams } from "./AppStack";
 import ConfirmDialog from "./ConfirmDialog";
+import StackHeader from "./StackHeader";
 import { MARGIN, PADDING } from "./constants";
 import { getNow, setRepo, settingsRepo } from "./db";
+import { DrawerParams } from "./drawer-param-list";
 import { emitter } from "./emitter";
 import { fixNumeric } from "./fix-numeric";
 import GymSet, {
@@ -29,15 +32,12 @@ import GymSet, {
   GYM_SET_UPDATED,
 } from "./gym-set";
 import Settings from "./settings";
-import StackHeader from "./StackHeader";
 import { toast } from "./toast";
-import { DrawerParams } from "./drawer-param-list";
-import { StackParams } from "./AppStack";
 
 export default function EditSet() {
   const { params } = useRoute<RouteProp<StackParams, "EditSet">>();
   const { set } = params;
-  const { goBack } = useNavigation<NavigationProp<DrawerParams>>();
+  const { navigate } = useNavigation<NavigationProp<DrawerParams>>();
   const [settings, setSettings] = useState<Settings>({} as Settings);
   const [name, setName] = useState(set.name);
   const [reps, setReps] = useState(set.reps?.toString());
@@ -74,13 +74,14 @@ export default function EditSet() {
       const first = await setRepo.findOne({ where: { name: value } });
       const milliseconds =
         (first?.minutes ?? 3) * 60 * 1000 + (first?.seconds ?? 0) * 1000;
+      console.log(`${EditSet.name}.timer:`, { milliseconds });
       if (milliseconds) NativeModules.AlarmModule.timer(milliseconds);
     },
     [settings]
   );
 
   const notify = (value: Partial<GymSet>) => {
-    if (!settings.notify) return goBack();
+    if (!settings.notify) return navigate("Home");
     if (
       value.weight > set.weight ||
       (value.reps > set.reps && value.weight === set.weight)
@@ -124,7 +125,7 @@ export default function EditSet() {
     notify(newSet);
     if (typeof set.id !== "number") added(saved);
     else emitter.emit(GYM_SET_UPDATED, saved);
-    goBack();
+    navigate("Home");
   };
 
   const changeImage = useCallback(async () => {
@@ -161,7 +162,7 @@ export default function EditSet() {
   const remove = async () => {
     await setRepo.delete(set.id);
     emitter.emit(GYM_SET_DELETED);
-    goBack();
+    navigate("Home");
   };
 
   const openMenu = async () => {