Correctly updating the screen after zaps have been accounted for

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

@@ -37,6 +37,7 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.math.BigDecimal
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -59,39 +60,74 @@ fun PollNote(
     pollViewModel.load(zappedNote)
 
     pollViewModel.pollEvent?.pollOptions()?.forEach { poll_op ->
-        val optionTally = pollViewModel.optionVoteTally(poll_op.key)
+        OptionNote(
-        val color = if (
+            poll_op.key,
-            pollViewModel.consensusThreshold != null &&
+            poll_op.value,
-            optionTally >= pollViewModel.consensusThreshold!!
+            pollViewModel,
-        ) {
+            baseNote,
-            Color.Green.copy(alpha = 0.32f)
+            accountViewModel,
-        } else {
+            canPreview,
-            MaterialTheme.colors.primary.copy(alpha = 0.32f)
+            backgroundColor,
+            navController
+        )
+    }
 }
 
+@Composable
+private fun OptionNote(
+    optionNumber: Int,
+    optionText: String,
+    pollViewModel: PollNoteViewModel,
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    canPreview: Boolean,
+    backgroundColor: Color,
+    navController: NavController
+) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier.padding(vertical = 3.dp)
     ) {
-            if (pollViewModel.canZap()) {
+        if (!pollViewModel.canZap()) {
+            val defaultColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+            var optionTally by remember { mutableStateOf(Pair(BigDecimal.ZERO, defaultColor)) }
+
+            LaunchedEffect(key1 = optionNumber, key2 = pollViewModel) {
+                val myTally = pollViewModel.optionVoteTally(optionNumber)
+                val color = if (
+                    pollViewModel.consensusThreshold != null &&
+                    myTally >= pollViewModel.consensusThreshold!!
+                ) {
+                    Color.Green.copy(alpha = 0.32f)
+                } else {
+                    defaultColor
+                }
+
+                if (myTally > optionTally.first || color != optionTally.second) {
+                    optionTally = Pair(myTally, color)
+                }
+            }
+
             ZapVote(
                 baseNote,
                 accountViewModel,
                 pollViewModel,
-                    poll_op.key,
+                optionNumber,
                 nonClickablePrepend = {
                     Box(
-                            Modifier.fillMaxWidth(0.75f).clip(shape = RoundedCornerShape(15.dp))
+                        Modifier
+                            .fillMaxWidth(0.75f)
+                            .clip(shape = RoundedCornerShape(15.dp))
                             .border(
                                 2.dp,
-                                    color,
+                                optionTally.second,
                                 RoundedCornerShape(15.dp)
                             )
                     ) {
                         LinearProgressIndicator(
                             modifier = Modifier.matchParentSize(),
-                                color = color,
+                            color = optionTally.second,
-                                progress = optionTally.toFloat()
+                            progress = optionTally.first.toFloat()
                         )
 
                         Row(
@@ -99,17 +135,23 @@ fun PollNote(
                         ) {
                             Column(
                                 horizontalAlignment = Alignment.End,
-                                    modifier = Modifier.padding(horizontal = 10.dp).width(40.dp)
+                                modifier = Modifier
+                                    .padding(horizontal = 10.dp)
+                                    .width(40.dp)
                             ) {
                                 Text(
-                                        text = "${(optionTally.toFloat() * 100).roundToInt()}%",
+                                    text = "${(optionTally.first.toFloat() * 100).roundToInt()}%",
                                     fontWeight = FontWeight.Bold
                                 )
                             }
 
-                                Column(modifier = Modifier.fillMaxWidth().padding(15.dp)) {
+                            Column(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(15.dp)
+                            ) {
                                 TranslatableRichTextViewer(
-                                        poll_op.value,
+                                    optionText,
                                     canPreview,
                                     Modifier,
                                     pollViewModel.pollEvent?.tags(),
@@ -129,11 +171,12 @@ fun PollNote(
                 baseNote,
                 accountViewModel,
                 pollViewModel,
-                    poll_op.key,
+                optionNumber,
                 nonClickablePrepend = {},
                 clickablePrepend = {
                     Box(
-                            Modifier.fillMaxWidth(0.75f)
+                        Modifier
+                            .fillMaxWidth(0.75f)
                             .clip(shape = RoundedCornerShape(15.dp))
                             .border(
                                 2.dp,
@@ -142,7 +185,7 @@ fun PollNote(
                             )
                     ) {
                         TranslatableRichTextViewer(
-                                poll_op.value,
+                            optionText,
                             canPreview,
                             Modifier.padding(15.dp),
                             pollViewModel.pollEvent?.tags(),
@@ -156,7 +199,6 @@ fun PollNote(
         }
     }
 }
-}
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
@@ -294,7 +336,7 @@ fun ZapVote(
 
         var optionWasZappedByLoggedInUser by remember { mutableStateOf(false) }
 
-        LaunchedEffect(key1 = zappedNote) {
+        LaunchedEffect(key1 = zapsState) {
             withContext(Dispatchers.IO) {
                 if (!optionWasZappedByLoggedInUser) {
                     optionWasZappedByLoggedInUser = pollViewModel.isPollOptionZappedBy(pollOption, accountViewModel.userProfile())
@@ -331,7 +373,7 @@ fun ZapVote(
 
     var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
 
-    LaunchedEffect(key1 = zappedNote) {
+    LaunchedEffect(key1 = zapsState) {
         withContext(Dispatchers.IO) {
             if (!wasZappedByLoggedInUser) {
                 wasZappedByLoggedInUser = zappedNote?.isZappedBy(accountViewModel.userProfile(), account) == true

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt

@@ -316,7 +316,7 @@ fun ZapReaction(
 
     var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
 
-    LaunchedEffect(key1 = zappedNote) {
+    LaunchedEffect(key1 = zapsState) {
         withContext(Dispatchers.IO) {
             if (!wasZappedByLoggedInUser) {
                 wasZappedByLoggedInUser = zappedNote?.isZappedBy(account.userProfile(), account) == true