From 36707366113ab4aa9620b16ccf128b10497d4c95 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Mon, 12 Jan 2026 03:06:06 -0500
Subject: [PATCH] Fixes after merge

---
 .../github/damontecres/wholphin/ui/discover/DiscoverPage.kt    | 3 +++
 .../damontecres/wholphin/ui/discover/SeerrRequestsPage.kt      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/DiscoverPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/DiscoverPage.kt
index 9f5e54ee..4d3bdc42 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/DiscoverPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/DiscoverPage.kt
@@ -47,6 +47,7 @@ fun DiscoverPage(
         )
     var selectedTabIndex by rememberSaveable { mutableIntStateOf(rememberedTabIndex) }
     val focusRequester = remember { FocusRequester() }
+    val tabFocusRequesters = remember(tabs) { List(tabs.size) { FocusRequester() } }
 
     val firstTabFocusRequester = remember { FocusRequester() }
     LaunchedEffect(Unit) { firstTabFocusRequester.tryRequestFocus() }
@@ -76,6 +77,7 @@ fun DiscoverPage(
                         .focusRequester(firstTabFocusRequester),
                 tabs = tabs,
                 onClick = { selectedTabIndex = it },
+                focusRequesters = tabFocusRequesters,
             )
         }
         when (selectedTabIndex) {
@@ -93,6 +95,7 @@ fun DiscoverPage(
             // Requests
             1 -> {
                 SeerrRequestsPage(
+                    focusRequesterOnEmpty = tabFocusRequesters.getOrNull(selectedTabIndex),
                     modifier =
                         Modifier
                             .fillMaxSize()
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrRequestsPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrRequestsPage.kt
index b8b1066e..6746950a 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrRequestsPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/discover/SeerrRequestsPage.kt
@@ -143,6 +143,7 @@ data class RequestGridItem(
 
 @Composable
 fun SeerrRequestsPage(
+    focusRequesterOnEmpty: FocusRequester?,
     modifier: Modifier = Modifier,
     viewModel: SeerrRequestsViewModel = hiltViewModel(),
 ) {
@@ -164,6 +165,8 @@ fun SeerrRequestsPage(
             LaunchedEffect(Unit) {
                 if (state.data.isNotEmpty()) {
                     focusRequester.tryRequestFocus()
+                } else {
+                    focusRequesterOnEmpty?.tryRequestFocus()
                 }
             }
             Column(modifier = modifier) {