fix: prevent MoreDrawer sentinel from undoing navigation

chriswritescode-dev · chriswritescode-dev · commit 5178ea6cdc7e · 2026-05-04T01:11:57.000-04:00
diff --git a/frontend/src/components/navigation/MoreDrawer.tsx b/frontend/src/components/navigation/MoreDrawer.tsx
@@ -67,10 +67,12 @@ export function MoreDrawer({ isOpen, onClose }: MoreDrawerProps) {
     window.addEventListener('popstate', onPop)
     return () => {
       window.removeEventListener('popstate', onPop)
+      // Only go back if sentinel is still active AND we haven't navigated away
       if (sentinelActive) {
         sentinelActive = false
         const top = window.history.state as { moreDrawerSentinel?: boolean } | null
-        if (top?.moreDrawerSentinel) {
+        // Only go back if the current URL hasn't changed (i.e., no navigation occurred)
+        if (top?.moreDrawerSentinel && window.location.href === baseUrl) {
           window.history.back()
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,12 @@ export function MoreDrawer({ isOpen, onClose }: MoreDrawerProps) {`
`67`	`67`	`window.addEventListener('popstate', onPop)`
`68`	`68`	`return () => {`
`69`	`69`	`window.removeEventListener('popstate', onPop)`
	`70`	`+ // Only go back if sentinel is still active AND we haven't navigated away`
`70`	`71`	`if (sentinelActive) {`
`71`	`72`	`sentinelActive = false`
`72`	`73`	`const top = window.history.state as { moreDrawerSentinel?: boolean } \| null`
`73`		`- if (top?.moreDrawerSentinel) {`
	`74`	`+ // Only go back if the current URL hasn't changed (i.e., no navigation occurred)`
	`75`	`+ if (top?.moreDrawerSentinel && window.location.href === baseUrl) {`
`74`	`76`	`window.history.back()`
`75`	`77`	`}`
`76`	`78`	`}`