diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/OpenPollsSection.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/OpenPollsSection.kt index 39223b078..ec1952309 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/OpenPollsSection.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/OpenPollsSection.kt @@ -62,23 +62,26 @@ private fun filterOpenPolls(notes: List): List { val now = TimeUtils.now() val oneDayInSeconds = TimeUtils.ONE_DAY - return notes.filter { note -> - val event = note.event ?: return@filter false + return notes + .filter { note -> + val event = note.event ?: return@filter false - when (event) { - is PollEvent -> { - val endsAt = event.endsAt() - if (endsAt != null) endsAt > now else event.createdAt + oneDayInSeconds > now + when (event) { + is PollEvent -> { + val endsAt = event.endsAt() + if (endsAt != null) endsAt > now else event.createdAt + oneDayInSeconds > now + } + + is ZapPollEvent -> { + val closedAt = event.closedAt() + if (closedAt != null) closedAt > now else event.createdAt + oneDayInSeconds > now + } + + else -> { + false + } } - - is ZapPollEvent -> { - val closedAt = event.closedAt() - if (closedAt != null) closedAt > now else event.createdAt + oneDayInSeconds > now - } - - else -> false - } - }.sortedByDescending { it.createdAt() } + }.sortedByDescending { it.createdAt() } } @Composable