From 6067a7d890ca7bb8deb3453cae4a9420b2831d1b Mon Sep 17 00:00:00 2001
From: maxmoney21m <maxmoney@nostrplebs.com>
Date: Sat, 4 Mar 2023 14:33:09 +0800
Subject: [PATCH] Use new channel() method

---
 .../vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt | 5 +++--
 .../amethyst/ui/screen/loggedIn/ChatroomListScreen.kt        | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt
index 6a54db451..46391ad37 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt
@@ -104,9 +104,10 @@ private fun FeedLoaded(
             for (note in state.feed.value) {
                 note.event?.let {
                     var route = ""
+                    val channel = note.channel()
 
-                    if (note.channel != null) {
-                        route = "Channel/${note.channel!!.idHex}"
+                    if (channel != null) {
+                        route = "Channel/${channel.idHex}"
                     } else {
                         val replyAuthorBase = note.mentions?.first()
                         var userToComposeOn = note.author!!
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
index 72c4a0dd3..253abe625 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
@@ -18,6 +18,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
@@ -28,8 +29,11 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.google.accompanist.pager.ExperimentalPagerApi