Fixes intent reopening the Zap Setup screen because it was saved in the backstack of the Home screen.

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -324,7 +324,7 @@ fun uriToRoute(uri: String?): String? =
                 uri?.let {
                     Nip47WalletConnect.parse(it)
                     val encodedUri = URLEncoder.encode(it, StandardCharsets.UTF_8.toString())
-                    Route.Home.base + "?nip47=" + encodedUri
+                    Route.NIP47Setup.base + "?nip47=" + encodedUri
                 }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -67,6 +67,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.home.HomeScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.profile.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.search.SearchScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.NIP47SetupScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SecurityFiltersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.settings.SettingsScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.threadview.ThreadScreen
@@ -100,24 +101,7 @@ fun AppNavigation(
             enterTransition = { fadeIn(animationSpec = tween(200)) },
             exitTransition = { fadeOut(animationSpec = tween(200)) },
         ) {
-            composable(
+            composable(Route.Home.route) { HomeScreen(accountViewModel, nav) }
-                Route.Home.route,
-                Route.Home.arguments,
-            ) {
-                val nip47 = it.arguments?.getString("nip47")
-
-                HomeScreen(accountViewModel, nav, nip47)
-
-                if (nip47 != null) {
-                    LaunchedEffect(key1 = Unit) {
-                        launch {
-                            delay(1000)
-                            it.arguments?.remove("nip47")
-                        }
-                    }
-                }
-            }
-
             composable(Route.Message.route) { ChatroomListScreen(accountViewModel, nav) }
             composable(Route.Video.route) { VideoScreen(accountViewModel, nav) }
             composable(Route.Discover.route) { DiscoverScreen(accountViewModel, nav) }
@@ -282,6 +266,21 @@ fun AppNavigation(
                     nav,
                 )
             }
+
+            composable(
+                Route.NIP47Setup.route,
+                Route.NIP47Setup.arguments,
+                enterTransition = { slideInHorizontallyFromEnd },
+                exitTransition = { scaleOut },
+                popEnterTransition = { scaleIn },
+                popExitTransition = { slideOutHorizontallyToEnd },
+            ) {
+                val nip47 = it.arguments?.getString("nip47")
+
+                println("AABBCC NavHost Home $nip47")
+
+                NIP47SetupScreen(accountViewModel, nav, nip47)
+            }
         }
     }
 
