From 5a2e149fa03d7771c38ffd99140894a7762e650a Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Sat, 23 Dec 2023 17:28:04 -0500
Subject: [PATCH] No need to remember simple state.

---
 .../vitorpamplona/amethyst/ui/note/NoteCompose.kt | 15 ++-------------
 .../amethyst/ui/note/UserProfilePicture.kt        | 13 +++++--------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 66d2c93e6..9edad0d63 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -2645,19 +2645,8 @@ private fun BadgeBox(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val isRepost by remember(baseNote) {
-        derivedStateOf {
-            baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent
-        }
-    }
-
-    if (isRepost) {
-        val baseReply by remember(baseNote) {
-            derivedStateOf {
-                baseNote.replyTo?.lastOrNull()
-            }
-        }
-        baseReply?.let {
+    if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
+        baseNote.replyTo?.lastOrNull()?.let {
             RelayBadges(it, accountViewModel, nav)
         }
     } else {
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
index 9bb9e7227..90155c0b9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
@@ -139,19 +139,13 @@ fun UserPicture(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val route by remember(user) {
-        derivedStateOf {
-            "User/${user.pubkeyHex}"
-        }
-    }
-
     ClickableUserPicture(
         baseUser = user,
         size = size,
         accountViewModel = accountViewModel,
         modifier = pictureModifier,
         onClick = {
-            nav(route)
+            nav("User/${user.pubkeyHex}")
         }
     )
 }
@@ -365,7 +359,10 @@ fun WatchUserFollows(userHex: String, accountViewModel: AccountViewModel, onFoll
         accountViewModel.userFollows.map {
             it.user.isFollowingCached(userHex) || (userHex == accountViewModel.account.userProfile().pubkeyHex)
         }.distinctUntilChanged()
-    }.observeAsState(false)
+    }.observeAsState(
+        accountViewModel.account.userProfile().isFollowingCached(userHex) ||
+            (userHex == accountViewModel.account.userProfile().pubkeyHex)
+    )
 
     onFollowChanges(showFollowingMark)
 }