From 59ccc13836cc82c16770a7b3ef9317a28b5c220a Mon Sep 17 00:00:00 2001
From: devthejo <devthejo@protonmail.com>
Date: Sun, 8 Mar 2026 20:28:40 +0100
Subject: [PATCH] fix(dae): navigation back

---
 src/navigation/Drawer.js     |  1 +
 src/navigation/HeaderLeft.js | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/navigation/Drawer.js b/src/navigation/Drawer.js
index 46306bf..d51e882 100644
--- a/src/navigation/Drawer.js
+++ b/src/navigation/Drawer.js
@@ -85,6 +85,7 @@ export default React.memo(function DrawerNav() {
 
   return (
     <Drawer.Navigator
+      backBehavior="history"
       drawerContent={(props) => <DrawerContent {...props} />}
       drawerStyle={{
         width: getDefaultDrawerWidth(dimensions),
diff --git a/src/navigation/HeaderLeft.js b/src/navigation/HeaderLeft.js
index 8e64ff7..805065b 100644
--- a/src/navigation/HeaderLeft.js
+++ b/src/navigation/HeaderLeft.js
@@ -1,7 +1,7 @@
 import React from "react";
 
 import { Image } from "react-native";
-import { useNavigation } from "@react-navigation/native";
+import { useNavigation, CommonActions } from "@react-navigation/native";
 import { HeaderBackButton } from "@react-navigation/elements";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 
@@ -28,7 +28,24 @@ export default function HeaderLeft(props) {
           if (canGoBack) {
             navigation.goBack();
           } else {
-            navigation.navigate(drawerState.topTabPrev || "SendAlert");
+            // HeaderLeft is rendered by the RootStack which has a single
+            // "Main" screen, so canGoBack is always false here.
+            // Dispatch GO_BACK targeted at the Drawer navigator so it
+            // uses its history-based back behaviour.
+            const rootState = navigation.getState();
+            const drawerNavState = rootState.routes[0]?.state;
+            if (
+              drawerNavState?.key &&
+              drawerNavState.history?.filter((h) => h.type === "route")
+                .length > 1
+            ) {
+              navigation.dispatch({
+                ...CommonActions.goBack(),
+                target: drawerNavState.key,
+              });
+            } else {
+              navigation.navigate(drawerState.topTabPrev || "SendAlert");
+            }
           }
         }}
         backImage={() => (