From 3ad0c570e687228c8f185608acca54ee00d52ad5 Mon Sep 17 00:00:00 2001
From: Marko Kocic <marko@appollo41.com>
Date: Tue, 17 Dec 2024 13:39:59 +0100
Subject: [PATCH] Update selectedHighlight on article observed

---
 .../thread/articles/details/ArticleDetailsViewModel.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/net/primal/android/thread/articles/details/ArticleDetailsViewModel.kt b/app/src/main/kotlin/net/primal/android/thread/articles/details/ArticleDetailsViewModel.kt
index 65338a472..a389c4af8 100644
--- a/app/src/main/kotlin/net/primal/android/thread/articles/details/ArticleDetailsViewModel.kt
+++ b/app/src/main/kotlin/net/primal/android/thread/articles/details/ArticleDetailsViewModel.kt
@@ -229,9 +229,14 @@ class ArticleDetailsViewModel @Inject constructor(
                     }
 
                     setState {
+                        val joinedHighlights = article.highlights.joinOnContent()
+                        val selectedHighlight = selectedHighlight?.let {
+                            joinedHighlights.first { it.content == selectedHighlight.content }
+                        }
                         copy(
                             article = article.mapAsArticleDetailsUi(),
-                            highlights = article.highlights.joinOnContent(),
+                            highlights = joinedHighlights,
+                            selectedHighlight = selectedHighlight,
                             topZaps = article.eventZaps
                                 .map { it.asEventZapUiModel() }
                                 .sortedWith(EventZapUiModel.DefaultComparator),