highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-25 19:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix voting on closed polls bug

Browse Source
This commit is contained in:
toadlyBroodle
2023-04-01 10:23:45 +09:00
parent 1f08f33600
commit 7e07573fa5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNote.kt
View File

@@ -131,7 +131,7 @@ fun ZapVote(
) )
.show() .show()
} }
} else if (pollViewModel.isPollClosed) { } else if (pollViewModel.isPollClosed()) {
scope.launch { scope.launch {
Toast Toast
.makeText( .makeText(

4
app/src/main/java/com/vitorpamplona/amethyst/ui/note/PollNoteViewModel.kt
View File

@@ -30,8 +30,8 @@ class PollNoteViewModel {
fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum
val isPollClosed: Boolean = closedAt?.let { // allow 2 minute leeway for zap to propagate fun isPollClosed(): Boolean = closedAt?.let { // allow 2 minute leeway for zap to propagate
pollNote?.createdAt()?.plus(it * (86400 + 120))!! > Date().time / 1000 pollNote?.createdAt()?.plus(it * (86400 + 120))!! < Date().time / 1000
} == true } == true
fun voteAmountPlaceHolderText(sats: String): String = if (valueMinimum == null && valueMaximum == null) { fun voteAmountPlaceHolderText(sats: String): String = if (valueMinimum == null && valueMaximum == null) {