v0.55.3

Added German translation

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 192
-        versionName "0.54.0"
+        versionCode 198
+        versionName "0.55.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -129,7 +129,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'
 
     // Json Serialization TODO: We might need to converge between gson and Jackson (we are usin both)
-    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.1'
+    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     // link preview
@@ -154,8 +154,6 @@ dependencies {
     // create blurhash
     implementation group: 'io.trbl', name: 'blurhash', version: '1.0.0'
 
-    // Rendering clickable text
-    implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
     // Permission to upload pictures:
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
 
@@ -178,7 +176,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts

app/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
@@ -10,7 +11,7 @@ fun TranslatableRichTextViewer(
     content: String,
     canPreview: Boolean,
     modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>,
     backgroundColor: Color,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit

app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.compose.runtime.Immutable
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.Account
@@ -30,6 +31,7 @@ import java.util.Locale
 private const val DEBUG_PLAINTEXT_PREFERENCES = false
 private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 
+@Immutable
 data class AccountInfo(
     val npub: String,
     val hasPrivKey: Boolean = false

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -89,10 +89,6 @@ class Account(
         return followingChannels.map { LocalCache.getOrCreateChannel(it) }
     }
 
-    fun hiddenUsers(): List<User> {
-        return (hiddenUsers + transientHiddenUsers).map { LocalCache.getOrCreateUser(it) }
-    }
-
     fun isWriteable(): Boolean {
         return loggedIn.privKey != null
     }
@@ -567,16 +563,15 @@ class Account(
         LocalCache.consume(signedEvent, null)
     }
 
-    fun sendPrivateMessage(message: String, toUser: String, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
+    fun sendPrivateMessage(message: String, toUser: User, replyingTo: Note? = null, mentions: List<User>?, zapReceiver: String? = null, wantsToMarkAsSensitive: Boolean) {
         if (!isWriteable()) return
-        val user = LocalCache.users[toUser] ?: return
 
         val repliesToHex = listOfNotNull(replyingTo?.idHex).ifEmpty { null }
         val mentionsHex = mentions?.map { it.pubkeyHex }
 
         val signedEvent = PrivateDmEvent.create(
-            recipientPubKey = user.pubkey(),
-            publishedRecipientPubKey = user.pubkey(),
+            recipientPubKey = toUser.pubkey(),
+            publishedRecipientPubKey = toUser.pubkey(),
             msg = message,
             replyTos = repliesToHex,
             mentions = mentionsHex,
@@ -1004,10 +999,10 @@ class Account(
     }
 
     private fun updateContactListTo(newContactList: ContactListEvent?) {
-        if (newContactList?.unverifiedFollowKeySet().isNullOrEmpty()) return
+        if (newContactList == null || newContactList.tags.isEmpty()) return
 
         // Events might be different objects, we have to compare their ids.
-        if (backupContactList?.id != newContactList?.id) {
+        if (backupContactList?.id != newContactList.id) {
             backupContactList = newContactList
             saveable.invalidateData()
         }
@@ -1135,7 +1130,9 @@ class Account(
 
         // saves contact list for the next time.
         userProfile().live().follows.observeForever {
-            updateContactListTo(userProfile().latestContactList)
+            GlobalScope.launch(Dispatchers.IO) {
+                updateContactListTo(userProfile().latestContactList)
+            }
         }
 
         // imports transient blocks due to spam.

app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -3,7 +3,9 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import android.util.LruCache
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
+import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import kotlinx.coroutines.Dispatchers
@@ -16,6 +18,8 @@ class AntiSpamFilter {
 
     @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
+        checkNotInMainThread()
+
         val idHex = event.id
 
         // if short message, ok
@@ -28,6 +32,7 @@ class AntiSpamFilter {
         val hash = (event.content + event.tags.flatten().joinToString(",")).hashCode()
 
         if ((recentMessages[hash] != null && recentMessages[hash] != idHex) || spamMessages[hash] != null) {
+            Log.w("Potential SPAM Message for sharing", "${Nip19.createNEvent(event.id, event.pubKey, event.kind, null)}")
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders

app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
@@ -9,6 +10,7 @@ import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.Dispatchers
 import java.util.concurrent.ConcurrentHashMap
 
+@Stable
 class Channel(val idHex: String) {
     var creator: User? = null
     var info = ChannelCreateEvent.ChannelData(null, null, null)
@@ -33,6 +35,10 @@ class Channel(val idHex: String) {
         notes.remove(note.idHex)
     }
 
+    fun removeNote(noteHex: String) {
+        notes.remove(noteHex)
+    }
+
     fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
         this.creator = creator
         this.info = channelInfo

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -1,9 +1,8 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
@@ -13,7 +12,6 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import nostr.postr.toNpub
-import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -23,12 +21,6 @@ import java.time.format.DateTimeFormatter
 import java.util.concurrent.ConcurrentHashMap
 
 object LocalCache {
-    val metadataParser by lazy {
-        jacksonObjectMapper()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .readerFor(UserMetadata::class.java)
-    }
-
     val antiSpam = AntiSpamFilter()
 
     val users = ConcurrentHashMap<HexKey, User>(5000)
@@ -40,6 +32,8 @@ object LocalCache {
         ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
 
     fun checkGetOrCreateUser(key: String): User? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateUser(key)
         }
@@ -48,6 +42,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateUser(key: HexKey): User {
+        // checkNotInMainThread()
+
         return users[key] ?: run {
             val answer = User(key)
             users.put(key, answer)
@@ -56,6 +52,8 @@ object LocalCache {
     }
 
     fun checkGetOrCreateNote(key: String): Note? {
+        checkNotInMainThread()
+
         if (ATag.isATag(key)) {
             return checkGetOrCreateAddressableNote(key)
         }
@@ -67,6 +65,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateNote(idHex: String): Note {
+        checkNotInMainThread()
+
         return notes[idHex] ?: run {
             val answer = Note(idHex)
             notes.put(idHex, answer)
@@ -75,6 +75,8 @@ object LocalCache {
     }
 
     fun checkGetOrCreateChannel(key: String): Channel? {
+        checkNotInMainThread()
+
         if (isValidHexNpub(key)) {
             return getOrCreateChannel(key)
         }
@@ -93,6 +95,8 @@ object LocalCache {
 
     @Synchronized
     fun getOrCreateChannel(key: String): Channel {
+        checkNotInMainThread()
+
         return channels[key] ?: run {
             val answer = Channel(key)
             channels.put(key, answer)
@@ -115,33 +119,35 @@ object LocalCache {
     }
 
     @Synchronized
-    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+    fun getOrCreateAddressableNoteInternal(key: ATag): AddressableNote {
+        checkNotInMainThread()
+
         // we can't use naddr here because naddr might include relay info and
         // the preferred relay should not be part of the index.
         return addressables[key.toTag()] ?: run {
             val answer = AddressableNote(key)
-            answer.author = checkGetOrCreateUser(key.pubKeyHex)
             addressables.put(key.toTag(), answer)
             answer
         }
     }
 
+    fun getOrCreateAddressableNote(key: ATag): AddressableNote {
+        val note = getOrCreateAddressableNoteInternal(key)
+        // Loads the user outside a Syncronized block to avoid blocking
+        if (note.author == null) {
+            note.author = checkGetOrCreateUser(key.pubKeyHex)
+        }
+        return note
+    }
+
     fun consume(event: MetadataEvent) {
         // new event
         val oldUser = getOrCreateUser(event.pubKey)
         if (oldUser.info == null || event.createdAt > oldUser.info!!.updatedMetadataAt) {
-            val newUser = try {
-                metadataParser.readValue(
-                    ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)),
-                    UserMetadata::class.java
-                )
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Log.w("MT", "Content Parse Error ${e.localizedMessage} ${event.content}")
-                return
+            val newUserMetadata = event.contactMetaData()
+            if (newUserMetadata != null) {
+                oldUser.updateUserInfo(newUserMetadata, event)
             }
-
-            oldUser.updateUserInfo(newUser, event)
             // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
         } else {
             // Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
@@ -285,12 +291,13 @@ object LocalCache {
         val note = getOrCreateAddressableNote(event.address())
         val author = getOrCreateUser(event.pubKey)
 
-        // Already processed this event.
-        if (note.event != null) return
+        if (note.event?.id() == event.id()) return
 
-        note.loadEvent(event, author, emptyList())
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
 
-        refreshObservers(note)
+            refreshObservers(note)
+        }
     }
 
     private fun consume(event: AudioTrackEvent) {
@@ -298,11 +305,13 @@ object LocalCache {
         val author = getOrCreateUser(event.pubKey)
 
         // Already processed this event.
-        if (note.event != null) return
+        if (note.event?.id() == event.id()) return
 
-        note.loadEvent(event, author, emptyList())
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
 
-        refreshObservers(note)
+            refreshObservers(note)
+        }
     }
 
     fun consume(event: BadgeDefinitionEvent) {
@@ -357,6 +366,32 @@ object LocalCache {
         refreshObservers(note)
     }
 
+    fun consume(event: AppDefinitionEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        refreshObservers(note)
+    }
+
+    fun consume(event: AppRecommendationEvent) {
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            refreshObservers(note)
+        }
+    }
+
     @Suppress("UNUSED_PARAMETER")
     fun consume(event: RecommendRelayEvent) {
 //        // Log.d("RR", event.toJson())
@@ -429,8 +464,10 @@ object LocalCache {
                     masterNote.removeReport(deleteNote)
                 }
 
-                val channel = deleteNote.channel()
-                channel?.removeNote(deleteNote)
+                deleteNote.channelHex()?.let {
+                    val channel = checkGetOrCreateChannel(it)
+                    channel?.removeNote(deleteNote)
+                }
 
                 if (deleteNote.event is PrivateDmEvent) {
                     val author = deleteNote.author
@@ -836,6 +873,8 @@ object LocalCache {
     }
 
     fun findUsersStartingWith(username: String): List<User> {
+        checkNotInMainThread()
+
         val key = decodePublicKeyAsHexOrNull(username)
 
         if (key != null && users[key] != null) {
@@ -850,6 +889,8 @@ object LocalCache {
     }
 
     fun findNotesStartingWith(text: String): List<Note> {
+        checkNotInMainThread()
+
         val key = try {
             Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
         } catch (e: Exception) {
@@ -875,6 +916,8 @@ object LocalCache {
     }
 
     fun findChannelsStartingWith(text: String): List<Channel> {
+        checkNotInMainThread()
+
         val key = try {
             Nip19.uriToRoute(text)?.hex ?: Hex.decode(text).toHexKey()
         } catch (e: Exception) {
@@ -903,6 +946,8 @@ object LocalCache {
     }
 
     fun pruneOldAndHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)
 
@@ -921,6 +966,8 @@ object LocalCache {
     }
 
     fun pruneHiddenMessages(account: Account) {
+        checkNotInMainThread()
+
         val toBeRemoved = account.hiddenUsers.map {
             (users[it]?.notes ?: emptySet())
         }.flatten()
@@ -948,6 +995,8 @@ object LocalCache {
     }
 
     fun pruneContactLists(userAccount: Account) {
+        checkNotInMainThread()
+
         var removingContactList = 0
         users.values.forEach {
             if (it != userAccount.userProfile() && (it.liveSet == null || it.liveSet?.isInUse() == false) && it.latestContactList != null) {
@@ -967,10 +1016,21 @@ object LocalCache {
     }
 
     fun consume(event: Event, relay: Relay?) {
-        if (!event.hasValidSignature()) return
+        checkNotInMainThread()
+
+        if (!event.hasValidSignature()) {
+            try {
+                event.checkSignature()
+            } catch (e: Exception) {
+                Log.w("Event failed retest ${event.kind}", e.message ?: "")
+            }
+            return
+        }
 
         try {
             when (event) {
+                is AppDefinitionEvent -> consume(event)
+                is AppRecommendationEvent -> consume(event)
                 is AudioTrackEvent -> consume(event)
                 is BadgeAwardEvent -> consume(event)
                 is BadgeDefinitionEvent -> consume(event)

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
@@ -73,10 +74,6 @@ open class Note(val idHex: String) {
             ?: (event as? ChannelCreateEvent)?.id
     }
 
-    fun channel(): Channel? {
-        return channelHex()?.let { LocalCache.checkGetOrCreateChannel(it) }
-    }
-
     open fun address(): ATag? = null
 
     open fun createdAt() = event?.createdAt()
@@ -183,6 +180,7 @@ open class Note(val idHex: String) {
 
     @Synchronized
     fun addZap(zapRequest: Note, zap: Note?) {
+        checkNotInMainThread()
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
             liveSet?.zaps?.invalidateData()
@@ -194,6 +192,7 @@ open class Note(val idHex: String) {
 
     @Synchronized
     fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
+        checkNotInMainThread()
         if (zapPaymentRequest !in zapPayments.keys) {
             zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
             liveSet?.zaps?.invalidateData()

app/src/main/java/com/vitorpamplona/amethyst/model/RelaySetupInfo.kt

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.model
 
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.service.relays.FeedType
 
+@Immutable
 data class RelaySetupInfo(
     val url: String,
     val read: Boolean,

app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.ATag
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
@@ -35,6 +36,8 @@ class ThreadAssembler {
 
     @OptIn(ExperimentalTime::class)
     fun findThreadFor(noteId: String): Set<Note> {
+        checkNotInMainThread()
+
         val (result, elapsed) = measureTimedValue {
             val note = if (noteId.contains(":")) {
                 val aTag = ATag.parse(noteId, null)

app/src/main/java/com/vitorpamplona/amethyst/model/UrlCachedPreviewer.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.model
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.previews.BahaUrlPreview
 import com.vitorpamplona.amethyst.service.previews.IUrlPreviewCallback
 import com.vitorpamplona.amethyst.service.previews.UrlInfoItem
@@ -11,6 +12,8 @@ object UrlCachedPreviewer {
         private set
 
     fun previewInfo(url: String, callback: IUrlPreviewCallback? = null) {
+        checkNotInMainThread()
+
         cache[url]?.let {
             callback?.onComplete(it)
             return

app/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -4,6 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
@@ -185,6 +186,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        checkNotInMainThread()
+
         return privateChatrooms[user] ?: run {
             val privateChatroom = Chatroom(setOf<Note>())
             privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
@@ -194,6 +197,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun addMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages + msg
@@ -203,6 +208,8 @@ class User(val pubkeyHex: String) {
 
     @Synchronized
     fun removeMessage(user: User, msg: Note) {
+        checkNotInMainThread()
+
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.roomMessages = privateChatroom.roomMessages - msg
@@ -249,15 +256,11 @@ class User(val pubkeyHex: String) {
     }
 
     fun isFollowing(user: User): Boolean {
-        return latestContactList?.unverifiedFollowKeySet()?.toSet()?.let {
-            return user.pubkeyHex in it
-        } ?: false
+        return latestContactList?.isTaggedUser(user.pubkeyHex) ?: false
     }
 
     fun isFollowingHashtag(tag: String): Boolean {
-        return latestContactList?.unverifiedFollowTagSet()?.toSet()?.let {
-            return tag in it
-        } ?: false
+        return latestContactList?.isTaggedHash(tag) ?: false
     }
 
     fun isFollowingHashtagCached(tag: String): Boolean {
@@ -272,11 +275,17 @@ class User(val pubkeyHex: String) {
         } ?: false
     }
 
+    fun isFollowingCached(userHex: String): Boolean {
+        return latestContactList?.verifiedFollowKeySet?.let {
+            return userHex in it
+        } ?: false
+    }
+
     fun transientFollowCount(): Int? {
         return latestContactList?.unverifiedFollowKeySet()?.size
     }
 
-    fun transientFollowerCount(): Int {
+    suspend fun transientFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
@@ -292,7 +301,7 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet?.size
     }
 
-    fun cachedFollowerCount(): Int {
+    suspend fun cachedFollowerCount(): Int {
         return LocalCache.users.values.count { it.latestContactList?.isTaggedUser(pubkeyHex) ?: false }
     }
 
@@ -353,6 +362,7 @@ class UserLiveSet(u: User) {
     }
 }
 
+@Immutable
 data class RelayInfo(
     val url: String,
     var lastEvent: Long,
@@ -388,9 +398,13 @@ class UserMetadata {
     var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
 
+    fun anyName(): String? {
+        return display_name ?: displayName ?: name ?: username
+    }
+
     fun anyNameStartsWith(prefix: String): Boolean {
         return listOfNotNull(name, username, display_name, displayName, nip05, lud06, lud16)
-            .any { it.startsWith(prefix, true) }
+            .any { it.contains(prefix, true) }
     }
 
     fun lnAddress(): String? {

app/src/main/java/com/vitorpamplona/amethyst/service/BlurHashImage.kt

@@ -20,6 +20,8 @@ class BlurHashFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): FetchResult {
+        checkNotInMainThread()
+
         val encodedHash = data.toString().removePrefix("bluehash:")
         val hash = URLDecoder.decode(encodedHash, "utf-8")
 

app/src/main/java/com/vitorpamplona/amethyst/service/MainThreadChecker.kt

@@ -0,0 +1,12 @@
+package com.vitorpamplona.amethyst.service
+
+import android.os.Looper
+import com.vitorpamplona.amethyst.BuildConfig
+
+fun checkNotInMainThread() {
+    if (BuildConfig.DEBUG && isMainThread()) throw OnMainThreadException("It should not be in the MainThread")
+}
+
+fun isMainThread() = Looper.myLooper() == Looper.getMainLooper()
+
+class OnMainThreadException(str: String) : RuntimeException(str)

app/src/main/java/com/vitorpamplona/amethyst/service/Nip05Verifier.kt

@@ -33,6 +33,8 @@ class Nip05Verifier() {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // checkNotInMainThread()
+
         val url = assembleUrl(nip05)
 
         if (url == null) {
@@ -70,6 +72,9 @@ class Nip05Verifier() {
     }
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        // check fails on tests
+        // checkNotInMainThread()
+
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(

app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
@@ -12,9 +11,9 @@ object NostrChannelDataSource : NostrDataSource("ChatroomFeed") {
     var account: Account? = null
     var channel: Channel? = null
 
-    fun loadMessagesBetween(account: Account, channelId: String) {
+    fun loadMessagesBetween(account: Account, channel: Channel) {
         this.account = account
-        channel = LocalCache.getOrCreateChannel(channelId)
+        this.channel = channel
         resetFilters()
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomDataSource.kt

@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -12,9 +11,9 @@ object NostrChatroomDataSource : NostrDataSource("ChatroomFeed") {
     lateinit var account: Account
     var withUser: User? = null
 
-    fun loadMessagesBetween(accountIn: Account, userId: String) {
+    fun loadMessagesBetween(accountIn: Account, user: User) {
         account = accountIn
-        withUser = LocalCache.users[userId]
+        withUser = user
         resetFilters()
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt

@@ -123,6 +123,8 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     fun resetFiltersSuspend() {
+        checkNotInMainThread()
+
         // saves the channels that are currently active
         val activeSubscriptions = subscriptions.values.filter { it.typedFilters != null }
         // saves the current content to only update if it changes

app/src/main/java/com/vitorpamplona/amethyst/service/NostrSearchEventOrUserDataSource.kt

@@ -48,14 +48,14 @@ object NostrSearchEventOrUserDataSource : NostrDataSource("SingleEventFeed") {
                 filter = JsonFilter(
                     kinds = listOf(MetadataEvent.kind),
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             ),
             TypedFilter(
                 types = setOf(FeedType.SEARCH),
                 filter = JsonFilter(
                     search = mySearchString,
-                    limit = 20
+                    limit = 100
                 )
             )
         )

app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt

@@ -29,7 +29,8 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                             ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind,
                             LnZapEvent.kind, LnZapRequestEvent.kind,
                             BadgeAwardEvent.kind, BadgeDefinitionEvent.kind, BadgeProfilesEvent.kind,
-                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
+                            PollNoteEvent.kind, AudioTrackEvent.kind, PinListEvent.kind,
+                            PeopleListEvent.kind, BookmarkListEvent.kind
                         ),
                         tags = mapOf("a" to listOf(aTag.toTag())),
                         since = it.lastReactionsDownloadTime
@@ -113,16 +114,6 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(
-                        TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind,
-                        ReactionEvent.kind, RepostEvent.kind,
-                        LnZapEvent.kind, LnZapRequestEvent.kind,
-                        ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind,
-                        BadgeDefinitionEvent.kind, BadgeAwardEvent.kind, BadgeProfilesEvent.kind,
-                        PrivateDmEvent.kind,
-                        FileHeaderEvent.kind, FileStorageEvent.kind, FileStorageHeaderEvent.kind,
-                        HighlightEvent.kind, AudioTrackEvent.kind, PinListEvent.kind
-                    ),
                     ids = interestedEvents.toList()
                 )
             )

app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt

@@ -81,9 +81,9 @@ object NostrUserProfileDataSource : NostrDataSource("UserProfileFeed") {
         TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind),
+                kinds = listOf(BookmarkListEvent.kind, PeopleListEvent.kind, AppRecommendationEvent.kind),
                 authors = listOf(it.pubkeyHex),
-                limit = 1
+                limit = 100
             )
         )
     }

app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.lnurl
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -45,6 +46,8 @@ class LightningAddressResolver() {
     }
 
     private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
         val url = assembleUrl(lnaddress)
 
         if (url == null) {

app/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LnInvoiceUtil.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.service.lnurl
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import java.math.BigDecimal
 import java.util.Locale
 import java.util.regex.Pattern
@@ -98,7 +99,7 @@ object LnInvoiceUtil {
      * @return invoice amount in bitcoins, zero if the invoice has no amount
      * @throws RuntimeException if invoice format is incorrect
      */
-    fun getAmount(invoice: String): BigDecimal {
+    private fun getAmount(invoice: String): BigDecimal {
         try {
             decodeUnlimitedLength(invoice) // checksum must match
         } catch (e: AddressFormatException) {
@@ -121,6 +122,8 @@ object LnInvoiceUtil {
     }
 
     fun getAmountInSats(invoice: String): BigDecimal {
+        checkNotInMainThread()
+
         return getAmount(invoice).multiply(BigDecimal(100000000))
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/model/AppDefinitionEvent.kt

@@ -0,0 +1,41 @@
+package com.vitorpamplona.amethyst.service.model
+
+import android.util.Log
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.UserMetadata
+import java.io.ByteArrayInputStream
+
+@Immutable
+class AppDefinitionEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    fun appMetaData() = try {
+        MetadataEvent.metadataParser.readValue(
+            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
+            UserMetadata::class.java
+        )
+    } catch (e: Exception) {
+        e.printStackTrace()
+        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
+        null
+    }
+
+    fun supportedKinds() = tags.filter { it.size > 1 && it[0] == "k" }.mapNotNull {
+        runCatching { it[1].toInt() }.getOrNull()
+    }
+
+    fun publishedAt() = tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)
+
+    companion object {
+        const val kind = 31990
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/AppRecommendationEvent.kt

@@ -0,0 +1,27 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+
+@Immutable
+class AppRecommendationEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig), AddressableEvent {
+    fun recommendations() = tags.filter { it.size > 1 && it[0] == "a" }.mapNotNull {
+        ATag.parse(it[1], it.getOrNull(2))
+    }
+
+    fun forKind() = runCatching { dTag().toInt() }.getOrNull()
+
+    override fun dTag() = tags.firstOrNull { it.size > 1 && it[0] == "d" }?.get(1) ?: ""
+    override fun address() = ATag(kind, pubKey, dTag(), null)
+
+    companion object {
+        const val kind = 31989
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMessageEvent.kt

@@ -16,7 +16,12 @@ class ChannelMessageEvent(
     sig: HexKey
 ) : BaseTextNoteEvent(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun channel() = tags.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1) ?: tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull {
+        it.size > 3 && it[0] == "e" && it[3] == "root"
+    }?.get(1) ?: tags.firstOrNull {
+        it.size > 1 && it[0] == "e"
+    }?.get(1)
+
     override fun replyTos() = tags.filter { it.firstOrNull() == "e" && it.getOrNull(1) != channel() }.mapNotNull { it.getOrNull(1) }
 
     companion object {

app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelMetadataEvent.kt

@@ -16,7 +16,7 @@ class ChannelMetadataEvent(
     content: String,
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
-    fun channel() = tags.firstOrNull { it.firstOrNull() == "e" }?.getOrNull(1)
+    fun channel() = tags.firstOrNull { it.size > 1 && it[0] == "e" }?.get(1)
     fun channelInfo() =
         try {
             MetadataEvent.gson.fromJson(content, ChannelCreateEvent.ChannelData::class.java)

app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt

@@ -23,14 +23,12 @@ class ContactListEvent(
     // This function is only used by the user logged in
     // But it is used all the time.
     val verifiedFollowKeySet: Set<HexKey> by lazy {
-        tags.filter { it[0] == "p" }.mapNotNull {
-            it.getOrNull(1)?.let { unverifiedHex: String ->
-                try {
-                    decodePublicKey(unverifiedHex).toHexKey()
-                } catch (e: Exception) {
-                    Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
-                    null
-                }
+        tags.filter { it.size > 1 && it[0] == "p" }.mapNotNull {
+            try {
+                decodePublicKey(it[1]).toHexKey()
+            } catch (e: Exception) {
+                Log.w("ContactListEvent", "Can't parse tags as a follows: ${it[1]}", e)
+                null
             }
         }.toSet()
     }

app/src/main/java/com/vitorpamplona/amethyst/service/model/Event.kt

@@ -138,7 +138,7 @@ open class Event(
             .replace("\\u2028", "\u2028")
             .replace("\\u2029", "\u2029")
 
-        return sha256.digest(rawEventJson.toByteArray()).toHexKey()
+        return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray()).toHexKey()
     }
 
     private class EventDeserializer : JsonDeserializer<Event> {
@@ -212,7 +212,6 @@ open class Event(
     companion object {
         private val secp256k1 = Secp256k1.get()
 
-        val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
         val gson: Gson = GsonBuilder()
             .disableHtmlEscaping()
             .registerTypeAdapter(Event::class.java, EventSerializer())
@@ -228,6 +227,8 @@ open class Event(
         fun fromJson(json: JsonElement, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)
 
         fun Event.getRefinedEvent(lenient: Boolean = false): Event = when (kind) {
+            AppDefinitionEvent.kind -> AppDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
+            AppRecommendationEvent.kind -> AppRecommendationEvent(id, pubKey, createdAt, tags, content, sig)
             AudioTrackEvent.kind -> AudioTrackEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeAwardEvent.kind -> BadgeAwardEvent(id, pubKey, createdAt, tags, content, sig)
             BadgeDefinitionEvent.kind -> BadgeDefinitionEvent(id, pubKey, createdAt, tags, content, sig)
@@ -281,7 +282,7 @@ open class Event(
                 .replace("\\u2028", "\u2028")
                 .replace("\\u2029", "\u2029")
 
-            return sha256.digest(rawEventJson.toByteArray())
+            return MessageDigest.getInstance("SHA-256").digest(rawEventJson.toByteArray())
         }
 
         fun create(privateKey: ByteArray, kind: Int, tags: List<List<String>> = emptyList(), content: String = "", createdAt: Long = Date().time / 1000): Event {

app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt

@@ -5,6 +5,7 @@ import com.vitorpamplona.amethyst.model.*
 import nostr.postr.Bech32
 import nostr.postr.Utils
 import java.nio.charset.Charset
+import java.security.MessageDigest
 import java.security.SecureRandom
 import java.util.*
 import javax.crypto.BadPaddingException
@@ -133,7 +134,7 @@ class LnZapRequestEvent(
         fun createEncryptionPrivateKey(privkey: String, id: String, createdAt: Long): ByteArray {
             var str = privkey + id + createdAt.toString()
             var strbyte = str.toByteArray(Charset.forName("utf-8"))
-            return sha256.digest(strbyte)
+            return MessageDigest.getInstance("SHA-256").digest(strbyte)
         }
 
         private fun encryptPrivateZapMessage(msg: String, privkey: ByteArray, pubkey: ByteArray): String {

app/src/main/java/com/vitorpamplona/amethyst/service/model/MetadataEvent.kt

@@ -1,22 +1,17 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
-import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.Gson
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.UserMetadata
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Utils
+import java.io.ByteArrayInputStream
 import java.util.Date
 
-@Immutable
-data class ContactMetaData(
-    val name: String,
-    val picture: String,
-    val about: String,
-    val nip05: String?
-)
-
 abstract class IdentityClaim(
     var identity: String,
     var proof: String
@@ -145,9 +140,13 @@ class MetadataEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
     fun contactMetaData() = try {
-        gson.fromJson(content, ContactMetaData::class.java)
+        metadataParser.readValue(
+            ByteArrayInputStream(content.toByteArray(Charsets.UTF_8)),
+            UserMetadata::class.java
+        )
     } catch (e: Exception) {
-        Log.e("MetadataEvent", "Can't parse $content", e)
+        e.printStackTrace()
+        Log.w("MT", "Content Parse Error ${e.localizedMessage} $content")
         null
     }
 
@@ -164,8 +163,10 @@ class MetadataEvent(
         const val kind = 0
         val gson = Gson()
 
-        fun create(contactMetaData: ContactMetaData, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {
-            return create(gson.toJson(contactMetaData), identities, privateKey, createdAt = createdAt)
+        val metadataParser by lazy {
+            jacksonObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .readerFor(UserMetadata::class.java)
         }
 
         fun create(contactMetaData: String, identities: List<IdentityClaim>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): MetadataEvent {

app/src/main/java/com/vitorpamplona/amethyst/service/model/zaps/UserZaps.kt

@@ -2,17 +2,21 @@ package com.vitorpamplona.amethyst.service.model.zaps
 
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.LnZapEventInterface
+import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
 
 object UserZaps {
-    fun forProfileFeed(zaps: Map<Note, Note?>?): List<Pair<Note, Note>> {
+    fun forProfileFeed(zaps: Map<Note, Note?>?): List<ZapReqResponse> {
         if (zaps == null) return emptyList()
 
         return (
             zaps
-                .filter { it.value != null }
-                .toList()
-                .sortedBy { (it.second?.event as? LnZapEventInterface)?.amount() }
+                .mapNotNull { entry ->
+                    entry.value?.let {
+                        ZapReqResponse(entry.key, it)
+                    }
+                }
+                .sortedBy { (it.zapEvent.event as? LnZapEventInterface)?.amount() }
                 .reversed()
-            ) as List<Pair<Note, Note>>
+            )
     }
 }

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

@@ -13,15 +13,22 @@ import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 
 class EventNotificationConsumer(private val applicationContext: Context) {
     fun consume(event: Event) {
-        // adds to database
-        LocalCache.consume(event, null)
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            // adds to database
+            LocalCache.consume(event, null)
 
-        when (event) {
-            is PrivateDmEvent -> notify(event)
-            is LnZapEvent -> notify(event)
+            when (event) {
+                is PrivateDmEvent -> notify(event)
+                is LnZapEvent -> notify(event)
+            }
         }
     }
 
@@ -54,6 +61,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
     private fun notify(event: LnZapEvent) {
         val noteZapEvent = LocalCache.notes[event.id] ?: return
+
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) }
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
 

app/src/main/java/com/vitorpamplona/amethyst/service/previews/BahaUrlPreview.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.previews
 
 import android.net.Uri
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.*
 import java.util.*
 
@@ -18,6 +19,7 @@ class BahaUrlPreview(val url: String, var callback: IUrlPreviewCallback?) {
     }
 
     private suspend fun fetch(timeOut: Int = 30000) {
+        checkNotInMainThread()
         lateinit var urlInfoItem: UrlInfoItem
         if (checkIsImageUrl()) {
             urlInfoItem = UrlInfoItem(url = url, image = url)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Client.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -32,6 +33,8 @@ object Client : RelayPool.Listener {
 
     @Synchronized
     fun connect(relays: Array<Relay>) {
+        checkNotInMainThread()
+
         RelayPool.register(this)
         RelayPool.unloadRelays()
         RelayPool.loadRelays(relays.toList())
@@ -54,6 +57,8 @@ object Client : RelayPool.Listener {
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf()
     ) {
+        checkNotInMainThread()
+
         subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilter(subscriptionId)
     }
@@ -62,11 +67,15 @@ object Client : RelayPool.Listener {
         subscriptionId: String = UUID.randomUUID().toString().substring(0..10),
         filters: List<TypedFilter> = listOf()
     ) {
+        checkNotInMainThread()
+
         subscriptions = subscriptions + Pair(subscriptionId, filters)
         RelayPool.sendFilterOnlyIfDisconnected()
     }
 
     fun send(signedEvent: EventInterface, relay: String? = null, feedTypes: Set<FeedType>? = null, onDone: (() -> Unit)? = null) {
+        checkNotInMainThread()
+
         if (relay == null) {
             RelayPool.send(signedEvent)
         } else {
@@ -91,7 +100,7 @@ object Client : RelayPool.Listener {
     }
 
     @OptIn(DelicateCoroutinesApi::class)
-    fun newSporadicRelay(url: String, feedTypes: Set<FeedType>?, onConnected: (Relay) -> Unit, onDone: (() -> Unit)?) {
+    private fun newSporadicRelay(url: String, feedTypes: Set<FeedType>?, onConnected: (Relay) -> Unit, onDone: (() -> Unit)?) {
         val relay = Relay(url, true, true, feedTypes ?: emptySet(), HttpClient.getProxy())
         RelayPool.addRelay(relay)
 

app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.service.relays
 import android.util.Log
 import com.google.gson.JsonElement
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import com.vitorpamplona.amethyst.service.model.RelayAuthEvent
@@ -69,7 +70,10 @@ class Relay(
 
     @Synchronized
     fun requestAndWatch() {
+        checkNotInMainThread()
         requestAndWatch {
+            checkNotInMainThread()
+
             // Sends everything.
             Client.allSubscriptions().forEach {
                 sendFilter(requestId = it)
@@ -79,6 +83,7 @@ class Relay(
 
     @Synchronized
     fun requestAndWatch(onConnected: (Relay) -> Unit) {
+        checkNotInMainThread()
         if (socket != null) return
 
         try {
@@ -89,6 +94,8 @@ class Relay(
             val listener = object : WebSocketListener() {
 
                 override fun onOpen(webSocket: WebSocket, response: Response) {
+                    checkNotInMainThread()
+
                     afterEOSE = false
                     isReady = true
                     ping = response.receivedResponseAtMillis - response.sentRequestAtMillis
@@ -99,6 +106,8 @@ class Relay(
                 }
 
                 override fun onMessage(webSocket: WebSocket, text: String) {
+                    checkNotInMainThread()
+
                     eventDownloadCounterInBytes += text.bytesUsedInMemory()
 
                     try {
@@ -153,6 +162,8 @@ class Relay(
                 }
 
                 override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                     listeners.forEach {
                         it.onRelayStateChange(
                             this@Relay,
@@ -163,6 +174,8 @@ class Relay(
                 }
 
                 override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                    checkNotInMainThread()
+
                     socket = null
                     isReady = false
                     afterEOSE = false
@@ -171,6 +184,8 @@ class Relay(
                 }
 
                 override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                    checkNotInMainThread()
+
                     errorCounter++
 
                     socket?.close(1000, "Normal close")
@@ -209,6 +224,8 @@ class Relay(
     }
 
     fun sendFilter(requestId: String) {
+        checkNotInMainThread()
+
         if (read) {
             if (isConnected()) {
                 if (isReady) {
@@ -233,6 +250,8 @@ class Relay(
     }
 
     fun sendFilterOnlyIfDisconnected() {
+        checkNotInMainThread()
+
         if (socket == null) {
             // waits 60 seconds to reconnect after disconnected.
             if (Date().time / 1000 > closingTime + 60) {
@@ -243,6 +262,8 @@ class Relay(
     }
 
     fun send(signedEvent: EventInterface) {
+        checkNotInMainThread()
+
         if (signedEvent is RelayAuthEvent) {
             val event = """["AUTH",${signedEvent.toJson()}]"""
             socket?.send(event)

app/src/main/java/com/vitorpamplona/amethyst/service/relays/RelayPool.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.relays
 
 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.Event
 import com.vitorpamplona.amethyst.service.model.EventInterface
 import kotlinx.coroutines.CoroutineScope
@@ -48,6 +49,8 @@ object RelayPool : Relay.Listener {
     }
 
     fun requestAndWatch() {
+        checkNotInMainThread()
+
         relays.forEach { it.requestAndWatch() }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/service/relays/TypedFilter.kt

@@ -55,6 +55,9 @@ class TypedFilter(
         filter.limit?.run {
             jsonObject.addProperty("limit", filter.limit)
         }
+        filter.search?.run {
+            jsonObject.addProperty("search", filter.search)
+        }
         return jsonObject
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -86,7 +86,9 @@ class MainActivity : FragmentActivity() {
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
         println("Trim Memory $level")
-        ServiceManager.cleanUp()
+        GlobalScope.launch(Dispatchers.Default) {
+            ServiceManager.cleanUp()
+        }
     }
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Divider
@@ -28,6 +29,8 @@ import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
@@ -52,13 +55,14 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.UserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
@@ -72,14 +76,28 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @Composable
-fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -> Unit) {
-    val searchBarViewModel: SearchBarViewModel = viewModel()
-    searchBarViewModel.account = account
+fun JoinUserOrChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val searchBarViewModel: SearchBarViewModel = viewModel(
+        key = accountViewModel.account.userProfile().pubkeyHex + "SearchBarViewModel",
+        factory = SearchBarViewModel.Factory(
+            accountViewModel.account
+        )
+    )
 
+    JoinUserOrChannelView(
+        searchBarViewModel = searchBarViewModel,
+        onClose = onClose,
+        accountViewModel = accountViewModel,
+        nav = nav
+    )
+}
+
+@Composable
+fun JoinUserOrChannelView(searchBarViewModel: SearchBarViewModel, onClose: () -> Unit, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     Dialog(
         onDismissRequest = {
             NostrSearchEventOrUserDataSource.clear()
-            searchBarViewModel.clean()
+            searchBarViewModel.clear()
             onClose()
         },
         properties = DialogProperties(
@@ -88,7 +106,9 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
     ) {
         Surface() {
             Column(
-                modifier = Modifier.padding(10.dp).heightIn(min = 500.dp)
+                modifier = Modifier
+                    .padding(10.dp)
+                    .heightIn(min = 500.dp)
             ) {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
@@ -96,7 +116,7 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     CloseButton(onCancel = {
-                        searchBarViewModel.clean()
+                        searchBarViewModel.clear()
                         NostrSearchEventOrUserDataSource.clear()
                         onClose()
                     })
@@ -115,28 +135,20 @@ fun JoinUserOrChannelView(onClose: () -> Unit, account: Account, nav: (String) -
 
                 Spacer(modifier = Modifier.height(15.dp))
 
-                RenderSeach(searchBarViewModel, account, nav)
+                RenderSearch(searchBarViewModel, accountViewModel, nav)
             }
         }
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
-private fun RenderSeach(
+private fun RenderSearch(
     searchBarViewModel: SearchBarViewModel,
-    account: Account,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val scope = rememberCoroutineScope()
     val listState = rememberLazyListState()
 
-    // initialize focus reference to be able to request focus programmatically
-    val focusRequester = remember { FocusRequester() }
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    val onlineSearch = NostrSearchEventOrUserDataSource
-
     val lifeCycleOwner = LocalLifecycleOwner.current
 
     // Create a channel for processing search queries.
@@ -147,7 +159,8 @@ private fun RenderSeach(
     LaunchedEffect(Unit) {
         launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect {
-                if (searchBarViewModel.isSearching()) {
+                checkNotInMainThread()
+                if (searchBarViewModel.isSearchingFun()) {
                     searchBarViewModel.invalidateData()
                 }
             }
@@ -155,9 +168,6 @@ private fun RenderSeach(
     }
 
     LaunchedEffect(Unit) {
-        delay(100)
-        focusRequester.requestFocus()
-
         // Wait for text changes to stop for 300 ms before firing off search.
         withContext(Dispatchers.IO) {
             searchTextChanges.receiveAsFlow()
@@ -166,13 +176,13 @@ private fun RenderSeach(
                 .debounce(300)
                 .collectLatest {
                     if (it.length >= 2) {
-                        onlineSearch.search(it.trim())
+                        NostrSearchEventOrUserDataSource.search(it.trim())
                     }
 
                     searchBarViewModel.invalidateData()
 
                     // makes sure to show the top of the search
-                    scope.launch(Dispatchers.Main) {
+                    launch(Dispatchers.Main) {
                         listState.animateScrollToItem(0)
                     }
                 }
@@ -200,8 +210,34 @@ private fun RenderSeach(
     }
 
     // LAST ROW
+    SearchEditTextForJoin(searchBarViewModel, searchTextChanges)
+
+    RenderSearchResults(searchBarViewModel, listState, accountViewModel, nav)
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun SearchEditTextForJoin(
+    searchBarViewModel: SearchBarViewModel,
+    searchTextChanges: Channel<String>
+) {
+    val scope = rememberCoroutineScope()
+
+    // initialize focus reference to be able to request focus programmatically
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    LaunchedEffect(Unit) {
+        launch {
+            delay(100)
+            focusRequester.requestFocus()
+        }
+    }
+
     Row(
-        modifier = Modifier.padding(horizontal = 10.dp).fillMaxWidth(),
+        modifier = Modifier
+            .padding(horizontal = 10.dp)
+            .fillMaxWidth(),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
     ) {
@@ -238,11 +274,11 @@ private fun RenderSeach(
                 )
             },
             trailingIcon = {
-                if (searchBarViewModel.isTrailingIconVisible) {
+                if (searchBarViewModel.isSearching) {
                     IconButton(
                         onClick = {
-                            searchBarViewModel.clean()
-                            onlineSearch.clear()
+                            searchBarViewModel.clear()
+                            NostrSearchEventOrUserDataSource.clear()
                         }
                     ) {
                         Icon(
@@ -254,10 +290,24 @@ private fun RenderSeach(
             }
         )
     }
+}
+
+@Composable
+private fun RenderSearchResults(
+    searchBarViewModel: SearchBarViewModel,
+    listState: LazyListState,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    if (searchBarViewModel.isSearching) {
+        val users by searchBarViewModel.searchResultsUsers.collectAsState()
+        val channels by searchBarViewModel.searchResultsChannels.collectAsState()
 
-    if (searchBarViewModel.searchValue.isNotBlank()) {
         Row(
-            modifier = Modifier.fillMaxWidth().fillMaxHeight().padding(vertical = 10.dp)
+            modifier = Modifier
+                .fillMaxWidth()
+                .fillMaxHeight()
+                .padding(vertical = 10.dp)
         ) {
             LazyColumn(
                 modifier = Modifier.fillMaxHeight(),
@@ -268,50 +318,60 @@ private fun RenderSeach(
                 state = listState
             ) {
                 itemsIndexed(
-                    searchBarViewModel.searchResultsUsers.value,
+                    users,
                     key = { _, item -> "u" + item.pubkeyHex }
                 ) { _, item ->
-                    UserComposeForChat(
-                        item,
-                        account = account,
-                        nav = nav
-                    )
+                    UserComposeForChat(item, accountViewModel) {
+                        nav("Room/${item.pubkeyHex}")
+                        searchBarViewModel.clear()
+                    }
                 }
 
                 itemsIndexed(
-                    searchBarViewModel.searchResultsChannels.value,
+                    channels,
                     key = { _, item -> "c" + item.idHex }
                 ) { _, item ->
-                    ChannelName(
-                        channelIdHex = item.idHex,
-                        channelPicture = item.profilePicture(),
-                        channelTitle = {
-                            Text(
-                                "${item.info.name}",
-                                fontWeight = FontWeight.Bold
-                            )
-                        },
-                        channelLastTime = null,
-                        channelLastContent = item.info.about,
-                        false,
-                        onClick = { nav("Channel/${item.idHex}") }
-                    )
+                    RenderChannel(item) {
+                        nav("Channel/${item.idHex}")
+                        searchBarViewModel.clear()
+                    }
                 }
             }
         }
     }
 }
 
+@Composable
+private fun RenderChannel(
+    item: com.vitorpamplona.amethyst.model.Channel,
+    onClick: () -> Unit
+) {
+    ChannelName(
+        channelIdHex = item.idHex,
+        channelPicture = item.profilePicture(),
+        channelTitle = {
+            Text(
+                "${item.info.name}",
+                fontWeight = FontWeight.Bold
+            )
+        },
+        channelLastTime = null,
+        channelLastContent = item.info.about,
+        false,
+        onClick = onClick
+    )
+}
+
 @Composable
 fun UserComposeForChat(
     baseUser: User,
-    account: Account,
-    nav: (String) -> Unit
+    accountViewModel: AccountViewModel,
+    onClick: () -> Unit
 ) {
     Column(
         modifier =
         Modifier.clickable(
-            onClick = { nav("Room/${baseUser.pubkeyHex}") }
+            onClick = onClick
         )
     ) {
         Row(
@@ -323,22 +383,18 @@ fun UserComposeForChat(
                 ),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, nav, account.userProfile(), 55.dp)
+            UserPicture(baseUser, 55.dp, accountViewModel)
 
-            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+            Column(
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)
+            ) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     UsernameDisplay(baseUser)
                 }
 
-                val baseUserState by baseUser.live().metadata.observeAsState()
-                val user = baseUserState?.user ?: return
-
-                Text(
-                    user.info?.about ?: "",
-                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
-                )
+                DisplayUserAboutInfo(baseUser)
             }
         }
 
@@ -348,3 +404,20 @@ fun UserComposeForChat(
         )
     }
 }
+
+@Composable
+private fun DisplayUserAboutInfo(baseUser: User) {
+    val baseUserState by baseUser.live().metadata.observeAsState()
+    val about by remember(baseUserState) {
+        derivedStateOf {
+            baseUserState?.user?.info?.about ?: ""
+        }
+    }
+
+    Text(
+        text = about,
+        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+    )
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewChannelView.kt

@@ -14,6 +14,7 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -24,13 +25,15 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @Composable
-fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = null) {
+fun NewChannelView(onClose: () -> Unit, accountViewModel: AccountViewModel, channel: Channel? = null) {
     val postViewModel: NewChannelViewModel = viewModel()
-    postViewModel.load(account, channel)
+    postViewModel.load(accountViewModel.account, channel)
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -53,10 +56,14 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
                         onClose()
                     })
 
+                    val scope = rememberCoroutineScope()
+
                     PostButton(
                         onPost = {
-                            postViewModel.create()
-                            onClose()
+                            scope.launch(Dispatchers.IO) {
+                                postViewModel.create()
+                                onClose()
+                            }
                         },
                         postViewModel.channelName.value.text.isNotBlank()
                     )
@@ -100,7 +107,9 @@ fun NewChannelView(onClose: () -> Unit, account: Account, channel: Channel? = nu
 
                 OutlinedTextField(
                     label = { Text(text = stringResource(R.string.description)) },
-                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(100.dp),
                     value = postViewModel.channelDescription.value,
                     onValueChange = { postViewModel.channelDescription.value = it },
                     placeholder = {

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaModel.kt

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -14,6 +15,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
+@Stable
 open class NewMediaModel : ViewModel() {
     var account: Account? = null
 

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMediaView.kt

@@ -33,8 +33,10 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
 fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
@@ -47,8 +49,13 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
     LaunchedEffect(uri) {
         val mediaType = resolver.getType(uri) ?: ""
         postViewModel.load(account, uri, mediaType)
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -124,8 +131,8 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = fileServers.map { it.second }
-    val fileServerExplainers = fileServers.map { it.third }
+    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
+    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
     val resolver = LocalContext.current.contentResolver
 
     Row(
@@ -172,7 +179,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, acc: Account) {
             }
         } else {
             postViewModel.galleryUri?.let {
-                VideoView(it)
+                VideoView(it.toString())
             }
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewMessageTagger.kt

@@ -1,13 +1,12 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.parseDirtyWordForKey
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 
-class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
+class NewMessageTagger(var channelHex: String?, var mentions: List<User>?, var replyTos: List<Note>?, var message: String) {
 
     fun addUserToMentions(user: User) {
         mentions = if (mentions?.contains(user) == true) mentions else mentions?.plus(user) ?: listOf(user)
@@ -20,12 +19,12 @@ class NewMessageTagger(var channel: Channel?, var mentions: List<User>?, var rep
 
     fun tagIndex(user: User): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (channel != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
+        return (if (channelHex != null) 1 else 0) + (replyTos?.size ?: 0) + (mentions?.indexOf(user) ?: 0)
     }
 
     fun tagIndex(note: Note): Int {
         // Postr Events assembles replies before mentions in the tag order
-        return (if (channel != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
+        return (if (channelHex != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
     fun run() {

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPollView.kt

@@ -1,197 +0,0 @@
-package com.vitorpamplona.amethyst.ui.actions
-
-import android.widget.Toast
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.ui.components.*
-import com.vitorpamplona.amethyst.ui.note.ReplyInformation
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
-import kotlinx.coroutines.delay
-
-@Composable
-fun NewPollView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = null, account: Account) {
-    val pollViewModel: NewPostViewModel = viewModel()
-
-    val context = LocalContext.current
-
-    val scrollState = rememberScrollState()
-
-    LaunchedEffect(Unit) {
-        pollViewModel.load(account, baseReplyTo, quote)
-        delay(100)
-
-        pollViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    Dialog(
-        onDismissRequest = { onClose() },
-        properties = DialogProperties(
-            usePlatformDefaultWidth = false,
-            dismissOnClickOutside = false,
-            decorFitsSystemWindows = false
-        )
-    ) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight()
-            ) {
-                Column(
-                    modifier = Modifier
-                        .padding(start = 10.dp, end = 10.dp, top = 10.dp)
-                        .imePadding()
-                        .weight(1f)
-                ) {
-                    Row(
-                        modifier = Modifier.fillMaxWidth(),
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        CloseButton(onCancel = {
-                            pollViewModel.cancel()
-                            onClose()
-                        })
-
-                        PollButton(
-                            onPost = {
-                                pollViewModel.sendPost()
-                                onClose()
-                            },
-                            isActive = pollViewModel.message.text.isNotBlank() &&
-                                pollViewModel.pollOptions.values.all { it.isNotEmpty() } &&
-                                pollViewModel.isValidRecipients.value &&
-                                pollViewModel.isValidvalueMaximum.value &&
-                                pollViewModel.isValidvalueMinimum.value &&
-                                pollViewModel.isValidConsensusThreshold.value &&
-                                pollViewModel.isValidClosedAt.value
-                        )
-                    }
-
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .weight(1f)
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .verticalScroll(scrollState)
-                        ) {
-                            if (pollViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
-                                ReplyInformation(pollViewModel.replyTos, pollViewModel.mentions, account, "✖ ") {
-                                    pollViewModel.removeFromReplyList(it)
-                                }
-                            }
-
-                            Text(stringResource(R.string.poll_heading_required))
-                            // NewPollRecipientsField(pollViewModel, account)
-                            NewPollPrimaryDescription(pollViewModel)
-                            pollViewModel.pollOptions.values.forEachIndexed { index, _ ->
-                                NewPollOption(pollViewModel, index)
-                            }
-                            Button(
-                                onClick = { pollViewModel.pollOptions[pollViewModel.pollOptions.size] = "" },
-                                border = BorderStroke(1.dp, MaterialTheme.colors.onSurface.copy(alpha = 0.32f)),
-                                colors = ButtonDefaults.outlinedButtonColors(
-                                    contentColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                )
-                            ) {
-                                Image(
-                                    painterResource(id = android.R.drawable.ic_input_add),
-                                    contentDescription = "Add poll option button",
-                                    modifier = Modifier.size(18.dp)
-                                )
-                            }
-                            Text(stringResource(R.string.poll_heading_optional))
-                            NewPollVoteValueRange(pollViewModel)
-                            NewPollConsensusThreshold(pollViewModel)
-                            NewPollClosing(pollViewModel)
-                        }
-                    }
-
-                    val userSuggestions = pollViewModel.userSuggestions
-                    if (userSuggestions.isNotEmpty()) {
-                        LazyColumn(
-                            contentPadding = PaddingValues(
-                                top = 10.dp
-                            ),
-                            modifier = Modifier.heightIn(0.dp, 300.dp)
-                        ) {
-                            itemsIndexed(
-                                userSuggestions,
-                                key = { _, item -> item.pubkeyHex }
-                            ) { _, item ->
-                                UserLine(item, account) {
-                                    pollViewModel.autocompleteWithUser(item)
-                                }
-                            }
-                        }
-                    }
-
-                    Row(modifier = Modifier.fillMaxWidth()) {
-                        /*UploadFromGallery(
-                            isUploading = pollViewModel.isUploadingImage
-                        ) {
-                            pollViewModel.upload(it, context)
-                        }*/
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun PollButton(modifier: Modifier = Modifier, onPost: () -> Unit = {}, isActive: Boolean) {
-    Button(
-        modifier = modifier,
-        onClick = {
-            if (isActive) {
-                onPost()
-            }
-        },
-        shape = RoundedCornerShape(20.dp),
-        colors = ButtonDefaults
-            .buttonColors(
-                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
-            )
-    ) {
-        Text(text = stringResource(R.string.post_poll), color = Color.White)
-    }
-}
-
-/*@Preview
-@Composable
-fun NewPollViewPreview() {
-    NewPollView(onClose = {}, account = Account(loggedIn = Persona()))
-}*/

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt

@@ -24,13 +24,13 @@ import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.CurrencyBitcoin
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
-import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material.icons.outlined.ArrowForwardIos
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.icons.rounded.Warning
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -71,9 +71,12 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -97,8 +100,12 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
         delay(100)
         focusRequester.requestFocus()
 
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
@@ -144,8 +151,10 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
                         PostButton(
                             onPost = {
-                                postViewModel.sendPost()
-                                onClose()
+                                scope.launch(Dispatchers.IO) {
+                                    postViewModel.sendPost()
+                                    onClose()
+                                }
                             },
                             isActive = postViewModel.canPost()
                         )
@@ -161,7 +170,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 .fillMaxWidth()
                                 .verticalScroll(scrollState)
                         ) {
-                            Notifying(postViewModel.mentions) {
+                            Notifying(postViewModel.mentions?.toImmutableList()) {
                                 postViewModel.removeFromReplyList(it)
                             }
 
@@ -291,7 +300,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                         } else {
                                             UrlPreview(myUrlPreview, myUrlPreview)
                                         }
-                                    } else if (isBechLink(myUrlPreview)) {
+                                    } else if (startsWithNIP19Scheme(myUrlPreview)) {
                                         BechLink(
                                             myUrlPreview,
                                             true,
@@ -319,7 +328,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                                 userSuggestions,
                                 key = { _, item -> item.pubkeyHex }
                             ) { _, item ->
-                                UserLine(item, account) {
+                                UserLine(item, accountViewModel) {
                                     postViewModel.autocompleteWithUser(item)
                                 }
                             }
@@ -371,7 +380,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
+fun Notifying(baseMentions: ImmutableList<User>?, onClick: (User) -> Unit) {
     val mentions = baseMentions?.toSet()
 
     FlowRow(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(horizontal = 10.dp)) {
@@ -384,11 +393,13 @@ fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
 
             mentions.forEachIndexed { idx, user ->
                 val innerUserState by user.live().metadata.observeAsState()
-                val innerUser = innerUserState?.user
-
-                innerUser?.let { myUser ->
+                innerUserState?.user?.let { myUser ->
                     Spacer(modifier = Modifier.width(5.dp))
 
+                    val tags = remember(innerUserState) {
+                        myUser.info?.latestMetadata?.tags?.toImmutableListOfLists()
+                    }
+
                     Button(
                         shape = RoundedCornerShape(20.dp),
                         colors = ButtonDefaults.buttonColors(
@@ -399,8 +410,8 @@ fun Notifying(baseMentions: List<User>?, onClick: (User) -> Unit) {
                         }
                     ) {
                         CreateTextWithEmoji(
-                            text = "✖ ${myUser.toBestDisplayName()}",
-                            tags = myUser.info?.latestMetadata?.tags,
+                            text = remember(innerUserState) { "✖ ${myUser.toBestDisplayName()}" },
+                            tags = tags,
                             color = Color.White,
                             textAlign = TextAlign.Center
                         )
@@ -743,8 +754,8 @@ fun ImageVideoDescription(
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = fileServers.map { it.second }
-    val fileServerExplainers = fileServers.map { it.third }
+    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
+    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
 
     var selectedServer by remember { mutableStateOf(defaultServer) }
     var message by remember { mutableStateOf("") }
@@ -850,7 +861,7 @@ fun ImageVideoDescription(
                         )
                     }
                 } else {
-                    VideoView(uri)
+                    VideoView(uri.toString())
                 }
             }
 
@@ -918,3 +929,10 @@ fun ImageVideoDescription(
         }
     }
 }
+
+@Stable
+data class ImmutableListOfLists<T>(val lists: List<List<T>> = emptyList())
+
+fun List<List<String>>.toImmutableListOfLists(): ImmutableListOfLists<String> {
+    return ImmutableListOfLists(this)
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateMapOf
@@ -24,7 +25,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
-open class NewPostViewModel : ViewModel() {
+@Stable
+open class NewPostViewModel() : ViewModel() {
     var account: Account? = null
     var originalNote: Note? = null
 
@@ -102,7 +104,7 @@ open class NewPostViewModel : ViewModel() {
         }
 
         canAddInvoice = account.userProfile().info?.lnAddress() != null
-        canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+        canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
         contentToAddUrl = null
 
         wantsForwardZapTo = false
@@ -114,7 +116,7 @@ open class NewPostViewModel : ViewModel() {
     }
 
     fun sendPost() {
-        val tagger = NewMessageTagger(originalNote?.channel(), mentions, replyTos, message.text)
+        val tagger = NewMessageTagger(originalNote?.channelHex(), mentions, replyTos, message.text)
         tagger.run()
 
         val zapReceiver = if (wantsForwardZapTo) {
@@ -129,10 +131,10 @@ open class NewPostViewModel : ViewModel() {
 
         if (wantsPoll) {
             account?.sendPoll(tagger.message, tagger.replyTos, tagger.mentions, pollOptions, valueMaximum, valueMinimum, consensusThreshold, closedAt, zapReceiver, wantsToMarkAsSensitive)
-        } else if (originalNote?.channel() != null) {
-            account?.sendChannelMessage(tagger.message, tagger.channel!!.idHex, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+        } else if (originalNote?.channelHex() != null) {
+            account?.sendChannelMessage(tagger.message, tagger.channelHex!!, tagger.replyTos, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
         } else if (originalNote?.event is PrivateDmEvent) {
-            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!.pubkeyHex, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
+            account?.sendPrivateMessage(tagger.message, originalNote!!.author!!, originalNote!!, tagger.mentions, zapReceiver, wantsToMarkAsSensitive)
         } else {
             account?.sendPost(tagger.message, tagger.replyTos, tagger.mentions, null, zapReceiver, wantsToMarkAsSensitive)
         }
@@ -226,7 +228,11 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionsMainMessage = true
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
+                viewModelScope.launch(Dispatchers.IO) {
+                    userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                        .sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() }))
+                        .reversed()
+                }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()
@@ -242,7 +248,15 @@ open class NewPostViewModel : ViewModel() {
             userSuggestionsMainMessage = false
             if (lastWord.startsWith("@") && lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
-                userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@")).sortedWith(compareBy({ account?.isFollowing(it) }, { it.toBestDisplayName() })).reversed()
+                viewModelScope.launch(Dispatchers.IO) {
+                    userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
+                        .sortedWith(
+                            compareBy(
+                                { account?.isFollowing(it) },
+                                { it.toBestDisplayName() }
+                            )
+                        ).reversed()
+                }
             } else {
                 NostrSearchEventOrUserDataSource.clear()
                 userSuggestions = emptyList()

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListViewModel.kt

@@ -7,6 +7,7 @@ import com.vitorpamplona.amethyst.service.model.ContactListEvent
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
+import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -46,7 +47,7 @@ class NewRelayListViewModel : ViewModel() {
             if (relayFile != null) {
                 relayFile.map {
                     val liveRelay = RelayPool.getRelay(it.key)
-                    val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet()
+                    val localInfoFeedTypes = account.localRelays.filter { localRelay -> localRelay.url == it.key }.firstOrNull()?.feedTypes ?: FeedType.values().toSet().toImmutableSet()
 
                     val errorCounter = liveRelay?.errorCounter ?: 0
                     val eventDownloadCounter = liveRelay?.eventDownloadCounterInBytes ?: 0

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt

@@ -28,6 +28,9 @@ import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
@@ -37,8 +40,12 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     LaunchedEffect(Unit) {
         postViewModel.load(account)
 
-        postViewModel.imageUploadingError.collect { error ->
-            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        launch(Dispatchers.IO) {
+            postViewModel.imageUploadingError.collect { error ->
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataViewModel.kt

@@ -13,6 +13,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.model.GitHubIdentity
 import com.vitorpamplona.amethyst.service.model.MastodonIdentity
 import com.vitorpamplona.amethyst.service.model.TwitterIdentity
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import java.io.ByteArrayInputStream
@@ -119,7 +120,9 @@ class NewUserMetadataViewModel : ViewModel() {
         val writer = StringWriter()
         ObjectMapper().writeValue(writer, currentJson)
 
-        account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
+        viewModelScope.launch(Dispatchers.IO) {
+            account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
+        }
 
         clear()
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt

@@ -28,6 +28,8 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.GetMediaActivityResultContract
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(ExperimentalPermissionsApi::class)
@@ -99,21 +101,23 @@ private fun UploadBoxButton(
     }
 }
 
+val DefaultAnimationColors = listOf(
+    Color(0xFF5851D8),
+    Color(0xFF833AB4),
+    Color(0xFFC13584),
+    Color(0xFFE1306C),
+    Color(0xFFFD1D1D),
+    Color(0xFFF56040),
+    Color(0xFFF77737),
+    Color(0xFFFCAF45),
+    Color(0xFFFFDC80),
+    Color(0xFF5851D8)
+).toImmutableList()
+
 @Composable
 fun LoadingAnimation(
     indicatorSize: Dp = 20.dp,
-    circleColors: List<Color> = listOf(
-        Color(0xFF5851D8),
-        Color(0xFF833AB4),
-        Color(0xFFC13584),
-        Color(0xFFE1306C),
-        Color(0xFFFD1D1D),
-        Color(0xFFF56040),
-        Color(0xFFF77737),
-        Color(0xFFFCAF45),
-        Color(0xFFFFDC80),
-        Color(0xFF5851D8)
-    ),
+    circleColors: ImmutableList<Color> = DefaultAnimationColors,
     animationDuration: Int = 1000
 ) {
     val infiniteTransition = rememberInfiniteTransition()

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/ChannelFabColumn.kt

@@ -16,12 +16,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.JoinUserOrChannelView
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun ChannelFabColumn(account: Account, nav: (String) -> Unit) {
+fun ChannelFabColumn(accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var isOpen by remember {
         mutableStateOf(false)
     }
@@ -35,11 +35,11 @@ fun ChannelFabColumn(account: Account, nav: (String) -> Unit) {
     }
 
     if (wantsToCreateChannel) {
-        NewChannelView({ wantsToCreateChannel = false }, account = account)
+        NewChannelView({ wantsToCreateChannel = false }, accountViewModel = accountViewModel)
     }
 
     if (wantsToJoinChannelOrUser) {
-        JoinUserOrChannelView({ wantsToJoinChannelOrUser = false }, account = account, nav = nav)
+        JoinUserOrChannelView({ wantsToJoinChannelOrUser = false }, accountViewModel = accountViewModel, nav = nav)
     }
 
     Column() {

app/src/main/java/com/vitorpamplona/amethyst/ui/buttons/NewChannelButton.kt

@@ -19,17 +19,17 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
-fun NewChannelButton(account: Account) {
+fun NewChannelButton(accountViewModel: AccountViewModel) {
     var wantsToPost by remember {
         mutableStateOf(false)
     }
 
     if (wantsToPost) {
-        NewChannelView({ wantsToPost = false }, account = account)
+        NewChannelView({ wantsToPost = false }, accountViewModel = accountViewModel)
     }
 
     OutlinedButton(

app/src/main/java/com/vitorpamplona/amethyst/ui/components/BundledUpdate.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -58,6 +59,8 @@ class BundledInsert<T>(
     private var queue = LinkedBlockingQueue<T>()
 
     fun invalidateList(newObject: T, onUpdate: suspend (Set<T>) -> Unit) {
+        checkNotInMainThread()
+
         queue.put(newObject)
         if (onlyOneInBlock.getAndSet(true)) {
             return

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt

@@ -13,7 +13,9 @@ import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -45,27 +47,61 @@ import com.vitorpamplona.amethyst.service.NIP30Parser
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.nip19.Nip19
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 @Composable
 fun ClickableRoute(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    if (nip19.type == Nip19.Type.USER) {
-        DisplayUser(nip19, nav)
-    } else if (nip19.type == Nip19.Type.ADDRESS) {
-        DisplayAddress(nip19, nav)
-    } else if (nip19.type == Nip19.Type.NOTE) {
-        DisplayNote(nip19, nav)
-    } else if (nip19.type == Nip19.Type.EVENT) {
-        DisplayEvent(nip19, nav)
-    } else {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
-        )
+    when (nip19.type) {
+        Nip19.Type.USER -> {
+            DisplayUser(nip19, nav)
+        }
+        Nip19.Type.ADDRESS -> {
+            DisplayAddress(nip19, nav)
+        }
+        Nip19.Type.NOTE -> {
+            DisplayNote(nip19, nav)
+        }
+        Nip19.Type.EVENT -> {
+            DisplayEvent(nip19, nav)
+        }
+        else -> {
+            Text(
+                remember {
+                    "@${nip19.hex}${nip19.additionalChars} "
+                }
+            )
+        }
+    }
+}
+
+@Composable
+private fun LoadNote(
+    hex: String,
+    content: @Composable (Note) -> Unit
+) {
+    var noteBase by remember(hex) { mutableStateOf<Note?>(null) }
+
+    LaunchedEffect(key1 = hex) {
+        if (noteBase == null) {
+            launch(Dispatchers.IO) {
+                noteBase = LocalCache.checkGetOrCreateNote(hex)
+            }
+        }
+    }
+
+    noteBase?.let {
+        content(it)
     }
 }
 
@@ -74,54 +110,8 @@ private fun DisplayEvent(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
-
-    LaunchedEffect(key1 = nip19.hex) {
-        withContext(Dispatchers.IO) {
-            noteBase = LocalCache.checkGetOrCreateNote(nip19.hex)
-        }
-    }
-
-    noteBase?.let {
-        val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
-        val channel = remember(noteState) { note.channel() }
-
-        if (note.event is ChannelCreateEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${nip19.hex}",
-                nav = nav
-            )
-        } else if (note.event is PrivateDmEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Room/${note.author?.pubkeyHex}",
-                nav = nav
-            )
-        } else if (channel != null) {
-            CreateClickableText(
-                clickablePart = channel.toBestDisplayName(),
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${channel.idHex}",
-                nav = nav
-            )
-        } else {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Event/${nip19.hex}",
-                nav = nav
-            )
-        }
-    }
-
-    if (noteBase == null) {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
-        )
+    LoadNote(nip19.hex) {
+        DisplayNoteLink(it, nip19, nav)
     }
 }
 
@@ -130,53 +120,61 @@ private fun DisplayNote(
     nip19: Nip19.Return,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf<Note?>(null) }
-
-    LaunchedEffect(key1 = nip19.hex) {
-        launch(Dispatchers.IO) {
-            noteBase = LocalCache.checkGetOrCreateNote(nip19.hex)
-        }
+    LoadNote(nip19.hex) {
+        DisplayNoteLink(it, nip19, nav)
     }
+}
 
-    noteBase?.let {
-        val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
-        val channel = note.channel()
+@Composable
+private fun DisplayNoteLink(
+    it: Note,
+    nip19: Nip19.Return,
+    nav: (String) -> Unit
+) {
+    val noteState by it.live().metadata.observeAsState()
+
+    val note = remember(noteState) { noteState?.note } ?: return
+
+    val channelHex = remember(noteState) { note.channelHex() }
+    val noteIdDisplayNote = remember(noteState) { "@${note.idDisplayNote()}" }
+    val addedCharts = remember { "${nip19.additionalChars} " }
+
+    if (note.event is ChannelCreateEvent || nip19.kind == ChannelCreateEvent.kind) {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Channel/${nip19.hex}" },
+            nav = nav
+        )
+    } else if (note.event is PrivateDmEvent || nip19.kind == PrivateDmEvent.kind) {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Room/${note.author?.pubkeyHex}" },
+            nav = nav
+        )
+    } else if (channelHex != null) {
+        LoadChannel(baseChannelHex = channelHex) { baseChannel ->
+            val channelState by baseChannel.live.observeAsState()
+            val channelDisplayName by remember(channelState) {
+                derivedStateOf {
+                    channelState?.channel?.toBestDisplayName() ?: noteIdDisplayNote
+                }
+            }
 
-        if (note.event is ChannelCreateEvent) {
             CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${nip19.hex}",
-                nav = nav
-            )
-        } else if (note.event is PrivateDmEvent) {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Room/${note.author?.pubkeyHex}",
-                nav = nav
-            )
-        } else if (channel != null) {
-            CreateClickableText(
-                clickablePart = channel.toBestDisplayName(),
-                suffix = "${nip19.additionalChars} ",
-                route = "Channel/${note.channel()?.idHex}",
-                nav = nav
-            )
-        } else {
-            CreateClickableText(
-                clickablePart = "@${note.idDisplayNote()}",
-                suffix = "${nip19.additionalChars} ",
-                route = "Note/${nip19.hex}",
+                clickablePart = channelDisplayName,
+                suffix = addedCharts,
+                route = remember(noteState) { "Channel/${baseChannel.idHex}" },
                 nav = nav
             )
         }
-    }
-
-    if (noteBase == null) {
-        Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+    } else {
+        CreateClickableText(
+            clickablePart = noteIdDisplayNote,
+            suffix = addedCharts,
+            route = remember(noteState) { "Event/${nip19.hex}" },
+            nav = nav
         )
     }
 }
@@ -196,19 +194,24 @@ private fun DisplayAddress(
 
     noteBase?.let {
         val noteState by it.live().metadata.observeAsState()
-        val note = remember(noteState) { noteState?.note } ?: return
+
+        val route = remember(noteState) { "Note/${nip19.hex}" }
+        val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
+        val addedCharts = remember { "${nip19.additionalChars} " }
 
         CreateClickableText(
-            clickablePart = "@${note.idDisplayNote()}",
-            suffix = "${nip19.additionalChars} ",
-            route = "Note/${nip19.hex}",
+            clickablePart = displayName,
+            suffix = addedCharts,
+            route = route,
             nav = nav
         )
     }
 
     if (noteBase == null) {
         Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+            remember {
+                "@${nip19.hex}${nip19.additionalChars} "
+            }
         )
     }
 }
@@ -230,12 +233,15 @@ private fun DisplayUser(
         val userState by it.live().metadata.observeAsState()
         val route = remember(userState) { "User/${it.pubkeyHex}" }
         val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
-        val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
+        val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
+        val addedCharts = remember {
+            "${nip19.additionalChars} "
+        }
 
         if (userDisplayName != null) {
             CreateClickableTextWithEmoji(
                 clickablePart = userDisplayName,
-                suffix = "${nip19.additionalChars} ",
+                suffix = addedCharts,
                 tags = userTags,
                 route = route,
                 nav = nav
@@ -245,7 +251,9 @@ private fun DisplayUser(
 
     if (userBase == null) {
         Text(
-            "@${nip19.hex}${nip19.additionalChars} "
+            remember {
+                "@${nip19.hex}${nip19.additionalChars} "
+            }
         )
     }
 }
@@ -279,7 +287,7 @@ fun CreateClickableText(
 @Composable
 fun CreateTextWithEmoji(
     text: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     color: Color = Color.Unspecified,
     textAlign: TextAlign? = null,
     fontWeight: FontWeight? = null,
@@ -288,32 +296,29 @@ fun CreateTextWithEmoji(
     overflow: TextOverflow = TextOverflow.Clip,
     modifier: Modifier = Modifier
 ) {
-    val emojis = remember {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = text) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList = assembleAnnotatedList(text, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
     }
 
-    CreateTextWithEmoji(text, emojis, color, textAlign, fontWeight, fontSize, maxLines, overflow, modifier)
-}
-
-@Composable
-fun CreateTextWithEmoji(
-    text: String,
-    emojis: Map<String, String>,
-    color: Color = Color.Unspecified,
-    textAlign: TextAlign? = null,
-    fontWeight: FontWeight? = null,
-    fontSize: TextUnit = TextUnit.Unspecified,
-    maxLines: Int = Int.MAX_VALUE,
-    overflow: TextOverflow = TextOverflow.Clip,
-    modifier: Modifier = Modifier
-) {
     val textColor = color.takeOrElse {
         LocalTextStyle.current.color.takeOrElse {
             LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
         }
     }
 
-    if (emojis.isEmpty()) {
+    if (emojiList.isEmpty()) {
         Text(
             text = text,
             color = textColor,
@@ -325,10 +330,6 @@ fun CreateTextWithEmoji(
             modifier = modifier
         )
     } else {
-        val myList = remember {
-            assembleAnnotatedList(text, emojis)
-        }
-
         val style = LocalTextStyle.current.merge(
             TextStyle(
                 color = textColor,
@@ -338,33 +339,97 @@ fun CreateTextWithEmoji(
             )
         ).toSpanStyle()
 
-        InLineIconRenderer(myList, style, maxLines, overflow, modifier)
+        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
+    }
+}
+
+@Composable
+fun CreateTextWithEmoji(
+    text: String,
+    emojis: ImmutableMap<String, String>,
+    color: Color = Color.Unspecified,
+    textAlign: TextAlign? = null,
+    fontWeight: FontWeight? = null,
+    fontSize: TextUnit = TextUnit.Unspecified,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+    modifier: Modifier = Modifier
+) {
+    var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = text) {
+        if (emojis.isNotEmpty()) {
+            launch(Dispatchers.Default) {
+                val newEmojiList = assembleAnnotatedList(text, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
+    }
+
+    val textColor = color.takeOrElse {
+        LocalTextStyle.current.color.takeOrElse {
+            LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
+        }
+    }
+
+    if (emojiList.isEmpty()) {
+        Text(
+            text = text,
+            color = textColor,
+            textAlign = textAlign,
+            fontWeight = fontWeight,
+            fontSize = fontSize,
+            maxLines = maxLines,
+            overflow = overflow,
+            modifier = modifier
+        )
+    } else {
+        val style = LocalTextStyle.current.merge(
+            TextStyle(
+                color = textColor,
+                textAlign = textAlign,
+                fontWeight = fontWeight,
+                fontSize = fontSize
+            )
+        ).toSpanStyle()
+
+        InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
     }
 }
 
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     style: TextStyle,
     onClick: (Int) -> Unit
 ) {
-    val emojis = remember(tags) {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiList by remember(clickablePart) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
+
+    LaunchedEffect(key1 = clickablePart) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList = assembleAnnotatedList(clickablePart, emojis)
+                if (newEmojiList.isNotEmpty()) {
+                    emojiList = newEmojiList.toImmutableList()
+                }
+            }
+        }
     }
 
-    if (emojis.isEmpty()) {
+    if (emojiList.isEmpty()) {
         ClickableText(
             AnnotatedString(clickablePart),
             style = style,
             onClick = onClick
         )
     } else {
-        val myList = remember {
-            assembleAnnotatedList(clickablePart, emojis)
-        }
-
-        ClickableInLineIconRenderer(myList, style.toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiList, style.toSpanStyle()) {
             onClick(it)
         }
     }
@@ -374,36 +439,44 @@ fun CreateClickableTextWithEmoji(
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
     suffix: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
     nav: (String) -> Unit
 ) {
-    val emojis = remember(tags) {
-        tags?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+    var emojiLists by remember(clickablePart) {
+        mutableStateOf<Pair<ImmutableList<Renderable>, ImmutableList<Renderable>>?>(null)
     }
 
-    if (emojis.isEmpty()) {
+    LaunchedEffect(key1 = clickablePart) {
+        launch(Dispatchers.Default) {
+            val emojis =
+                tags?.lists?.filter { it.size > 2 && it[0] == "emoji" }?.associate { ":${it[1]}:" to it[2] } ?: emptyMap()
+
+            if (emojis.isNotEmpty()) {
+                val newEmojiList1 = assembleAnnotatedList(clickablePart, emojis)
+                val newEmojiList2 = assembleAnnotatedList(suffix, emojis)
+
+                if (newEmojiList1.isNotEmpty() || newEmojiList2.isNotEmpty()) {
+                    emojiLists = Pair(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
+                }
+            }
+        }
+    }
+
+    if (emojiLists == null) {
         CreateClickableText(clickablePart, suffix, overrideColor, fontWeight, route, nav)
     } else {
-        val myList = remember {
-            assembleAnnotatedList(clickablePart, emojis)
-        }
-
-        ClickableInLineIconRenderer(myList, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiLists!!.first, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
             nav(route)
         }
 
-        val myList2 = remember {
-            assembleAnnotatedList(suffix, emojis)
-        }
-
-        InLineIconRenderer(myList2, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
+        InLineIconRenderer(emojiLists!!.second, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
     }
 }
 
-fun assembleAnnotatedList(text: String, emojis: Map<String, String>): List<Renderable> {
+suspend fun assembleAnnotatedList(text: String, emojis: Map<String, String>): ImmutableList<Renderable> {
     return NIP30Parser().buildArray(text).map {
         val url = emojis[it]
         if (url != null) {
@@ -411,15 +484,20 @@ fun assembleAnnotatedList(text: String, emojis: Map<String, String>): List<Rende
         } else {
             TextType(it)
         }
-    }
+    }.toImmutableList()
 }
 
+@Immutable
 open class Renderable()
+
+@Immutable
 class TextType(val text: String) : Renderable()
+
+@Immutable
 class ImageUrlType(val url: String) : Renderable()
 
 @Composable
-fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
+fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
@@ -434,7 +512,9 @@ fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle
                     AsyncImage(
                         model = value.url,
                         contentDescription = null,
-                        modifier = Modifier.fillMaxSize().padding(1.dp)
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(1.dp)
                     )
                 }
             )
@@ -478,7 +558,7 @@ fun ClickableInLineIconRenderer(wordsInOrder: List<Renderable>, style: SpanStyle
 
 @Composable
 fun InLineIconRenderer(
-    wordsInOrder: List<Renderable>,
+    wordsInOrder: ImmutableList<Renderable>,
     style: SpanStyle,
     maxLines: Int = Int.MAX_VALUE,
     overflow: TextOverflow = TextOverflow.Clip,
@@ -498,7 +578,9 @@ fun InLineIconRenderer(
                     AsyncImage(
                         model = value.url,
                         contentDescription = null,
-                        modifier = Modifier.fillMaxSize().padding(horizontal = 1.dp)
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(horizontal = 1.dp)
                     )
                 }
             )

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUrl.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
 
@@ -11,10 +12,16 @@ import androidx.compose.ui.text.AnnotatedString
 fun ClickableUrl(urlText: String, url: String) {
     val uri = LocalUriHandler.current
 
-    val doubleCheckedUrl = if (url.contains("://")) url else "https://$url"
+    val doubleCheckedUrl = remember(url) {
+        if (url.contains("://")) url else "https://$url"
+    }
+
+    val text = remember(urlText) {
+        AnnotatedString(urlText)
+    }
 
     ClickableText(
-        text = AnnotatedString(urlText),
+        text = text,
         onClick = { runCatching { uri.openUri(doubleCheckedUrl) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableUserTag.kt

@@ -6,6 +6,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.text.AnnotatedString
 import com.vitorpamplona.amethyst.model.User
 
@@ -14,10 +15,19 @@ fun ClickableUserTag(
     user: User,
     nav: (String) -> Unit
 ) {
+    val route = remember {
+        "User/${user.pubkeyHex}"
+    }
+
     val innerUserState by user.live().metadata.observeAsState()
+
+    val userName = remember(innerUserState) {
+        AnnotatedString("@${innerUserState?.user?.toBestDisplayName()}")
+    }
+
     ClickableText(
-        text = AnnotatedString("@${innerUserState?.user?.toBestDisplayName()}"),
-        onClick = { nav("User/${innerUserState?.user?.pubkeyHex}") },
+        text = userName,
+        onClick = { nav(route) },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableWithdrawal.kt

@@ -13,14 +13,14 @@ import androidx.compose.ui.text.style.TextDirection
 import androidx.core.content.ContextCompat
 import com.vitorpamplona.amethyst.service.lnurl.LnWithdrawalUtil
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 
 @Composable
 fun MayBeWithdrawal(lnurlWord: String) {
     var lnWithdrawal by remember { mutableStateOf<String?>(null) }
 
     LaunchedEffect(key1 = lnurlWord) {
-        withContext(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             lnWithdrawal = LnWithdrawalUtil.findWithdrawal(lnurlWord)
         }
     }
@@ -38,11 +38,19 @@ fun MayBeWithdrawal(lnurlWord: String) {
 fun ClickableWithdrawal(withdrawalString: String) {
     val context = LocalContext.current
 
+    val uri = remember(withdrawalString) {
+        Uri.parse("lightning:$withdrawalString")
+    }
+
+    val withdraw = remember(withdrawalString) {
+        AnnotatedString("$withdrawalString ")
+    }
+
     ClickableText(
-        text = AnnotatedString("$withdrawalString "),
+        text = withdraw,
         onClick = {
             runCatching {
-                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$withdrawalString"))
+                val intent = Intent(Intent.ACTION_VIEW, uri)
                 ContextCompat.startActivity(context, intent, null)
             }
         },

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt

@@ -26,6 +26,7 @@ import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 const val SHORT_TEXT_LENGTH = 350
@@ -34,8 +35,8 @@ const val SHORT_TEXT_LENGTH = 350
 fun ExpandableRichTextViewer(
     content: String,
     canPreview: Boolean,
-    modifier: Modifier = Modifier,
-    tags: List<List<String>>?,
+    modifier: Modifier,
+    tags: ImmutableListOfLists<String>,
     backgroundColor: Color,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -87,18 +88,26 @@ fun ExpandableRichTextViewer(
                         )
                     )
             ) {
-                Button(
-                    modifier = Modifier.padding(top = 10.dp),
-                    onClick = { showFullText = !showFullText },
-                    shape = RoundedCornerShape(20.dp),
-                    colors = ButtonDefaults.buttonColors(
-                        backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background)
-                    ),
-                    contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
-                ) {
-                    Text(text = stringResource(R.string.show_more), color = Color.White)
+                ShowMoreButton() {
+                    showFullText = !showFullText
                 }
             }
         }
     }
 }
+
+@Composable
+private fun ShowMoreButton(onClick: () -> Unit) {
+    Button(
+        modifier = Modifier.padding(top = 10.dp),
+        onClick = onClick,
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.primary.copy(alpha = 0.32f)
+                .compositeOver(MaterialTheme.colors.background)
+        ),
+        contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+    ) {
+        Text(text = stringResource(R.string.show_more), color = Color.White)
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoicePreview.kt

@@ -27,19 +27,18 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.math.BigDecimal
 import java.text.NumberFormat
 
 @Composable
 fun MayBeInvoicePreview(lnbcWord: String) {
-    var lnInvoice by remember { mutableStateOf<Pair<String, BigDecimal?>?>(null) }
+    var lnInvoice by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
     LaunchedEffect(key1 = lnbcWord) {
         withContext(Dispatchers.IO) {
             val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
             if (myInvoice != null) {
                 val myInvoiceAmount = try {
-                    LnInvoiceUtil.getAmountInSats(myInvoice)
+                    NumberFormat.getInstance().format(LnInvoiceUtil.getAmountInSats(myInvoice))
                 } catch (e: Exception) {
                     e.printStackTrace()
                     null
@@ -60,7 +59,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
 }
 
 @Composable
-fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
+fun InvoicePreview(lnInvoice: String, amount: String?) {
     val context = LocalContext.current
 
     Column(
@@ -100,9 +99,7 @@ fun InvoicePreview(lnInvoice: String, amount: BigDecimal?) {
 
             amount?.let {
                 Text(
-                    text = "${
-                    NumberFormat.getInstance().format(amount)
-                    } ${stringResource(id = R.string.sats)}",
+                    text = "$it ${stringResource(id = R.string.sats)}",
                     fontSize = 25.sp,
                     fontWeight = FontWeight.W500,
                     modifier = Modifier

app/src/main/java/com/vitorpamplona/amethyst/ui/components/Robohash.kt

@@ -12,6 +12,7 @@ import coil.fetch.SourceResult
 import coil.request.ImageRequest
 import coil.request.Options
 import coil.size.Size
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import okio.Buffer
 import java.security.MessageDigest
 
@@ -21,8 +22,6 @@ private fun toHex(color: Color): String {
     return String.format("#%06X", rgb)
 }
 
-private val sha256: MessageDigest = MessageDigest.getInstance("SHA-256")
-
 private fun byteMod10(byte: Byte): Int {
     val ub = byte.toUByte().toInt()
     return ub % 10
@@ -33,7 +32,7 @@ private fun bytesToRGB(b1: Byte, b2: Byte, b3: Byte): Color {
 }
 
 private fun svgString(msg: String): String {
-    val hash = sha256.digest(msg.toByteArray())
+    val hash = MessageDigest.getInstance("SHA-256").digest(msg.toByteArray())
     val hashHex = hash.joinToString(separator = "") { b -> "%02x".format(b) }
     val bgColor = bytesToRGB(hash[0], hash[1], hash[2])
     val fgColor = bytesToRGB(hash[3], hash[4], hash[5])
@@ -67,6 +66,7 @@ class HashImageFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): SourceResult {
+        checkNotInMainThread()
         val source = try {
             Buffer().apply { write(svgString(data.toString()).toByteArray()) }
         } finally {

app/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt

@@ -31,13 +31,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun TextSpinner(
     label: String,
     placeholder: String,
-    options: List<String>,
-    explainers: List<String>? = null,
+    options: ImmutableList<String>,
+    explainers: ImmutableList<String>? = null,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -83,7 +84,12 @@ fun TextSpinner(
 }
 
 @Composable
-fun SpinnerSelectionDialog(options: List<String>, explainers: List<String>?, onDismiss: () -> Unit, onSelect: (Int) -> Unit) {
+fun SpinnerSelectionDialog(
+    options: ImmutableList<String>,
+    explainers: ImmutableList<String>?,
+    onDismiss: () -> Unit,
+    onSelect: (Int) -> Unit
+) {
     Dialog(onDismissRequest = onDismiss) {
         Surface(
             border = BorderStroke(0.25.dp, Color.LightGray),

app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt

@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import android.content.Context
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
@@ -27,7 +25,7 @@ import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -46,7 +44,6 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isFinite
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import coil.imageLoader
@@ -61,26 +58,9 @@ import com.google.android.exoplayer2.ui.StyledPlayerView
 import com.vitorpamplona.amethyst.VideoCache
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.io.File
 
 public var DefaultMutedSetting = mutableStateOf(true)
 
-@Composable
-fun VideoView(localFile: File?, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
-    if (localFile != null) {
-        val video = remember(localFile) { localFile.toUri() }
-
-        VideoView(video, description, null, onDialog)
-    }
-}
-
-@Composable
-fun VideoView(videoUri: String, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
-    val video = remember(videoUri) { Uri.parse(videoUri) }
-
-    VideoView(video, description, null, onDialog)
-}
-
 @Composable
 fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thumbUri: String, onDialog: ((Boolean) -> Unit)? = null) {
     var loadingFinished by remember { mutableStateOf<Pair<Boolean, Drawable?>>(Pair(false, null)) }
@@ -106,40 +86,37 @@ fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thu
 
     if (loadingFinished.first) {
         if (loadingFinished.second != null) {
-            val video = remember(videoUri) { Uri.parse(videoUri) }
-
-            VideoView(video, description, loadingFinished.second, onDialog)
+            VideoView(videoUri, description, VideoThumb(loadingFinished.second), onDialog)
         } else {
-            VideoView(videoUri, description, onDialog)
+            VideoView(videoUri, description, null, onDialog)
         }
     }
 }
 
 @Composable
-fun VideoView(videoUri: Uri, description: String? = null, thumb: Drawable? = null, onDialog: ((Boolean) -> Unit)? = null) {
+fun VideoView(videoUri: String, description: String? = null, thumb: VideoThumb? = null, onDialog: ((Boolean) -> Unit)? = null) {
     val context = LocalContext.current
     val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
 
-    val mutedInstance = remember { mutableStateOf(DefaultMutedSetting.value) }
-
-    var exoPlayer by remember { mutableStateOf<ExoPlayer?>(null) }
+    var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
+    val defaultVolume = remember { if (DefaultMutedSetting.value) 0f else 1f }
 
     LaunchedEffect(key1 = videoUri) {
-        if (exoPlayer == null) {
+        if (exoPlayerData == null) {
             launch(Dispatchers.Default) {
-                exoPlayer = ExoPlayer.Builder(context).build()
+                exoPlayerData = VideoPlayer(ExoPlayer.Builder(context).build())
             }
         }
     }
 
-    exoPlayer?.let {
+    exoPlayerData?.let {
         val media = remember { MediaItem.Builder().setUri(videoUri).build() }
 
-        it.apply {
+        it.exoPlayer.apply {
             repeatMode = Player.REPEAT_MODE_ALL
             videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT
-            volume = if (mutedInstance.value) 0f else 1f
-            if (videoUri.scheme?.startsWith("file") == true) {
+            volume = defaultVolume
+            if (videoUri.startsWith("file") == true) {
                 setMediaItem(media)
             } else {
                 setMediaSource(
@@ -151,14 +128,14 @@ fun VideoView(videoUri: Uri, description: String? = null, thumb: Drawable? = nul
             prepare()
         }
 
-        RenderVideoPlayer(it, context, thumb, onDialog, mutedInstance)
+        RenderVideoPlayer(it, thumb, onDialog)
     }
 
     DisposableEffect(Unit) {
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
                 Lifecycle.Event.ON_PAUSE -> {
-                    exoPlayer?.pause()
+                    exoPlayerData?.exoPlayer?.pause()
                 }
                 else -> {}
             }
@@ -167,20 +144,30 @@ fun VideoView(videoUri: Uri, description: String? = null, thumb: Drawable? = nul
         lifecycle.addObserver(observer)
 
         onDispose {
-            exoPlayer?.release()
+            exoPlayerData?.exoPlayer?.release()
             lifecycle.removeObserver(observer)
         }
     }
 }
 
+@Stable
+data class VideoPlayer(
+    val exoPlayer: ExoPlayer
+)
+
+@Stable
+data class VideoThumb(
+    val thumb: Drawable?
+)
+
 @Composable
 private fun RenderVideoPlayer(
-    exoPlayer: ExoPlayer,
-    context: Context,
-    thumb: Drawable?,
-    onDialog: ((Boolean) -> Unit)?,
-    mutedInstance: MutableState<Boolean>
+    playerData: VideoPlayer,
+    thumbData: VideoThumb?,
+    onDialog: ((Boolean) -> Unit)?
 ) {
+    val context = LocalContext.current
+
     BoxWithConstraints() {
         AndroidView(
             modifier = Modifier
@@ -188,27 +175,27 @@ private fun RenderVideoPlayer(
                 .defaultMinSize(minHeight = 70.dp)
                 .align(Alignment.Center)
                 .onVisibilityChanges { visible ->
-                    if (visible && !exoPlayer.isPlaying) {
-                        exoPlayer.play()
-                    } else if (!visible && exoPlayer.isPlaying) {
-                        exoPlayer.pause()
+                    if (visible && !playerData.exoPlayer.isPlaying) {
+                        playerData.exoPlayer.play()
+                    } else if (!visible && playerData.exoPlayer.isPlaying) {
+                        playerData.exoPlayer.pause()
                     }
                 },
             factory = {
                 StyledPlayerView(context).apply {
-                    player = exoPlayer
+                    player = playerData.exoPlayer
                     layoutParams = FrameLayout.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
                         ViewGroup.LayoutParams.WRAP_CONTENT
                     )
                     controllerAutoShow = false
-                    thumb?.let { defaultArtwork = thumb }
+                    thumbData?.thumb?.let { defaultArtwork = it }
                     hideController()
                     resizeMode =
                         if (maxHeight.isFinite) AspectRatioFrameLayout.RESIZE_MODE_FIT else AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
                     onDialog?.let { innerOnDialog ->
                         setFullscreenButtonClickListener {
-                            exoPlayer.pause()
+                            playerData.exoPlayer.pause()
                             innerOnDialog(it)
                         }
                     }
@@ -216,11 +203,10 @@ private fun RenderVideoPlayer(
             }
         )
 
-        MuteButton(mutedInstance) {
-            mutedInstance.value = !mutedInstance.value
-            DefaultMutedSetting.value = mutedInstance.value
+        MuteButton() { mute: Boolean ->
+            DefaultMutedSetting.value = mute
 
-            exoPlayer.volume = if (mutedInstance.value) 0f else 1f
+            playerData.exoPlayer.volume = if (mute) 0f else 1f
         }
     }
 }
@@ -255,7 +241,7 @@ fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
 }
 
 @Composable
-private fun MuteButton(muted: MutableState<Boolean>, toggle: () -> Unit) {
+private fun MuteButton(toggle: (Boolean) -> Unit) {
     Box(
         remember {
             Modifier
@@ -272,11 +258,16 @@ private fun MuteButton(muted: MutableState<Boolean>, toggle: () -> Unit) {
                 .background(MaterialTheme.colors.background)
         )
 
+        val mutedInstance = remember { mutableStateOf(DefaultMutedSetting.value) }
+
         IconButton(
-            onClick = toggle,
+            onClick = {
+                mutedInstance.value = !mutedInstance.value
+                toggle(mutedInstance.value)
+            },
             modifier = Modifier.size(50.dp)
         ) {
-            if (muted.value) {
+            if (mutedInstance.value) {
                 Icon(
                     imageVector = Icons.Default.VolumeOff,
                     "Hash Verified",

app/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt

@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
@@ -62,10 +64,10 @@ import androidx.compose.ui.unit.isFinite
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.core.net.toUri
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.AsyncImage
 import coil.imageLoader
-import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.service.BlurHashRequester
@@ -74,6 +76,8 @@ import com.vitorpamplona.amethyst.ui.actions.LoadingAnimation
 import com.vitorpamplona.amethyst.ui.actions.SaveToGallery
 import com.vitorpamplona.amethyst.ui.note.BlankNote
 import com.vitorpamplona.amethyst.ui.theme.Nip05
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -163,7 +167,7 @@ fun figureOutMimeType(fullUrl: String): ZoomableContent {
 
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
-fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent> = listOf(content)) {
+fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<ZoomableContent> = listOf(content).toImmutableList()) {
     val clipboardManager = LocalClipboardManager.current
 
     // store the dialog open or close state
@@ -200,7 +204,10 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
         is ZoomableUrlImage -> UrlImageView(content, mainImageModifier)
         is ZoomableUrlVideo -> VideoView(content.url, content.description) { dialogOpen = true }
         is ZoomableLocalImage -> LocalImageView(content, mainImageModifier)
-        is ZoomableLocalVideo -> VideoView(content.localFile, content.description) { dialogOpen = true }
+        is ZoomableLocalVideo ->
+            content.localFile?.let {
+                VideoView(it.toUri().toString(), content.description) { dialogOpen = true }
+            }
     }
 
     if (dialogOpen) {
@@ -208,6 +215,7 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun LocalImageView(
     content: ZoomableLocalImage,
@@ -271,6 +279,7 @@ private fun LocalImageView(
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun UrlImageView(
     content: ZoomableUrlImage,
@@ -439,7 +448,7 @@ private fun DisplayBlurHash(
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: List<ZoomableContent> = listOf(imageUrl), onDismiss: () -> Unit) {
+fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<ZoomableContent> = listOf(imageUrl).toImmutableList(), onDismiss: () -> Unit) {
     Dialog(
         onDismissRequest = onDismiss,
         properties = DialogProperties(usePlatformDefaultWidth = false)
@@ -504,7 +513,9 @@ fun RenderImageOrVideo(content: ZoomableContent) {
         LocalImageView(content = content, mainImageModifier = mainModifier)
     } else if (content is ZoomableLocalVideo) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
-            VideoView(content.localFile, content.description)
+            content.localFile?.let {
+                VideoView(it.toUri().toString(), content.description)
+            }
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChannelFeedFilter.kt

@@ -1,23 +1,12 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
 
-object ChannelFeedFilter : AdditiveFeedFilter<Note>() {
-    lateinit var account: Account
-    var channelId: String? = null
-
-    fun loadMessagesBetween(accountLoggedIn: Account, channelId: String?) {
-        this.account = accountLoggedIn
-        this.channelId = channelId
-    }
-
+class ChannelFeedFilter(val channel: Channel, val account: Account) : AdditiveFeedFilter<Note>() {
     // returns the last Note of each user.
     override fun feed(): List<Note> {
-        val processingChannel = channelId ?: return emptyList()
-        val channel = LocalCache.getOrCreateChannel(processingChannel)
-
         return channel.notes
             .values
             .filter { account.isAcceptable(it) }
@@ -26,9 +15,6 @@ object ChannelFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     override fun applyFilter(collection: Set<Note>): Set<Note> {
-        val processingChannel = channelId ?: return emptySet()
-        val channel = LocalCache.getOrCreateChannel(processingChannel)
-
         return collection
             .filter { it.idHex in channel.notes.keys && account.isAcceptable(it) }
             .toSet()

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomFeedFilter.kt

@@ -1,51 +1,29 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 
-object ChatroomFeedFilter : AdditiveFeedFilter<Note>() {
-    var account: Account? = null
-    var withUser: String? = null
-
-    fun loadMessagesBetween(accountIn: Account, userId: String) {
-        account = accountIn
-        withUser = userId
-    }
-
+class ChatroomFeedFilter(val withUser: User, val account: Account) : AdditiveFeedFilter<Note>() {
     // returns the last Note of each user.
     override fun feed(): List<Note> {
-        val processingUser = withUser ?: return emptyList()
-
-        val myAccount = account
-        val myUser = LocalCache.checkGetOrCreateUser(processingUser)
-
-        if (myAccount == null || myUser == null) return emptyList()
-
-        val messages = myAccount
+        val messages = account
             .userProfile()
-            .privateChatrooms[myUser] ?: return emptyList()
+            .privateChatrooms[withUser] ?: return emptyList()
 
         return messages.roomMessages
-            .filter { myAccount.isAcceptable(it) }
+            .filter { account.isAcceptable(it) }
             .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
 
     override fun applyFilter(collection: Set<Note>): Set<Note> {
-        val processingUser = withUser ?: return emptySet()
-
-        val myAccount = account
-        val myUser = LocalCache.checkGetOrCreateUser(processingUser)
-
-        if (myAccount == null || myUser == null) return emptySet()
-
-        val messages = myAccount
+        val messages = account
             .userProfile()
-            .privateChatrooms[myUser] ?: return emptySet()
+            .privateChatrooms[withUser] ?: return emptySet()
 
         return collection
-            .filter { it in messages.roomMessages && account?.isAcceptable(it) == true }
+            .filter { it in messages.roomMessages && account.isAcceptable(it) == true }
             .toSet()
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt

@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.dal
 
-import android.util.Log
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
@@ -84,7 +83,7 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             sort(myNewList.toSet()).take(1000)
         }
 
-        Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
+        // Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
         return feed
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt

@@ -1,9 +1,14 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
+import com.vitorpamplona.amethyst.ui.actions.updated
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
-class ChatroomListNewFeedFilter(val account: Account) : FeedFilter<Note>() {
+class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
 
     // returns the last Note of each user.
     override fun feed(): List<Note> {
@@ -26,4 +31,80 @@ class ChatroomListNewFeedFilter(val account: Account) : FeedFilter<Note>() {
             .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
             .reversed()
     }
+
+    @OptIn(ExperimentalTime::class)
+    override fun updateListWith(oldList: List<Note>, newItems: Set<Note>): List<Note> {
+        val (feed, elapsed) = measureTimedValue {
+            val me = account.userProfile()
+
+            // Gets the latest message by room from the new items.
+            val newRelevantPrivateMessages = filterRelevantPrivateMessages(newItems, account)
+
+            if (newRelevantPrivateMessages.isEmpty()) {
+                return oldList
+            }
+
+            var myNewList = oldList
+
+            newRelevantPrivateMessages.forEach { newNotePair ->
+                oldList.forEach { oldNote ->
+                    val oldRoom = (oldNote.event as? PrivateDmEvent)?.talkingWith(me.pubkeyHex)
+
+                    if (
+                        (newNotePair.key == oldRoom) && (newNotePair.value.createdAt() ?: 0) > (oldNote.createdAt() ?: 0)
+                    ) {
+                        myNewList = myNewList.updated(oldNote, newNotePair.value)
+                    }
+                }
+            }
+
+            sort(myNewList.toSet()).take(1000)
+        }
+
+        // Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
+        return feed
+    }
+
+    override fun applyFilter(newItems: Set<Note>): Set<Note> {
+        // Gets the latest message by room from the new items.
+        val newRelevantPrivateMessages = filterRelevantPrivateMessages(newItems, account)
+
+        return if (newRelevantPrivateMessages.isEmpty()) {
+            emptySet()
+        } else {
+            newRelevantPrivateMessages.values.toSet()
+        }
+    }
+
+    private fun filterRelevantPrivateMessages(newItems: Set<Note>, account: Account): MutableMap<String, Note> {
+        val me = account.userProfile()
+        val followingKeySet = account.followingKeySet()
+
+        val newRelevantPrivateMessages = mutableMapOf<String, Note>()
+        newItems.filter { it.event is PrivateDmEvent }.forEach { newNote ->
+            val roomUserHex = (newNote.event as? PrivateDmEvent)?.talkingWith(me.pubkeyHex)
+            val roomUser = roomUserHex?.let { LocalCache.users[it] }
+
+            if (roomUserHex != null &&
+                (newNote.author?.pubkeyHex != me.pubkeyHex && roomUserHex !in followingKeySet && !me.hasSentMessagesTo(roomUser)) &&
+                !account.isHidden(roomUserHex)
+            ) {
+                val lastNote = newRelevantPrivateMessages.get(roomUserHex)
+                if (lastNote != null) {
+                    if ((newNote.createdAt() ?: 0) > (lastNote.createdAt() ?: 0)) {
+                        newRelevantPrivateMessages.put(roomUserHex, newNote)
+                    }
+                } else {
+                    newRelevantPrivateMessages.put(roomUserHex, newNote)
+                }
+            }
+        }
+        return newRelevantPrivateMessages
+    }
+
+    override fun sort(collection: Set<Note>): List<Note> {
+        return collection
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+            .reversed()
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/FeedFilter.kt

@@ -1,12 +1,15 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import android.util.Log
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 abstract class FeedFilter<T> {
     @OptIn(ExperimentalTime::class)
     fun loadTop(): List<T> {
+        checkNotInMainThread()
+
         val (feed, elapsed) = measureTimedValue {
             feed()
         }
@@ -24,6 +27,8 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
 
     @OptIn(ExperimentalTime::class)
     open fun updateListWith(oldList: List<T>, newItems: Set<T>): List<T> {
+        checkNotInMainThread()
+
         val (feed, elapsed) = measureTimedValue {
             val newItemsToBeAdded = applyFilter(newItems)
             if (newItemsToBeAdded.isNotEmpty()) {
@@ -34,7 +39,7 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
             }
         }
 
-        Log.d("Time", "${this.javaClass.simpleName} Additive Feed in $elapsed with ${feed.size} objects")
+        // Log.d("Time", "${this.javaClass.simpleName} Additive Feed in $elapsed with ${feed.size} objects")
         return feed
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt

@@ -1,10 +1,13 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 
-object HiddenAccountsFeedFilter : FeedFilter<User>() {
-    lateinit var account: Account
+class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
 
-    override fun feed() = account.hiddenUsers()
+    override fun feed(): List<User> {
+        return (account.hiddenUsers + account.transientHiddenUsers)
+            .map { LocalCache.getOrCreateUser(it) }
+    }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileAppRecommendationsFeedFilter.kt

@@ -0,0 +1,21 @@
+package com.vitorpamplona.amethyst.ui.dal
+
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.AppRecommendationEvent
+
+class UserProfileAppRecommendationsFeedFilter(val user: User) : FeedFilter<Note>() {
+    override fun feed(): List<Note> {
+        val recommendations = LocalCache.addressables.values.filter {
+            (it.event as? AppRecommendationEvent)?.pubKey == user.pubkeyHex
+        }.mapNotNull {
+            (it.event as? AppRecommendationEvent)?.recommendations()
+        }.flatten()
+            .mapNotNull {
+                LocalCache.getOrCreateAddressableNote(it)
+            }.toSet().toList()
+
+        return recommendations
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt

@@ -4,18 +4,9 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 
-object UserProfileFollowersFeedFilter : FeedFilter<User>() {
-    lateinit var account: Account
-    var user: User? = null
-
-    fun loadUserProfile(accountLoggedIn: Account, user: User?) {
-        account = accountLoggedIn
-        this.user = user
-    }
+class UserProfileFollowersFeedFilter(val user: User, val account: Account) : FeedFilter<User>() {
 
     override fun feed(): List<User> {
-        return user?.let { myUser ->
-            LocalCache.users.values.filter { it.isFollowing(myUser) && account.isAcceptable(it) }
-        } ?: emptyList()
+        return LocalCache.users.values.filter { it.isFollowing(user) && !account.isHidden(it) }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt

@@ -3,21 +3,25 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.ContactListEvent
 
-object UserProfileFollowsFeedFilter : FeedFilter<User>() {
-    lateinit var account: Account
-    var user: User? = null
+class UserProfileFollowsFeedFilter(val user: User, val account: Account) : FeedFilter<User>() {
 
-    fun loadUserProfile(accountLoggedIn: Account, user: User?) {
-        account = accountLoggedIn
-        this.user = user
-    }
+    val cache: MutableMap<ContactListEvent, List<User>> = mutableMapOf()
 
     override fun feed(): List<User> {
-        return user?.latestContactList?.unverifiedFollowKeySet()?.mapNotNull {
-            LocalCache.checkGetOrCreateUser(it)
-        }?.toSet()
-            ?.filter { account.isAcceptable(it) }
+        val contactList = user.latestContactList ?: return emptyList()
+
+        val previousList = cache[contactList]
+        if (previousList != null) return previousList
+
+        cache[contactList] = user.latestContactList
+            ?.unverifiedFollowKeySet()?.mapNotNull {
+                LocalCache.checkGetOrCreateUser(it)
+            }?.toSet()
+            ?.filter { !account.isHidden(it) }
             ?.reversed() ?: emptyList()
+
+        return cache[contactList] ?: emptyList()
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileNewThreadFeedFilter.kt

@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.AppRecommendationEvent
 import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 
@@ -18,7 +19,7 @@ object UserProfileNewThreadFeedFilter : FeedFilter<Note>() {
 
     override fun feed(): List<Note> {
         val longFormNotes = LocalCache.addressables.values
-            .filter { it.author == user && (it.event !is PeopleListEvent && it.event !is BookmarkListEvent) }
+            .filter { it.author == user && (it.event !is PeopleListEvent && it.event !is BookmarkListEvent && it.event !is AppRecommendationEvent) }
 
         return user?.notes
             ?.plus(longFormNotes)

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileZapsFeedFilter.kt

@@ -1,17 +1,11 @@
 package com.vitorpamplona.amethyst.ui.dal
 
-import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.zaps.UserZaps
+import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
 
-object UserProfileZapsFeedFilter : FeedFilter<Pair<Note, Note>>() {
-    var user: User? = null
-
-    fun loadUserProfile(user: User?) {
-        this.user = user
-    }
-
-    override fun feed(): List<Pair<Note, Note>> {
-        return UserZaps.forProfileFeed(user?.zaps)
+class UserProfileZapsFeedFilter(val user: User) : FeedFilter<ZapReqResponse>() {
+    override fun feed(): List<ZapReqResponse> {
+        return UserZaps.forProfileFeed(user.zaps)
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt

@@ -26,6 +26,8 @@ import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Logout
 import androidx.compose.material.icons.filled.RadioButtonChecked
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -37,14 +39,18 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.decodePublicKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
@@ -52,6 +58,8 @@ import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedOff.LoginPage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 @Composable
 fun AccountSwitchBottomSheet(
@@ -59,11 +67,6 @@ fun AccountSwitchBottomSheet(
     accountStateViewModel: AccountStateViewModel
 ) {
     val accounts = LocalPreferences.allSavedAccounts()
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    val accountUserState by account.userProfile().live().metadata.observeAsState()
-    val accountUser = accountUserState?.user ?: return
 
     var popupExpanded by remember { mutableStateOf(false) }
     val scrollState = rememberScrollState()
@@ -79,108 +82,7 @@ fun AccountSwitchBottomSheet(
             Text(stringResource(R.string.account_switch_select_account), fontWeight = FontWeight.Bold)
         }
         accounts.forEach { acc ->
-            val current = accountUser.pubkeyNpub() == acc.npub
-
-            val baseUser = try {
-                LocalCache.getOrCreateUser(decodePublicKey(acc.npub).toHexKey())
-            } catch (e: Exception) {
-                null
-            }
-
-            if (baseUser != null) {
-                val userState by baseUser.live().metadata.observeAsState()
-                val user = userState?.user ?: return
-
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Row(
-                        modifier = Modifier
-                            .weight(1f)
-                            .clickable {
-                                accountStateViewModel.switchUser(acc.npub)
-                            },
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Row(
-                            modifier = Modifier
-                                .padding(16.dp, 16.dp)
-                                .weight(1f),
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .width(55.dp)
-                                    .padding(0.dp)
-                            ) {
-                                RobohashAsyncImageProxy(
-                                    robot = user.pubkeyHex,
-                                    model = ResizeImage(user.profilePicture(), 55.dp),
-                                    contentDescription = stringResource(R.string.profile_image),
-                                    modifier = Modifier
-                                        .width(55.dp)
-                                        .height(55.dp)
-                                        .clip(shape = CircleShape)
-                                )/*
-                                Box(
-                                    modifier = Modifier
-                                        .size(20.dp)
-                                        .align(Alignment.TopEnd)
-                                ) {
-                                    if (acc.hasPrivKey) {
-                                        Icon(
-                                            imageVector = Icons.Default.Key,
-                                            contentDescription = stringResource(R.string.account_switch_has_private_key),
-                                            modifier = Modifier.size(20.dp),
-                                            tint = MaterialTheme.colors.primary
-                                        )
-                                    } else {
-                                        Icon(
-                                            imageVector = Icons.Default.Visibility,
-                                            contentDescription = stringResource(R.string.account_switch_pubkey_only),
-                                            modifier = Modifier.size(20.dp),
-                                            tint = MaterialTheme.colors.primary
-                                        )
-                                    }
-                                }*/
-                            }
-                            Spacer(modifier = Modifier.width(16.dp))
-                            Column(modifier = Modifier.weight(1f)) {
-                                val npubShortHex = acc.npub.toShortenHex()
-
-                                user.bestDisplayName()?.let {
-                                    CreateTextWithEmoji(
-                                        text = it,
-                                        tags = user.info?.latestMetadata?.tags
-                                    )
-                                }
-
-                                Text(npubShortHex)
-                            }
-                            Column(modifier = Modifier.width(32.dp)) {
-                                if (current) {
-                                    Icon(
-                                        imageVector = Icons.Default.RadioButtonChecked,
-                                        contentDescription = stringResource(R.string.account_switch_active_account),
-                                        tint = MaterialTheme.colors.secondary
-                                    )
-                                }
-                            }
-                        }
-                    }
-
-                    IconButton(
-                        onClick = { accountStateViewModel.logOff(acc.npub) }
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Logout,
-                            contentDescription = stringResource(R.string.log_out),
-                            tint = MaterialTheme.colors.onSurface
-                        )
-                    }
-                }
-            }
+            DisplayAccount(acc, accountViewModel, accountStateViewModel)
         }
         Row(
             modifier = Modifier
@@ -222,3 +124,140 @@ fun AccountSwitchBottomSheet(
         }
     }
 }
+
+@Composable
+fun DisplayAccount(
+    acc: AccountInfo,
+    accountViewModel: AccountViewModel,
+    accountStateViewModel: AccountStateViewModel
+) {
+    var baseUser by remember { mutableStateOf<User?>(null) }
+
+    LaunchedEffect(key1 = acc.npub) {
+        launch(Dispatchers.IO) {
+            baseUser = try {
+                LocalCache.getOrCreateUser(decodePublicKey(acc.npub).toHexKey())
+            } catch (e: Exception) {
+                null
+            }
+        }
+    }
+
+    baseUser?.let {
+        Row(
+            modifier = Modifier.fillMaxWidth().clickable {
+                accountStateViewModel.switchUser(acc.npub)
+            }.padding(16.dp, 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Row(
+                modifier = Modifier.weight(1f),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Row(
+                    modifier = Modifier.weight(1f),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Box(
+                        modifier = Modifier.width(55.dp).padding(0.dp)
+                    ) {
+                        AccountPicture(it)
+                    }
+                    Spacer(modifier = Modifier.width(16.dp))
+                    Column(modifier = Modifier.weight(1f)) {
+                        AccountName(acc, it)
+                    }
+                    Column(modifier = Modifier.width(32.dp)) {
+                        ActiveMarker(acc, accountViewModel)
+                    }
+                }
+            }
+
+            LogoutButton(acc, accountStateViewModel)
+        }
+    }
+}
+
+@Composable
+private fun ActiveMarker(acc: AccountInfo, accountViewModel: AccountViewModel) {
+    val isCurrentUser by remember(accountViewModel) {
+        derivedStateOf {
+            accountViewModel.account.userProfile().pubkeyNpub() == acc.npub
+        }
+    }
+
+    if (isCurrentUser) {
+        Icon(
+            imageVector = Icons.Default.RadioButtonChecked,
+            contentDescription = stringResource(R.string.account_switch_active_account),
+            tint = MaterialTheme.colors.secondary
+        )
+    }
+}
+
+@Composable
+private fun AccountPicture(user: User) {
+    val userState by user.live().metadata.observeAsState()
+    val profilePicture by remember(userState) {
+        derivedStateOf {
+            ResizeImage(userState?.user?.profilePicture(), 55.dp)
+        }
+    }
+
+    RobohashAsyncImageProxy(
+        robot = remember(user) { user.pubkeyHex },
+        model = profilePicture,
+        contentDescription = stringResource(R.string.profile_image),
+        modifier = Modifier
+            .width(55.dp)
+            .height(55.dp)
+            .clip(shape = CircleShape)
+    )
+}
+
+@Composable
+private fun AccountName(
+    acc: AccountInfo,
+    user: User
+) {
+    val userState by user.live().metadata.observeAsState()
+    val displayName by remember(userState) {
+        derivedStateOf {
+            user.bestDisplayName()
+        }
+    }
+    val tags by remember(userState) {
+        derivedStateOf {
+            user.info?.latestMetadata?.tags?.toImmutableListOfLists()
+        }
+    }
+
+    displayName?.let {
+        CreateTextWithEmoji(
+            text = it,
+            tags = tags,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
+        )
+    }
+
+    Text(
+        text = remember(user) { acc.npub.toShortenHex() }
+    )
+}
+
+@Composable
+private fun LogoutButton(
+    acc: AccountInfo,
+    accountStateViewModel: AccountStateViewModel
+) {
+    IconButton(
+        onClick = { accountStateViewModel.logOff(acc.npub) }
+    ) {
+        Icon(
+            imageVector = Icons.Default.Logout,
+            contentDescription = stringResource(R.string.log_out),
+            tint = MaterialTheme.colors.onSurface
+        )
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt

@@ -21,6 +21,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -37,8 +38,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.NavBackStackEntry
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -67,11 +67,16 @@ fun keyboardAsState(): State<Keyboard> {
             view.getWindowVisibleDisplayFrame(rect)
             val screenHeight = view.rootView.height
             val keypadHeight = screenHeight - rect.bottom
-            keyboardState.value = if (keypadHeight > screenHeight * 0.15) {
+
+            val newKeyboardValue = if (keypadHeight > screenHeight * 0.15) {
                 Keyboard.Opened
             } else {
                 Keyboard.Closed
             }
+
+            if (newKeyboardValue != keyboardState.value) {
+                keyboardState.value = newKeyboardValue
+            }
         }
         view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
 
@@ -84,21 +89,30 @@ fun keyboardAsState(): State<Keyboard> {
 }
 
 @Composable
-fun AppBottomBar(navController: NavHostController, accountViewModel: AccountViewModel) {
+fun AppBottomBar(accountViewModel: AccountViewModel, navEntryState: State<NavBackStackEntry?>, nav: (Route, Boolean) -> Unit) {
     val isKeyboardOpen by keyboardAsState()
     if (isKeyboardOpen == Keyboard.Closed) {
-        Column() {
-            Divider(
-                thickness = 0.25.dp
-            )
-            BottomNavigation(
-                modifier = Modifier,
-                elevation = 0.dp,
-                backgroundColor = MaterialTheme.colors.background
-            ) {
-                bottomNavigationItems.forEach { item ->
-                    HasNewItemsIcon(item, accountViewModel, navController)
-                }
+        RenderBottomMenu(accountViewModel, navEntryState, nav)
+    }
+}
+
+@Composable
+private fun RenderBottomMenu(
+    accountViewModel: AccountViewModel,
+    navEntryState: State<NavBackStackEntry?>,
+    nav: (Route, Boolean) -> Unit
+) {
+    Column() {
+        Divider(
+            thickness = 0.25.dp
+        )
+        BottomNavigation(
+            modifier = Modifier,
+            elevation = 0.dp,
+            backgroundColor = MaterialTheme.colors.background
+        ) {
+            bottomNavigationItems.forEach { item ->
+                HasNewItemsIcon(item, accountViewModel, navEntryState, nav)
             }
         }
     }
@@ -108,33 +122,14 @@ fun AppBottomBar(navController: NavHostController, accountViewModel: AccountView
 private fun RowScope.HasNewItemsIcon(
     route: Route,
     accountViewModel: AccountViewModel,
-    navController: NavHostController
+    navEntryState: State<NavBackStackEntry?>,
+    nav: (Route, Boolean) -> Unit
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = remember(accountState) { accountState?.account } ?: return
+    var hasNewItems by remember { mutableStateOf(false) }
 
-    val notifState by NotificationCache.live.observeAsState()
-    val notif = remember(notifState) { notifState?.cache } ?: return
-
-    var hasNewItems by remember { mutableStateOf<Boolean>(false) }
-
-    LaunchedEffect(key1 = notifState, key2 = accountState) {
-        launch(Dispatchers.IO) {
-            val newHasNewItems = route.hasNewItems(account, notif, emptySet())
-            if (newHasNewItems != hasNewItems) {
-                hasNewItems = newHasNewItems
-            }
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        launch(Dispatchers.IO) {
-            LocalCache.live.newEventBundles.collect {
-                val newHasNewItems = route.hasNewItems(account, notif, it)
-                if (newHasNewItems != hasNewItems) {
-                    hasNewItems = newHasNewItems
-                }
-            }
+    WatchPossibleNotificationChanges(route, accountViewModel) {
+        if (it != hasNewItems) {
+            hasNewItems = it
         }
     }
 
@@ -146,21 +141,37 @@ private fun RowScope.HasNewItemsIcon(
         iconSize = if ("Home" == route.base) 24.dp else 20.dp,
         base = route.base,
         hasNewItems = hasNewItems,
-        navController
+        navEntryState = navEntryState
     ) { selected ->
         scope.launch {
-            if (!selected) {
-                navController.navigate(route.base) {
-                    popUpTo(Route.Home.route)
-                    launchSingleTop = true
-                    restoreState = true
-                }
-            } else {
-                val newRoute = route.route.replace("{scrollToTop}", "true")
-                navController.navigate(newRoute) {
-                    popUpTo(Route.Home.route)
-                    launchSingleTop = true
-                    restoreState = true
+            nav(route, selected)
+        }
+    }
+}
+
+@Composable
+fun WatchPossibleNotificationChanges(
+    route: Route,
+    accountViewModel: AccountViewModel,
+    onChange: (Boolean) -> Unit
+) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = remember(accountState) { accountState?.account } ?: return
+
+    val notifState by NotificationCache.live.observeAsState()
+    val notif = remember(notifState) { notifState?.cache } ?: return
+
+    LaunchedEffect(key1 = notifState, key2 = accountState) {
+        launch(Dispatchers.IO) {
+            onChange(route.hasNewItems(account, notif, emptySet()))
+        }
+    }
+
+    LaunchedEffect(Unit) {
+        launch(Dispatchers.IO) {
+            LocalCache.live.newEventBundles.collect {
+                launch(Dispatchers.IO) {
+                    onChange(route.hasNewItems(account, notif, it))
                 }
             }
         }
@@ -174,30 +185,40 @@ private fun RowScope.BottomIcon(
     iconSize: Dp,
     base: String,
     hasNewItems: Boolean,
-    navController: NavHostController,
+    navEntryState: State<NavBackStackEntry?>,
     onClick: (Boolean) -> Unit
 ) {
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-
-    navBackStackEntry?.let {
-        val selected = remember(it) {
-            it.destination.route?.substringBefore("?") == base
+    val selected by remember(navEntryState.value) {
+        derivedStateOf {
+            navEntryState.value?.destination?.route?.substringBefore("?") == base
         }
-
-        BottomNavigationItem(
-            icon = {
-                NotifiableIcon(
-                    icon,
-                    size,
-                    iconSize,
-                    selected,
-                    hasNewItems
-                )
-            },
-            selected = selected,
-            onClick = { onClick(selected) }
-        )
     }
+
+    NavigationIcon(icon, size, iconSize, selected, hasNewItems, onClick)
+}
+
+@Composable
+private fun RowScope.NavigationIcon(
+    icon: Int,
+    size: Dp,
+    iconSize: Dp,
+    selected: Boolean,
+    hasNewItems: Boolean,
+    onClick: (Boolean) -> Unit
+) {
+    BottomNavigationItem(
+        icon = {
+            NotifiableIcon(
+                icon,
+                size,
+                iconSize,
+                selected,
+                hasNewItems
+            )
+        },
+        selected = selected,
+        onClick = { onClick(selected) }
+    )
 }
 
 @Composable

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -64,13 +64,9 @@ fun AppNavigation(
             composable(route.route, route.arguments, content = {
                 val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false
 
-                LaunchedEffect(key1 = it) {
-                    if (scrollToTop) {
-                        launch {
-                            videoFeedViewModel.sendToTop()
-                            it.arguments?.remove("scrollToTop")
-                        }
-                    }
+                if (scrollToTop) {
+                    videoFeedViewModel.sendToTop()
+                    it.arguments?.remove("scrollToTop")
                 }
 
                 VideoScreen(
@@ -85,13 +81,9 @@ fun AppNavigation(
             composable(route.route, route.arguments, content = {
                 val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false
 
-                LaunchedEffect(key1 = it) {
-                    if (scrollToTop) {
-                        launch {
-                            searchFeedViewModel.sendToTop()
-                            it.arguments?.remove("scrollToTop")
-                        }
-                    }
+                if (scrollToTop) {
+                    searchFeedViewModel.sendToTop()
+                    it.arguments?.remove("scrollToTop")
                 }
 
                 SearchScreen(
@@ -107,14 +99,10 @@ fun AppNavigation(
                 val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false
                 val nip47 = it.arguments?.getString("nip47")
 
-                LaunchedEffect(key1 = it) {
-                    if (scrollToTop) {
-                        launch {
-                            homeFeedViewModel.sendToTop()
-                            repliesFeedViewModel.sendToTop()
-                            it.arguments?.remove("scrollToTop")
-                        }
-                    }
+                if (scrollToTop) {
+                    homeFeedViewModel.sendToTop()
+                    repliesFeedViewModel.sendToTop()
+                    it.arguments?.remove("scrollToTop")
                 }
 
                 HomeScreen(
@@ -140,14 +128,10 @@ fun AppNavigation(
             composable(route.route, route.arguments, content = {
                 val scrollToTop = it.arguments?.getBoolean("scrollToTop") ?: false
 
-                LaunchedEffect(key1 = it) {
-                    if (scrollToTop) {
-                        launch {
-                            notifFeedViewModel.clear()
-                            notifFeedViewModel.sendToTop()
-                            it.arguments?.remove("scrollToTop")
-                        }
-                    }
+                if (scrollToTop) {
+                    notifFeedViewModel.clear()
+                    notifFeedViewModel.sendToTop()
+                    it.arguments?.remove("scrollToTop")
                 }
 
                 NotificationScreen(
@@ -228,7 +212,6 @@ fun AppNavigation(
             composable(route.route, route.arguments, content = {
                 LoadRedirectScreen(
                     eventId = it.arguments?.getString("id"),
-                    accountViewModel = accountViewModel,
                     navController = navController
                 )
             })

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -27,6 +27,7 @@ import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -47,6 +48,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import coil.Coil
 import com.vitorpamplona.amethyst.R
@@ -54,7 +56,6 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
@@ -68,6 +69,7 @@ import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
@@ -89,8 +91,29 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
 @Composable
-fun AppTopBar(followLists: FollowListViewModel, navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    when (currentRoute(navController)?.substringBefore("?")) {
+fun AppTopBar(
+    followLists: FollowListViewModel,
+    navEntryState: State<NavBackStackEntry?>,
+    scaffoldState: ScaffoldState,
+    accountViewModel: AccountViewModel
+) {
+    val currentRoute by remember(navEntryState.value) {
+        derivedStateOf {
+            navEntryState.value?.destination?.route?.substringBefore("?")
+        }
+    }
+
+    RenderTopRouteBar(currentRoute, followLists, scaffoldState, accountViewModel)
+}
+
+@Composable
+private fun RenderTopRouteBar(
+    currentRoute: String?,
+    followLists: FollowListViewModel,
+    scaffoldState: ScaffoldState,
+    accountViewModel: AccountViewModel
+) {
+    when (currentRoute) {
         // Route.Profile.route -> TopBarWithBackButton(nav)
         Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel)
         Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel)
@@ -103,16 +126,20 @@ fun AppTopBar(followLists: FollowListViewModel, navController: NavHostController
 fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
         val accountState by accountViewModel.accountLiveData.observeAsState()
-        accountState?.account?.let { account ->
-            FollowList(
-                followLists,
-                account.defaultStoriesFollowList,
-                account.userProfile(),
-                true
-            ) { listName ->
-                account.changeDefaultStoriesFollowList(listName)
+
+        val list by remember(accountState) {
+            derivedStateOf {
+                accountState?.account?.defaultStoriesFollowList ?: GLOBAL_FOLLOWS
             }
         }
+
+        FollowList(
+            followLists,
+            list,
+            true
+        ) { listName ->
+            accountViewModel.account.changeDefaultStoriesFollowList(listName)
+        }
     }
 }
 
@@ -120,16 +147,20 @@ fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState
 fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
         val accountState by accountViewModel.accountLiveData.observeAsState()
-        accountState?.account?.let { account ->
-            FollowList(
-                followLists,
-                account.defaultHomeFollowList,
-                account.userProfile(),
-                false
-            ) { listName ->
-                account.changeDefaultHomeFollowList(listName)
+
+        val list by remember(accountState) {
+            derivedStateOf {
+                accountState?.account?.defaultHomeFollowList ?: GLOBAL_FOLLOWS
             }
         }
+
+        FollowList(
+            followLists,
+            list,
+            false
+        ) { listName ->
+            accountViewModel.account.changeDefaultHomeFollowList(listName)
+        }
     }
 }
 
@@ -137,16 +168,20 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
 fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
         val accountState by accountViewModel.accountLiveData.observeAsState()
-        accountState?.account?.let { account ->
-            FollowList(
-                followLists,
-                account.defaultNotificationFollowList,
-                account.userProfile(),
-                true
-            ) { listName ->
-                account.changeDefaultNotificationFollowList(listName)
+
+        val list by remember(accountState) {
+            derivedStateOf {
+                accountState?.account?.defaultNotificationFollowList ?: GLOBAL_FOLLOWS
             }
         }
+
+        FollowList(
+            followLists,
+            list,
+            true
+        ) { listName ->
+            accountViewModel.account.changeDefaultNotificationFollowList(listName)
+        }
     }
 }
 
@@ -160,10 +195,6 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
 @OptIn(coil.annotation.ExperimentalCoilApi::class)
 @Composable
 fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, content: @Composable (AccountViewModel) -> Unit) {
-    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
-    val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState()
-    val availableRelaysLiveData by relayViewModel.availableRelaysLiveData.observeAsState()
-
     val coroutineScope = rememberCoroutineScope()
 
     var wantsToEditRelays by remember {
@@ -195,29 +226,9 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                             content(accountViewModel)
                         }
 
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .fillMaxHeight(),
-                            horizontalAlignment = Alignment.End
-
-                        ) {
-                            Row(
-                                modifier = Modifier.fillMaxHeight(),
-                                verticalAlignment = Alignment.CenterVertically
-                            ) {
-                                Text(
-                                    "${connectedRelaysLiveData ?: "--"}/${availableRelaysLiveData ?: "--"}",
-                                    color = if (connectedRelaysLiveData == 0) Color.Red else MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                                    style = MaterialTheme.typography.subtitle1,
-                                    modifier = Modifier.clickable(
-                                        onClick = {
-                                            wantsToEditRelays = true
-                                        }
-                                    )
-                                )
-                            }
-                        }
+                        RelayStatus(
+                            { wantsToEditRelays = true }
+                        )
                     }
                 }
             },
@@ -229,38 +240,110 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                 }
             },
             actions = {
-                IconButton(
-                    onClick = { wantsToEditRelays = true },
-                    modifier = Modifier
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.relays),
-                        null,
-                        modifier = Modifier.size(24.dp),
-                        tint = Color.Unspecified
-                    )
-                }
+                RelayIcon { wantsToEditRelays = true }
             }
         )
         Divider(thickness = 0.25.dp)
     }
 }
 
+@Composable
+private fun RelayStatus(
+    onClick: () -> Unit
+) {
+    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight(),
+        horizontalAlignment = Alignment.End
+    ) {
+        Row(
+            modifier = Modifier.fillMaxHeight(),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            RelayStatus(relayViewModel, onClick)
+        }
+    }
+}
+
+@Composable
+private fun RelayStatus(
+    relayViewModel: RelayPoolViewModel,
+    onClick: () -> Unit
+) {
+    val connectedRelaysLiveData = relayViewModel.connectedRelaysLiveData.observeAsState()
+    val availableRelaysLiveData = relayViewModel.availableRelaysLiveData.observeAsState()
+
+    val connectedRelaysText by remember(connectedRelaysLiveData, availableRelaysLiveData) {
+        derivedStateOf {
+            "${connectedRelaysLiveData.value ?: "--"}/${availableRelaysLiveData.value ?: "--"}"
+        }
+    }
+
+    val isConnected by remember(connectedRelaysLiveData) {
+        derivedStateOf {
+            (connectedRelaysLiveData.value ?: 0) > 0
+        }
+    }
+
+    RenderRelayStatus(connectedRelaysText, isConnected, onClick)
+}
+
+@Composable
+private fun RenderRelayStatus(
+    connectedRelaysText: String,
+    isConnected: Boolean,
+    onClick: () -> Unit
+) {
+    Text(
+        text = connectedRelaysText,
+        color = if (isConnected) {
+            MaterialTheme.colors.onSurface.copy(
+                alpha = 0.32f
+            )
+        } else {
+            Color.Red
+        },
+        style = MaterialTheme.typography.subtitle1,
+        modifier = Modifier.clickable(
+            onClick = onClick
+        )
+    )
+}
+
+@Composable
+private fun RelayIcon(onClick: () -> Unit) {
+    IconButton(
+        onClick = onClick,
+        modifier = Modifier
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.relays),
+            null,
+            modifier = Modifier.size(24.dp),
+            tint = Color.Unspecified
+        )
+    }
+}
+
 @Composable
 private fun LoggedInUserPictureDrawer(
     accountViewModel: AccountViewModel,
     onClick: () -> Unit
 ) {
     val accountUserState by accountViewModel.account.userProfile().live().metadata.observeAsState()
-    val accountUser = accountUserState?.user ?: return
+
+    val pubkeyHex = remember { accountUserState?.user?.pubkeyHex ?: "" }
+    val profilePicture = remember(accountUserState) { ResizeImage(accountUserState?.user?.profilePicture(), 34.dp) }
 
     IconButton(
         onClick = onClick,
         modifier = Modifier
     ) {
         RobohashAsyncImageProxy(
-            robot = remember { accountUser.pubkeyHex },
-            model = remember(accountUser) { ResizeImage(accountUser.profilePicture(), 34.dp) },
+            robot = pubkeyHex,
+            model = profilePicture,
             contentDescription = stringResource(id = R.string.profile_image),
             modifier = Modifier
                 .width(34.dp)
@@ -271,7 +354,7 @@ private fun LoggedInUserPictureDrawer(
 }
 
 @Composable
-fun FollowList(followListsModel: FollowListViewModel, listName: String, loggedIn: User, withGlobal: Boolean, onChange: (String) -> Unit) {
+fun FollowList(followListsModel: FollowListViewModel, listName: String, withGlobal: Boolean, onChange: (String) -> Unit) {
     val kind3Follow = Pair(KIND3_FOLLOWS, stringResource(id = R.string.follow_list_kind3follows))
     val globalFollow = Pair(GLOBAL_FOLLOWS, stringResource(id = R.string.follow_list_global))
 
@@ -283,15 +366,15 @@ fun FollowList(followListsModel: FollowListViewModel, listName: String, loggedIn
         (defaultOptions + followLists)
     }
 
-    val followNames = remember(followLists) {
+    val followNames by remember(followLists) {
         derivedStateOf {
-            allLists.map { it.second }
+            allLists.map { it.second }.toImmutableList()
         }
     }
 
     SimpleTextSpinner(
         placeholder = allLists.firstOrNull { it.first == listName }?.second ?: "Select an Option",
-        options = followNames.value,
+        options = followNames,
         onSelect = {
             onChange(allLists.getOrNull(it)?.first ?: KIND3_FOLLOWS)
         }
@@ -311,10 +394,15 @@ class FollowListViewModel(val account: Account) : ViewModel() {
     }
 
     private suspend fun refreshFollows() {
+        checkNotInMainThread()
+
         val newFollowLists = LocalCache.addressables.mapNotNull {
             val event = (it.value.event as? PeopleListEvent)
             // Has to have an list
-            if (event != null && event.pubKey == account.userProfile().pubkeyHex && (event.tags.size > 1 || event.content.length > 50)) {
+            if (event != null &&
+                event.pubKey == account.userProfile().pubkeyHex &&
+                (event.tags.size > 1 || event.content.length > 50)
+            ) {
                 Pair(event.dTag(), event.dTag())
             } else {
                 null
@@ -332,10 +420,9 @@ class FollowListViewModel(val account: Account) : ViewModel() {
         refresh()
         collectorJob = viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect { newNotes ->
-                newNotes.forEach {
-                    if (it.event is PeopleListEvent) {
-                        refresh()
-                    }
+                checkNotInMainThread()
+                if (newNotes.any { it.event is PeopleListEvent }) {
+                    refresh()
                 }
             }
         }
@@ -356,8 +443,8 @@ class FollowListViewModel(val account: Account) : ViewModel() {
 @Composable
 fun SimpleTextSpinner(
     placeholder: String,
-    options: List<String>,
-    explainers: List<String>? = null,
+    options: ImmutableList<String>,
+    explainers: ImmutableList<String>? = null,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -32,6 +32,7 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -48,6 +49,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
@@ -58,12 +60,14 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -74,16 +78,13 @@ fun DrawerContent(
     sheetState: ModalBottomSheetState,
     accountViewModel: AccountViewModel
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
     Surface(
         modifier = Modifier.fillMaxWidth(),
         color = MaterialTheme.colors.background
     ) {
         Column() {
             ProfileContent(
-                account.userProfile(),
+                accountViewModel.account.userProfile(),
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 25.dp)
@@ -96,17 +97,16 @@ fun DrawerContent(
                 modifier = Modifier.padding(top = 20.dp)
             )
             ListContent(
-                account.userProfile().pubkeyHex,
                 nav,
                 scaffoldState,
                 sheetState,
                 modifier = Modifier
                     .fillMaxWidth()
                     .weight(1f),
-                account
+                accountViewModel
             )
 
-            BottomContent(account.userProfile(), scaffoldState, nav)
+            BottomContent(accountViewModel.account.userProfile(), scaffoldState, nav)
         }
     }
 }
@@ -129,13 +129,9 @@ fun ProfileContent(
     val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture()?.ifBlank { null }?.let { ResizeImage(it, 100.dp) } }
     val bestUserName = remember(accountUserState) { accountUserState?.user?.bestUsername() }
     val bestDisplayName = remember(accountUserState) { accountUserState?.user?.bestDisplayName() }
-    val tags = remember(accountUserState) { accountUserState?.user?.info?.latestMetadata?.tags }
+    val tags = remember(accountUserState) { accountUserState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
     val route = remember(accountUserState) { "User/${accountUserState?.user?.pubkeyHex}" }
 
-    val accountUserFollowsState by baseAccountUser.live().follows.observeAsState()
-    val followingCount = remember(accountUserFollowsState) { accountUserFollowsState?.user?.cachedFollowCount()?.toString() ?: "--" }
-    val followerCount = remember(accountUserFollowsState) { accountUserFollowsState?.user?.cachedFollowerCount()?.toString() ?: "--" }
-
     Box {
         if (profileBanner != null) {
             AsyncImage(
@@ -191,14 +187,18 @@ fun ProfileContent(
                             }
                         }),
                     fontWeight = FontWeight.Bold,
-                    fontSize = 18.sp
+                    fontSize = 18.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
             if (bestUserName != null) {
                 CreateTextWithEmoji(
-                    text = " @$bestUserName",
-                    tags = accountUser.info?.latestMetadata?.tags,
+                    text = remember { " @$bestUserName" },
+                    tags = tags,
                     color = Color.LightGray,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
                     modifier = Modifier
                         .padding(top = 15.dp)
                         .clickable(
@@ -221,35 +221,61 @@ fun ProfileContent(
                         }
                     })
             ) {
-                Row() {
-                    Text(
-                        text = followingCount,
-                        fontWeight = FontWeight.Bold
-                    )
-                    Text(stringResource(R.string.following))
-                }
-                Row(modifier = Modifier.padding(start = 10.dp)) {
-                    Text(
-                        text = followerCount,
-                        fontWeight = FontWeight.Bold
-                    )
-                    Text(stringResource(R.string.followers))
-                }
+                FollowingAndFollowerCounts(baseAccountUser)
             }
         }
     }
 }
 
+@Composable
+private fun FollowingAndFollowerCounts(baseAccountUser: User) {
+    val accountUserFollowsState by baseAccountUser.live().follows.observeAsState()
+
+    var followingCount by remember { mutableStateOf("--") }
+    var followerCount by remember { mutableStateOf("--") }
+
+    LaunchedEffect(key1 = accountUserFollowsState) {
+        launch(Dispatchers.IO) {
+            val newFollowing = accountUserFollowsState?.user?.cachedFollowCount()?.toString() ?: "--"
+            val newFollower = accountUserFollowsState?.user?.cachedFollowerCount()?.toString() ?: "--"
+
+            if (followingCount != newFollowing) {
+                followingCount = newFollowing
+            }
+            if (followerCount != newFollower) {
+                followerCount = newFollower
+            }
+        }
+    }
+
+    Row() {
+        Text(
+            text = followingCount,
+            fontWeight = FontWeight.Bold
+        )
+        Text(stringResource(R.string.following))
+    }
+    Row(modifier = Modifier.padding(start = 10.dp)) {
+        Text(
+            text = followerCount,
+            fontWeight = FontWeight.Bold
+        )
+        Text(stringResource(R.string.followers))
+    }
+}
+
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun ListContent(
-    accountUserPubKey: String?,
     nav: (String) -> Unit,
     scaffoldState: ScaffoldState,
     sheetState: ModalBottomSheetState,
     modifier: Modifier,
-    account: Account
+    accountViewModel: AccountViewModel
 ) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = remember(accountState) { accountState?.account } ?: return
+
     val coroutineScope = rememberCoroutineScope()
     var backupDialogOpen by remember { mutableStateOf(false) }
     var checked by remember { mutableStateOf(account.proxy != null) }
@@ -257,26 +283,28 @@ fun ListContent(
     var conectOrbotDialogOpen by remember { mutableStateOf(false) }
     var proxyPort = remember { mutableStateOf(account.proxyPort.toString()) }
 
-    Column(modifier = modifier.fillMaxHeight().verticalScroll(rememberScrollState())) {
-        if (accountUserPubKey != null) {
-            NavigationRow(
-                title = stringResource(R.string.profile),
-                icon = Route.Profile.icon,
-                tint = MaterialTheme.colors.primary,
-                nav = nav,
-                scaffoldState = scaffoldState,
-                route = "User/$accountUserPubKey"
-            )
+    Column(
+        modifier = modifier
+            .fillMaxHeight()
+            .verticalScroll(rememberScrollState())
+    ) {
+        NavigationRow(
+            title = stringResource(R.string.profile),
+            icon = Route.Profile.icon,
+            tint = MaterialTheme.colors.primary,
+            nav = nav,
+            scaffoldState = scaffoldState,
+            route = "User/${account.userProfile().pubkeyHex}"
+        )
 
-            NavigationRow(
-                title = stringResource(R.string.bookmarks),
-                icon = Route.Bookmarks.icon,
-                tint = MaterialTheme.colors.onBackground,
-                nav = nav,
-                scaffoldState = scaffoldState,
-                route = Route.Bookmarks.route
-            )
-        }
+        NavigationRow(
+            title = stringResource(R.string.bookmarks),
+            icon = Route.Bookmarks.icon,
+            tint = MaterialTheme.colors.onBackground,
+            nav = nav,
+            scaffoldState = scaffoldState,
+            route = Route.Bookmarks.route
+        )
 
         NavigationRow(
             title = stringResource(R.string.security_filters),

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.navigation
 
 import android.os.Bundle
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavDestination
@@ -18,12 +19,16 @@ import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 
+@Immutable
 sealed class Route(
     val route: String,
     val icon: Int,
     val hasNewItems: (Account, NotificationCache, Set<com.vitorpamplona.amethyst.model.Note>) -> Boolean = { _, _, _ -> false },
-    val arguments: List<NamedNavArgument> = emptyList()
+    val arguments: ImmutableList<NamedNavArgument> = persistentListOf()
 ) {
     val base: String
         get() = route.substringBefore("?")
@@ -34,26 +39,26 @@ sealed class Route(
         arguments = listOf(
             navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false },
             navArgument("nip47") { type = NavType.StringType; nullable = true; defaultValue = null }
-        ),
+        ).toImmutableList(),
         hasNewItems = { accountViewModel, cache, newNotes -> HomeLatestItem.hasNewItems(accountViewModel, cache, newNotes) }
     )
 
     object Search : Route(
         route = "Search?scrollToTop={scrollToTop}",
         icon = R.drawable.ic_globe,
-        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false })
+        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false }).toImmutableList()
     )
 
     object Video : Route(
         route = "Video?scrollToTop={scrollToTop}",
         icon = R.drawable.ic_video,
-        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false })
+        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false }).toImmutableList()
     )
 
     object Notification : Route(
         route = "Notification?scrollToTop={scrollToTop}",
         icon = R.drawable.ic_notifications,
-        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false }),
+        arguments = listOf(navArgument("scrollToTop") { type = NavType.BoolType; defaultValue = false }).toImmutableList(),
         hasNewItems = { accountViewModel, cache, newNotes -> NotificationLatestItem.hasNewItems(accountViewModel, cache, newNotes) }
     )
 
@@ -76,37 +81,37 @@ sealed class Route(
     object Profile : Route(
         route = "User/{id}",
         icon = R.drawable.ic_profile,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
     object Note : Route(
         route = "Note/{id}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
     object Hashtag : Route(
         route = "Hashtag/{id}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
     object Room : Route(
         route = "Room/{id}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
     object Channel : Route(
         route = "Channel/{id}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 
     object Event : Route(
         route = "Event/{id}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType })
+        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
     )
 }
 

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

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -16,14 +15,11 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
@@ -38,6 +34,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.PostButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 class AddBountyAmountViewModel : ViewModel() {
     private var account: Account? = null
@@ -75,16 +72,10 @@ class AddBountyAmountViewModel : ViewModel() {
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun AddBountyAmountDialog(bounty: Note, account: Account, onClose: () -> Unit) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
+fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onClose: () -> Unit) {
     val postViewModel: AddBountyAmountViewModel = viewModel()
-
-    LaunchedEffect(account) {
-        postViewModel.load(account, bounty)
-    }
+    postViewModel.load(accountViewModel.account, bounty)
 
     Dialog(
         onDismissRequest = { onClose() },

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.ui.note
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
@@ -17,10 +19,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.collections.immutable.ImmutableSet
 
 @Composable
 fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false, idHex: String? = null) {
@@ -53,8 +55,16 @@ fun BlankNote(modifier: Modifier = Modifier, isQuote: Boolean = false, idHex: St
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun HiddenNote(reports: Set<Note>, loggedIn: User, modifier: Modifier = Modifier, isQuote: Boolean = false, nav: (String) -> Unit, onClick: () -> Unit) {
+fun HiddenNote(
+    reports: ImmutableSet<Note>,
+    accountViewModel: AccountViewModel,
+    modifier: Modifier = Modifier,
+    isQuote: Boolean = false,
+    nav: (String) -> Unit,
+    onClick: () -> Unit
+) {
     Column(modifier = modifier) {
         Row(modifier = Modifier.padding(horizontal = if (!isQuote) 12.dp else 6.dp)) {
             Column(modifier = Modifier.padding(start = if (!isQuote) 10.dp else 5.dp)) {
@@ -75,7 +85,7 @@ fun HiddenNote(reports: Set<Note>, loggedIn: User, modifier: Modifier = Modifier
                                 NoteAuthorPicture(
                                     baseNote = it,
                                     nav = nav,
-                                    userAccount = loggedIn,
+                                    accountViewModel = accountViewModel,
                                     size = 35.dp
                                 )
                             }

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

@@ -1,138 +0,0 @@
-package com.vitorpamplona.amethyst.ui.note
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.compositeOver
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import com.google.accompanist.flowlayout.FlowRow
-import com.vitorpamplona.amethyst.NotificationCache
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val noteState by boostSetCard.note.live().metadata.observeAsState()
-    val note = noteState?.note
-
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    var popupExpanded by remember { mutableStateOf(false) }
-
-    val scope = rememberCoroutineScope()
-
-    if (note == null) {
-        BlankNote(Modifier, isInnerNote)
-    } else {
-        var isNew by remember { mutableStateOf<Boolean>(false) }
-
-        LaunchedEffect(key1 = boostSetCard) {
-            withContext(Dispatchers.IO) {
-                isNew = boostSetCard.createdAt > NotificationCache.load(routeForLastRead)
-
-                NotificationCache.markAsRead(routeForLastRead, boostSetCard.createdAt)
-            }
-        }
-
-        val backgroundColor = if (isNew) {
-            MaterialTheme.colors.newItemBackgroundColor.compositeOver(MaterialTheme.colors.background)
-        } else {
-            MaterialTheme.colors.background
-        }
-
-        Column(
-            modifier = Modifier
-                .background(backgroundColor)
-                .combinedClickable(
-                    onClick = {
-                        scope.launch {
-                            routeFor(
-                                note,
-                                account.userProfile()
-                            )?.let { nav(it) }
-                        }
-                    },
-                    onLongClick = { popupExpanded = true }
-                )
-        ) {
-            Row(
-                modifier = Modifier
-                    .padding(
-                        start = if (!isInnerNote) 12.dp else 0.dp,
-                        end = if (!isInnerNote) 12.dp else 0.dp,
-                        top = 10.dp
-                    )
-            ) {
-                // Draws the like picture outside the boosted card.
-                if (!isInnerNote) {
-                    Box(
-                        modifier = Modifier
-                            .width(55.dp)
-                            .padding(0.dp)
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_retweeted),
-                            null,
-                            modifier = Modifier
-                                .size(16.dp)
-                                .align(Alignment.TopEnd),
-                            tint = Color.Unspecified
-                        )
-                    }
-                }
-
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
-                    FlowRow() {
-                        boostSetCard.boostEvents.forEach {
-                            NoteAuthorPicture(
-                                baseNote = it,
-                                nav = nav,
-                                userAccount = account.userProfile(),
-                                size = 35.dp
-                            )
-                        }
-                    }
-
-                    NoteCompose(
-                        baseNote = note,
-                        routeForLastRead = null,
-                        modifier = Modifier.padding(top = 5.dp),
-                        isBoostedNote = true,
-                        parentBackgroundColor = backgroundColor,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
-
-                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
-                }
-            }
-        }
-    }
-}

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

@@ -18,11 +18,11 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -41,8 +41,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
@@ -61,120 +63,181 @@ fun ChatroomCompose(
     val noteState by baseNote.live().metadata.observeAsState()
     val note = noteState?.note
 
-    val notificationCacheState = NotificationCache.live.observeAsState()
-    val notificationCache = notificationCacheState.value ?: return
-
-    val scope = rememberCoroutineScope()
+    val channelHex by remember(noteState) {
+        derivedStateOf {
+            noteState?.note?.channelHex()
+        }
+    }
 
     if (note?.event == null) {
         BlankNote(Modifier)
-    } else if (note.channel() != null) {
-        val authorState by note.author!!.live().metadata.observeAsState()
-        val author = authorState?.user
-
-        val channelState by note.channel()!!.live.observeAsState()
-        val channel = channelState?.channel
-
-        val noteEvent = note.event
-
-        val description = if (noteEvent is ChannelCreateEvent) {
-            stringResource(R.string.channel_created)
-        } else if (noteEvent is ChannelMetadataEvent) {
-            "${stringResource(R.string.channel_information_changed_to)} "
-        } else {
-            noteEvent?.content()
-        }
-        channel?.let { chan ->
-            var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
-
-            LaunchedEffect(key1 = notificationCache, key2 = note) {
-                scope.launch(Dispatchers.IO) {
-                    note.createdAt()?.let { timestamp ->
-                        hasNewMessages =
-                            timestamp > notificationCache.cache.load("Channel/${chan.idHex}")
-                    }
-                }
-            }
-
-            ChannelName(
-                channelIdHex = chan.idHex,
-                channelPicture = chan.profilePicture(),
-                channelTitle = { modifier ->
-                    Text(
-                        text = buildAnnotatedString {
-                            withStyle(
-                                SpanStyle(
-                                    fontWeight = FontWeight.Bold
-                                )
-                            ) {
-                                append(chan.info.name)
-                            }
-
-                            withStyle(
-                                SpanStyle(
-                                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                                    fontWeight = FontWeight.Normal
-                                )
-                            ) {
-                                append(" ${stringResource(id = R.string.public_chat)}")
-                            }
-                        },
-                        fontWeight = FontWeight.Bold,
-                        modifier = modifier,
-                        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-                    )
-                },
-                channelLastTime = note.createdAt(),
-                channelLastContent = "${author?.toBestDisplayName()}: " + description,
-                hasNewMessages = hasNewMessages,
-                onClick = { nav("Channel/${chan.idHex}") }
-            )
+    } else if (channelHex != null) {
+        LoadChannel(baseChannelHex = channelHex!!) { channel ->
+            ChannelRoomCompose(note, channel, nav)
         }
     } else {
-        val replyAuthorBase =
-            (note.event as? PrivateDmEvent)
-                ?.verifiedRecipientPubKey()
-                ?.let { LocalCache.getOrCreateUser(it) }
+        val userRoomHex = remember(noteState, accountViewModel) {
+            (note.event as? PrivateDmEvent)?.talkingWith(accountViewModel.userProfile().pubkeyHex)
+        } ?: return
 
-        var userToComposeOn = note.author!!
-
-        if (replyAuthorBase != null) {
-            if (note.author == accountViewModel.userProfile()) {
-                userToComposeOn = replyAuthorBase
-            }
+        LoadUser(userRoomHex) { user ->
+            UserRoomCompose(note, user, accountViewModel, nav)
         }
+    }
+}
 
-        val noteEvent = note.event
+@Composable
+private fun ChannelRoomCompose(
+    note: Note,
+    channel: Channel,
+    nav: (String) -> Unit
+) {
+    val authorState by note.author!!.live().metadata.observeAsState()
+    val authorName = remember(authorState) {
+        authorState?.user?.toBestDisplayName()
+    }
 
-        userToComposeOn.let { user ->
-            var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+    val chanHex = remember { channel.idHex }
 
-            LaunchedEffect(key1 = notificationCache, key2 = note) {
-                scope.launch(Dispatchers.IO) {
-                    noteEvent?.let {
-                        hasNewMessages = it.createdAt() > notificationCache.cache.load(
-                            "Room/${userToComposeOn.pubkeyHex}"
+    val channelState by channel.live.observeAsState()
+    val channelPicture by remember(channelState) {
+        derivedStateOf {
+            channel.profilePicture()
+        }
+    }
+    val channelName by remember(channelState) {
+        derivedStateOf {
+            channel.info.name
+        }
+    }
+
+    val noteEvent = note.event
+
+    val route = remember(note) {
+        "Channel/$chanHex"
+    }
+
+    val description = if (noteEvent is ChannelCreateEvent) {
+        stringResource(R.string.channel_created)
+    } else if (noteEvent is ChannelMetadataEvent) {
+        "${stringResource(R.string.channel_information_changed_to)} "
+    } else {
+        noteEvent?.content()
+    }
+
+    var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+
+    WatchNotificationChanges(note, route) { newHasNewMessages ->
+        if (hasNewMessages != newHasNewMessages) {
+            hasNewMessages = newHasNewMessages
+        }
+    }
+
+    ChannelName(
+        channelIdHex = chanHex,
+        channelPicture = channelPicture,
+        channelTitle = { modifier ->
+            Text(
+                text = buildAnnotatedString {
+                    withStyle(
+                        SpanStyle(
+                            fontWeight = FontWeight.Bold
                         )
+                    ) {
+                        append(channelName)
                     }
-                }
-            }
 
-            ChannelName(
-                channelPicture = {
-                    UserPicture(
-                        userToComposeOn,
-                        accountViewModel.userProfile(),
-                        size = 55.dp
-                    )
+                    withStyle(
+                        SpanStyle(
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                            fontWeight = FontWeight.Normal
+                        )
+                    ) {
+                        append(" ${stringResource(id = R.string.public_chat)}")
+                    }
                 },
-                channelTitle = { UsernameDisplay(userToComposeOn, it) },
-                channelLastTime = note.createdAt(),
-                channelLastContent = accountViewModel.decrypt(note),
-                hasNewMessages = hasNewMessages,
-                onClick = { nav("Room/${user.pubkeyHex}") }
+                fontWeight = FontWeight.Bold,
+                modifier = modifier,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
             )
+        },
+        channelLastTime = remember(note) { note.createdAt() },
+        channelLastContent = remember(note) { "$authorName: $description" },
+        hasNewMessages = hasNewMessages,
+        onClick = { nav(route) }
+    )
+}
+
+@Composable
+private fun UserRoomCompose(
+    note: Note,
+    user: User,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+
+    val route = remember(user) {
+        "Room/${user.pubkeyHex}"
+    }
+
+    WatchNotificationChanges(note, route) { newHasNewMessages ->
+        if (hasNewMessages != newHasNewMessages) {
+            hasNewMessages = newHasNewMessages
         }
     }
+
+    ChannelName(
+        channelPicture = {
+            UserPicture(
+                user,
+                accountViewModel = accountViewModel,
+                size = 55.dp
+            )
+        },
+        channelTitle = { UsernameDisplay(user, it) },
+        channelLastTime = remember(note) { note.createdAt() },
+        channelLastContent = remember(note) { accountViewModel.decrypt(note) },
+        hasNewMessages = hasNewMessages,
+        onClick = { nav(route) }
+    )
+}
+
+@Composable
+private fun WatchNotificationChanges(
+    note: Note,
+    route: String,
+    onNewStatus: (Boolean) -> Unit
+) {
+    val cacheState by NotificationCache.live.observeAsState()
+
+    LaunchedEffect(key1 = note, cacheState) {
+        launch(Dispatchers.IO) {
+            note.event?.createdAt()?.let {
+                val lastTime = NotificationCache.load(route)
+                onNewStatus(it > lastTime)
+            }
+        }
+    }
+}
+
+@Composable
+fun LoadUser(baseUserHex: String, content: @Composable (User) -> Unit) {
+    var user by remember(baseUserHex) {
+        mutableStateOf<User?>(null)
+    }
+
+    LaunchedEffect(key1 = baseUserHex) {
+        if (user == null) {
+            launch(Dispatchers.IO) {
+                user = LocalCache.checkGetOrCreateUser(baseUserHex)
+            }
+        }
+    }
+
+    user?.let {
+        content(it)
+    }
 }
 
 @Composable

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

@@ -7,6 +7,8 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -48,14 +50,14 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateClickableTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.ResizeImage
@@ -65,6 +67,7 @@ import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.RelayIconFilter
+import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -115,7 +118,7 @@ fun ChatroomMessageCompose(
         var isAcceptableAndCanPreview by remember { mutableStateOf(Pair(true, true)) }
 
         LaunchedEffect(key1 = noteReportsState, key2 = accountState) {
-            withContext(Dispatchers.IO) {
+            launch(Dispatchers.Default) {
                 account.userProfile().let { loggedIn ->
                     val newCanPreview = note.author?.pubkeyHex == loggedIn.pubkeyHex ||
                         (note.author?.let { loggedIn.isFollowingCached(it) } ?: true) ||
@@ -131,9 +134,12 @@ fun ChatroomMessageCompose(
         }
 
         if (!isAcceptableAndCanPreview.first && !showHiddenNote) {
+            val reports = remember {
+                account.getRelevantReports(noteForReports).toImmutableSet()
+            }
             HiddenNote(
-                account.getRelevantReports(noteForReports),
-                account.userProfile(),
+                reports,
+                accountViewModel,
                 Modifier,
                 innerQuote,
                 nav,
@@ -264,7 +270,6 @@ fun ChatroomMessageCompose(
                                         else -> {
                                             RenderRegularTextNote(
                                                 note,
-                                                loggedIn,
                                                 isAcceptableAndCanPreview.second,
                                                 backgroundBubbleColor,
                                                 accountViewModel,
@@ -358,18 +363,18 @@ fun ChatTimeAgo(time: Long) {
 @Composable
 private fun RenderRegularTextNote(
     note: Note,
-    loggedIn: User,
     canPreview: Boolean,
     backgroundBubbleColor: Color,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val tags = remember { note.event?.tags() }
+    val tags = remember(note.event) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
     val eventContent = remember { accountViewModel.decrypt(note) }
     val modifier = remember { Modifier.padding(top = 5.dp) }
 
     if (eventContent != null) {
         val hasSensitiveContent = remember(note.event) { note.event?.isSensitive() ?: false }
+
         SensitivityWarning(
             hasSensitiveContent = hasSensitiveContent,
             accountViewModel = accountViewModel
@@ -418,7 +423,7 @@ private fun RenderChangeChannelMetadataNote(
 
     CreateTextWithEmoji(
         text = text,
-        tags = note.author?.info?.latestMetadata?.tags
+        tags = remember { note.author?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
     )
 }
 
@@ -441,7 +446,7 @@ private fun RenderCreateChannelNote(note: Note) {
 
     CreateTextWithEmoji(
         text = text,
-        tags = note.author?.info?.latestMetadata?.tags
+        tags = remember { note.author?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
     )
 }
 
@@ -457,7 +462,7 @@ private fun DrawAuthorInfo(
     val route = remember { "User/$pubkeyHex" }
     val userDisplayName = remember(userState) { userState?.user?.toBestDisplayName() }
     val userProfilePicture = remember(userState) { ResizeImage(userState?.user?.profilePicture(), 25.dp) }
-    val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
+    val userTags = remember(userState) { userState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
 
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -468,17 +473,19 @@ private fun DrawAuthorInfo(
             robot = pubkeyHex,
             model = userProfilePicture,
             contentDescription = stringResource(id = R.string.profile_image),
-            modifier = Modifier
-                .width(25.dp)
-                .height(25.dp)
-                .clip(shape = CircleShape)
-                .clickable(onClick = {
-                    nav(route)
-                })
+            modifier = remember {
+                Modifier
+                    .width(25.dp)
+                    .height(25.dp)
+                    .clip(shape = CircleShape)
+                    .clickable(onClick = {
+                        nav(route)
+                    })
+            }
         )
 
         CreateClickableTextWithEmoji(
-            clickablePart = "  $userDisplayName",
+            clickablePart = remember { "  $userDisplayName" },
             suffix = "",
             tags = userTags,
             fontWeight = FontWeight.Bold,
@@ -495,6 +502,7 @@ data class RelayBadgesState(
     val noteRelaysSimple: List<String>
 )
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun RelayBadges(baseNote: Note) {
     val noteRelaysState by baseNote.live().relays.observeAsState()

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

@@ -1,138 +0,0 @@
-package com.vitorpamplona.amethyst.ui.note
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.compositeOver
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import com.google.accompanist.flowlayout.FlowRow
-import com.vitorpamplona.amethyst.NotificationCache
-import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun LikeSetCompose(likeSetCard: LikeSetCard, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val noteState by likeSetCard.note.live().metadata.observeAsState()
-    val note = noteState?.note
-
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    val noteEvent = note?.event
-    var popupExpanded by remember { mutableStateOf(false) }
-    val scope = rememberCoroutineScope()
-
-    if (note == null) {
-        BlankNote(Modifier, isInnerNote)
-    } else {
-        var isNew by remember { mutableStateOf<Boolean>(false) }
-
-        LaunchedEffect(key1 = likeSetCard) {
-            withContext(Dispatchers.IO) {
-                isNew = likeSetCard.createdAt > NotificationCache.load(routeForLastRead)
-
-                NotificationCache.markAsRead(routeForLastRead, likeSetCard.createdAt)
-            }
-        }
-
-        val backgroundColor = if (isNew) {
-            MaterialTheme.colors.newItemBackgroundColor.compositeOver(MaterialTheme.colors.background)
-        } else {
-            MaterialTheme.colors.background
-        }
-
-        Column(
-            modifier = Modifier
-                .background(backgroundColor)
-                .combinedClickable(
-                    onClick = {
-                        scope.launch {
-                            routeFor(
-                                note,
-                                account.userProfile()
-                            )?.let { nav(it) }
-                        }
-                    },
-                    onLongClick = { popupExpanded = true }
-                )
-        ) {
-            Row(
-                modifier = Modifier
-                    .padding(
-                        start = if (!isInnerNote) 12.dp else 0.dp,
-                        end = if (!isInnerNote) 12.dp else 0.dp,
-                        top = 10.dp
-                    )
-            ) {
-                // Draws the like picture outside the boosted card.
-                if (!isInnerNote) {
-                    Box(
-                        modifier = Modifier
-                            .width(55.dp)
-                            .padding(0.dp)
-                    ) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_liked),
-                            null,
-                            modifier = Modifier
-                                .size(16.dp)
-                                .align(Alignment.TopEnd),
-                            tint = Color.Unspecified
-                        )
-                    }
-                }
-
-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
-                    FlowRow() {
-                        likeSetCard.likeEvents.forEach {
-                            NoteAuthorPicture(
-                                baseNote = it,
-                                nav = nav,
-                                userAccount = account.userProfile(),
-                                size = 35.dp
-                            )
-                        }
-                    }
-
-                    NoteCompose(
-                        baseNote = note,
-                        routeForLastRead = null,
-                        modifier = Modifier.padding(top = 5.dp),
-                        isBoostedNote = true,
-                        parentBackgroundColor = backgroundColor,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
-
-                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
-                }
-            }
-        }
-    }
-}

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

@@ -39,9 +39,6 @@ import kotlinx.coroutines.launch
 fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val baseNote = remember { messageSetCard.note }
 
-    val noteState by baseNote.live().metadata.observeAsState()
-    val note = remember(noteState) { noteState?.note }
-
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val loggedIn = remember(accountState) { accountState?.account?.userProfile() } ?: return
 
@@ -49,71 +46,69 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
 
     val scope = rememberCoroutineScope()
 
-    if (note == null) {
-        BlankNote(Modifier)
-    } else {
-        var isNew by remember { mutableStateOf(false) }
+    var isNew by remember { mutableStateOf(false) }
 
-        LaunchedEffect(key1 = messageSetCard.createdAt()) {
-            scope.launch(Dispatchers.IO) {
-                val newIsNew =
-                    messageSetCard.createdAt() > NotificationCache.load(routeForLastRead)
+    LaunchedEffect(key1 = messageSetCard.createdAt()) {
+        launch(Dispatchers.IO) {
+            val newIsNew =
+                messageSetCard.createdAt() > NotificationCache.load(routeForLastRead)
 
-                NotificationCache.markAsRead(routeForLastRead, messageSetCard.createdAt())
+            NotificationCache.markAsRead(routeForLastRead, messageSetCard.createdAt())
 
-                if (newIsNew != isNew) {
-                    isNew = newIsNew
-                }
+            if (newIsNew != isNew) {
+                isNew = newIsNew
             }
         }
+    }
 
-        val backgroundColor = if (isNew) {
-            MaterialTheme.colors.newItemBackgroundColor.compositeOver(MaterialTheme.colors.background)
-        } else {
-            MaterialTheme.colors.background
-        }
+    val backgroundColor = if (isNew) {
+        MaterialTheme.colors.newItemBackgroundColor.compositeOver(MaterialTheme.colors.background)
+    } else {
+        MaterialTheme.colors.background
+    }
 
-        val columnModifier = remember(isNew) {
-            Modifier
-                .background(backgroundColor)
-                .padding(
-                    start = 12.dp,
-                    end = 12.dp,
-                    top = 10.dp
-                )
-                .combinedClickable(
-                    onClick = {
-                        scope.launch {
-                            routeFor(
-                                baseNote,
-                                loggedIn
-                            )?.let { nav(it) }
-                        }
-                    },
-                    onLongClick = { popupExpanded = true }
-                )
-                .fillMaxWidth()
-        }
+    val columnModifier = remember(isNew) {
+        Modifier
+            .background(backgroundColor)
+            .padding(
+                start = 12.dp,
+                end = 12.dp,
+                top = 10.dp
+            )
+            .combinedClickable(
+                onClick = {
+                    scope.launch {
+                        routeFor(
+                            baseNote,
+                            loggedIn
+                        )?.let { nav(it) }
+                    }
+                },
+                onLongClick = { popupExpanded = true }
+            )
+            .fillMaxWidth()
+    }
 
-        Column(columnModifier) {
-            Row(Modifier.fillMaxWidth()) {
-                MessageIcon()
+    Column(columnModifier) {
+        Row(Modifier.fillMaxWidth()) {
+            MessageIcon()
 
-                Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
-                    val routeForLastRead = "Room/${(baseNote.event as? PrivateDmEvent)?.talkingWith(loggedIn.pubkeyHex)}"
-
-                    NoteCompose(
-                        baseNote = baseNote,
-                        routeForLastRead = routeForLastRead,
-                        isBoostedNote = true,
-                        addMarginTop = false,
-                        parentBackgroundColor = null,
-                        accountViewModel = accountViewModel,
-                        nav = nav
-                    )
-
-                    NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
+            Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+                val routeForLastRead = remember(baseNote) {
+                    "Room/${(baseNote.event as? PrivateDmEvent)?.talkingWith(loggedIn.pubkeyHex)}"
                 }
+
+                NoteCompose(
+                    baseNote = baseNote,
+                    routeForLastRead = routeForLastRead,
+                    isBoostedNote = true,
+                    addMarginTop = false,
+                    parentBackgroundColor = null,
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+
+                NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
             }
         }
     }

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

@@ -6,6 +6,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -38,7 +40,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -46,6 +47,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.MultiSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -62,95 +64,87 @@ import kotlinx.coroutines.launch
 fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val baseNote = remember { multiSetCard.note }
 
-    val noteState by baseNote.live().metadata.observeAsState()
-    val note = remember(noteState) { noteState?.note } ?: return
-
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val loggedIn = remember(accountState) { accountState?.account?.userProfile() } ?: return
-
     var popupExpanded by remember { mutableStateOf(false) }
-
     val scope = rememberCoroutineScope()
+    var isNew by remember { mutableStateOf(false) }
 
-    if (note.event == null) {
-        BlankNote(Modifier, false)
-    } else {
-        var isNew by remember { mutableStateOf(false) }
+    LaunchedEffect(key1 = multiSetCard) {
+        launch(Dispatchers.IO) {
+            val newIsNew = multiSetCard.maxCreatedAt > NotificationCache.load(routeForLastRead)
 
-        LaunchedEffect(key1 = multiSetCard.createdAt()) {
-            scope.launch(Dispatchers.IO) {
-                val newIsNew = multiSetCard.maxCreatedAt > NotificationCache.load(routeForLastRead)
+            NotificationCache.markAsRead(routeForLastRead, multiSetCard.maxCreatedAt)
 
-                NotificationCache.markAsRead(routeForLastRead, multiSetCard.maxCreatedAt)
+            if (newIsNew != isNew) {
+                isNew = newIsNew
+            }
+        }
+    }
 
-                if (newIsNew != isNew) {
-                    isNew = newIsNew
+    val primaryColor = MaterialTheme.colors.newItemBackgroundColor
+    val defaultBackgroundColor = MaterialTheme.colors.background
+
+    val backgroundColor by remember(isNew) {
+        derivedStateOf {
+            if (isNew) {
+                primaryColor.compositeOver(defaultBackgroundColor)
+            } else {
+                defaultBackgroundColor
+            }
+        }
+    }
+
+    val columnModifier = Modifier
+        .background(backgroundColor)
+        .padding(
+            start = 12.dp,
+            end = 12.dp,
+            top = 10.dp
+        )
+        .combinedClickable(
+            onClick = {
+                scope.launch {
+                    routeFor(baseNote, accountViewModel.userProfile())?.let { nav(it) }
                 }
-            }
+            },
+            onLongClick = { popupExpanded = true }
+        )
+        .fillMaxWidth()
+
+    val zapEvents by remember { derivedStateOf { multiSetCard.zapEvents } }
+    val boostEvents by remember { derivedStateOf { multiSetCard.boostEvents } }
+    val likeEvents by remember { derivedStateOf { multiSetCard.likeEvents } }
+
+    val hasZapEvents by remember { derivedStateOf { multiSetCard.zapEvents.isNotEmpty() } }
+    val hasBoostEvents by remember { derivedStateOf { multiSetCard.boostEvents.isNotEmpty() } }
+    val hasLikeEvents by remember { derivedStateOf { multiSetCard.likeEvents.isNotEmpty() } }
+
+    Column(modifier = columnModifier) {
+        if (hasZapEvents) {
+            RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
         }
 
-        val primaryColor = MaterialTheme.colors.newItemBackgroundColor
-        val defaultBackgroundColor = MaterialTheme.colors.background
-
-        val backgroundColor = if (isNew) {
-            primaryColor.compositeOver(defaultBackgroundColor)
-        } else {
-            defaultBackgroundColor
+        if (hasBoostEvents) {
+            RenderBoostGallery(boostEvents, backgroundColor, nav, accountViewModel)
         }
 
-        val columnModifier = Modifier
-            .background(backgroundColor)
-            .padding(
-                start = 12.dp,
-                end = 12.dp,
-                top = 10.dp
+        if (hasLikeEvents) {
+            RenderLikeGallery(likeEvents, backgroundColor, nav, accountViewModel)
+        }
+
+        Row(Modifier.fillMaxWidth()) {
+            Spacer(modifier = Modifier.width(65.dp))
+
+            NoteCompose(
+                baseNote = baseNote,
+                routeForLastRead = null,
+                modifier = remember { Modifier.padding(top = 5.dp) },
+                isBoostedNote = true,
+                parentBackgroundColor = backgroundColor,
+                accountViewModel = accountViewModel,
+                nav = nav
             )
-            .combinedClickable(
-                onClick = {
-                    scope.launch {
-                        routeFor(baseNote, loggedIn)?.let { nav(it) }
-                    }
-                },
-                onLongClick = { popupExpanded = true }
-            )
-            .fillMaxWidth()
 
-        val zapEvents by remember { derivedStateOf { multiSetCard.zapEvents } }
-        val boostEvents by remember { derivedStateOf { multiSetCard.boostEvents } }
-        val likeEvents by remember { derivedStateOf { multiSetCard.likeEvents } }
-
-        val hasZapEvents by remember { derivedStateOf { multiSetCard.zapEvents.isNotEmpty() } }
-        val hasBoostEvents by remember { derivedStateOf { multiSetCard.boostEvents.isNotEmpty() } }
-        val hasLikeEvents by remember { derivedStateOf { multiSetCard.likeEvents.isNotEmpty() } }
-
-        Column(modifier = columnModifier) {
-            if (hasZapEvents) {
-                RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
-            }
-
-            if (hasBoostEvents) {
-                RenderBoostGallery(boostEvents, backgroundColor, nav, accountViewModel)
-            }
-
-            if (hasLikeEvents) {
-                RenderLikeGallery(likeEvents, backgroundColor, nav, accountViewModel)
-            }
-
-            Row(Modifier.fillMaxWidth()) {
-                Spacer(modifier = Modifier.width(65.dp))
-
-                NoteCompose(
-                    baseNote = baseNote,
-                    routeForLastRead = null,
-                    modifier = Modifier.padding(top = 5.dp),
-                    isBoostedNote = true,
-                    parentBackgroundColor = backgroundColor,
-                    accountViewModel = accountViewModel,
-                    nav = nav
-                )
-
-                NoteDropDownMenu(note, popupExpanded, { popupExpanded = false }, accountViewModel)
-            }
+            NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
     }
 }
@@ -187,7 +181,7 @@ private fun RenderLikeGallery(
 }
 
 @Composable
-private fun RenderZapGallery(
+fun RenderZapGallery(
     zapEvents: ImmutableMap<Note, Note>,
     backgroundColor: Color,
     nav: (String) -> Unit,
@@ -252,6 +246,7 @@ private fun RenderBoostGallery(
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun AuthorGalleryZaps(
     authorNotes: ImmutableMap<Note, Note>,
@@ -277,10 +272,9 @@ private fun AuthorPictureAndComment(
     accountViewModel: AccountViewModel
 ) {
     var content by remember { mutableStateOf<Triple<User?, String?, String?>>(Triple(zapRequest.author, null, null)) }
-    val scope = rememberCoroutineScope()
 
     LaunchedEffect(key1 = zapRequest.idHex, key2 = zapEvent?.idHex) {
-        scope.launch(Dispatchers.Default) {
+        launch(Dispatchers.Default) {
             (zapRequest.event as? LnZapRequestEvent)?.let {
                 val decryptedContent = accountViewModel.decryptZap(zapRequest)
                 val amount = (zapEvent?.event as? LnZapEvent)?.amount
@@ -340,7 +334,7 @@ private fun AuthorPictureAndComment(
         Box(modifier = remember { Modifier.size(35.dp) }, contentAlignment = Alignment.BottomCenter) {
             FastNoteAuthorPicture(
                 author = author,
-                size = 35.dp,
+                size = remember { 35.dp },
                 accountViewModel = accountViewModel,
                 pictureModifier = authorPictureModifier
             )
@@ -370,7 +364,7 @@ private fun AuthorPictureAndComment(
             TranslatableRichTextViewer(
                 content = it,
                 canPreview = true,
-                tags = null,
+                tags = remember { ImmutableListOfLists() },
                 modifier = remember { Modifier.fillMaxWidth() },
                 backgroundColor = backgroundColor,
                 accountViewModel = accountViewModel,
@@ -380,6 +374,7 @@ private fun AuthorPictureAndComment(
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun AuthorGallery(
     authorNotes: ImmutableList<Note>,
@@ -387,10 +382,10 @@ fun AuthorGallery(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = Modifier.padding(start = 10.dp)) {
+    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
         FlowRow() {
             authorNotes.forEach { note ->
-                Box(Modifier.size(35.dp)) {
+                Box(remember { Modifier.size(35.dp) }) {
                     NotePictureAndComment(note, backgroundColor, nav, accountViewModel)
                 }
             }
@@ -438,22 +433,11 @@ fun FastNoteAuthorPicture(
         author.pubkeyHex
     }
 
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val loggedInLiveFollows = remember(accountState) { accountState?.account?.userProfile()?.live()?.follows } ?: return
-
-    val accountFollowsState by loggedInLiveFollows.observeAsState()
-
-    val showFollowingMark by remember(accountFollowsState) {
-        derivedStateOf {
-            accountFollowsState?.user?.isFollowingCached(author) == true || (author.pubkeyHex == accountFollowsState?.user?.pubkeyHex)
-        }
-    }
-
     UserPicture(
         userHex = authorPubKey,
         userPicture = profilePicture,
-        showFollowingMark = showFollowingMark,
         size = size,
-        modifier = pictureModifier
+        modifier = pictureModifier,
+        accountViewModel = accountViewModel
     )
 }

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

@@ -15,11 +15,11 @@ import androidx.compose.material.icons.filled.Report
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -40,7 +40,7 @@ import java.util.Date
 
 @Composable
 fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String): State<Boolean?> {
-    val nip05Verified = remember(user) {
+    val nip05Verified = remember(user.nip05) {
         // starts with null if must verify or already filled in if verified in the last hour
         val default = if ((user.nip05LastVerificationTime ?: 0) > (Date().time / 1000 - 60 * 60)) { // 1hour
             user.nip05Verified
@@ -51,11 +51,9 @@ fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String): State<Bool
         mutableStateOf(default)
     }
 
-    val scope = rememberCoroutineScope()
-
-    LaunchedEffect(key1 = user) {
+    LaunchedEffect(key1 = user.nip05) {
         if (nip05Verified.value == null) {
-            scope.launch(Dispatchers.IO) {
+            launch(Dispatchers.IO) {
                 user.nip05?.ifBlank { null }?.let { nip05 ->
                     Nip05Verifier().verifyNip05(
                         nip05,
@@ -97,84 +95,103 @@ fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String): State<Bool
 @Composable
 fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifier) {
     val noteState by baseNote.live().metadata.observeAsState()
-    val note = noteState?.note ?: return
+    val author by remember(noteState) {
+        derivedStateOf {
+            noteState?.note?.author
+        }
+    }
 
-    val author = note.author
-    if (author != null) {
-        ObserveDisplayNip05Status(author, columnModifier)
+    author?.let {
+        ObserveDisplayNip05Status(it, columnModifier)
     }
 }
 
 @Composable
 fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier) {
     val userState by baseUser.live().metadata.observeAsState()
-    val user = remember(userState) { userState?.user } ?: return
-    val parts = remember(userState) { userState?.user?.nip05()?.split("@") } ?: return
+    val isValidNIP05 by remember(userState) {
+        derivedStateOf {
+            userState?.user?.nip05()?.split("@")?.size == 2
+        }
+    }
+    val nip05 by remember(userState) {
+        derivedStateOf {
+            userState?.user?.nip05()
+        }
+    }
 
-    if (parts.size == 2) {
-        val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
+    if (isValidNIP05) {
+        nip05?.let {
+            DisplayNIP05Line(it, baseUser, columnModifier)
+        }
+    }
+}
 
-        Column(modifier = columnModifier) {
-            DisplayNIP05(parts[0], parts[1], nip05Verified)
+@Composable
+private fun DisplayNIP05Line(nip05: String, baseUser: User, columnModifier: Modifier = Modifier) {
+    Column(modifier = columnModifier) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            val nip05Verified by nip05VerificationAsAState(baseUser.info!!, baseUser.pubkeyHex)
+            DisplayNIP05(nip05, nip05Verified)
         }
     }
 }
 
 @Composable
 private fun DisplayNIP05(
-    user: String,
-    domain: String,
+    nip05: String,
     nip05Verified: Boolean?
 ) {
     val uri = LocalUriHandler.current
+    val (user, domain) = remember(nip05) {
+        nip05.split("@")
+    }
 
-    Row(verticalAlignment = Alignment.CenterVertically) {
-        if (user != "_") {
-            Text(
-                text = AnnotatedString(user),
-                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
-
-        if (nip05Verified == null) {
-            Icon(
-                tint = Color.Yellow,
-                imageVector = Icons.Default.Downloading,
-                contentDescription = "Downloading",
-                modifier = Modifier
-                    .size(14.dp)
-                    .padding(top = 1.dp)
-            )
-        } else if (nip05Verified == true) {
-            Icon(
-                painter = painterResource(R.drawable.ic_verified),
-                "NIP-05 Verified",
-                tint = Nip05.copy(0.52f),
-                modifier = Modifier
-                    .size(14.dp)
-                    .padding(top = 1.dp)
-            )
-        } else {
-            Icon(
-                tint = Color.Red,
-                imageVector = Icons.Default.Report,
-                contentDescription = "Invalid Nip05",
-                modifier = Modifier
-                    .size(14.dp)
-                    .padding(top = 1.dp)
-            )
-        }
-
-        ClickableText(
-            text = AnnotatedString(domain),
-            onClick = { runCatching { uri.openUri("https://$domain") } },
-            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(0.52f)),
+    if (user != "_") {
+        Text(
+            text = AnnotatedString(user),
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
             maxLines = 1,
-            overflow = TextOverflow.Visible
+            overflow = TextOverflow.Ellipsis
         )
     }
+
+    if (nip05Verified == null) {
+        Icon(
+            tint = Color.Yellow,
+            imageVector = Icons.Default.Downloading,
+            contentDescription = "Downloading",
+            modifier = Modifier
+                .size(14.dp)
+                .padding(top = 1.dp)
+        )
+    } else if (nip05Verified == true) {
+        Icon(
+            painter = painterResource(R.drawable.ic_verified),
+            "NIP-05 Verified",
+            tint = Nip05.copy(0.52f),
+            modifier = Modifier
+                .size(14.dp)
+                .padding(top = 1.dp)
+        )
+    } else {
+        Icon(
+            tint = Color.Red,
+            imageVector = Icons.Default.Report,
+            contentDescription = "Invalid Nip05",
+            modifier = Modifier
+                .size(14.dp)
+                .padding(top = 1.dp)
+        )
+    }
+
+    ClickableText(
+        text = AnnotatedString(domain),
+        onClick = { runCatching { uri.openUri("https://$domain") } },
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(0.52f)),
+        maxLines = 1,
+        overflow = TextOverflow.Visible
+    )
 }
 
 @Composable

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

@@ -69,6 +69,7 @@ import com.vitorpamplona.amethyst.ui.components.SelectTextDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ReportNoteDialog
 import com.vitorpamplona.amethyst.ui.theme.WarningColor
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 private fun lightenColor(color: Color, amount: Float): Color {
@@ -111,33 +112,34 @@ private fun VerticalDivider(color: Color) =
 
 @Composable
 fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, accountViewModel: AccountViewModel) {
-    val context = LocalContext.current
-    val primaryLight = lightenColor(MaterialTheme.colors.primary, 0.1f)
-    val cardShape = RoundedCornerShape(5.dp)
-    val clipboardManager = LocalClipboardManager.current
-    val scope = rememberCoroutineScope()
     var showSelectTextDialog by remember(note) { mutableStateOf(false) }
     var showDeleteAlertDialog by remember(note) { mutableStateOf(false) }
     var showBlockAlertDialog by remember(note) { mutableStateOf(false) }
     var showReportDialog by remember(note) { mutableStateOf(false) }
 
-    val backgroundColor = if (MaterialTheme.colors.isLight) {
-        MaterialTheme.colors.primary
-    } else {
-        MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background)
-    }
-
-    val showToast = { stringResource: Int ->
-        scope.launch {
-            Toast.makeText(
-                context,
-                context.getString(stringResource),
-                Toast.LENGTH_SHORT
-            ).show()
-        }
-    }
-
     if (popupExpanded) {
+        val context = LocalContext.current
+        val primaryLight = lightenColor(MaterialTheme.colors.primary, 0.1f)
+        val cardShape = RoundedCornerShape(5.dp)
+        val clipboardManager = LocalClipboardManager.current
+        val scope = rememberCoroutineScope()
+
+        val backgroundColor = if (MaterialTheme.colors.isLight) {
+            MaterialTheme.colors.primary
+        } else {
+            MaterialTheme.colors.primary.copy(alpha = 0.32f).compositeOver(MaterialTheme.colors.background)
+        }
+
+        val showToast = { stringResource: Int ->
+            scope.launch {
+                Toast.makeText(
+                    context,
+                    context.getString(stringResource),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+
         val isOwnNote = accountViewModel.isLoggedUser(note.author)
         val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author)
 
@@ -153,25 +155,31 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
                             icon = Icons.Default.ContentCopy,
                             label = stringResource(R.string.quick_action_copy_text)
                         ) {
-                            clipboardManager.setText(
-                                AnnotatedString(
-                                    accountViewModel.decrypt(note) ?: ""
+                            scope.launch(Dispatchers.IO) {
+                                clipboardManager.setText(
+                                    AnnotatedString(
+                                        accountViewModel.decrypt(note) ?: ""
+                                    )
                                 )
-                            )
-                            showToast(R.string.copied_note_text_to_clipboard)
-                            onDismiss()
+                                showToast(R.string.copied_note_text_to_clipboard)
+                                onDismiss()
+                            }
                         }
                         VerticalDivider(primaryLight)
                         NoteQuickActionItem(Icons.Default.AlternateEmail, stringResource(R.string.quick_action_copy_user_id)) {
-                            clipboardManager.setText(AnnotatedString("nostr:${note.author?.pubkeyNpub()}"))
-                            showToast(R.string.copied_user_id_to_clipboard)
-                            onDismiss()
+                            scope.launch(Dispatchers.IO) {
+                                clipboardManager.setText(AnnotatedString("nostr:${note.author?.pubkeyNpub()}"))
+                                showToast(R.string.copied_user_id_to_clipboard)
+                                onDismiss()
+                            }
                         }
                         VerticalDivider(primaryLight)
                         NoteQuickActionItem(Icons.Default.FormatQuote, stringResource(R.string.quick_action_copy_note_id)) {
-                            clipboardManager.setText(AnnotatedString("nostr:${note.toNEvent()}"))
-                            showToast(R.string.copied_note_id_to_clipboard)
-                            onDismiss()
+                            scope.launch(Dispatchers.IO) {
+                                clipboardManager.setText(AnnotatedString("nostr:${note.toNEvent()}"))
+                                showToast(R.string.copied_note_id_to_clipboard)
+                                onDismiss()
+                            }
                         }
 
                         if (!isOwnNote) {
@@ -179,8 +187,10 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
 
                             NoteQuickActionItem(Icons.Default.Block, stringResource(R.string.quick_action_block)) {
                                 if (accountViewModel.hideBlockAlertDialog) {
-                                    note.author?.let { accountViewModel.hide(it) }
-                                    onDismiss()
+                                    scope.launch(Dispatchers.IO) {
+                                        note.author?.let { accountViewModel.hide(it) }
+                                        onDismiss()
+                                    }
                                 } else {
                                     showBlockAlertDialog = true
                                 }
@@ -197,21 +207,27 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
                         if (isOwnNote) {
                             NoteQuickActionItem(Icons.Default.Delete, stringResource(R.string.quick_action_delete)) {
                                 if (accountViewModel.hideDeleteRequestDialog) {
-                                    accountViewModel.delete(note)
-                                    onDismiss()
+                                    scope.launch(Dispatchers.IO) {
+                                        accountViewModel.delete(note)
+                                        onDismiss()
+                                    }
                                 } else {
                                     showDeleteAlertDialog = true
                                 }
                             }
                         } else if (isFollowingUser) {
                             NoteQuickActionItem(Icons.Default.PersonRemove, stringResource(R.string.quick_action_unfollow)) {
-                                accountViewModel.unfollow(note.author!!)
-                                onDismiss()
+                                scope.launch(Dispatchers.IO) {
+                                    accountViewModel.unfollow(note.author!!)
+                                    onDismiss()
+                                }
                             }
                         } else {
                             NoteQuickActionItem(Icons.Default.PersonAdd, stringResource(R.string.quick_action_follow)) {
-                                accountViewModel.follow(note.author!!)
-                                onDismiss()
+                                scope.launch(Dispatchers.IO) {
+                                    accountViewModel.follow(note.author!!)
+                                    onDismiss()
+                                }
                             }
                         }
 
@@ -220,9 +236,11 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
                             icon = ImageVector.vectorResource(id = R.drawable.relays),
                             label = stringResource(R.string.broadcast)
                         ) {
-                            accountViewModel.broadcast(note)
-                            // showSelectTextDialog = true
-                            onDismiss()
+                            scope.launch(Dispatchers.IO) {
+                                accountViewModel.broadcast(note)
+                                // showSelectTextDialog = true
+                                onDismiss()
+                            }
                         }
                         VerticalDivider(primaryLight)
                         NoteQuickActionItem(icon = Icons.Default.Share, label = stringResource(R.string.quick_action_share)) {

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

@@ -27,6 +27,8 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
@@ -44,7 +46,7 @@ fun PollNote(
     nav: (String) -> Unit
 ) {
     val pollViewModel: PollNoteViewModel = viewModel(
-        key = baseNote.idHex
+        key = baseNote.idHex + "PollNoteViewModel"
     )
 
     pollViewModel.load(accountViewModel.account, baseNote)
@@ -91,10 +93,9 @@ private fun WatchZapsAndUpdateTallies(
     pollViewModel: PollNoteViewModel
 ) {
     val zapsState by baseNote.live().zaps.observeAsState()
-    val scope = rememberCoroutineScope()
 
     LaunchedEffect(key1 = zapsState) {
-        scope.launch(Dispatchers.IO) {
+        launch(Dispatchers.Default) {
             pollViewModel.refreshTallies()
         }
     }
@@ -110,7 +111,9 @@ private fun OptionNote(
     backgroundColor: Color,
     nav: (String) -> Unit
 ) {
-    val tags = remember { baseNote.event?.tags() }
+    val tags = remember(baseNote) {
+        baseNote.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists()
+    }
 
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -164,7 +167,7 @@ private fun RenderOptionAfterVote(
     totalRatio: Float,
     color: Color,
     canPreview: Boolean,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>,
     backgroundColor: Color,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -231,7 +234,7 @@ private fun RenderOptionAfterVote(
 private fun RenderOptionBeforeVote(
     description: String,
     canPreview: Boolean,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>,
     backgroundColor: Color,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -269,19 +272,18 @@ fun ZapVote(
     nonClickablePrepend: @Composable () -> Unit,
     clickablePrepend: @Composable () -> Unit
 ) {
-    val zapsState by baseNote.live().zaps.observeAsState()
-    val zappedNote = zapsState?.note ?: return
+    val isLoggedUser by remember {
+        derivedStateOf {
+            accountViewModel.isLoggedUser(baseNote.author)
+        }
+    }
 
     var wantsToZap by remember { mutableStateOf(false) }
+    var zappingProgress by remember { mutableStateOf(0f) }
 
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
 
-    var zappingProgress by remember { mutableStateOf(0f) }
-
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
     nonClickablePrepend()
 
     Row(
@@ -311,7 +313,7 @@ fun ZapVote(
                             )
                             .show()
                     }
-                } else if (accountViewModel.isLoggedUser(zappedNote.author)) {
+                } else if (isLoggedUser) {
                     scope.launch {
                         Toast
                             .makeText(
@@ -333,11 +335,13 @@ fun ZapVote(
                             .show()
                     }
                     return@combinedClickable
-                } else if (account.zapAmountChoices.size == 1 && pollViewModel.isValidInputVoteAmount(account.zapAmountChoices.first())) {
+                } else if (accountViewModel.account.zapAmountChoices.size == 1 &&
+                    pollViewModel.isValidInputVoteAmount(accountViewModel.account.zapAmountChoices.first())
+                ) {
                     scope.launch(Dispatchers.IO) {
                         accountViewModel.zap(
                             baseNote,
-                            account.zapAmountChoices.first() * 1000,
+                            accountViewModel.account.zapAmountChoices.first() * 1000,
                             poolOption.option,
                             "",
                             context,
@@ -354,7 +358,7 @@ fun ZapVote(
                                     zappingProgress = it
                                 }
                             },
-                            zapType = account.defaultZapType
+                            zapType = accountViewModel.account.defaultZapType
                         )
                     }
                 } else {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Context
 import android.widget.Toast
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -62,6 +63,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
@@ -201,7 +203,9 @@ fun BoostReaction(
         onClick = {
             if (accountViewModel.isWriteable()) {
                 if (accountViewModel.hasBoosted(baseNote)) {
-                    accountViewModel.deleteBoostsTo(baseNote)
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.deleteBoostsTo(baseNote)
+                    }
                 } else {
                     wantsToBoost = true
                 }
@@ -293,10 +297,12 @@ fun LikeReaction(
         modifier = iconButtonModifier,
         onClick = {
             if (accountViewModel.isWriteable()) {
-                if (accountViewModel.hasReactedTo(baseNote)) {
-                    accountViewModel.deleteReactionTo(baseNote)
-                } else {
-                    accountViewModel.reactTo(baseNote)
+                scope.launch(Dispatchers.IO) {
+                    if (accountViewModel.hasReactedTo(baseNote)) {
+                        accountViewModel.deleteReactionTo(baseNote)
+                    } else {
+                        accountViewModel.reactTo(baseNote)
+                    }
                 }
             } else {
                 scope.launch {
@@ -319,9 +325,16 @@ fun LikeReaction(
 fun LikeIcon(baseNote: Note, iconSize: Dp = 20.dp, grayTint: Color, loggedIn: User) {
     val reactionsState by baseNote.live().reactions.observeAsState()
 
-    val wasReactedByLoggedIn by remember(reactionsState) {
-        derivedStateOf {
-            reactionsState?.note?.isReactedBy(loggedIn) == true
+    var wasReactedByLoggedIn by remember(reactionsState) {
+        mutableStateOf(false)
+    }
+
+    LaunchedEffect(key1 = reactionsState) {
+        launch(Dispatchers.Default) {
+            val newWasReactedByLoggedIn = reactionsState?.note?.isReactedBy(loggedIn) == true
+            if (wasReactedByLoggedIn != newWasReactedByLoggedIn) {
+                wasReactedByLoggedIn = newWasReactedByLoggedIn
+            }
         }
     }
 
@@ -350,9 +363,16 @@ fun LikeIcon(baseNote: Note, iconSize: Dp = 20.dp, grayTint: Color, loggedIn: Us
 fun LikeText(baseNote: Note, grayTint: Color) {
     val reactionsState by baseNote.live().reactions.observeAsState()
 
-    val reactionsCount by remember(reactionsState) {
-        derivedStateOf {
-            " " + showCount(reactionsState?.note?.reactions?.size)
+    var reactionsCount by remember(reactionsState) {
+        mutableStateOf("")
+    }
+
+    LaunchedEffect(key1 = reactionsState) {
+        launch(Dispatchers.Default) {
+            val newReactionsCount = " " + showCount(reactionsState?.note?.reactions?.size)
+            if (reactionsCount != newReactionsCount) {
+                reactionsCount = newReactionsCount
+            }
         }
     }
 
@@ -372,9 +392,6 @@ fun ZapReaction(
     iconSize: Dp = 20.dp,
     animationSize: Dp = 14.dp
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = remember(accountState) { accountState?.account } ?: return
-
     var wantsToZap by remember { mutableStateOf(false) }
     var wantsToChangeZapAmount by remember { mutableStateOf(false) }
     var wantsToSetCustomZap by remember { mutableStateOf(false) }
@@ -393,53 +410,18 @@ fun ZapReaction(
                 interactionSource = remember { MutableInteractionSource() },
                 indication = rememberRipple(bounded = false, radius = 24.dp),
                 onClick = {
-                    if (account.zapAmountChoices.isEmpty()) {
-                        scope.launch {
-                            Toast
-                                .makeText(
-                                    context,
-                                    context.getString(R.string.no_zap_amount_setup_long_press_to_change),
-                                    Toast.LENGTH_SHORT
-                                )
-                                .show()
+                    zapClick(
+                        baseNote,
+                        accountViewModel,
+                        scope,
+                        context,
+                        onZappingProgress = { progress: Float ->
+                            zappingProgress = progress
+                        },
+                        onMultipleChoices = {
+                            wantsToZap = true
                         }
-                    } else if (!accountViewModel.isWriteable()) {
-                        scope.launch {
-                            Toast
-                                .makeText(
-                                    context,
-                                    context.getString(R.string.login_with_a_private_key_to_be_able_to_send_zaps),
-                                    Toast.LENGTH_SHORT
-                                )
-                                .show()
-                        }
-                    } else if (account.zapAmountChoices.size == 1) {
-                        scope.launch(Dispatchers.IO) {
-                            accountViewModel.zap(
-                                baseNote,
-                                account.zapAmountChoices.first() * 1000,
-                                null,
-                                "",
-                                context,
-                                onError = {
-                                    scope.launch {
-                                        zappingProgress = 0f
-                                        Toast
-                                            .makeText(context, it, Toast.LENGTH_SHORT)
-                                            .show()
-                                    }
-                                },
-                                onProgress = {
-                                    scope.launch(Dispatchers.Main) {
-                                        zappingProgress = it
-                                    }
-                                },
-                                zapType = account.defaultZapType
-                            )
-                        }
-                    } else if (account.zapAmountChoices.size > 1) {
-                        wantsToZap = true
-                    }
+                    )
                 },
                 onLongClick = {
                     wantsToChangeZapAmount = true
@@ -480,7 +462,7 @@ fun ZapReaction(
         }
 
         if (wantsToSetCustomZap) {
-            ZapCustomDialog({ wantsToSetCustomZap = false }, account = account, accountViewModel, baseNote)
+            ZapCustomDialog({ wantsToSetCustomZap = false }, accountViewModel, baseNote)
         }
 
         if (zappingProgress > 0.00001 && zappingProgress < 0.99999) {
@@ -493,7 +475,7 @@ fun ZapReaction(
 
             CircularProgressIndicator(
                 progress = animatedProgress,
-                modifier = Modifier.size(animationSize),
+                modifier = remember { Modifier.size(animationSize) },
                 strokeWidth = 2.dp
             )
         } else {
@@ -509,6 +491,63 @@ fun ZapReaction(
     ZapAmountText(baseNote, grayTint, accountViewModel)
 }
 
+private fun zapClick(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    scope: CoroutineScope,
+    context: Context,
+    onZappingProgress: (Float) -> Unit,
+    onMultipleChoices: () -> Unit
+) {
+    if (accountViewModel.account.zapAmountChoices.isEmpty()) {
+        scope.launch {
+            Toast
+                .makeText(
+                    context,
+                    context.getString(R.string.no_zap_amount_setup_long_press_to_change),
+                    Toast.LENGTH_SHORT
+                )
+                .show()
+        }
+    } else if (!accountViewModel.isWriteable()) {
+        scope.launch {
+            Toast
+                .makeText(
+                    context,
+                    context.getString(R.string.login_with_a_private_key_to_be_able_to_send_zaps),
+                    Toast.LENGTH_SHORT
+                )
+                .show()
+        }
+    } else if (accountViewModel.account.zapAmountChoices.size == 1) {
+        scope.launch(Dispatchers.IO) {
+            accountViewModel.zap(
+                baseNote,
+                accountViewModel.account.zapAmountChoices.first() * 1000,
+                null,
+                "",
+                context,
+                onError = {
+                    scope.launch {
+                        onZappingProgress(0f)
+                        Toast
+                            .makeText(context, it, Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                },
+                onProgress = {
+                    scope.launch(Dispatchers.Main) {
+                        onZappingProgress(it)
+                    }
+                },
+                zapType = accountViewModel.account.defaultZapType
+            )
+        }
+    } else if (accountViewModel.account.zapAmountChoices.size > 1) {
+        onMultipleChoices()
+    }
+}
+
 @Composable
 private fun ZapIcon(
     baseNote: Note,
@@ -519,10 +558,8 @@ private fun ZapIcon(
     var wasZappedByLoggedInUser by remember { mutableStateOf(false) }
     val zapsState by baseNote.live().zaps.observeAsState()
 
-    val scope = rememberCoroutineScope()
-
     LaunchedEffect(key1 = zapsState) {
-        scope.launch(Dispatchers.IO) {
+        launch(Dispatchers.Default) {
             zapsState?.note?.let {
                 if (!wasZappedByLoggedInUser) {
                     val newWasZapped = accountViewModel.calculateIfNoteWasZappedByAccount(it)
@@ -559,17 +596,16 @@ private fun ZapAmountText(
     accountViewModel: AccountViewModel
 ) {
     val zapsState by baseNote.live().zaps.observeAsState()
-    val zappedNote = remember(zapsState) { zapsState?.note } ?: return
-
-    val scope = rememberCoroutineScope()
 
     var zapAmountTxt by remember { mutableStateOf("") }
 
     LaunchedEffect(key1 = zapsState) {
-        scope.launch(Dispatchers.IO) {
-            val newZapAmount = showAmount(accountViewModel.calculateZapAmount(zappedNote))
-            if (newZapAmount != zapAmountTxt) {
-                zapAmountTxt = newZapAmount
+        launch(Dispatchers.Default) {
+            zapsState?.note?.let {
+                val newZapAmount = showAmount(accountViewModel.calculateZapAmount(it))
+                if (newZapAmount != zapAmountTxt) {
+                    zapAmountTxt = newZapAmount
+                }
             }
         }
     }
@@ -582,7 +618,7 @@ private fun ZapAmountText(
 }
 
 @Composable
-public fun ViewCountReaction(
+fun ViewCountReaction(
     idHex: String,
     grayTint: Color,
     iconSize: Dp = 20.dp,
@@ -642,12 +678,15 @@ private fun BoostTypeChoicePopup(baseNote: Note, accountViewModel: AccountViewMo
         offset = IntOffset(0, -50),
         onDismissRequest = { onDismiss() }
     ) {
-        FlowRow() {
+        FlowRow {
+            val scope = rememberCoroutineScope()
             Button(
                 modifier = Modifier.padding(horizontal = 3.dp),
                 onClick = {
-                    accountViewModel.boost(baseNote)
-                    onDismiss()
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.boost(baseNote)
+                        onDismiss()
+                    }
                 },
                 shape = RoundedCornerShape(20.dp),
                 colors = ButtonDefaults

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
@@ -14,39 +16,55 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.unit.sp
-import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.*
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateClickableTextWithEmoji
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 @Composable
-fun ReplyInformation(replyTo: List<Note>?, mentions: List<String>, account: Account, nav: (String) -> Unit) {
-    var dupMentions by remember { mutableStateOf<List<User>?>(null) }
+fun ReplyInformation(
+    replyTo: ImmutableList<Note>?,
+    mentions: ImmutableList<String>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var sortedMentions by remember { mutableStateOf<ImmutableList<User>?>(null) }
 
     LaunchedEffect(Unit) {
         launch(Dispatchers.IO) {
-            dupMentions = mentions.mapNotNull { LocalCache.checkGetOrCreateUser(it) }
+            sortedMentions = mentions.mapNotNull { LocalCache.checkGetOrCreateUser(it) }
+                .toSet()
+                .sortedBy { !accountViewModel.account.userProfile().isFollowingCached(it) }
+                .toImmutableList()
         }
     }
 
-    if (dupMentions != null) {
-        ReplyInformation(replyTo, dupMentions, account) {
+    if (sortedMentions != null) {
+        ReplyInformation(replyTo, sortedMentions) {
             nav("User/${it.pubkeyHex}")
         }
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Account, prefix: String = "", onUserTagClick: (User) -> Unit) {
-    val mentions = dupMentions?.toSet()?.sortedBy { !account.userProfile().isFollowingCached(it) }
-    var expanded by remember { mutableStateOf((mentions?.size ?: 0) <= 2) }
+private fun ReplyInformation(
+    replyTo: ImmutableList<Note>?,
+    sortedMentions: ImmutableList<User>?,
+    prefix: String = "",
+    onUserTagClick: (User) -> Unit
+) {
+    var expanded by remember { mutableStateOf((sortedMentions?.size ?: 0) <= 2) }
 
     FlowRow() {
-        if (mentions != null && mentions.isNotEmpty()) {
+        if (sortedMentions != null && sortedMentions.isNotEmpty()) {
             if (replyTo != null && replyTo.isNotEmpty()) {
-                val repliesToDisplay = if (expanded) mentions else mentions.take(2)
+                val repliesToDisplay = if (expanded) sortedMentions else sortedMentions.take(2)
 
                 Text(
                     stringResource(R.string.replying_to),
@@ -66,7 +84,7 @@ fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Ac
                             )
                         } else if (idx < repliesToDisplay.size - 1) {
                             Text(
-                                "${stringResource(R.string.and)}",
+                                stringResource(R.string.and),
                                 fontSize = 13.sp,
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
@@ -80,13 +98,13 @@ fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Ac
                             )
                         } else if (idx < repliesToDisplay.size) {
                             Text(
-                                "${stringResource(R.string.and)}",
+                                stringResource(R.string.and),
                                 fontSize = 13.sp,
                                 color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
                             )
 
                             ClickableText(
-                                AnnotatedString("${mentions.size - 2}"),
+                                AnnotatedString("${sortedMentions.size - 2}"),
                                 style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
                                 onClick = { expanded = true }
                             )
@@ -105,35 +123,44 @@ fun ReplyInformation(replyTo: List<Note>?, dupMentions: List<User>?, account: Ac
 }
 
 @Composable
-fun ReplyInformationChannel(replyTo: List<Note>?, mentions: List<String>, channel: Channel, account: Account, nav: (String) -> Unit) {
-    var sortedMentions by remember { mutableStateOf<List<User>?>(null) }
+fun ReplyInformationChannel(
+    replyTo: ImmutableList<Note>?,
+    mentions: ImmutableList<String>,
+    channelHex: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var sortedMentions by remember { mutableStateOf<ImmutableList<User>?>(null) }
 
     LaunchedEffect(Unit) {
         launch(Dispatchers.IO) {
             sortedMentions = mentions
                 .mapNotNull { LocalCache.checkGetOrCreateUser(it) }
                 .toSet()
-                .sortedBy { account.isFollowing(it) }
+                .sortedBy { accountViewModel.account.isFollowing(it) }
+                .toImmutableList()
         }
     }
 
     if (sortedMentions != null) {
-        ReplyInformationChannel(
-            replyTo,
-            sortedMentions,
-            channel,
-            onUserTagClick = {
-                nav("User/${it.pubkeyHex}")
-            },
-            onChannelTagClick = {
-                nav("Channel/${it.idHex}")
-            }
-        )
+        LoadChannel(channelHex) { channel ->
+            ReplyInformationChannel(
+                replyTo,
+                sortedMentions,
+                channel,
+                onUserTagClick = {
+                    nav("User/${it.pubkeyHex}")
+                },
+                onChannelTagClick = {
+                    nav("Channel/${it.idHex}")
+                }
+            )
+        }
     }
 }
 
 @Composable
-fun ReplyInformationChannel(replyTo: List<Note>?, mentions: List<User>?, channel: Channel, nav: (String) -> Unit) {
+fun ReplyInformationChannel(replyTo: ImmutableList<Note>?, mentions: ImmutableList<User>?, channel: Channel, nav: (String) -> Unit) {
     ReplyInformationChannel(
         replyTo,
         mentions,
@@ -147,10 +174,11 @@ fun ReplyInformationChannel(replyTo: List<Note>?, mentions: List<User>?, channel
     )
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun ReplyInformationChannel(
-    replyTo: List<Note>?,
-    mentions: List<User>?,
+    replyTo: ImmutableList<Note>?,
+    mentions: ImmutableList<User>?,
     baseChannel: Channel,
     prefix: String = "",
     onUserTagClick: (User) -> Unit,
@@ -159,6 +187,10 @@ fun ReplyInformationChannel(
     val channelState by baseChannel.live.observeAsState()
     val channel = channelState?.channel ?: return
 
+    val channelName = remember(channelState) {
+        AnnotatedString("${channel.info.name} ")
+    }
+
     FlowRow() {
         Text(
             stringResource(R.string.in_channel),
@@ -167,7 +199,7 @@ fun ReplyInformationChannel(
         )
 
         ClickableText(
-            AnnotatedString("${channel.info.name} "),
+            text = channelName,
             style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
             onClick = { onChannelTagClick(channel) }
         )
@@ -209,17 +241,14 @@ private fun ReplyInfoMention(
     onUserTagClick: (User) -> Unit
 ) {
     val innerUserState by user.live().metadata.observeAsState()
-    val innerUser = remember(innerUserState) {
-        innerUserState?.user
-    } ?: return
 
     CreateClickableTextWithEmoji(
-        clickablePart = "$prefix${innerUser.toBestDisplayName()}",
-        tags = innerUser.info?.latestMetadata?.tags,
+        clickablePart = remember(innerUserState) { "$prefix${innerUserState?.user?.toBestDisplayName()}" },
+        tags = remember(innerUserState) { innerUserState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() },
         style = LocalTextStyle.current.copy(
             color = MaterialTheme.colors.primary.copy(alpha = 0.52f),
             fontSize = 13.sp
         ),
-        onClick = { onUserTagClick(innerUser) }
+        onClick = { onUserTagClick(user) }
     )
 }

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

@@ -78,6 +78,7 @@ import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.getFragmentActivity
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import androidx.compose.runtime.rememberCoroutineScope as rememberCoroutineScope
@@ -212,8 +213,8 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, nip47uri: String? = null, account
         Triple(LnZapEvent.ZapType.NONZAP, stringResource(id = R.string.zap_type_nonzap), stringResource(id = R.string.zap_type_nonzap_explainer))
     )
 
-    val zapOptions = zapTypes.map { it.second }
-    val zapOptionExplainers = zapTypes.map { it.third }
+    val zapOptions = remember { zapTypes.map { it.second }.toImmutableList() }
+    val zapOptionExplainers = remember { zapTypes.map { it.third }.toImmutableList() }
 
     LaunchedEffect(accountViewModel) {
         postViewModel.load()

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

@@ -7,18 +7,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.FollowButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.ShowUserButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.UnfollowButton
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 @Composable
 fun UserCompose(
@@ -32,14 +25,6 @@ fun UserCompose(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    val userState by account.userProfile().live().follows.observeAsState()
-    val userFollows = userState?.user ?: return
-
-    val coroutineScope = rememberCoroutineScope()
-
     Column(
         modifier =
         Modifier.clickable(
@@ -50,7 +35,7 @@ fun UserCompose(
             modifier = overallModifier,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, nav, account.userProfile(), 55.dp)
+            UserPicture(baseUser, nav, accountViewModel, 55.dp)
 
             Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
@@ -61,15 +46,7 @@ fun UserCompose(
             }
 
             Column(modifier = Modifier.padding(start = 10.dp)) {
-                if (account.isHidden(baseUser)) {
-                    ShowUserButton {
-                        account.showUser(baseUser.pubkeyHex)
-                    }
-                } else if (userFollows.isFollowingCached(baseUser)) {
-                    UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
-                } else {
-                    FollowButton({ coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } })
-                }
+                UserActionOptions(baseUser, accountViewModel)
             }
         }
 

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

@@ -39,10 +39,12 @@ import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.ui.components.BundledInsert
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
@@ -82,28 +84,48 @@ fun UserReactionsRow(
             )
         }
 
-        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
-            val replies by model.replies.collectAsState()
-            UserReplyReaction(replies[model.today()])
+        Row(verticalAlignment = CenterVertically, modifier = remember { Modifier.weight(1f) }) {
+            UserReplyModel(model)
         }
 
-        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
-            val boosts by model.boosts.collectAsState()
-            UserBoostReaction(boosts[model.today()])
+        Row(verticalAlignment = CenterVertically, modifier = remember { Modifier.weight(1f) }) {
+            UserBoostModel(model)
         }
 
-        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
-            val reactions by model.reactions.collectAsState()
-            UserLikeReaction(reactions[model.today()])
+        Row(verticalAlignment = CenterVertically, modifier = remember { Modifier.weight(1f) }) {
+            UserReactionModel(model)
         }
 
-        Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) {
-            val zaps by model.zaps.collectAsState()
-            UserZapReaction(zaps[model.today()])
+        Row(verticalAlignment = CenterVertically, modifier = remember { Modifier.weight(1f) }) {
+            UserZapModel(model)
         }
     }
 }
 
+@Composable
+private fun UserZapModel(model: UserReactionsViewModel) {
+    val zaps by model.zaps.collectAsState()
+    UserZapReaction(showAmountAxis(zaps[model.today()]))
+}
+
+@Composable
+private fun UserReactionModel(model: UserReactionsViewModel) {
+    val reactions by model.reactions.collectAsState()
+    UserLikeReaction(reactions[model.today()])
+}
+
+@Composable
+private fun UserBoostModel(model: UserReactionsViewModel) {
+    val boosts by model.boosts.collectAsState()
+    UserBoostReaction(boosts[model.today()])
+}
+
+@Composable
+private fun UserReplyModel(model: UserReactionsViewModel) {
+    val replies by model.replies.collectAsState()
+    UserReplyReaction(replies[model.today()])
+}
+
 @Stable
 class UserReactionsViewModel(val account: Account) : ViewModel() {
     val user: User = account.userProfile()
@@ -269,24 +291,29 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     var collectorJob: Job? = null
 
     init {
-        _reactions.value = emptyMap()
-        _boosts.value = emptyMap()
-        _zaps.value = emptyMap()
-        _replies.value = emptyMap()
-        takenIntoAccount = emptySet()
-
         viewModelScope.launch(Dispatchers.IO) {
             initializeSuspend()
 
             collectorJob = viewModelScope.launch(Dispatchers.IO) {
                 LocalCache.live.newEventBundles.collect { newNotes ->
-                    addToStatsSuspend(newNotes)
+                    checkNotInMainThread()
+
+                    invalidateInsertData(newNotes)
                 }
             }
         }
     }
 
+    private val bundlerInsert = BundledInsert<Set<Note>>(250, Dispatchers.IO)
+
+    fun invalidateInsertData(newItems: Set<Note>) {
+        bundlerInsert.invalidateList(newItems) {
+            addToStatsSuspend(it.flatten().toSet())
+        }
+    }
+
     override fun onCleared() {
+        collectorJob?.cancel()
         super.onCleared()
     }
 
@@ -365,10 +392,8 @@ fun UserLikeReaction(
 
 @Composable
 fun UserZapReaction(
-    amount: BigDecimal?
+    amount: String
 ) {
-    val showAmounts = remember(amount) { showAmountAxis(amount) }
-
     Icon(
         imageVector = Icons.Default.Bolt,
         contentDescription = stringResource(R.string.zaps),
@@ -379,7 +404,7 @@ fun UserZapReaction(
     Spacer(modifier = Modifier.width(8.dp))
 
     Text(
-        showAmounts,
+        amount,
         fontWeight = FontWeight.Bold,
         fontSize = 18.sp
     )

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

@@ -11,12 +11,16 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 
 @Composable
 fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier) {
     val noteState by baseNote.live().metadata.observeAsState()
-    val author = remember(noteState) { noteState?.note?.author } ?: return
+    val author = remember(noteState) {
+        noteState?.note?.author
+    } ?: return
 
     UsernameDisplay(author, weight)
 }
@@ -27,7 +31,7 @@ fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier) {
     val bestUserName = remember(userState) { userState?.user?.bestUsername() }
     val bestDisplayName = remember(userState) { userState?.user?.bestDisplayName() }
     val npubDisplay = remember { baseUser.pubkeyDisplayHex() }
-    val tags = remember(userState) { userState?.user?.info?.latestMetadata?.tags }
+    val tags = remember(userState) { userState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
 
     UserNameDisplay(bestUserName, bestDisplayName, npubDisplay, tags, weight)
 }
@@ -37,7 +41,7 @@ private fun UserNameDisplay(
     bestUserName: String?,
     bestDisplayName: String?,
     npubDisplay: String,
-    tags: List<List<String>>?,
+    tags: ImmutableListOfLists<String>?,
     modifier: Modifier
 ) {
     if (bestUserName != null && bestDisplayName != null) {
@@ -47,7 +51,7 @@ private fun UserNameDisplay(
             fontWeight = FontWeight.Bold
         )
         CreateTextWithEmoji(
-            text = "@$bestUserName",
+            text = remember { "@$bestUserName" },
             tags = tags,
             color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
             maxLines = 1,
@@ -65,7 +69,7 @@ private fun UserNameDisplay(
         )
     } else if (bestUserName != null) {
         CreateTextWithEmoji(
-            text = "@$bestUserName",
+            text = remember { "@$bestUserName" },
             tags = tags,
             fontWeight = FontWeight.Bold,
             maxLines = 1,