From 7d910ea57dad47dfb670669a1fe9d4b16821b1cc Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Fri, 27 Feb 2026 10:32:50 -0300
Subject: [PATCH] Improve navigation logic for external requests in MainScreen

- Ensure `localRoute` defaults to `Route.IncomingRequest.route` when `isExternalRequest` is true.
- Update `LaunchedEffect` to prioritize routing to the incoming request screen when an external request is detected.
---
 .../com/greenart7c3/nostrsigner/ui/MainScreen.kt | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
index 039e2a2e..d3b2617c 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
@@ -209,10 +209,20 @@ fun MainScreen(
         )
     }
 
-    var localRoute by remember { mutableStateOf(route.value ?: if (intents.isEmpty() && bunkerRequests.isEmpty()) Route.Applications.route else Route.IncomingRequest.route) }
-    LaunchedEffect(Unit, route.value, intents, bunkerRequests) {
+    var localRoute by remember {
+        mutableStateOf(
+            if (isExternalRequest) {
+                Route.IncomingRequest.route
+            } else {
+                route.value ?: if (intents.isEmpty() && bunkerRequests.isEmpty()) Route.Applications.route else Route.IncomingRequest.route
+            }
+        )
+    }
+    LaunchedEffect(Unit, route.value, intents, bunkerRequests, isExternalRequest) {
         launch(Dispatchers.Main) {
-            if (route.value != null) {
+            if (isExternalRequest) {
+                localRoute = Route.IncomingRequest.route
+            } else if (route.value != null) {
                 localRoute = route.value!!
                 route.value = null
             } else {