diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt index 6f5a5533f..2634b6a05 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt @@ -30,7 +30,7 @@ object NostrChannelDataSource: NostrDataSource("ChatroomFeed") { // returns the last Note of each user. override fun feed(): List { - return channel?.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt } ?: emptyList() + return channel?.notes?.values?.filter { account.isAcceptable(it) }?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList() } override fun updateChannelFilters() { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatRoomDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatRoomDataSource.kt index c39e21770..ed761f069 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatRoomDataSource.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatRoomDataSource.kt @@ -35,7 +35,7 @@ object NostrChatRoomDataSource: NostrDataSource("ChatroomFeed") { override fun feed(): List { val messages = account.userProfile().messages[withUser]?.filter { account.isAcceptable(it) } - return messages?.sortedBy { it.event?.createdAt } ?: emptyList() + return messages?.sortedBy { it.event?.createdAt }?.reversed() ?: emptyList() } override fun updateChannelFilters() { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt index 23631b5b1..7bc314f32 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt @@ -61,6 +61,7 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode top = 10.dp, bottom = 10.dp ), + reverseLayout = true, state = listState ) { var previousDate: String = "" @@ -68,10 +69,6 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode ChatroomMessageCompose(item, accountViewModel = accountViewModel, navController = navController) } } - - LaunchedEffect(Unit) { - listState.animateScrollToItem(state.feed.size-1, 0) - } } FeedState.Loading -> { LoadingFeed()