From 94eb4f9be44c54afd3be37be753254800af5eaa8 Mon Sep 17 00:00:00 2001
From: androidlover5842 <androidlover5842@gmail.com>
Date: Tue, 27 Jan 2026 04:29:05 +0530
Subject: [PATCH] Fix amenities back navigation

---
 .../main/java/com/android/trisolarispms/MainActivity.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/android/trisolarispms/MainActivity.kt b/app/src/main/java/com/android/trisolarispms/MainActivity.kt
index 9faba05..89e0b16 100644
--- a/app/src/main/java/com/android/trisolarispms/MainActivity.kt
+++ b/app/src/main/java/com/android/trisolarispms/MainActivity.kt
@@ -52,6 +52,7 @@ class MainActivity : ComponentActivity() {
                     val selectedRoomType = remember { mutableStateOf<com.android.trisolarispms.data.api.model.RoomTypeDto?>(null) }
                     val selectedAmenity = remember { mutableStateOf<com.android.trisolarispms.data.api.model.AmenityDto?>(null) }
                     val roomFormKey = remember { mutableStateOf(0) }
+                    val amenitiesReturnRoute = remember { mutableStateOf<AppRoute>(AppRoute.Home) }
                     val currentRoute = route.value
                     val canManageProperty: (String) -> Boolean = { propertyId ->
                         state.isSuperAdmin || (state.propertyRoles[propertyId]?.contains("ADMIN") == true)
@@ -64,7 +65,10 @@ class MainActivity : ComponentActivity() {
                             isSuperAdmin = state.isSuperAdmin,
                             onAddProperty = { route.value = AppRoute.AddProperty },
                             onAmenities = {
-                                selectedPropertyId.value?.let { route.value = AppRoute.Amenities(it) }
+                                selectedPropertyId.value?.let { propertyId ->
+                                    amenitiesReturnRoute.value = AppRoute.Home
+                                    route.value = AppRoute.Amenities(propertyId)
+                                }
                             },
                             refreshKey = refreshKey.value,
                             selectedPropertyId = selectedPropertyId.value,
@@ -132,7 +136,7 @@ class MainActivity : ComponentActivity() {
                         )
                         is AppRoute.Amenities -> AmenitiesScreen(
                             propertyId = currentRoute.propertyId,
-                            onBack = { route.value = AppRoute.RoomTypes(currentRoute.propertyId) },
+                            onBack = { route.value = amenitiesReturnRoute.value },
                             onAdd = { route.value = AppRoute.AddAmenity(currentRoute.propertyId) },
                             canManageAmenities = state.isSuperAdmin,
                             onEdit = {