From 57113e089641c4c55425a7311536b1ca5ee18f11 Mon Sep 17 00:00:00 2001 From: kashaf-ansari-dev Date: Fri, 31 Jul 2026 09:49:36 +0500 Subject: [PATCH] mobile: remove AddReminder from stack on navigation away to prevent stale form state Signed-off-by: kashaf-ansari-dev --- apps/mobile/app/screens/add-reminder/index.tsx | 2 +- apps/mobile/app/services/navigation.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/mobile/app/screens/add-reminder/index.tsx b/apps/mobile/app/screens/add-reminder/index.tsx index e6cc813fa..4315c047e 100644 --- a/apps/mobile/app/screens/add-reminder/index.tsx +++ b/apps/mobile/app/screens/add-reminder/index.tsx @@ -288,7 +288,7 @@ export default function AddReminder(props: NavigationProps<"AddReminder">) { Notifications.scheduleNotification(_reminder as Reminder); Navigation.queueRoutesForUpdate(); useRelationStore.getState().update(); - Navigation.goBack(); + handleBackNavigation(); } catch (e) { ToastManager.error(e as Error, undefined); } diff --git a/apps/mobile/app/services/navigation.ts b/apps/mobile/app/services/navigation.ts index f3b4114d0..4bcc58eb9 100755 --- a/apps/mobile/app/services/navigation.ts +++ b/apps/mobile/app/services/navigation.ts @@ -177,9 +177,11 @@ function resetRootState( if (state.routes.length < 2) return; - const routes = state.routes.filter( + let routes = state.routes.filter( (route) => - (route.name !== "Auth" && route.name !== "Welcome") || + (route.name !== "Auth" && + route.name !== "Welcome" && + route.name !== "AddReminder") || route.key === focusedRoute.key );