app/task/[id].tsx

@@ -25,7 +25,6 @@ import { colors } from '@/src/theme/colors';
 import { useSettingsStore } from '@/src/stores/useSettingsStore';
 import { isValidUUID } from '@/src/lib/validation';
 import { getPriorityOptions } from '@/src/lib/priority';
-import { goBack } from '@/src/lib/navigation';
 import { RECURRENCE_OPTIONS } from '@/src/lib/recurrence';
 import {
   getTaskById,
@@ -127,9 +126,8 @@ export default function TaskDetailScreen() {
         listId: selectedListId,
       });
       await setTagsForTask(task.id, selectedTagIds);
-      goBack(router);
+      router.back();
     } catch {
-      // Save failed — stay on screen so user can retry
       setSaving(false);
     }
   };
@@ -143,7 +141,7 @@ export default function TaskDetailScreen() {
         onPress: async () => {
           await deleteTask(id!);
           Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
-          goBack(router);
+          router.back();
         },
       },
     ]);
@@ -187,7 +185,7 @@ export default function TaskDetailScreen() {
       <View
         className={`flex-row items-center justify-between border-b px-4 pb-3 pt-14 ${isDark ? 'border-[#3A3A3A]' : 'border-[#E5E7EB]'}`}
       >
-        <Pressable onPress={() => goBack(router)} className="p-2.5" hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
+        <Pressable onPress={() => router.back()} className="p-2.5" hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
           <ArrowLeft size={24} color={isDark ? '#F5F5F5' : '#1A1A1A'} />
         </Pressable>
         <View className="flex-row items-center">

app/task/new.tsx

@@ -27,7 +27,6 @@ import { getInboxId, getAllLists } from '@/src/db/repository/lists';
 import { getAllTags, setTagsForTask } from '@/src/db/repository/tags';
 import { getPriorityOptions } from '@/src/lib/priority';
 import { RECURRENCE_OPTIONS } from '@/src/lib/recurrence';
-import { goBack } from '@/src/lib/navigation';
 import TagChip from '@/src/components/task/TagChip';
 
 const ICON_MAP: Record<string, LucideIcon> = {
@@ -84,7 +83,7 @@ export default function NewTaskScreen() {
       for (const sub of pendingSubtasks) {
         await createTask({ title: sub, listId: selectedListId, parentId: taskId });
       }
-      goBack(router);
+      router.back();
     } catch {
       // FK constraint or other DB error — fallback to inbox
       setSaving(false);
@@ -121,7 +120,7 @@ export default function NewTaskScreen() {
           isDark ? 'border-[#3A3A3A]' : 'border-[#E5E7EB]'
         }`}
       >
-        <Pressable onPress={() => goBack(router)} className="p-2.5" hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
+        <Pressable onPress={() => router.back()} className="p-2.5" hitSlop={{ top: 8, bottom: 8, left: 8, right: 8 }}>
           <X size={24} color={isDark ? '#F5F5F5' : '#1A1A1A'} />
         </Pressable>
         <Text

src/lib/navigation.ts

@@ -1,13 +0,0 @@
-import type { Router } from 'expo-router';
-
-/**
- * Navigate back if possible, otherwise replace with root.
- * Shared between task screens to avoid duplication.
- */
-export const goBack = (router: Router) => {
-  if (router.canGoBack()) {
-    router.back();
-  } else {
-    router.replace('/');
-  }
-};