UI Overview

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListViewModel.kt

@@ -44,7 +44,7 @@ class NewRelayListViewModel : ViewModel() {
 
     fun load(account: Account) {
         this.account = account
-        clear()
+        reset()
         loadRelayDocuments()
     }
 
@@ -52,7 +52,7 @@ class NewRelayListViewModel : ViewModel() {
         relays.let {
             viewModelScope.launch(Dispatchers.IO) {
                 account.saveRelayList(it.value)
-                clear()
+                reset()
             }
         }
     }
@@ -71,10 +71,10 @@ class NewRelayListViewModel : ViewModel() {
         }
     }
 
-    fun clear() {
-        _relays.update {
-            var relayFile = account.userProfile().latestContactList?.relays()
+    fun reset() {
+        var relayFile = account.userProfile().latestContactList?.relays()
 
+        val currentKind3List =
             if (relayFile != null) {
                 // Ugly, but forces nostr.band as the only search-supporting relay today.
                 // TODO: Remove when search becomes more available.
@@ -159,6 +159,9 @@ class NewRelayListViewModel : ViewModel() {
                     .sortedBy { it.downloadCountInBytes }
                     .reversed()
             }
+
+        _relays.update {
+            currentKind3List
         }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -547,7 +547,11 @@ fun ListContent(
     }
 
     if (wantsToEditRelays) {
-        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
+        NewRelayListView(
+            onClose = { wantsToEditRelays = false },
+            accountViewModel = accountViewModel,
+            nav = nav,
+        )
     }
     if (backupDialogOpen) {
         AccountBackupDialog(accountViewModel, onClose = { backupDialogOpen = false })

app/src/main/java/com/vitorpamplona/amethyst/ui/note/types/RelayList.kt

@@ -167,7 +167,7 @@ private fun RelayOptionsAction(
     var wantsToAddRelay by remember { mutableStateOf("") }
 
     if (wantsToAddRelay.isNotEmpty()) {
-        NewRelayListView({ wantsToAddRelay = "" }, accountViewModel, wantsToAddRelay, nav = nav)
+        NewRelayListView(wantsToAddRelay, { wantsToAddRelay = "" }, accountViewModel, nav = nav)
     }
 
     if (isCurrentlyOnTheUsersList) {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/RelayFeedView.kt

@@ -137,7 +137,7 @@ fun RelayFeedView(
     var wantsToAddRelay by remember { mutableStateOf("") }
 
     if (wantsToAddRelay.isNotEmpty()) {
-        NewRelayListView({ wantsToAddRelay = "" }, accountViewModel, wantsToAddRelay, nav = nav)
+        NewRelayListView(wantsToAddRelay, { wantsToAddRelay = "" }, accountViewModel, nav = nav)
     }
 
     var refreshing by remember { mutableStateOf(false) }