@@ -297,6 +296,8 @@ private fun NavigateIfIntentRequested(
     accountViewModel: AccountViewModel,
     accountStateViewModel: AccountStateViewModel,
 ) {
+    println("AABBCC NavigateIfIntentRequested")
+
     val activity = LocalContext.current.getActivity()
     var newAccount by remember { mutableStateOf<String?>(null) }
 
@@ -315,6 +316,7 @@ private fun NavigateIfIntentRequested(
         }
 
         LaunchedEffect(intentNextPage) {
+            println("AABBCC NavigateIfIntentRequested LaunchedEffect(intentNextPage)")
             if (actionableNextPage != null) {
                 actionableNextPage?.let {
                     val currentRoute = getRouteWithArguments(nav.controller)
@@ -347,6 +349,8 @@ private fun NavigateIfIntentRequested(
     DisposableEffect(nav, activity) {
         val consumer =
             Consumer<Intent> { intent ->
+                println("AABBCC NavigateIfIntentRequested DisposableEffect(nav, activity)")
+
                 val uri = intent.data?.toString()
                 if (!uri.isNullOrBlank()) {
                     // navigation functions

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -52,18 +52,10 @@ sealed class Route(
 ) {
     object Home :
         Route(
-            route = "Home?nip47={nip47}",
+            route = "Home",
             icon = R.drawable.ic_home,
             notifSize = Modifier.size(Size25dp),
             iconSize = Modifier.size(Size24dp),
-            arguments =
-                listOf(
-                    navArgument("nip47") {
-                        type = NavType.StringType
-                        nullable = true
-                        defaultValue = null
-                    },
-                ).toImmutableList(),
             contentDescriptor = R.string.route_home,
         )
 
@@ -92,9 +84,6 @@ sealed class Route(
         Route(
             route = "Discover",
             icon = R.drawable.ic_sensors,
-            // hasNewItems = { accountViewModel, newNotes ->
-            //    DiscoverLatestItem.hasNewItems(accountViewModel, newNotes)
-            // },
             contentDescriptor = R.string.route_discover,
         )
 
@@ -217,6 +206,20 @@ sealed class Route(
             route = "Settings",
             icon = R.drawable.ic_settings,
         )
+
+    object NIP47Setup :
+        Route(
+            route = "NIP47Setup?nip47={nip47}",
+            icon = R.drawable.ic_home,
+            arguments =
+                listOf(
+                    navArgument("nip47") {
+                        type = NavType.StringType
+                        nullable = true
+                        defaultValue = null
+                    },
+                ).toImmutableList(),
+        )
 }
 
 fun getRouteWithArguments(navController: NavHostController): String? {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UpdateZapAmountDialog.kt

@@ -31,7 +31,6 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
@@ -220,16 +219,66 @@ fun UpdateZapAmountDialog(
     onClose: () -> Unit,
     nip47uri: String? = null,
     accountViewModel: AccountViewModel,
+) {
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties =
+            DialogProperties(
+                usePlatformDefaultWidth = false,
+                dismissOnClickOutside = false,
+                decorFitsSystemWindows = false,
+            ),
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Column {
+                val postViewModel: UpdateZapAmountViewModel =
+                    viewModel(
+                        key = "UpdateZapAmountViewModel",
+                        factory = UpdateZapAmountViewModel.Factory(accountViewModel.account.settings),
+                    )
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    CloseButton(
+                        onPress = {
+                            postViewModel.cancel()
+                            onClose()
+                        },
+                    )
+
+                    SaveButton(
+                        onPost = {
+                            postViewModel.sendPost()
+                            onClose()
+                        },
+                        isActive = postViewModel.hasChanged(),
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                UpdateZapAmountContent(postViewModel, onClose, nip47uri, accountViewModel)
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun UpdateZapAmountContent(
+    postViewModel: UpdateZapAmountViewModel,
+    onClose: () -> Unit,
+    nip47uri: String? = null,
+    accountViewModel: AccountViewModel,
 ) {
     val context = LocalContext.current
     val clipboardManager = LocalClipboardManager.current
 
-    val postViewModel: UpdateZapAmountViewModel =
-        viewModel(
-            key = "UpdateZapAmountViewModel",
-            factory = UpdateZapAmountViewModel.Factory(accountViewModel.account.settings),
-        )
-
     val uri = LocalUriHandler.current
 
     val zapTypes =
@@ -282,337 +331,295 @@ fun UpdateZapAmountDialog(
         }
     }
 
-    Dialog(
+    Column(
-        onDismissRequest = { onClose() },
+        modifier =
-        properties =
+            Modifier
-            DialogProperties(
+                .padding(10.dp)
-                usePlatformDefaultWidth = false,
+                .fillMaxWidth()
-                dismissOnClickOutside = false,
+                .imePadding()
-                decorFitsSystemWindows = false,
+                .verticalScroll(rememberScrollState()),
-            ),
     ) {
-        Surface(
+        FlowRow(
             modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.Center,
         ) {
-            Column(modifier = Modifier.padding(10.dp).imePadding()) {
+            postViewModel.amountSet.forEach { amountInSats ->
-                Row(
+                Button(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier.padding(horizontal = 3.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
+                    shape = ButtonBorder,
-                    verticalAlignment = Alignment.CenterVertically,
+                    colors =
+                        ButtonDefaults.buttonColors(
+                            containerColor = MaterialTheme.colorScheme.primary,
+                        ),
+                    onClick = { postViewModel.removeAmount(amountInSats) },
                 ) {
-                    CloseButton(
+                    Text(
-                        onPress = {
+                        "⚡ ${
-                            postViewModel.cancel()
+                            showAmount(
-                            onClose()
+                                amountInSats.toBigDecimal().setScale(1),
-                        },
+                            )
-                    )
+                        } ✖",
-
+                        color = Color.White,
-                    SaveButton(
+                        textAlign = TextAlign.Center,
-                        onPost = {
-                            postViewModel.sendPost()
-                            onClose()
-                        },
-                        isActive = postViewModel.hasChanged(),
                     )
                 }
+            }
+        }
 
-                Spacer(modifier = Modifier.height(10.dp))
+        Spacer(modifier = Modifier.height(10.dp))
 
-                Row(
+        Row(
-                    modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                ) {
+            verticalAlignment = Alignment.CenterVertically,
-                    Column(
+        ) {
-                        modifier = Modifier.verticalScroll(rememberScrollState()),
+            OutlinedTextField(
-                    ) {
+                label = { Text(text = stringRes(R.string.new_amount_in_sats)) },
-                        Row(modifier = Modifier.fillMaxWidth()) {
+                value = postViewModel.nextAmount,
-                            Column(modifier = Modifier.animateContentSize()) {
+                onValueChange = { postViewModel.nextAmount = it },
-                                FlowRow(
+                keyboardOptions =
-                                    modifier = Modifier.fillMaxWidth(),
+                    KeyboardOptions.Default.copy(
-                                    horizontalArrangement = Arrangement.Center,
+                        capitalization = KeyboardCapitalization.None,
-                                ) {
+                        keyboardType = KeyboardType.Number,
-                                    postViewModel.amountSet.forEach { amountInSats ->
+                    ),
-                                        Button(
+                placeholder = {
-                                            modifier = Modifier.padding(horizontal = 3.dp),
+                    Text(
-                                            shape = ButtonBorder,
+                        text = "100, 1000, 5000",
-                                            colors =
+                        color = MaterialTheme.colorScheme.placeholderText,
-                                                ButtonDefaults.buttonColors(
+                    )
-                                                    containerColor = MaterialTheme.colorScheme.primary,
+                },
-                                                ),
+                singleLine = true,
-                                            onClick = { postViewModel.removeAmount(amountInSats) },
+                modifier = Modifier.padding(end = 10.dp).weight(1f),
-                                        ) {
+            )
-                                            Text(
-                                                "⚡ ${
-                                                    showAmount(
-                                                        amountInSats.toBigDecimal().setScale(1),
-                                                    )
-                                                } ✖",
-                                                color = Color.White,
-                                                textAlign = TextAlign.Center,
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                        }
 
-                        Spacer(modifier = Modifier.height(10.dp))
+            Button(
+                onClick = { postViewModel.addAmount() },
+                shape = ButtonBorder,
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.primary,
+                    ),
+            ) {
+                Text(text = stringRes(R.string.add), color = Color.White)
+            }
+        }
 
-                        Row(
+        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
+            verticalAlignment = Alignment.CenterVertically,
-                        ) {
+        ) {
-                            OutlinedTextField(
+            TextSpinner(
-                                label = { Text(text = stringRes(R.string.new_amount_in_sats)) },
+                label = stringRes(id = R.string.zap_type_explainer),
-                                value = postViewModel.nextAmount,
+                placeholder =
-                                onValueChange = { postViewModel.nextAmount = it },
+                    zapTypes.filter { it.first == accountViewModel.defaultZapType() }.first().second,
-                                keyboardOptions =
+                options = zapOptions,
-                                    KeyboardOptions.Default.copy(
+                onSelect = { postViewModel.selectedZapType = zapTypes[it].first },
-                                        capitalization = KeyboardCapitalization.None,
+                modifier = Modifier.weight(1f).padding(end = 5.dp),
-                                        keyboardType = KeyboardType.Number,
+            )
-                                    ),
+        }
-                                placeholder = {
+
-                                    Text(
+        HorizontalDivider(
-                                        text = "100, 1000, 5000",
+            modifier = Modifier.padding(vertical = 10.dp),
-                                        color = MaterialTheme.colorScheme.placeholderText,
+            thickness = DividerThickness,
-                                    )
+        )
-                                },
+
-                                singleLine = true,
+        var qrScanning by remember { mutableStateOf(false) }
-                                modifier = Modifier.padding(end = 10.dp).weight(1f),
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                stringRes(id = R.string.wallet_connect_service),
+                Modifier.weight(1f),
+            )
+
+            IconButton(
+                onClick = {
+                    onClose()
+                    runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
+                },
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.alby),
+                    contentDescription = stringRes(id = R.string.accessibility_navigate_to_alby),
+                    modifier = Modifier.size(24.dp),
+                    tint = Color.Unspecified,
+                )
+            }
+
+            IconButton(
+                onClick = {
+                    clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
+                },
+            ) {
+                Icon(
+                    Icons.Outlined.ContentPaste,
+                    contentDescription = stringRes(id = R.string.paste_from_clipboard),
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+            }
+
+            IconButton(onClick = { qrScanning = true }) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_qrcode),
+                    contentDescription = stringRes(id = R.string.accessibility_scan_qr_code),
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+            }
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                stringRes(id = R.string.wallet_connect_service_explainer),
+                Modifier.weight(1f),
+                color = MaterialTheme.colorScheme.placeholderText,
+                fontSize = Font14SP,
+            )
+        }
+
+        if (qrScanning) {
+            SimpleQrCodeScanner {
+                qrScanning = false
+                if (!it.isNullOrEmpty()) {
+                    try {
+                        postViewModel.updateNIP47(it)
+                    } catch (e: IllegalArgumentException) {
+                        if (e.message != null) {
+                            accountViewModel.toast(
+                                stringRes(context, R.string.error_parsing_nip47_title),
+                                stringRes(context, R.string.error_parsing_nip47, it, e.message!!),
                             )
-
+                        } else {
-                            Button(
+                            accountViewModel.toast(
-                                onClick = { postViewModel.addAmount() },
+                                stringRes(context, R.string.error_parsing_nip47_title),
-                                shape = ButtonBorder,
+                                stringRes(context, R.string.error_parsing_nip47_no_error, it),
-                                colors =
-                                    ButtonDefaults.buttonColors(
-                                        containerColor = MaterialTheme.colorScheme.primary,
-                                    ),
-                            ) {
-                                Text(text = stringRes(R.string.add), color = Color.White)
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            TextSpinner(
-                                label = stringRes(id = R.string.zap_type_explainer),
-                                placeholder =
-                                    zapTypes.filter { it.first == accountViewModel.defaultZapType() }.first().second,
-                                options = zapOptions,
-                                onSelect = { postViewModel.selectedZapType = zapTypes[it].first },
-                                modifier = Modifier.weight(1f).padding(end = 5.dp),
-                            )
-                        }
-
-                        HorizontalDivider(
-                            modifier = Modifier.padding(vertical = 10.dp),
-                            thickness = DividerThickness,
-                        )
-
-                        var qrScanning by remember { mutableStateOf(false) }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Text(
-                                stringRes(id = R.string.wallet_connect_service),
-                                Modifier.weight(1f),
-                            )
-
-                            IconButton(
-                                onClick = {
-                                    onClose()
-                                    runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }
-                                },
-                            ) {
-                                Icon(
-                                    painter = painterResource(R.drawable.alby),
-                                    contentDescription = stringRes(id = R.string.accessibility_navigate_to_alby),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = Color.Unspecified,
-                                )
-                            }
-
-                            IconButton(
-                                onClick = {
-                                    clipboardManager.getText()?.let { postViewModel.copyFromClipboard(it.text) }
-                                },
-                            ) {
-                                Icon(
-                                    Icons.Outlined.ContentPaste,
-                                    contentDescription = stringRes(id = R.string.paste_from_clipboard),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = MaterialTheme.colorScheme.primary,
-                                )
-                            }
-
-                            IconButton(onClick = { qrScanning = true }) {
-                                Icon(
-                                    painter = painterResource(R.drawable.ic_qrcode),
-                                    contentDescription = stringRes(id = R.string.accessibility_scan_qr_code),
-                                    modifier = Modifier.size(24.dp),
-                                    tint = MaterialTheme.colorScheme.primary,
-                                )
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(bottom = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Text(
-                                stringRes(id = R.string.wallet_connect_service_explainer),
-                                Modifier.weight(1f),
-                                color = MaterialTheme.colorScheme.placeholderText,
-                                fontSize = Font14SP,
-                            )
-                        }
-
-                        if (qrScanning) {
-                            SimpleQrCodeScanner {
-                                qrScanning = false
-                                if (!it.isNullOrEmpty()) {
-                                    try {
-                                        postViewModel.updateNIP47(it)
-                                    } catch (e: IllegalArgumentException) {
-                                        if (e.message != null) {
-                                            accountViewModel.toast(
-                                                stringRes(context, R.string.error_parsing_nip47_title),
-                                                stringRes(context, R.string.error_parsing_nip47, it, e.message!!),
-                                            )
-                                        } else {
-                                            accountViewModel.toast(
-                                                stringRes(context, R.string.error_parsing_nip47_title),
-                                                stringRes(context, R.string.error_parsing_nip47_no_error, it),
-                                            )
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_pubkey)) },
-                                value = postViewModel.walletConnectPubkey,
-                                onValueChange = { postViewModel.walletConnectPubkey = it },
-                                keyboardOptions =
-                                    KeyboardOptions.Default.copy(
-                                        capitalization = KeyboardCapitalization.None,
-                                    ),
-                                placeholder = {
-                                    Text(
-                                        text = "npub, hex",
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                    )
-                                },
-                                singleLine = true,
-                                modifier = Modifier.weight(1f),
-                            )
-                        }
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_relay)) },
-                                modifier = Modifier.weight(1f),
-                                value = postViewModel.walletConnectRelay,
-                                onValueChange = { postViewModel.walletConnectRelay = it },
-                                placeholder = {
-                                    Text(
-                                        text = "wss://relay.server.com",
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                        maxLines = 1,
-                                    )
-                                },
-                                singleLine = true,
-                            )
-                        }
-
-                        var showPassword by remember { mutableStateOf(false) }
-
-                        val context = LocalContext.current
-
-                        val keyguardLauncher =
-                            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-                                if (result.resultCode == Activity.RESULT_OK) {
-                                    showPassword = true
-                                }
-                            }
-
-                        val authTitle = stringRes(id = R.string.wallet_connect_service_show_secret)
-
-                        Row(
-                            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            OutlinedTextField(
-                                label = { Text(text = stringRes(R.string.wallet_connect_service_secret)) },
-                                modifier = Modifier.weight(1f),
-                                value = postViewModel.walletConnectSecret,
-                                onValueChange = { postViewModel.walletConnectSecret = it },
-                                keyboardOptions =
-                                    KeyboardOptions(
-                                        autoCorrect = false,
-                                        keyboardType = KeyboardType.Password,
-                                        imeAction = ImeAction.Go,
-                                    ),
-                                placeholder = {
-                                    Text(
-                                        text = stringRes(R.string.wallet_connect_service_secret_placeholder),
-                                        color = MaterialTheme.colorScheme.placeholderText,
-                                    )
-                                },
-                                trailingIcon = {
-                                    IconButton(
-                                        onClick = {
-                                            if (!showPassword) {
-                                                authenticate(
-                                                    title = authTitle,
-                                                    context = context,
-                                                    keyguardLauncher = keyguardLauncher,
-                                                    onApproved = { showPassword = true },
-                                                    onError = { title, message -> accountViewModel.toast(title, message) },
-                                                )
-                                            } else {
-                                                showPassword = false
-                                            }
-                                        },
-                                    ) {
-                                        Icon(
-                                            imageVector =
-                                                if (showPassword) {
-                                                    Icons.Outlined.VisibilityOff
-                                                } else {
-                                                    Icons.Outlined.Visibility
-                                                },
-                                            contentDescription =
-                                                if (showPassword) {
-                                                    stringRes(R.string.show_password)
-                                                } else {
-                                                    stringRes(
-                                                        R.string.hide_password,
-                                                    )
-                                                },
-                                        )
-                                    }
-                                },
-                                visualTransformation =
-                                    if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
                             )
                         }
                     }
                 }
             }
         }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_pubkey)) },
+                value = postViewModel.walletConnectPubkey,
+                onValueChange = { postViewModel.walletConnectPubkey = it },
+                keyboardOptions =
+                    KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.None,
+                    ),
+                placeholder = {
+                    Text(
+                        text = "npub, hex",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                    )
+                },
+                singleLine = true,
+                modifier = Modifier.weight(1f),
+            )
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_relay)) },
+                modifier = Modifier.weight(1f),
+                value = postViewModel.walletConnectRelay,
+                onValueChange = { postViewModel.walletConnectRelay = it },
+                placeholder = {
+                    Text(
+                        text = "wss://relay.server.com",
+                        color = MaterialTheme.colorScheme.placeholderText,
+                        maxLines = 1,
+                    )
+                },
+                singleLine = true,
+            )
+        }
+
+        var showPassword by remember { mutableStateOf(false) }
+
+        val context = LocalContext.current
+
+        val keyguardLauncher =
+            rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    showPassword = true
+                }
+            }
+
+        val authTitle = stringRes(id = R.string.wallet_connect_service_show_secret)
+
+        Row(
+            modifier = Modifier.fillMaxWidth().padding(vertical = 5.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                label = { Text(text = stringRes(R.string.wallet_connect_service_secret)) },
+                modifier = Modifier.weight(1f),
+                value = postViewModel.walletConnectSecret,
+                onValueChange = { postViewModel.walletConnectSecret = it },
+                keyboardOptions =
+                    KeyboardOptions(
+                        autoCorrect = false,
+                        keyboardType = KeyboardType.Password,
+                        imeAction = ImeAction.Go,
+                    ),
+                placeholder = {
+                    Text(
+                        text = stringRes(R.string.wallet_connect_service_secret_placeholder),
+                        color = MaterialTheme.colorScheme.placeholderText,
+                    )
+                },
+                trailingIcon = {
+                    IconButton(
+                        onClick = {
+                            if (!showPassword) {
+                                authenticate(
+                                    title = authTitle,
+                                    context = context,
+                                    keyguardLauncher = keyguardLauncher,
+                                    onApproved = { showPassword = true },
+                                    onError = { title, message -> accountViewModel.toast(title, message) },
+                                )
+                            } else {
+                                showPassword = false
+                            }
+                        },
+                    ) {
+                        Icon(
+                            imageVector =
+                                if (showPassword) {
+                                    Icons.Outlined.VisibilityOff
+                                } else {
+                                    Icons.Outlined.Visibility
+                                },
+                            contentDescription =
+                                if (showPassword) {
+                                    stringRes(R.string.show_password)
+                                } else {
+                                    stringRes(
+                                        R.string.hide_password,
+                                    )
+                                },
+                        )
+                    }
+                },
+                visualTransformation =
+                    if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+            )
+        }
     }
 }
 

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/HomeScreen.kt

@@ -63,7 +63,6 @@ import com.vitorpamplona.amethyst.ui.feeds.rememberForeverPagerState
 import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
 import com.vitorpamplona.amethyst.ui.navigation.INav
 import com.vitorpamplona.amethyst.ui.navigation.Route
-import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.DisappearingScaffold
 import com.vitorpamplona.amethyst.ui.stringRes
@@ -78,10 +77,7 @@ import kotlinx.coroutines.launch
 fun HomeScreen(
     accountViewModel: AccountViewModel,
     nav: INav,
-    nip47: String? = null,
 ) {
-    ResolveNIP47(nip47, accountViewModel)
-
     HomeScreen(
         newThreadsFeedState = accountViewModel.feedStates.homeNewThreads,
         repliesFeedState = accountViewModel.feedStates.homeReplies,
@@ -139,18 +135,6 @@ private fun AssembleHomeTabs(
     inner(pagerState, tabs)
 }
 
-@Composable
-fun ResolveNIP47(
-    nip47: String?,
-    accountViewModel: AccountViewModel,
-) {
-    var wantsToAddNip47 by remember(nip47) { mutableStateOf(nip47) }
-
-    if (wantsToAddNip47 != null) {
-        UpdateZapAmountDialog({ wantsToAddNip47 = null }, wantsToAddNip47, accountViewModel)
-    }
-}
-
 @Composable
 private fun WatchLifeCycleChanges(accountViewModel: AccountViewModel) {
     val lifeCycleOwner = LocalLifecycleOwner.current
@@ -169,7 +153,6 @@ private fun WatchLifeCycleChanges(accountViewModel: AccountViewModel) {
 }
 
 @Composable
-@OptIn(ExperimentalFoundationApi::class)
 private fun HomePages(
     pagerState: PagerState,
     tabs: ImmutableList<TabItem>,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/NIP47SetupScreen.kt

@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2024 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.settings
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.SaveButton
+import com.vitorpamplona.amethyst.ui.navigation.INav
+import com.vitorpamplona.amethyst.ui.navigation.rememberHeightDecreaser
+import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
+import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountContent
+import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.stringRes
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun NIP47SetupScreen(
+    accountViewModel: AccountViewModel,
+    nav: INav,
+    nip47: String?,
+) {
+    val postViewModel: UpdateZapAmountViewModel =
+        viewModel(
+            key = "UpdateZapAmountViewModel",
+            factory = UpdateZapAmountViewModel.Factory(accountViewModel.account.settings),
+        )
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                scrollBehavior = rememberHeightDecreaser(),
+                title = { Text(stringRes(id = R.string.wallet_connect)) },
+                navigationIcon = {
+                    IconButton(
+                        onClick = {
+                            postViewModel.cancel()
+                            nav.popBack()
+                        },
+                        modifier = Modifier,
+                    ) {
+                        ArrowBackIcon()
+                    }
+                },
+                actions = {
+                    SaveButton(
+                        onPost = {
+                            postViewModel.sendPost()
+                            nav.popBack()
+                        },
+                        isActive = postViewModel.hasChanged(),
+                    )
+                },
+            )
+        },
+    ) {
+        Column(Modifier.padding(it)) {
+            UpdateZapAmountContent(postViewModel, onClose = {
+                postViewModel.cancel()
+                nav.popBack()
+            }, nip47, accountViewModel)
+        }
+    }
+}

amethyst/src/main/res/values/strings.xml

@@ -610,6 +610,7 @@
     <string name="light">Light</string>
     <string name="dark">Dark</string>
     <string name="application_preferences">Application Preferences</string>
+    <string name="wallet_connect">Wallet Connect</string>
     <string name="language">Language</string>
     <string name="theme">Theme</string>
     <string name="automatically_load_images_gifs">Image Preview</string>