From facd8ed39773632a10d6134933225b1014404679 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Sat, 7 Mar 2026 12:42:15 -0300
Subject: [PATCH] Decouple AccountBackupScreen from NavHostController by
 introducing onShowQrCode callback

- Replace `navController` parameter with an `onShowQrCode: (String) -> Unit` lambda in `AccountBackupScreen` and its internal components.
- Move the navigation logic for displaying QR codes to `MainScreen`, using the application scope to handle the transition to the `QrCode` route.
- Clean up unused imports and streamline navigation responsibility within the account backup flow.
---
 .../greenart7c3/nostrsigner/ui/MainScreen.kt  |  6 +++++-
 .../ui/actions/AccountBackupScreen.kt         | 20 +++++++------------
 2 files changed, 12 insertions(+), 14 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 56ee6c4b..5b929627 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/MainScreen.kt
@@ -455,7 +455,11 @@ fun MainScreen(
                                 .padding(horizontal = verticalPadding)
                                 .padding(top = verticalPadding * 1.5f)
                                 .imePadding(),
-                            navController,
+                            onShowQrCode = {
+                                Amber.instance.applicationIOScope.launch(Dispatchers.Main) {
+                                    navController.navigate(Route.QrCode.route.replace("{content}", it))
+                                }
+                            },
                         )
                     },
                 )
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupScreen.kt
index 1915ff4a..ba266435 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupScreen.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/AccountBackupScreen.kt
@@ -88,7 +88,6 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import androidx.navigation.NavHostController
 import coil3.compose.SubcomposeAsyncImage
 import com.greenart7c3.nostrsigner.Amber
 import com.greenart7c3.nostrsigner.BuildFlavorChecker
@@ -102,7 +101,6 @@ import com.greenart7c3.nostrsigner.ui.InnerQrCodeDrawer
 import com.greenart7c3.nostrsigner.ui.QrCodeDrawer
 import com.greenart7c3.nostrsigner.ui.components.CloseButton
 import com.greenart7c3.nostrsigner.ui.components.SeedWordsPage
-import com.greenart7c3.nostrsigner.ui.navigation.Route
 import com.greenart7c3.nostrsigner.ui.theme.Size35dp
 import com.greenart7c3.nostrsigner.ui.theme.fromHex
 import com.halilibo.richtext.commonmark.CommonMarkdownParseOptions
@@ -119,7 +117,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun AccountBackupScreen(
     modifier: Modifier,
-    navController: NavHostController,
+    onShowQrCode: (String) -> Unit,
 ) {
     var isLoading by remember { mutableStateOf(false) }
 
@@ -183,7 +181,7 @@ fun AccountBackupScreen(
                             password = password.value.text,
                             seedWords = seedWords,
                             onLoading = { isLoading = it },
-                            navController = navController,
+                            onShowQrCode = onShowQrCode,
                         )
                         Spacer(modifier = Modifier.height(12.dp))
                     }
@@ -330,7 +328,7 @@ private fun AccountBackupCard(
     password: String,
     seedWords: String,
     onLoading: (Boolean) -> Unit,
-    navController: NavHostController,
+    onShowQrCode: (String) -> Unit,
 ) {
     val profileUrl = account.picture.collectAsState()
     val name = account.name.collectAsState()
@@ -429,7 +427,7 @@ private fun AccountBackupCard(
                     modifier = Modifier.weight(1f),
                     onLoading = onLoading,
                     onBackupDone = { didBackup = true },
-                    navController = navController,
+                    onShowQrCode = onShowQrCode,
                 )
             }
 
@@ -453,7 +451,7 @@ private fun NSecQrButton(
     modifier: Modifier = Modifier,
     onLoading: (Boolean) -> Unit,
     onBackupDone: () -> Unit,
-    navController: NavHostController,
+    onShowQrCode: (String) -> Unit,
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -485,9 +483,7 @@ private fun NSecQrButton(
                     val ncryptsec = account.nip49Encrypt(password)
                     account.didBackup = true
                     onBackupDone()
-                    Amber.instance.applicationIOScope.launch(Dispatchers.Main) {
-                        navController.navigate(Route.QrCode.route.replace("{content}", ncryptsec))
-                    }
+                    onShowQrCode(ncryptsec)
                     onLoading(false)
                 }
             } else {
@@ -514,9 +510,7 @@ private fun NSecQrButton(
                             val ncryptsec = account.nip49Encrypt(password)
                             account.didBackup = true
                             onBackupDone()
-                            Amber.instance.applicationIOScope.launch(Dispatchers.Main) {
-                                navController.navigate(Route.QrCode.route.replace("{content}", ncryptsec))
-                            }
+                            onShowQrCode(ncryptsec)
                             onLoading(false)
                         }
                     } else {