From 35cd9cb6c52c47c165b416b08e038f2e2709564e Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 22 Dec 2023 09:15:21 -0500
Subject: [PATCH] Starts relay observers with a non null value

---
 .../java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt   | 3 +--
 .../java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt   | 2 +-
 .../vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt  | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt
index eeebf309f..ff1e09882 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListBox.kt
@@ -24,14 +24,13 @@ import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonBoxModifer
 import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconButtonModifier
 import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconModifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import kotlinx.collections.immutable.persistentListOf
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var expanded by remember { mutableStateOf(false) }
 
-    val relayList by baseNote.live().relayInfo.observeAsState(persistentListOf())
+    val relayList by baseNote.live().relayInfo.observeAsState(baseNote.relays)
 
     Spacer(DoubleVertSpacer)
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
index 36134ed90..8399c95a3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
@@ -57,7 +57,7 @@ public fun RelayBadgesHorizontal(baseNote: Note, accountViewModel: AccountViewMo
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun RenderRelayList(baseNote: Note, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val noteRelays by baseNote.live().relayInfo.observeAsState()
+    val noteRelays by baseNote.live().relayInfo.observeAsState(baseNote.relays)
 
     FlowRow(StdStartPadding, verticalArrangement = Arrangement.Center) {
         if (expanded.value) {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
index 39e8a511c..31388915a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt
@@ -402,9 +402,9 @@ private fun VideoUserOptionAction(
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val noteRelays by baseNote.live().relayInfo.observeAsState()
+    val noteRelays by baseNote.live().relayInfo.observeAsState(baseNote.relays)
 
-    FlowRow() {
+    FlowRow {
         noteRelays?.forEach { relayInfo ->
             RenderRelay(relayInfo, accountViewModel, nav)
         }