From a4b28b1dc7a7b6f9f98cf9d200ebfd43bebaaaaf Mon Sep 17 00:00:00 2001
From: Barnabas Balogh <bdbarni@gmail.com>
Date: Wed, 18 Feb 2026 12:07:30 +0100
Subject: [PATCH] fix: prevent popping the last item from backStack if it's the
 only item

---
 app/src/main/java/hu/bbara/purefin/PurefinActivity.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
index ea50629..9163ae2 100644
--- a/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
+++ b/app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
@@ -155,7 +155,7 @@ class PurefinActivity : ComponentActivity() {
             LaunchedEffect(navigationManager, backStack) {
                 navigationManager.commands.collect { command ->
                     when (command) {
-                        NavigationCommand.Pop -> backStack.removeLastOrNull()
+                        NavigationCommand.Pop -> if (backStack.size > 1) backStack.removeLastOrNull()
                         is NavigationCommand.Navigate -> backStack.add(command.route)
                         is NavigationCommand.ReplaceAll -> {
                             backStack.clear()
@@ -168,6 +168,7 @@ class PurefinActivity : ComponentActivity() {
             CompositionLocalProvider(LocalNavigationManager provides navigationManager) {
                 NavDisplay(
                     backStack = backStack,
+                    onBack = { navigationManager.pop() },
                     modifier = Modifier.fillMaxSize(),
                     entryDecorators =
                         listOf(