Merge branch 'main' into amber

app/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -23,7 +23,7 @@ class RegisterAccounts(
     ): List<RelayAuthEvent> {
         return accounts.mapNotNull {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
-            if (acc != null) {
+            if (acc != null && acc.isWriteable()) {
                 val relayToUse = acc.activeRelays()?.firstOrNull { it.read }
                 if (relayToUse != null) {
                     acc.createAuthEvent(relayToUse, notificationToken)

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

@@ -1,7 +1,10 @@
 package com.vitorpamplona.amethyst.ui.note
 
 import android.util.Log
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -358,6 +361,12 @@ private fun ParseAuthorCommentAndAmount(
     onReady(content)
 }
 
+fun click(content: MutableState<ZapAmountCommentNotification>, nav: (String) -> Unit) {
+    content.value.user?.let {
+        nav(routeFor(it))
+    }
+}
+
 @Composable
 private fun RenderState(
     content: MutableState<ZapAmountCommentNotification>,
@@ -366,11 +375,7 @@ private fun RenderState(
     nav: (String) -> Unit
 ) {
     Row(
-        modifier = Modifier.clickable {
-            content.value.user?.let {
-                nav(routeFor(it))
-            }
-        },
+        modifier = Modifier.clickable { click(content, nav) },
         verticalAlignment = Alignment.CenterVertically
     ) {
         DisplayAuthorCommentAndAmount(
@@ -418,8 +423,19 @@ fun CrossfadeToDisplayPicture(authorComment: MutableState<ZapAmountCommentNotifi
 
 @Composable
 fun CrossfadeToDisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
-    Crossfade(authorComment.value, modifier = amountBoxModifier) {
-        it.amount?.let {
+    val visible by remember(authorComment) {
+        derivedStateOf {
+            authorComment.value.amount != null
+        }
+    }
+
+    AnimatedVisibility(
+        visible = visible,
+        modifier = amountBoxModifier,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        authorComment.value.amount?.let {
             Box(
                 modifier = amountBoxModifier,
                 contentAlignment = Alignment.BottomCenter
@@ -453,8 +469,18 @@ fun CrossfadeToDisplayComment(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Crossfade(authorComment.value) {
-        it.comment?.let {
+    val visible by remember(authorComment) {
+        derivedStateOf {
+            authorComment.value.comment != null
+        }
+    }
+
+    AnimatedVisibility(
+        visible,
+        enter = fadeIn(),
+        exit = fadeOut()
+    ) {
+        authorComment.value.comment?.let {
             TranslatableRichTextViewer(
                 content = it,
                 canPreview = true,

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

@@ -1076,6 +1076,8 @@ private fun NoteBody(
 fun DisplayZapSplits(noteEvent: EventInterface, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val list = remember(noteEvent) { noteEvent.zapSplitSetup() }
 
+    if (list.isEmpty()) return
+
     Row(verticalAlignment = CenterVertically) {
         Box(
             Modifier

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/VideoScreen.kt

@@ -127,7 +127,6 @@ fun WatchAccountForVideoScreen(videoFeedView: NostrVideoFeedViewModel, accountVi
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun SaveableFeedState(
     videoFeedView: NostrVideoFeedViewModel,