From 8c11815bc459740a59d6c5650847a84a6f469ee5 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Sun, 28 Jun 2026 09:01:32 +0700 Subject: [PATCH] remove force unwraps in chat screen --- .../kotlin/su/reya/coop/screens/ChatScreen.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt index 0e7db46..27d308e 100644 --- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt +++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt @@ -59,6 +59,7 @@ import coop.composeapp.generated.resources.ic_arrow_back import coop.composeapp.generated.resources.ic_cancel import coop.composeapp.generated.resources.ic_check_circle import coop.composeapp.generated.resources.ic_send +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch import org.jetbrains.compose.resources.painterResource import rust.nostr.sdk.PublicKey @@ -103,8 +104,13 @@ fun ChatScreen(id: Long, screening: Boolean = false) { return } - val displayName by remember(room) { room!!.nameFlow(viewModel) }.collectAsStateWithLifecycle("Loading...") - val picture by remember(room) { room!!.pictureFlow(viewModel) }.collectAsStateWithLifecycle(null) + val displayName by remember(room) { + room?.nameFlow(viewModel) ?: flowOf("Loading...") + }.collectAsStateWithLifecycle("Loading...") + + val picture by remember(room) { + room?.pictureFlow(viewModel) ?: flowOf(null) + }.collectAsStateWithLifecycle(null) var text by remember { mutableStateOf("") } var loading by remember { mutableStateOf(true) } @@ -161,7 +167,7 @@ fun ChatScreen(id: Long, screening: Boolean = false) { Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.clickable { - room!!.members.firstOrNull()?.let { pubkey -> + room?.members?.firstOrNull()?.let { pubkey -> navigator.navigate(Screen.Profile(pubkey.toBech32())) } }