From 7e07573fa54fa0c8daa7a677411777aec682c200 Mon Sep 17 00:00:00 2001 From: toadlyBroodle Date: Sat, 1 Apr 2023 10:23:45 +0900 Subject: [PATCH] fix voting on closed polls bug --- .../main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt | 2 +- .../com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt index 640fecffb..09b858122 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt @@ -131,7 +131,7 @@ fun ZapVote( ) .show() } - } else if (pollViewModel.isPollClosed) { + } else if (pollViewModel.isPollClosed()) { scope.launch { Toast .makeText( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt index 77080d3e0..2da8418d2 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt @@ -30,8 +30,8 @@ class PollNoteViewModel { fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum - val isPollClosed: Boolean = closedAt?.let { // allow 2 minute leeway for zap to propagate - pollNote?.createdAt()?.plus(it * (86400 + 120))!! > Date().time / 1000 + fun isPollClosed(): Boolean = closedAt?.let { // allow 2 minute leeway for zap to propagate + pollNote?.createdAt()?.plus(it * (86400 + 120))!! < Date().time / 1000 } == true fun voteAmountPlaceHolderText(sats: String): String = if (valueMinimum == null && valueMaximum == null) {