v0.64.3

Added #Cashu

README.md

@@ -4,6 +4,11 @@
 
 Amethyst brings the best social network to your Android phone. Just insert your Nostr private key and start posting. 
 
+[<img src="./docs/design/obtainium.png"
+alt="Get it on Obtaininum"
+height="80">](https://github.com/ImranR98/Obtainium)
+[<img src="https://github.com/machiav3lli/oandbackupx/raw/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" alt="Get it on GitHub"
+height="80">](https://github.com/vitorpamplona/amethyst/releases)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/com.vitorpamplona.amethyst/)
@@ -11,15 +16,15 @@ Amethyst brings the best social network to your Android phone. Just insert your
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=com.vitorpamplona.amethyst)
 
-Or get the latest APK from the [Releases Section](https://github.com/vitorpamplona/amethyst/releases/latest).
-
 # Current Features
 
 - [x] Event Builders / WebSocket Subscriptions (NIP-01)
 - [x] Home Feed
 - [x] Notifications Feed
 - [x] Global Feed
-- [x] Reactions (likes NIP-25, boost, reply)
+- [x] Replies and mentions (NIP-10)
+- [x] Reactions (NIP-25)
+- [x] Reposts (NIP-18)
 - [x] Image/Video/Url/LnInvoice Previews
 - [x] View Threads
 - [x] Private Messages (NIP-04)
@@ -56,6 +61,7 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Relay Authentication (NIP-42)
 - [x] Content stored in relays themselves (NIP-95)
 - [x] Custom Emoji (NIP-30)
+- [x] Zap Forwarding (NIP-57)
 - [x] Text Note References (NIP-27)
 - [x] Audio Tracks (zapstr.live) (NIP-TBD)
 - [x] Push Notifications (Zaps and Messages)
@@ -65,12 +71,14 @@ Or get the latest APK from the [Releases Section](https://github.com/vitorpamplo
 - [x] Recommended Application Handlers (NIP-89)
 - [x] Events with a Subject (NIP-14)
 - [x] Generic Reposts (kind:16)
-- [x] Live Activities (NIP-102)
+- [x] Live Activities & Live Chats (NIP-102)
+- [x] Relay Pages (NIP-11)
+- [x] HTTP Auth (NIP-98)
+- [x] Zapraiser (NIP-TBD)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
-- [ ] Relay Pages (NIP-11)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Workspaces
 - [ ] Expiration Support (NIP-40)
@@ -186,6 +194,12 @@ Information that you share is publicly visible to anyone reading from relays tha
 ## Information Permanence ##
 Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
 
+# Screenshots
+
+| Home Feed                                 | Messages                                     | Live Streams                                    | Notifications                                          |
+|-------------------------------------------|----------------------------------------------|-------------------------------------------------|--------------------------------------------------------|
+| ![Home Feed](./docs/screenshots/home.png) | ![Messages](./docs/screenshots/messages.png) | ![Live Streams](./docs/screenshots/replies.png) | ![Notifications](./docs/screenshots/notifications.png) |
+
 # Contributing
 
 [Issues](https://github.com/vitorpamplona/amethyst/issues) and [pull requests](https://github.com/vitorpamplona/amethyst/pulls) are very welcome.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 218
-        versionName "0.61.2"
+        versionCode 234
+        versionName "0.64.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -181,7 +181,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.1')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts

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

@@ -14,7 +14,6 @@ import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
@@ -23,6 +22,7 @@ import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.actions.ImageUploader
 
 object ServiceManager {
     private var account: Account? = null
@@ -66,6 +66,7 @@ object ServiceManager {
             NostrHomeDataSource.account = myAccount
             NostrChatroomListDataSource.account = myAccount
             NostrVideoDataSource.account = myAccount
+            ImageUploader.account = myAccount
 
             // Notification Elements
             NostrHomeDataSource.start()
@@ -87,7 +88,6 @@ object ServiceManager {
         NostrChannelDataSource.stop()
         NostrChatroomListDataSource.stop()
 
-        NostrGlobalDataSource.stop()
         NostrSingleChannelDataSource.stop()
         NostrSingleEventDataSource.stop()
         NostrSingleUserDataSource.stop()

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

@@ -322,6 +322,12 @@ class Account(
         }
     }
 
+    fun createHTTPAuthorization(url: String, method: String, body: String? = null): HTTPAuthorizationEvent? {
+        if (!isWriteable()) return null
+
+        return HTTPAuthorizationEvent.create(url, method, body, loggedIn.privKey!!)
+    }
+
     fun boost(note: Note) {
         if (!isWriteable()) return
 
@@ -1128,7 +1134,7 @@ class Account(
             user.countReportAuthorsBy(followingKeySet()) < 5
     }
 
-    fun isAcceptableDirect(note: Note): Boolean {
+    private fun isAcceptableDirect(note: Note): Boolean {
         if (!warnAboutPostsWithReports) {
             return note.reportsBy(userProfile()).isEmpty()
         }
@@ -1222,8 +1228,7 @@ class Account(
             GlobalScope.launch(Dispatchers.IO) {
                 it.cache.spamMessages.snapshot().values.forEach {
                     if (it.pubkeyHex !in transientHiddenUsers && it.duplicatedMessages.size >= 5) {
-                        val userToBlock = LocalCache.getOrCreateUser(it.pubkeyHex)
-                        if (userToBlock != userProfile() && userToBlock.pubkeyHex !in followingKeySet()) {
+                        if (it.pubkeyHex != userProfile().pubkeyHex && it.pubkeyHex !in followingKeySet()) {
                             transientHiddenUsers = transientHiddenUsers + it.pubkeyHex
                             live.invalidateData()
                         }
@@ -1234,6 +1239,7 @@ class Account(
     }
 
     init {
+        Log.d("Init", "Account")
         backupContactList?.let {
             println("Loading saved contacts ${it.toJson()}")
             if (userProfile().latestContactList == null) {

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.model
 
 import android.util.Log
 import android.util.LruCache
+import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.OptOutFromFilters
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
@@ -17,7 +18,6 @@ class AntiSpamFilter {
     val recentMessages = LruCache<Int, String>(1000)
     val spamMessages = LruCache<Int, Spammer>(1000)
 
-    @Synchronized
     fun isSpam(event: Event, relay: Relay?): Boolean {
         checkNotInMainThread()
 
@@ -44,15 +44,9 @@ class AntiSpamFilter {
             Log.w("Potential SPAM Message", "${event.id} ${recentMessages[hash]} ${spamMessages[hash] != null} ${relay?.url} ${event.content.replace("\n", " | ")}")
 
             // Log down offenders
-            if (spamMessages.get(hash) == null) {
-                spamMessages.put(hash, Spammer(event.pubKey, setOf(recentMessages[hash], event.id)))
-                liveSpam.invalidateData()
-            } else {
-                val spammer = spamMessages.get(hash)
-                spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+            logOffender(hash, event)
 
-                liveSpam.invalidateData()
-            }
+            liveSpam.invalidateData()
 
             return true
         }
@@ -62,9 +56,20 @@ class AntiSpamFilter {
         return false
     }
 
+    @Synchronized
+    private fun logOffender(hashCode: Int, event: Event) {
+        if (spamMessages.get(hashCode) == null) {
+            spamMessages.put(hashCode, Spammer(event.pubKey, setOf(recentMessages[hashCode], event.id)))
+        } else {
+            val spammer = spamMessages.get(hashCode)
+            spammer.duplicatedMessages = spammer.duplicatedMessages + event.id
+        }
+    }
+
     val liveSpam: AntiSpamLiveData = AntiSpamLiveData(this)
 }
 
+@Stable
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.

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

@@ -33,7 +33,7 @@ class PublicChatChannel(idHex: String) : Channel(idHex) {
     }
 
     override fun profilePicture(): String? {
-        if (info.picture.isNullOrBlank()) info.picture = null
+        if (info.picture.isNullOrBlank()) return super.profilePicture()
         return info.picture ?: super.profilePicture()
     }
 
@@ -65,7 +65,7 @@ class LiveActivitiesChannel(val address: ATag) : Channel(address.toTag()) {
     }
 
     override fun profilePicture(): String? {
-        return info?.image()?.ifBlank { null } ?: super.profilePicture()
+        return info?.image()?.ifBlank { null }
     }
 
     override fun anyNameStartsWith(prefix: String): Boolean {

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

@@ -1,26 +1,31 @@
 package com.vitorpamplona.amethyst.model
 import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-fun checkForHashtagWithIcon(tag: String): HashtagIcon? {
+fun checkForHashtagWithIcon(tag: String, primary: Color): HashtagIcon? {
     return when (tag.lowercase()) {
-        "bitcoin", "btc", "timechain" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
+        "bitcoin", "btc", "timechain", "bitcoiner", "bitcoiners" -> HashtagIcon(R.drawable.ht_btc, "Bitcoin", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "nostr", "nostrich", "nostriches" -> HashtagIcon(R.drawable.ht_nostr, "Nostr", Color.Unspecified, Modifier.padding(1.dp, 2.dp, 0.dp, 0.dp))
         "lightning", "lightningnetwork" -> HashtagIcon(R.drawable.ht_lightning, "Lightning", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "zap", "zaps", "zapper", "zappers", "zapping", "zapped", "zapathon", "zapraiser", "zaplife", "zapchain" -> HashtagIcon(R.drawable.zap, "Zap", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "amethyst" -> HashtagIcon(R.drawable.amethyst, "Amethyst", Color.Unspecified, Modifier.padding(3.dp, 2.dp, 0.dp, 0.dp))
         "onyx" -> HashtagIcon(R.drawable.black_heart, "Onyx", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
+        "cashu", "ecash", "nut", "nuts", "deeznuts" -> HashtagIcon(R.drawable.cashu, "Cashu", Color.Unspecified, Modifier.padding(1.dp, 3.dp, 0.dp, 0.dp))
         "plebs", "pleb", "plebchain" -> HashtagIcon(R.drawable.plebs, "Pleb", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 1.dp))
         "coffee", "coffeechain", "cafe" -> HashtagIcon(R.drawable.coffee, "Coffee", Color.Unspecified, Modifier.padding(2.dp, 2.dp, 0.dp, 0.dp))
         "skullofsatoshi" -> HashtagIcon(R.drawable.skull, "SkullofSatoshi", Color.Unspecified, Modifier.padding(2.dp, 1.dp, 0.dp, 0.dp))
         "grownostr", "gardening", "garden" -> HashtagIcon(R.drawable.grownostr, "GrowNostr", Color.Unspecified, Modifier.padding(0.dp, 1.dp, 0.dp, 1.dp))
         "footstr" -> HashtagIcon(R.drawable.footstr, "Footstr", Color.Unspecified, Modifier.padding(1.dp, 1.dp, 0.dp, 0.dp))
+        "tunestr", "music", "nowplaying" -> HashtagIcon(R.drawable.tunestr, "Tunestr", primary, Modifier.padding(0.dp, 3.dp, 0.dp, 1.dp))
         "weed", "weedstr", "420", "cannabis", "marijuana" -> HashtagIcon(R.drawable.weed, "Weed", Color.Unspecified, Modifier.padding(0.dp, 0.dp, 0.dp, 0.dp))
         else -> null
     }
 }
+
+@Immutable
 class HashtagIcon(
     val icon: Int,
     val description: String,

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

@@ -1,10 +1,11 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
+import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.service.HexValidator
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.*
-import com.vitorpamplona.amethyst.service.model.ATag.Companion.isATag
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -12,7 +13,6 @@ import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import nostr.postr.toNpub
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -41,19 +41,18 @@ object LocalCache {
         return null
     }
 
-    @Synchronized
     fun getOrCreateUser(key: HexKey): User {
         // checkNotInMainThread()
 
         return users[key] ?: run {
-            val answer = User(key)
-            users.put(key, answer)
-            answer
+            val newObject = User(key)
+            users.putIfAbsent(key, newObject) ?: newObject
         }
     }
 
     fun getUserIfExists(key: String): User? {
-        return users[key]
+        if (key.isEmpty()) return null
+        return users.get(key)
     }
 
     fun getNoteIfExists(key: String): Note? {
@@ -83,14 +82,12 @@ object LocalCache {
         return null
     }
 
-    @Synchronized
     fun getOrCreateNote(idHex: String): Note {
         checkNotInMainThread()
 
-        return notes[idHex] ?: run {
-            val answer = Note(idHex)
-            notes.put(idHex, answer)
-            answer
+        return notes.get(idHex) ?: run {
+            val newObject = Note(idHex)
+            notes.putIfAbsent(idHex, newObject) ?: newObject
         }
     }
 
@@ -112,23 +109,18 @@ object LocalCache {
     }
 
     private fun isValidHexNpub(key: String): Boolean {
-        return try {
-            Hex.decode(key).toNpub()
-            true
-        } catch (e: IllegalArgumentException) {
-            Log.e("LocalCache", "Invalid Key to create user: $key", e)
-            false
-        }
+        if (key.isBlank()) return false
+        if (key.contains(":")) return false
+
+        return HexValidator.isHex(key)
     }
 
-    @Synchronized
     fun getOrCreateChannel(key: String, channelFactory: (String) -> Channel): Channel {
         checkNotInMainThread()
 
         return channels[key] ?: run {
-            val answer = channelFactory(key)
-            channels.put(key, answer)
-            answer
+            val newObject = channelFactory(key)
+            channels.putIfAbsent(key, newObject) ?: newObject
         }
     }
 
@@ -146,16 +138,14 @@ object LocalCache {
         }
     }
 
-    @Synchronized
     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)
-            addressables.put(key.toTag(), answer)
-            answer
+            val newObject = AddressableNote(key)
+            addressables.putIfAbsent(key.toTag(), newObject) ?: newObject
         }
     }
 
@@ -242,7 +232,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)
@@ -314,7 +304,7 @@ object LocalCache {
 
         note.loadEvent(event, author, replyTo)
 
-        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.take(100)} ${formattedDateTime(event.createdAt)}")
+        // Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content()?.split("\n")?.take(100)} ${formattedDateTime(event.createdAt)}")
 
         // Prepares user's profile view.
         author.addNote(note)
@@ -544,8 +534,7 @@ object LocalCache {
 
         // Log.d("PM", "${author.toBestDisplayName()} to ${recipient?.toBestDisplayName()}")
 
-        val repliesTo = event.tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-            .mapNotNull { checkGetOrCreateNote(it) }
+        val repliesTo = event.taggedEvents().mapNotNull { checkGetOrCreateNote(it) }
 
         note.loadEvent(event, author, repliesTo)
 
@@ -1280,12 +1269,13 @@ object LocalCache {
     }
 }
 
+@Stable
 class LocalCacheLiveData {
     private val _newEventBundles = MutableSharedFlow<Set<Note>>()
     val newEventBundles = _newEventBundles.asSharedFlow() // read-only public view
 
     // Refreshes observers in batches.
-    private val bundler = BundledInsert<Note>(300, Dispatchers.IO)
+    private val bundler = BundledInsert<Note>(1000, Dispatchers.IO)
 
     fun invalidateData(newNote: Note) {
         bundler.invalidateList(newNote) { bundledNewNotes ->

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

@@ -30,7 +30,14 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
     override fun toNEvent() = address.toNAddr()
     override fun idDisplayNote() = idNote().toShortenHex()
     override fun address() = address
-    override fun createdAt() = (event as? LongTextNoteEvent)?.publishedAt() ?: event?.createdAt()
+    override fun createdAt(): Long? {
+        if (event == null) return null
+
+        val publishedAt = (event as? LongTextNoteEvent)?.publishedAt() ?: Long.MAX_VALUE
+        val lastCreatedAt = event?.createdAt() ?: Long.MAX_VALUE
+
+        return minOf(publishedAt, lastCreatedAt)
+    }
 }
 
 @Stable
@@ -70,11 +77,20 @@ open class Note(val idHex: String) {
     open fun idDisplayNote() = idNote().toShortenHex()
 
     fun channelHex(): HexKey? {
-        return (event as? ChannelMessageEvent)?.channel()
-            ?: (event as? ChannelMetadataEvent)?.channel()
-            ?: (event as? ChannelCreateEvent)?.id
-            ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
-            ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        return if (event is ChannelMessageEvent ||
+            event is ChannelMetadataEvent ||
+            event is ChannelCreateEvent ||
+            event is LiveActivitiesChatMessageEvent ||
+            event is LiveActivitiesEvent
+        ) {
+            (event as? ChannelMessageEvent)?.channel()
+                ?: (event as? ChannelMetadataEvent)?.channel()
+                ?: (event as? ChannelCreateEvent)?.id
+                ?: (event as? LiveActivitiesChatMessageEvent)?.activity()?.toTag()
+                ?: (event as? LiveActivitiesEvent)?.address()?.toTag()
+        } else {
+            null
+        }
     }
 
     open fun address(): ATag? = null
@@ -486,13 +502,13 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {
-            // if (hasObservers()) {
-            postValue(NoteState(note))
-            // }
+            if (hasActiveObservers()) {
+                postValue(NoteState(note))
+            }
         }
     }
 

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

@@ -0,0 +1,250 @@
+package com.vitorpamplona.amethyst.model
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import java.lang.reflect.Type
+
+class RelayInformation(
+    val name: String?,
+    val description: String?,
+    val pubkey: String?,
+    val contact: String?,
+    val supported_nips: List<Int>?,
+    val supported_nip_extensions: List<String>?,
+    val software: String?,
+    val version: String?,
+    val limitation: RelayInformationLimitation?,
+    val relay_countries: List<String>?,
+    val language_tags: List<String>?,
+    val tags: List<String>?,
+    val posting_policy: String?,
+    val payments_url: String?,
+    val fees: RelayInformationFees?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformation::class.java, RelayInformationSerializer())
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformation = gson.fromJson(json, RelayInformation::class.java)
+    }
+}
+
+class RelayInformationFee(
+    val amount: Int?,
+    val unit: String?,
+    val period: Int?,
+    val kinds: List<Int>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFee::class.java, RelayInformationFeeSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFee = gson.fromJson(json, RelayInformationFee::class.java)
+    }
+}
+
+private class RelayInformationFeeSerializer : JsonSerializer<RelayInformationFee> {
+    override fun serialize(
+        src: RelayInformationFee,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("amount", src.amount)
+            addProperty("unit", src.unit)
+            addProperty("period", src.period)
+            add(
+                "kinds",
+                JsonArray().also { kinds ->
+                    src.kinds?.forEach { kind ->
+                        kinds.add(
+                            kind
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationFees(
+    val admission: List<RelayInformationFee>?,
+    val subscription: List<RelayInformationFee>?,
+    val publication: List<RelayInformationFee>?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationFees::class.java, RelayInformationFeesSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationFees = gson.fromJson(json, RelayInformationFees::class.java)
+    }
+}
+
+private class RelayInformationFeesSerializer : JsonSerializer<RelayInformationFees> {
+    override fun serialize(
+        src: RelayInformationFees,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            add(
+                "admission",
+                JsonArray().also { admissions ->
+                    src.admission?.forEach { admission ->
+                        admissions.add(
+                            admission.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "publication",
+                JsonArray().also { publications ->
+                    src.publication?.forEach { publication ->
+                        publications.add(
+                            publication.toString()
+                        )
+                    }
+                }
+            )
+            add(
+                "subscription",
+                JsonArray().also { subscriptions ->
+                    src.subscription?.forEach { subscription ->
+                        subscriptions.add(
+                            subscription.toString()
+                        )
+                    }
+                }
+            )
+        }
+    }
+}
+
+class RelayInformationLimitation(
+    val max_message_length: Int?,
+    val max_subscriptions: Int?,
+    val max_filters: Int?,
+    val max_limit: Int?,
+    val max_subid_length: Int?,
+    val min_prefix: Int?,
+    val max_event_tags: Int?,
+    val max_content_length: Int?,
+    val min_pow_difficulty: Int?,
+    val auth_required: Boolean?,
+    val payment_required: Boolean?
+) {
+    companion object {
+        val gson: Gson = GsonBuilder()
+            .disableHtmlEscaping()
+            .registerTypeAdapter(RelayInformationLimitation::class.java, RelayInformationLimitationSerializer())
+            .create()
+
+        fun fromJson(json: String): RelayInformationLimitation = gson.fromJson(json, RelayInformationLimitation::class.java)
+    }
+}
+
+private class RelayInformationLimitationSerializer : JsonSerializer<RelayInformationLimitation> {
+    override fun serialize(
+        src: RelayInformationLimitation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("max_message_length", src.max_message_length)
+            addProperty("max_subscriptions", src.max_subscriptions)
+            addProperty("max_filters", src.max_filters)
+            addProperty("max_limit", src.max_limit)
+            addProperty("max_subid_length", src.max_subid_length)
+            addProperty("min_prefix", src.min_prefix)
+            addProperty("max_event_tags", src.max_event_tags)
+            addProperty("max_content_length", src.max_content_length)
+            addProperty("min_pow_difficulty", src.min_pow_difficulty)
+            addProperty("auth_required", src.auth_required)
+            addProperty("payment_required", src.payment_required)
+        }
+    }
+}
+
+private class RelayInformationSerializer : JsonSerializer<RelayInformation> {
+    override fun serialize(
+        src: RelayInformation,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement {
+        return JsonObject().apply {
+            addProperty("name", src.name)
+            addProperty("description", src.description)
+            addProperty("pubkey", src.pubkey)
+            addProperty("contact", src.contact)
+            add(
+                "supported_nip_extensions",
+                JsonArray().also { supported_nip_extensions ->
+                    src.supported_nip_extensions?.forEach { nip ->
+                        supported_nip_extensions.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            add(
+                "supported_nips",
+                JsonArray().also { supported_nips ->
+                    src.supported_nips?.forEach { nip ->
+                        supported_nips.add(
+                            nip
+                        )
+                    }
+                }
+            )
+            addProperty("software", src.software)
+            addProperty("version", src.version)
+            add(
+                "relay_countries",
+                JsonArray().also { relay_countries ->
+                    src.relay_countries?.forEach { country ->
+                        relay_countries.add(
+                            country
+                        )
+                    }
+                }
+            )
+            add(
+                "language_tags",
+                JsonArray().also { language_tags ->
+                    src.language_tags?.forEach { language_tag ->
+                        language_tags.add(
+                            language_tag
+                        )
+                    }
+                }
+            )
+            add(
+                "tags",
+                JsonArray().also { tags ->
+                    src.tags?.forEach { tag ->
+                        tags.add(
+                            tag
+                        )
+                    }
+                }
+            )
+            addProperty("posting_policy", src.posting_policy)
+            addProperty("payments_url", src.payments_url)
+        }
+    }
+}

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

@@ -12,5 +12,6 @@ data class RelaySetupInfo(
     val downloadCountInBytes: Int = 0,
     val uploadCountInBytes: Int = 0,
     val spamCount: Int = 0,
-    val feedTypes: Set<FeedType>
+    val feedTypes: Set<FeedType>,
+    val paidRelay: Boolean = false
 )

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

@@ -1,12 +1,14 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.LruCache
+import androidx.compose.runtime.Stable
 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
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 
+@Stable
 object UrlCachedPreviewer {
     var cache = LruCache<String, UrlPreviewState>(100)
         private set

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

@@ -12,6 +12,8 @@ import com.vitorpamplona.amethyst.service.model.MetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
@@ -144,8 +146,10 @@ class User(val pubkeyHex: String) {
     }
 
     fun updateAcceptedBadges(note: AddressableNote) {
-        acceptedBadges = note
-        liveSet?.badges?.invalidateData()
+        if (acceptedBadges?.idHex != note.idHex) {
+            acceptedBadges = note
+            liveSet?.badges?.invalidateData()
+        }
     }
 
     fun addZap(zapRequest: Note, zap: Note?) {
@@ -185,34 +189,34 @@ class User(val pubkeyHex: String) {
     }
 
     @Synchronized
-    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+    private fun getOrCreatePrivateChatroomSync(user: User): Chatroom {
         checkNotInMainThread()
 
         return privateChatrooms[user] ?: run {
-            val privateChatroom = Chatroom(setOf<Note>())
+            val privateChatroom = Chatroom()
             privateChatrooms = privateChatrooms + Pair(user, privateChatroom)
             privateChatroom
         }
     }
 
-    @Synchronized
-    fun addMessage(user: User, msg: Note) {
-        checkNotInMainThread()
+    private fun getOrCreatePrivateChatroom(user: User): Chatroom {
+        return privateChatrooms[user] ?: getOrCreatePrivateChatroomSync(user)
+    }
 
+    fun addMessage(user: User, msg: Note) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages + msg
+            privateChatroom.addMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
 
-    @Synchronized
     fun removeMessage(user: User, msg: Note) {
         checkNotInMainThread()
 
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
-            privateChatroom.roomMessages = privateChatroom.roomMessages - msg
+            privateChatroom.removeMessageSync(msg)
             liveSet?.messages?.invalidateData()
         }
     }
@@ -235,6 +239,7 @@ class User(val pubkeyHex: String) {
         info = newUserInfo
         info?.latestMetadata = latestMetadata
         info?.updatedMetadataAt = latestMetadata.createdAt
+        info?.tags = latestMetadata.tags.toImmutableListOfLists()
 
         if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
             try {
@@ -371,7 +376,27 @@ data class RelayInfo(
     var counter: Long
 )
 
-data class Chatroom(var roomMessages: Set<Note>)
+class Chatroom() {
+    var roomMessages: Set<Note> = setOf()
+
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+        }
+    }
+
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+        }
+    }
+}
 
 @Stable
 class UserMetadata {
@@ -399,6 +424,7 @@ class UserMetadata {
 
     var updatedMetadataAt: Long = 0
     var latestMetadata: MetadataEvent? = null
+    var tags: ImmutableListOfLists<String>? = null
 
     fun anyName(): String? {
         return display_name ?: displayName ?: name ?: username
@@ -412,11 +438,28 @@ class UserMetadata {
     fun lnAddress(): String? {
         return (lud16?.trim() ?: lud06?.trim())?.ifBlank { null }
     }
+
+    fun bestUsername(): String? {
+        return name?.ifBlank { null } ?: username?.ifBlank { null }
+    }
+
+    fun bestDisplayName(): String? {
+        return displayName?.ifBlank { null } ?: display_name?.ifBlank { null }
+    }
+
+    fun nip05(): String? {
+        return nip05?.ifBlank { null }
+    }
+
+    fun profilePicture(): String? {
+        if (picture.isNullOrBlank()) picture = null
+        return picture
+    }
 }
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.IO)
+    private val bundler = BundledUpdate(500, Dispatchers.IO)
 
     fun invalidateData() {
         bundler.invalidate() {

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

@@ -49,6 +49,8 @@ object BlurHashDecoder {
      *                 By default it is true.
      */
     fun decode(blurHash: String?, width: Int, height: Int, punch: Float = 1f, useCache: Boolean = true): Bitmap? {
+        checkNotInMainThread()
+
         if (blurHash == null || blurHash.length < 6) {
             return null
         }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Stable
 import androidx.core.graphics.drawable.toDrawable
 import coil.ImageLoader
 import coil.decode.DataSource
@@ -14,6 +15,7 @@ import java.net.URLDecoder
 import java.net.URLEncoder
 import kotlin.math.roundToInt
 
+@Stable
 class BlurHashFetcher(
     private val options: Options,
     private val data: Uri

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

@@ -0,0 +1,274 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import android.util.Patterns
+import androidx.compose.runtime.Immutable
+import com.linkedin.urls.detection.UrlDetector
+import com.linkedin.urls.detection.UrlDetectorOptions
+import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlContent
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
+import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
+import com.vitorpamplona.amethyst.ui.components.hashTagsPattern
+import com.vitorpamplona.amethyst.ui.components.imageExtensions
+import com.vitorpamplona.amethyst.ui.components.startsWithNIP19Scheme
+import com.vitorpamplona.amethyst.ui.components.tagIndex
+import com.vitorpamplona.amethyst.ui.components.videoExtensions
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
+import kotlinx.collections.immutable.toImmutableSet
+import java.util.regex.Pattern
+
+@Immutable
+data class RichTextViewerState(
+    val urlSet: ImmutableSet<String>,
+    val imagesForPager: ImmutableMap<String, ZoomableUrlContent>,
+    val imageList: ImmutableList<ZoomableUrlContent>,
+    val customEmoji: ImmutableMap<String, String>,
+    val paragraphs: ImmutableList<ImmutableList<Segment>>
+)
+
+object CachedRichTextParser {
+    val richTextCache = LruCache<String, RichTextViewerState>(200)
+
+    fun parseText(content: String, tags: ImmutableListOfLists<String>): RichTextViewerState {
+        return if (richTextCache[content] != null) {
+            richTextCache[content]
+        } else {
+            val newUrls = RichTextParser().parseText(content, tags)
+            richTextCache.put(content, newUrls)
+            newUrls
+        }
+    }
+}
+
+val longDatePattern: Pattern = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$")
+val shortDatePattern: Pattern = Pattern.compile("^\\d{2}-\\d{2}-\\d{2}$")
+val numberPattern: Pattern = Pattern.compile("^(-?[\\d.]+)([a-zA-Z%]*)$")
+
+// Group 1 = url, group 4 additional chars
+val noProtocolUrlValidator = Pattern.compile("(([\\w\\d-]+\\.)*[a-zA-Z][\\w-]+[\\.\\:]\\w+([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)(.*)")
+
+class RichTextParser() {
+    fun parseText(
+        content: String,
+        tags: ImmutableListOfLists<String>
+    ): RichTextViewerState {
+        val urls = UrlDetector(content, UrlDetectorOptions.Default).detect()
+
+        val urlSet = urls.mapNotNullTo(LinkedHashSet(urls.size)) {
+            // removes e-mails
+            if (Patterns.EMAIL_ADDRESS.matcher(it.originalUrl).matches()) {
+                null
+            } else if (isNumber(it.originalUrl)) {
+                null
+            } else {
+                it.originalUrl
+            }
+        }
+
+        val imagesForPager = urlSet.mapNotNull { fullUrl ->
+            val removedParamsFromUrl = fullUrl.split("?")[0].lowercase()
+            if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlImage(fullUrl)
+            } else if (videoExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                ZoomableUrlVideo(fullUrl)
+            } else {
+                null
+            }
+        }.associateBy { it.url }
+        val imageList = imagesForPager.values.toList()
+
+        val emojiMap =
+            tags.lists.filter { it.size > 2 && it[0] == "emoji" }.associate { ":${it[1]}:" to it[2] }
+
+        val segments = findTextSegments(content, imagesForPager.keys, urlSet, emojiMap, tags)
+
+        return RichTextViewerState(
+            urlSet.toImmutableSet(),
+            imagesForPager.toImmutableMap(),
+            imageList.toImmutableList(),
+            emojiMap.toImmutableMap(),
+            segments
+        )
+    }
+
+    private fun findTextSegments(content: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): ImmutableList<ImmutableList<Segment>> {
+        var paragraphSegments = persistentListOf<ImmutableList<Segment>>()
+
+        content.split('\n').forEach { paragraph ->
+            var segments = persistentListOf<Segment>()
+            var isDirty = false
+
+            val wordList = paragraph.split(' ')
+            wordList.forEach { word ->
+                val wordSegment = wordIdentifier(word, images, urls, emojis, tags)
+                if (wordSegment !is RegularTextSegment) {
+                    isDirty = true
+                }
+                segments = segments.add(wordSegment)
+            }
+
+            val newSegments = if (isDirty) {
+                if (isArabic(paragraph)) {
+                    segments.asReversed().toImmutableList()
+                } else {
+                    segments
+                }
+            } else {
+                persistentListOf<Segment>(RegularTextSegment(paragraph))
+            }
+
+            paragraphSegments = paragraphSegments.add(newSegments)
+        }
+
+        return paragraphSegments
+    }
+
+    fun isNumber(word: String): Boolean {
+        return numberPattern.matcher(word).matches()
+    }
+
+    fun isDate(word: String): Boolean {
+        return shortDatePattern.matcher(word).matches() || longDatePattern.matcher(word).matches()
+    }
+
+    private fun isArabic(text: String): Boolean {
+        return text.any { it in '\u0600'..'\u06FF' || it in '\u0750'..'\u077F' }
+    }
+
+    private fun wordIdentifier(word: String, images: Set<String>, urls: Set<String>, emojis: Map<String, String>, tags: ImmutableListOfLists<String>): Segment {
+        val emailMatcher = Patterns.EMAIL_ADDRESS.matcher(word)
+        val phoneMatcher = Patterns.PHONE.matcher(word)
+        val schemelessMatcher = noProtocolUrlValidator.matcher(word)
+
+        return if (word.isEmpty()) {
+            RegularTextSegment(word)
+        } else if (images.contains(word)) {
+            ImageSegment(word)
+        } else if (urls.contains(word)) {
+            LinkSegment(word)
+        } else if (emojis.any { word.contains(it.key) }) {
+            EmojiSegment(word)
+        } else if (word.startsWith("lnbc", true)) {
+            InvoiceSegment(word)
+        } else if (word.startsWith("lnurl", true)) {
+            WithdrawSegment(word)
+        } else if (word.startsWith("cashuA", true)) {
+            CashuSegment(word)
+        } else if (emailMatcher.matches()) {
+            EmailSegment(word)
+        } else if (word.length in 7..14 && !isDate(word) && phoneMatcher.matches()) {
+            PhoneSegment(word)
+        } else if (startsWithNIP19Scheme(word)) {
+            BechSegment(word)
+        } else if (word.startsWith("#")) {
+            parseHash(word, tags)
+        } else if (schemelessMatcher.find()) {
+            val url = schemelessMatcher.group(1) // url
+            val additionalChars = schemelessMatcher.group(4) // additional chars
+            if (url != null) {
+                SchemelessUrlSegment(word, url, additionalChars)
+            } else {
+                RegularTextSegment(word)
+            }
+        } else {
+            RegularTextSegment(word)
+        }
+    }
+
+    private fun parseHash(word: String, tags: ImmutableListOfLists<String>): Segment {
+        // First #[n]
+
+        val matcher = tagIndex.matcher(word)
+        try {
+            if (matcher.find()) {
+                val index = matcher.group(1)?.toInt()
+                val suffix = matcher.group(2)
+
+                if (index != null && index >= 0 && index < tags.lists.size) {
+                    val tag = tags.lists[index]
+
+                    if (tag.size > 1) {
+                        if (tag[0] == "p") {
+                            return HashIndexUserSegment(word, tag[1], suffix)
+                        } else if (tag[0] == "e" || tag[0] == "a") {
+                            return HashIndexEventSegment(word, tag[1], suffix)
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.w("Tag Parser", "Couldn't link tag $word", e)
+        }
+
+        // Second #Amethyst
+        val hashtagMatcher = hashTagsPattern.matcher(word)
+
+        try {
+            if (hashtagMatcher.find()) {
+                val hashtag = hashtagMatcher.group(1)
+                if (hashtag != null) {
+                    return HashTagSegment(word, hashtag, hashtagMatcher.group(2))
+                }
+            }
+        } catch (e: Exception) {
+            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+        }
+
+        return RegularTextSegment(word)
+    }
+}
+
+@Immutable
+open class Segment(val segmentText: String)
+
+@Immutable
+class ImageSegment(segment: String) : Segment(segment)
+
+@Immutable
+class LinkSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmojiSegment(segment: String) : Segment(segment)
+
+@Immutable
+class InvoiceSegment(segment: String) : Segment(segment)
+
+@Immutable
+class WithdrawSegment(segment: String) : Segment(segment)
+
+@Immutable
+class CashuSegment(segment: String) : Segment(segment)
+
+@Immutable
+class EmailSegment(segment: String) : Segment(segment)
+
+@Immutable
+class PhoneSegment(segment: String) : Segment(segment)
+
+@Immutable
+class BechSegment(segment: String) : Segment(segment)
+
+@Immutable
+open class HashIndexSegment(segment: String, val hex: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class HashIndexUserSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashIndexEventSegment(segment: String, hex: String, extras: String?) : HashIndexSegment(segment, hex, extras)
+
+@Immutable
+class HashTagSegment(segment: String, val hashtag: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class SchemelessUrlSegment(segment: String, val url: String, val extras: String?) : Segment(segment)
+
+@Immutable
+class RegularTextSegment(segment: String) : Segment(segment)

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

@@ -0,0 +1,98 @@
+package com.vitorpamplona.amethyst.service
+
+import androidx.compose.runtime.Immutable
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.ui.components.GenericLoadable
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.util.Base64
+
+@Immutable
+data class CashuToken(
+    val token: String,
+    val mint: String,
+    val totalAmount: Long,
+    val fees: Int,
+    val redeemInvoiceAmount: Long,
+    val proofs: JsonArray
+)
+
+class CashuProcessor {
+    fun parse(cashuToken: String): GenericLoadable<CashuToken> {
+        checkNotInMainThread()
+
+        try {
+            val base64token = cashuToken.replace("cashuA", "")
+            val cashu = JsonParser.parseString(String(Base64.getDecoder().decode(base64token)))
+            val token = cashu.asJsonObject.get("token").asJsonArray[0].asJsonObject
+            val proofs = token["proofs"].asJsonArray
+            val mint = token["mint"].asString
+
+            var totalAmount = 0L
+            for (proof in proofs) {
+                totalAmount += proof.asJsonObject["amount"].asLong
+            }
+            val fees = Math.max(((totalAmount * 0.02).toInt()), 2)
+            val redeemInvoiceAmount = totalAmount - fees
+
+            return GenericLoadable.Loaded(CashuToken(cashuToken, mint, totalAmount, fees, redeemInvoiceAmount, proofs))
+        } catch (e: Exception) {
+            return GenericLoadable.Error<CashuToken>("Could not parse this cashu token")
+        }
+    }
+
+    fun melt(token: CashuToken, lud16: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        checkNotInMainThread()
+
+        runCatching {
+            LightningAddressResolver().lnAddressInvoice(
+                lnaddress = lud16,
+                milliSats = token.redeemInvoiceAmount * 1000, // Make invoice and leave room for fees
+                message = "Reedem Cashu",
+                onSuccess = { invoice ->
+                    meltInvoice(token, invoice, onSuccess, onError)
+                },
+                onProgress = {
+                },
+                onError = onError
+            )
+        }
+    }
+
+    private fun meltInvoice(token: CashuToken, invoice: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+        try {
+            val client = HttpClient.getHttpClient()
+            val url = token.mint + "/melt" // Melt cashu tokens at Mint
+
+            val jsonObject = JsonObject()
+            jsonObject.add("proofs", token.proofs)
+            jsonObject.addProperty("pr", invoice)
+
+            val mediaType = "application/json; charset=utf-8".toMediaType()
+            val requestBody = jsonObject.toString().toRequestBody(mediaType)
+            val request = Request.Builder()
+                .url(url)
+                .post(requestBody)
+                .build()
+
+            val response = client.newCall(request).execute()
+            val body = response.body.string()
+            val tree = jacksonObjectMapper().readTree(body)
+
+            val successful = tree?.get("paid")?.asText() == "true"
+
+            if (successful) {
+                onSuccess("Redeemed ${token.totalAmount} Sats" + " (Fees: ${token.fees} Sats)")
+            } else {
+                onError(tree?.get("detail")?.asText()?.split('.')?.getOrNull(0) ?: "Cashu: Tokens already spent.")
+            }
+        } catch (e: Exception) {
+            onError("Token melt failure: " + e.message)
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.service
+
+object HexValidator {
+
+    private fun isHex2(c: Char): Boolean {
+        return when (c) {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F', ' ' -> true
+            else -> false
+        }
+    }
+
+    fun isHex(hex: String?): Boolean {
+        if (hex == null) return false
+        var isHex = true
+        for (c in hex.toCharArray()) {
+            if (!isHex2(c)) {
+                isHex = false
+                break
+            }
+        }
+        return isHex
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.service
 
+import androidx.compose.runtime.Immutable
 import java.util.regex.Pattern
 
+@Immutable
 class NIP30Parser {
     val customEmojiPattern: Pattern = Pattern.compile("\\:([A-Za-z0-9_\\-]+)\\:", Pattern.CASE_INSENSITIVE)
 
@@ -18,7 +20,7 @@ class NIP30Parser {
 
         val regularChars = input.split(customEmojiPattern.toRegex())
 
-        var finalList = mutableListOf<String>()
+        val finalList = mutableListOf<String>()
         var index = 0
         for (e in regularChars) {
             finalList.add(e)

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

@@ -19,6 +19,9 @@ class Nip05Verifier() {
         if (parts.size == 2) {
             return "https://${parts[1]}/.well-known/nostr.json?name=${parts[0]}"
         }
+        if (parts.size == 1) {
+            return "https://${parts[0]}/.well-known/nostr.json?name=_"
+        }
 
         return null
     }
@@ -31,7 +34,7 @@ class Nip05Verifier() {
     }
 
     private suspend fun fetchNip05JsonSuspend(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val url = assembleUrl(nip05)
 
@@ -49,6 +52,8 @@ class Nip05Verifier() {
 
                 HttpClient.getHttpClient().newCall(request).enqueue(object : Callback {
                     override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+
                         response.use {
                             if (it.isSuccessful) {
                                 onSuccess(it.body.string())
@@ -71,13 +76,15 @@ class Nip05Verifier() {
 
     fun verifyNip05(nip05: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
         // check fails on tests
-        // checkNotInMainThread()
+        checkNotInMainThread()
 
         val mapper = jacksonObjectMapper()
 
         fetchNip05Json(
             nip05,
             onSuccess = {
+                checkNotInMainThread()
+
                 // NIP05 usernames are case insensitive, but JSON properties are not
                 // converts the json to lowercase and then tries to access the username via a
                 // lowercase version of the username.
@@ -88,7 +95,12 @@ class Nip05Verifier() {
                     null
                 }
 
-                val user = nip05.split("@")[0].lowercase()
+                val parts = nip05.split("@")
+                val user = if (parts.size == 2) {
+                    parts[0].lowercase()
+                } else {
+                    "_"
+                }
 
                 val hexKey = nip05url?.get("names")?.get(user)?.asText()
 

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

@@ -70,6 +70,7 @@ abstract class NostrDataSource(val debugName: String) {
     }
 
     init {
+        Log.d("Init", "${this.javaClass.simpleName} Subscribe")
         Client.subscribe(clientListener)
     }
 

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

@@ -1,28 +0,0 @@
-package com.vitorpamplona.amethyst.service
-
-import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
-import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
-import com.vitorpamplona.amethyst.service.model.HighlightEvent
-import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
-import com.vitorpamplona.amethyst.service.model.PinListEvent
-import com.vitorpamplona.amethyst.service.model.PollNoteEvent
-import com.vitorpamplona.amethyst.service.model.TextNoteEvent
-import com.vitorpamplona.amethyst.service.relays.FeedType
-import com.vitorpamplona.amethyst.service.relays.JsonFilter
-import com.vitorpamplona.amethyst.service.relays.TypedFilter
-
-object NostrGlobalDataSource : NostrDataSource("GlobalFeed") {
-    fun createGlobalFilter() = TypedFilter(
-        types = setOf(FeedType.GLOBAL),
-        filter = JsonFilter(
-            kinds = listOf(TextNoteEvent.kind, PollNoteEvent.kind, ChannelMessageEvent.kind, AudioTrackEvent.kind, PinListEvent.kind, LongTextNoteEvent.kind, HighlightEvent.kind),
-            limit = 200
-        )
-    )
-
-    val globalFeedChannel = requestNewChannel()
-
-    override fun updateChannelFilters() {
-        globalFeedChannel.typedFilters = listOf(createGlobalFilter()).ifEmpty { null }
-    }
-}

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

@@ -51,13 +51,13 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
     }
 
     fun createFollowAccountsFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
+        val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
 
-        val followKeys = follows.map {
+        val followKeys = follows?.map {
             it.substring(0, 6)
         }
 
-        val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))
+        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 6))
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),

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

@@ -0,0 +1,40 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.BuildConfig
+import okhttp3.Request
+
+@Immutable
+data class OnlineCheckResult(val timeInMs: Long, val online: Boolean)
+
+object OnlineChecker {
+    val checkOnlineCache = LruCache<String, OnlineCheckResult>(10)
+    val fiveMinutes = 1000 * 60 * 5
+
+    fun isOnline(url: String?): Boolean {
+        checkNotInMainThread()
+
+        if (url.isNullOrBlank()) return false
+        if ((checkOnlineCache.get(url)?.timeInMs ?: 0) > System.currentTimeMillis() - fiveMinutes) {
+            return checkOnlineCache.get(url).online
+        }
+
+        val request = Request.Builder()
+            .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+            .url(url)
+            .get()
+            .build()
+
+        return try {
+            val result = HttpClient.getHttpClient().newCall(request).execute().code == 200
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), result))
+            result
+        } catch (e: Exception) {
+            checkOnlineCache.put(url, OnlineCheckResult(System.currentTimeMillis(), false))
+            Log.e("LiveActivities", "Failed to check streaming url $url", e)
+            false
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst.service
+
+fun String.isUTF16Char(pos: Int): Boolean {
+    return Character.charCount(this.codePointAt(pos)) == 2
+}
+
+fun String.firstFullChar(): String {
+    return when (this.length) {
+        0, 1 -> return this
+        2, 3 -> return if (isUTF16Char(0)) this.take(2) else this.take(1)
+        else -> {
+            val first = isUTF16Char(0)
+            val second = isUTF16Char(2)
+            if (first && second) {
+                this.take(4)
+            } else if (first) {
+                this.take(2)
+            } else {
+                this.take(1)
+            }
+        }
+    }
+}

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

@@ -55,28 +55,32 @@ class LightningAddressResolver() {
             return
         }
 
-        withContext(Dispatchers.IO) {
-            val request: Request = Request.Builder()
-                .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-                .url(url)
-                .build()
+        try {
+            withContext(Dispatchers.IO) {
+                val request: Request = Request.Builder()
+                    .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
+                    .url(url)
+                    .build()
 
-            client.newCall(request).enqueue(object : Callback {
-                override fun onResponse(call: Call, response: Response) {
-                    response.use {
-                        if (it.isSuccessful) {
-                            onSuccess(it.body.string())
-                        } else {
-                            onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                client.newCall(request).enqueue(object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        response.use {
+                            if (it.isSuccessful) {
+                                onSuccess(it.body.string())
+                            } else {
+                                onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                            }
                         }
                     }
-                }
 
-                override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
-                    e.printStackTrace()
-                }
-            })
+                    override fun onFailure(call: Call, e: java.io.IOException) {
+                        onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+                        e.printStackTrace()
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
         }
     }
 

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

@@ -46,5 +46,6 @@ class ChannelCreateEvent(
         }
     }
 
-    data class ChannelData(var name: String?, var about: String?, var picture: String?)
+    @Immutable
+    data class ChannelData(val name: String?, val about: String?, val picture: String?)
 }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import com.google.gson.reflect.TypeToken
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.decodePublicKey
@@ -12,6 +13,7 @@ import java.util.Date
 @Immutable
 data class Contact(val pubKeyHex: String, val relayUri: String?)
 
+@Stable
 class ContactListEvent(
     id: HexKey,
     pubKey: HexKey,

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

@@ -55,7 +55,7 @@ open class Event(
     }
 
     override fun zapraiserAmount() = tags.firstOrNull() {
-        (it.size > 1 && it[0].equals("zapraiser", true))
+        (it.size > 1 && it[0] == "zapraiser")
     }?.get(1)?.toLongOrNull()
 
     override fun zapAddress() = tags.firstOrNull { it.size > 1 && it[0] == "zap" }?.get(1)

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

@@ -0,0 +1,49 @@
+package com.vitorpamplona.amethyst.service.model
+
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.HexKey
+import com.vitorpamplona.amethyst.model.toHexKey
+import nostr.postr.Utils
+import java.security.MessageDigest
+import java.util.Date
+
+@Immutable
+class HTTPAuthorizationEvent(
+    id: HexKey,
+    pubKey: HexKey,
+    createdAt: Long,
+    tags: List<List<String>>,
+    content: String,
+    sig: HexKey
+) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+    companion object {
+        const val kind = 27235
+
+        fun create(
+            url: String,
+            method: String,
+            body: String? = null,
+            privateKey: ByteArray,
+            createdAt: Long = Date().time / 1000
+        ): HTTPAuthorizationEvent {
+            val sha256 = MessageDigest.getInstance("SHA-256")
+
+            var hash = ""
+            body?.let {
+                hash = sha256.digest(it.toByteArray()).toHexKey()
+            }
+
+            val tags = listOfNotNull(
+                listOf("u", url),
+                listOf("method", method),
+                listOf("payload", hash)
+            )
+
+            val pubKey = Utils.pubkeyCreate(privateKey).toHexKey()
+            val id = generateId(pubKey, createdAt, kind, tags, "")
+            val sig = Utils.sign(id, privateKey)
+            return HTTPAuthorizationEvent(id.toHexKey(), pubKey, createdAt, tags, "", sig.toHexKey())
+        }
+    }
+}

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

@@ -24,7 +24,7 @@ class LongTextNoteEvent(
     fun summary() = tags.filter { it.firstOrNull() == "summary" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
 
     fun publishedAt() = try {
-        tags.filter { it.firstOrNull() == "published_at" }.mapNotNull { it.getOrNull(1) }.firstOrNull()?.toLong()
+        tags.firstOrNull { it.size > 1 && it[0] == "published_at" }?.get(1)?.toLongOrNull()
     } catch (_: Exception) {
         null
     }

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import androidx.compose.runtime.Stable
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.google.gson.Gson
@@ -12,9 +13,10 @@ import nostr.postr.Utils
 import java.io.ByteArrayInputStream
 import java.util.Date
 
+@Stable
 abstract class IdentityClaim(
-    var identity: String,
-    var proof: String
+    val identity: String,
+    val proof: String
 ) {
     abstract fun toProofUrl(): String
     abstract fun toIcon(): Int

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

@@ -4,6 +4,7 @@ import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.HexKey
 import com.vitorpamplona.amethyst.model.toHexKey
+import com.vitorpamplona.amethyst.service.HexValidator
 import fr.acinq.secp256k1.Hex
 import nostr.postr.Utils
 import nostr.postr.toHex
@@ -23,11 +24,18 @@ class PrivateDmEvent(
      * nip-04 EncryptedDmEvent but may omit the recipient, too. This value can be queried and used
      * for initial messages.
      */
-    private fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }
+    private fun recipientPubKey() = tags.firstOrNull { it.size > 1 && it[0] == "p" }?.get(1)
 
-    fun recipientPubKeyBytes() = recipientPubKey()?.runCatching { Hex.decode(this[1]) }?.getOrNull()
+    fun recipientPubKeyBytes() = recipientPubKey()?.runCatching { Hex.decode(this) }?.getOrNull()
 
-    fun verifiedRecipientPubKey() = recipientPubKey()?.runCatching { Hex.decode(this[1]).toHexKey() }?.getOrNull() // makes sure its a valid one
+    fun verifiedRecipientPubKey(): HexKey? {
+        val recipient = recipientPubKey()
+        return if (HexValidator.isHex(recipient)) {
+            recipient
+        } else {
+            null
+        }
+    }
 
     fun talkingWith(oneSideHex: String): HexKey {
         return if (pubKey == oneSideHex) verifiedRecipientPubKey() ?: pubKey else pubKey

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

@@ -17,8 +17,8 @@ class RepostEvent(
     sig: HexKey
 ) : Event(id, pubKey, createdAt, kind, tags, content, sig) {
 
-    fun boostedPost() = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
-    fun originalAuthor() = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+    fun boostedPost() = taggedEvents()
+    fun originalAuthor() = taggedUsers()
 
     fun containedPost() = try {
         fromJson(content, Client.lenient)

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -67,7 +67,7 @@ object Nip19 {
             }
             parsed?.copy(additionalChars = additionalChars ?: "")
         } catch (e: Throwable) {
-            Log.e("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
+            Log.w("NIP19 Parser", "Issue trying to Decode NIP19 $key: ${e.message}", e)
             null
         }
     }

app/src/main/java/com/vitorpamplona/amethyst/service/tts/TextToSpeechHelper.kt

@@ -7,6 +7,7 @@
 package com.vitorpamplona.amethyst.service.tts
 
 import android.content.Context
+import android.util.Log
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
@@ -33,6 +34,7 @@ class TextToSpeechHelper private constructor(private val context: WeakReference<
     private var customActionForDestroy: (() -> Unit)? = null
 
     init {
+        Log.d("Init", "Init TTS")
         initTTS()
     }
 

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

@@ -39,6 +39,7 @@ import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
 
 class MainActivity : FragmentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

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

@@ -7,19 +7,21 @@ import android.webkit.MimeTypeMap
 import androidx.core.net.toFile
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.service.HttpClient
 import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
 import okio.BufferedSink
+import okio.IOException
 import okio.source
-import java.io.IOException
 import java.io.InputStream
+import java.util.Base64
 
 val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 
 fun randomChars() = List(16) { charPool.random() }.joinToString("")
-
 object ImageUploader {
+    lateinit var account: Account
 
     fun uploadImage(
         uri: Uri,
@@ -33,12 +35,11 @@ object ImageUploader {
         val myContentType = contentType ?: contentResolver.getType(uri)
         val imageInputStream = contentResolver.openInputStream(uri)
 
-        val length = size
-            ?: contentResolver.query(uri, null, null, null, null)?.use {
-                it.moveToFirst()
-                val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
-                it.getLong(sizeIndex)
-            } ?: kotlin.runCatching {
+        val length = size ?: contentResolver.query(uri, null, null, null, null)?.use {
+            it.moveToFirst()
+            val sizeIndex = it.getColumnIndex(OpenableColumns.SIZE)
+            it.getLong(sizeIndex)
+        } ?: kotlin.runCatching {
             uri.toFile().length()
         }.getOrNull() ?: 0
 
@@ -58,6 +59,9 @@ object ImageUploader {
             ServersAvailable.NOSTRFILES_DEV, ServersAvailable.NOSTRFILES_DEV_NIP_94 -> {
                 NostrFilesDevServer()
             }
+            ServersAvailable.NOSTRCHECK_ME, ServersAvailable.NOSTRCHECK_ME_NIP_94 -> {
+                NostrCheckMeServer()
+            }
             else -> {
                 NostrBuildServer()
             }
@@ -99,7 +103,7 @@ object ImageUploader {
             )
             .build()
 
-        server.clientID()?.let {
+        server.clientID(requestBody.toString())?.let {
             requestBuilder.addHeader("Authorization", it)
         }
 
@@ -133,6 +137,12 @@ object ImageUploader {
             }
         })
     }
+
+    fun NIP98Header(url: String, method: String, body: String): String {
+        val noteJson = account.createHTTPAuthorization(url, method, body)?.toJson() ?: ""
+        val encodedNIP98Event: String = Base64.getEncoder().encodeToString(noteJson.toByteArray())
+        return "Nostr " + encodedNIP98Event
+    }
 }
 
 abstract class FileServer {
@@ -140,7 +150,7 @@ abstract class FileServer {
     abstract fun parseUrlFromSuccess(body: String): String?
     abstract fun inputParameterName(contentType: String?): String
 
-    open fun clientID(): String? = null
+    open fun clientID(info: String): String? = null
 }
 
 class NostrImgServer : FileServer() {
@@ -156,7 +166,7 @@ class NostrImgServer : FileServer() {
         return contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
 }
 
 class ImgurServer : FileServer() {
@@ -175,7 +185,7 @@ class ImgurServer : FileServer() {
         return contentType?.toMediaType()?.toString()?.split("/")?.get(0) ?: "image"
     }
 
-    override fun clientID() = "Client-ID e6aea87296f3f96"
+    override fun clientID(info: String) = "Client-ID e6aea87296f3f96"
 }
 
 class NostrBuildServer : FileServer() {
@@ -189,7 +199,7 @@ class NostrBuildServer : FileServer() {
         return "fileToUpload"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
 }
 
 class NostrFilesDevServer : FileServer() {
@@ -203,5 +213,43 @@ class NostrFilesDevServer : FileServer() {
         return "file"
     }
 
-    override fun clientID() = null
+    override fun clientID(info: String) = null
+}
+
+class NostrCheckMeServer : FileServer() {
+    override fun postUrl(contentType: String?) = "https://nostrcheck.me/api/v1/media"
+    override fun parseUrlFromSuccess(body: String): String? {
+        val tree = jacksonObjectMapper().readTree(body)
+        val url = tree?.get("url")?.asText()
+        var id = tree?.get("id")?.asText()
+        var isCompleted = false
+
+        val client = OkHttpClient()
+        var requrl = "https://nostrcheck.me/api/v1/media?id=" + id // + "&apikey=26d075787d261660682fb9d20dbffa538c708b1eda921d0efa2be95fbef4910a"
+
+        val request = Request.Builder()
+            .url(requrl)
+            .addHeader("Authorization", ImageUploader.NIP98Header(requrl, "GET", ""))
+            .get()
+            .build()
+
+        while (!isCompleted) {
+            val response = client.newCall(request).execute()
+            val body = response.body?.string()
+            val tree = jacksonObjectMapper().readTree(body)
+            isCompleted = tree?.get("status")?.asText() == "completed"
+            try {
+                Thread.sleep(500)
+            } catch (e: InterruptedException) {
+                e.printStackTrace()
+            }
+        }
+        return url
+    }
+
+    override fun inputParameterName(contentType: String?): String {
+        return "mediafile"
+    }
+
+    override fun clientID(body: String) = ImageUploader.NIP98Header("https://nostrcheck.me/api/v1/media", "POST", body)
 }

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

@@ -33,6 +33,7 @@ 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.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -60,10 +61,11 @@ 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.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel
@@ -347,6 +349,10 @@ private fun RenderChannel(
     item: com.vitorpamplona.amethyst.model.Channel,
     onClick: () -> Unit
 ) {
+    val hasNewMessages = remember {
+        mutableStateOf(false)
+    }
+
     ChannelName(
         channelIdHex = item.idHex,
         channelPicture = item.profilePicture(),
@@ -358,7 +364,7 @@ private fun RenderChannel(
         },
         channelLastTime = null,
         channelLastContent = item.summary(),
-        false,
+        hasNewMessages,
         onClick = onClick
     )
 }
@@ -384,7 +390,7 @@ fun UserComposeForChat(
                 ),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, 55.dp, accountViewModel)
+            ClickableUserPicture(baseUser, Size55dp, accountViewModel)
 
             Column(
                 modifier = Modifier

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

@@ -50,6 +50,8 @@ open class NewMediaModel : ViewModel() {
             selectedServer = ServersAvailable.NOSTR_BUILD_NIP_94
         } else if (selectedServer == ServersAvailable.NOSTRFILES_DEV) {
             selectedServer = ServersAvailable.NOSTRFILES_DEV_NIP_94
+        } else if (selectedServer == ServersAvailable.NOSTRCHECK_ME) {
+            selectedServer = ServersAvailable.NOSTRCHECK_ME_NIP_94
         }
     }
 

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

@@ -67,12 +67,14 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.*
 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 com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -621,7 +623,7 @@ private fun ForwardZapTo(
                 Text(
                     text = stringResource(R.string.zap_forward_lnAddress),
                     color = MaterialTheme.colors.placeholderText,
-                    fontSize = 14.sp
+                    fontSize = Font14SP
                 )
             },
             colors = TextFieldDefaults
@@ -797,11 +799,13 @@ enum class ServersAvailable {
     NOSTR_BUILD,
     NOSTRIMG,
     NOSTRFILES_DEV,
+    NOSTRCHECK_ME,
 
     // IMGUR_NIP_94,
     NOSTRIMG_NIP_94,
     NOSTR_BUILD_NIP_94,
     NOSTRFILES_DEV_NIP_94,
+    NOSTRCHECK_ME_NIP_94,
     NIP95
 }
 
@@ -824,10 +828,12 @@ fun ImageVideoDescription(
         Triple(ServersAvailable.NOSTRIMG, stringResource(id = R.string.upload_server_nostrimg), stringResource(id = R.string.upload_server_nostrimg_explainer)),
         Triple(ServersAvailable.NOSTR_BUILD, stringResource(id = R.string.upload_server_nostrbuild), stringResource(id = R.string.upload_server_nostrbuild_explainer)),
         Triple(ServersAvailable.NOSTRFILES_DEV, stringResource(id = R.string.upload_server_nostrfilesdev), stringResource(id = R.string.upload_server_nostrfilesdev_explainer)),
+        Triple(ServersAvailable.NOSTRCHECK_ME, stringResource(id = R.string.upload_server_nostrcheckme), stringResource(id = R.string.upload_server_nostrcheckme_explainer)),
         // Triple(ServersAvailable.IMGUR_NIP_94, stringResource(id = R.string.upload_server_imgur_nip94), stringResource(id = R.string.upload_server_imgur_nip94_explainer)),
         Triple(ServersAvailable.NOSTRIMG_NIP_94, stringResource(id = R.string.upload_server_nostrimg_nip94), stringResource(id = R.string.upload_server_nostrimg_nip94_explainer)),
         Triple(ServersAvailable.NOSTR_BUILD_NIP_94, stringResource(id = R.string.upload_server_nostrbuild_nip94), stringResource(id = R.string.upload_server_nostrbuild_nip94_explainer)),
         Triple(ServersAvailable.NOSTRFILES_DEV_NIP_94, stringResource(id = R.string.upload_server_nostrfilesdev_nip94), stringResource(id = R.string.upload_server_nostrfilesdev_nip94_explainer)),
+        Triple(ServersAvailable.NOSTRCHECK_ME_NIP_94, stringResource(id = R.string.upload_server_nostrcheckme_nip94), stringResource(id = R.string.upload_server_nostrcheckme_nip94_explainer)),
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 

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

@@ -20,9 +20,9 @@ import com.vitorpamplona.amethyst.service.model.AddressableEvent
 import com.vitorpamplona.amethyst.service.model.BaseTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
 import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch

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

@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.ui.actions
 
+import android.content.Context
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -28,6 +30,7 @@ import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.DeleteSweep
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Groups
+import androidx.compose.material.icons.filled.Paid
 import androidx.compose.material.icons.filled.Public
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.SyncProblem
@@ -53,22 +56,32 @@ 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.RelayInformation
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.lang.Math.round
 
 @Composable
-fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "") {
+fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, relayToAdd: String = "", nav: (String) -> Unit) {
     val postViewModel: NewRelayListViewModel = viewModel()
     val feedState by postViewModel.relays.collectAsState()
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         postViewModel.load(accountViewModel.account)
+        postViewModel.relays.value.forEach { item ->
+            loadRelayInfo(item.url, context, scope) {
+                postViewModel.togglePaidRelay(item, it.limitation?.payment_required ?: false)
+            }
+        }
     }
 
     Dialog(
@@ -114,6 +127,7 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                             if (index == 0) {
                                 ServerConfigHeader()
                             }
+
                             ServerConfig(
                                 item,
                                 onToggleDownload = { postViewModel.toggleDownload(it) },
@@ -125,7 +139,11 @@ fun NewRelayListView(onClose: () -> Unit, accountViewModel: AccountViewModel, re
                                 onToggleGlobal = { postViewModel.toggleGlobal(it) },
                                 onToggleSearch = { postViewModel.toggleSearch(it) },
 
-                                onDelete = { postViewModel.deleteRelay(it) }
+                                onDelete = { postViewModel.deleteRelay(it) },
+                                accountViewModel = accountViewModel,
+                                nav = nav,
+                                scope = scope,
+                                context = context
                             )
                         }
                     }
@@ -163,7 +181,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.bytes),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1.2f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -173,7 +191,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(id = R.string.bytes),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1.2f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -183,7 +201,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.errors),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -193,7 +211,7 @@ fun ServerConfigHeader() {
                     Text(
                         text = stringResource(R.string.spam),
                         maxLines = 1,
-                        fontSize = 14.sp,
+                        fontSize = Font14SP,
                         modifier = Modifier.weight(1f),
                         color = MaterialTheme.colors.placeholderText
                     )
@@ -222,10 +240,25 @@ fun ServerConfig(
     onToggleGlobal: (RelaySetupInfo) -> Unit,
     onToggleSearch: (RelaySetupInfo) -> Unit,
 
-    onDelete: (RelaySetupInfo) -> Unit
+    onDelete: (RelaySetupInfo) -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    context: Context,
+    scope: CoroutineScope
 ) {
-    val context = LocalContext.current
-    val scope = rememberCoroutineScope()
+    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+
+    if (relayInfo != null) {
+        RelayInformationDialog(
+            onClose = {
+                relayInfo = null
+            },
+            relayInfo = relayInfo!!,
+            accountViewModel,
+            nav
+        )
+    }
+
     Column(Modifier.fillMaxWidth()) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -249,9 +282,26 @@ fun ServerConfig(
 
             Column(Modifier.weight(1f)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
+                    if (item.paidRelay) {
+                        Icon(
+                            imageVector = Icons.Default.Paid,
+                            null,
+                            modifier = Modifier
+                                .padding(end = 5.dp)
+                                .size(14.dp),
+                            tint = Color.Green
+                        )
+                    }
+
                     Text(
-                        text = item.url.removePrefix("wss://"),
-                        modifier = Modifier.weight(1f),
+                        text = item.url.removePrefix("wss://").removeSuffix("/"),
+                        modifier = Modifier
+                            .weight(1f)
+                            .clickable {
+                                loadRelayInfo(item.url, context, scope) {
+                                    relayInfo = it
+                                }
+                            },
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
                     )
@@ -275,11 +325,13 @@ fun ServerConfig(
                                             onClick = { onToggleFollows(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.home_feed),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.home_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -306,11 +358,13 @@ fun ServerConfig(
                                             onClick = { onTogglePrivateDMs(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.private_message_feed),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.private_message_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -337,11 +391,13 @@ fun ServerConfig(
                                             onClick = { onTogglePublicChats(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.public_chat_feed),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.public_chat_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -368,11 +424,13 @@ fun ServerConfig(
                                             onClick = { onToggleGlobal(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.global_feed),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.global_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -400,11 +458,13 @@ fun ServerConfig(
                                             onClick = { onToggleSearch(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.search_feed),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.search_feed),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -436,11 +496,13 @@ fun ServerConfig(
                                             onClick = { onToggleDownload(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.read_from_relay),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.read_from_relay),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -476,11 +538,13 @@ fun ServerConfig(
                                             onClick = { onToggleUpload(item) },
                                             onLongClick = {
                                                 scope.launch {
-                                                    Toast.makeText(
-                                                        context,
-                                                        context.getString(R.string.write_to_relay),
-                                                        Toast.LENGTH_SHORT
-                                                    ).show()
+                                                    Toast
+                                                        .makeText(
+                                                            context,
+                                                            context.getString(R.string.write_to_relay),
+                                                            Toast.LENGTH_SHORT
+                                                        )
+                                                        .show()
                                                 }
                                             }
                                         ),
@@ -512,11 +576,13 @@ fun ServerConfig(
                                         onClick = { },
                                         onLongClick = {
                                             scope.launch {
-                                                Toast.makeText(
-                                                    context,
-                                                    context.getString(R.string.errors),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
+                                                Toast
+                                                    .makeText(
+                                                        context,
+                                                        context.getString(R.string.errors),
+                                                        Toast.LENGTH_SHORT
+                                                    )
+                                                    .show()
                                             }
                                         }
                                     ),
@@ -541,11 +607,13 @@ fun ServerConfig(
                                         onClick = { },
                                         onLongClick = {
                                             scope.launch {
-                                                Toast.makeText(
-                                                    context,
-                                                    context.getString(R.string.spam),
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
+                                                Toast
+                                                    .makeText(
+                                                        context,
+                                                        context.getString(R.string.spam),
+                                                        Toast.LENGTH_SHORT
+                                                    )
+                                                    .show()
                                             }
                                         }
                                     ),

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

@@ -136,6 +136,12 @@ class NewRelayListViewModel : ViewModel() {
             it.updated(relay, relay.copy(feedTypes = newTypes))
         }
     }
+
+    fun togglePaidRelay(relay: RelaySetupInfo, paid: Boolean) {
+        _relays.update {
+            it.updated(relay, relay.copy(paidRelay = paid))
+        }
+    }
 }
 
 fun <T> Iterable<T>.updated(old: T, new: T): List<T> = map { if (it == old) new else it }

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

@@ -0,0 +1,369 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import android.content.Context
+import android.util.Log
+import android.widget.Toast
+import androidx.compose.animation.Crossfade
+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.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.components.ClickableEmail
+import com.vitorpamplona.amethyst.ui.components.ClickableUrl
+import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun RelayInformationDialog(
+    onClose: () -> Unit,
+    relayInfo: RelayInformation,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface {
+            val scrollState = rememberScrollState()
+
+            Column(
+                modifier = Modifier
+                    .padding(10.dp)
+                    .fillMaxSize()
+                    .verticalScroll(scrollState)
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        onClose()
+                    })
+                }
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    Title(relayInfo.name ?: "")
+                }
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.Center
+                ) {
+                    SectionContent(relayInfo.description ?: "")
+                }
+
+                Section(stringResource(R.string.owner))
+
+                relayInfo.pubkey?.let {
+                    DisplayOwnerInformation(it, accountViewModel, nav)
+                }
+
+                Section(stringResource(R.string.software))
+
+                DisplaySoftwareInformation(relayInfo)
+
+                Section(stringResource(R.string.version))
+
+                SectionContent(relayInfo.version ?: "")
+
+                Section(stringResource(R.string.contact))
+
+                Box(modifier = Modifier.padding(start = 10.dp)) {
+                    ClickableEmail(relayInfo.contact ?: "")
+                }
+
+                Section(stringResource(R.string.supports))
+
+                DisplaySupportedNips(relayInfo)
+
+                relayInfo.fees?.admission?.let {
+                    if (it.isNotEmpty()) {
+                        Section(stringResource(R.string.admission_fees))
+
+                        it.forEach { item ->
+                            SectionContent("${item.amount?.div(1000) ?: 0} sats")
+                        }
+                    }
+                }
+
+                relayInfo.payments_url?.let {
+                    Section(stringResource(R.string.payments_url))
+
+                    Box(modifier = Modifier.padding(start = 10.dp)) {
+                        ClickableUrl(
+                            urlText = it,
+                            url = it
+                        )
+                    }
+                }
+
+                relayInfo.limitation?.let {
+                    Section(stringResource(R.string.limitations))
+                    val authRequired = it.auth_required ?: false
+                    val authRequiredText = if (authRequired) stringResource(R.string.yes) else stringResource(R.string.no)
+                    val paymentRequired = it.payment_required ?: false
+                    val paymentRequiredText = if (paymentRequired) stringResource(R.string.yes) else stringResource(R.string.no)
+
+                    Column {
+                        SectionContent("${stringResource(R.string.message_length)}: ${it.max_message_length ?: 0}")
+                        SectionContent("${stringResource(R.string.subscriptions)}: ${it.max_subscriptions ?: 0}")
+                        SectionContent("${stringResource(R.string.filters)}: ${it.max_subscriptions ?: 0}")
+                        SectionContent("${stringResource(R.string.subscription_id_length)}: ${it.max_subid_length ?: 0}")
+                        SectionContent("${stringResource(R.string.minimum_prefix)}: ${it.min_prefix ?: 0}")
+                        SectionContent("${stringResource(R.string.maximum_event_tags)}: ${it.max_event_tags ?: 0}")
+                        SectionContent("${stringResource(R.string.content_length)}: ${it.max_content_length ?: 0}")
+                        SectionContent("${stringResource(R.string.minimum_pow)}: ${it.min_pow_difficulty ?: 0}")
+                        SectionContent("${stringResource(R.string.auth)}: $authRequiredText")
+                        SectionContent("${stringResource(R.string.payment)}: $paymentRequiredText")
+                    }
+                }
+
+                relayInfo.relay_countries?.let {
+                    Section(stringResource(R.string.countries))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.language_tags?.let {
+                    Section(stringResource(R.string.languages))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.tags?.let {
+                    Section(stringResource(R.string.tags))
+
+                    FlowRow {
+                        it.forEach { item ->
+                            SectionContent(item)
+                        }
+                    }
+                }
+
+                relayInfo.posting_policy?.let {
+                    Section(stringResource(R.string.posting_policy))
+
+                    Box(Modifier.padding(10.dp)) {
+                        ClickableUrl(
+                            it,
+                            it
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun DisplaySupportedNips(relayInfo: RelayInformation) {
+    FlowRow {
+        relayInfo.supported_nips?.forEach { item ->
+            val text = item.toString().padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = "$text",
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
+                )
+            }
+        }
+
+        relayInfo.supported_nip_extensions?.forEach { item ->
+            val text = item.padStart(2, '0')
+            Box(Modifier.padding(10.dp)) {
+                ClickableUrl(
+                    urlText = "$text",
+                    url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DisplaySoftwareInformation(relayInfo: RelayInformation) {
+    val url = (relayInfo.software ?: "").replace("git+", "")
+    Box(modifier = Modifier.padding(start = 10.dp)) {
+        ClickableUrl(
+            urlText = url,
+            url = url
+        )
+    }
+}
+
+@Composable
+private fun DisplayOwnerInformation(
+    userHex: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LoadUser(baseUserHex = userHex) {
+        Crossfade(it) {
+            if (it != null) {
+                UserCompose(baseUser = it, accountViewModel = accountViewModel, showDiviser = false, nav = nav)
+            }
+        }
+    }
+}
+
+@Composable
+fun Title(text: String) {
+    Spacer(modifier = DoubleVertSpacer)
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp
+    )
+    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun Section(text: String) {
+    Spacer(modifier = DoubleVertSpacer)
+    Text(
+        text = text,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp
+    )
+    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun SectionContent(text: String) {
+    Text(
+        modifier = Modifier.padding(start = 10.dp),
+        text = text
+    )
+}
+
+fun loadRelayInfo(
+    dirtyUrl: String,
+    context: Context,
+    scope: CoroutineScope,
+    onInfo: (RelayInformation) -> Unit
+) {
+    try {
+        val url = if (dirtyUrl.contains("://")) {
+            dirtyUrl
+                .replace("wss://", "https://")
+                .replace("ws://", "http://")
+        } else {
+            "https://$dirtyUrl"
+        }
+
+        val request: Request = Request
+            .Builder()
+            .header("Accept", "application/nostr+json")
+            .url(url)
+            .build()
+
+        HttpClient.getHttpClient()
+            .newCall(request)
+            .enqueue(
+                object : Callback {
+                    override fun onResponse(call: Call, response: Response) {
+                        checkNotInMainThread()
+                        response.use {
+                            val body = it.body.string()
+                            try {
+                                if (it.isSuccessful) {
+                                    onInfo(RelayInformation.fromJson(body))
+                                } else {
+                                    scope.launch {
+                                        Toast
+                                            .makeText(
+                                                context,
+                                                context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                                Toast.LENGTH_SHORT
+                                            ).show()
+                                    }
+                                }
+                            } catch (e: Exception) {
+                                Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
+                                scope.launch {
+                                    Toast
+                                        .makeText(
+                                            context,
+                                            context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                }
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call, e: IOException) {
+                        Log.e("RelayInfoFail", "Resulting Message from Relay in not parseable $dirtyUrl", e)
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                        }
+                    }
+                }
+            )
+    } catch (e: Exception) {
+        Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+        scope.launch {
+            Toast
+                .makeText(
+                    context,
+                    context.getString(R.string.an_error_ocurred_trying_to_get_relay_information, dirtyUrl),
+                    Toast.LENGTH_SHORT
+                ).show()
+        }
+    }
+}

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

@@ -1,83 +0,0 @@
-package com.vitorpamplona.amethyst.ui.components
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.DefaultAlpha
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.unit.Dp
-import coil.compose.AsyncImage
-import coil.compose.AsyncImagePainter
-import java.util.Base64
-
-@Immutable
-data class ResizeImage(val url: String?, val size: Dp) {
-    fun proxyUrl(): String? {
-        if (url == null) return null
-
-        // Fixes Image size to reduce pings to servers for each size used in the app
-        val imgPx = 200 // with(LocalDensity.current) { model.size.toPx().toInt() }
-        val base64 = Base64.getUrlEncoder().encodeToString(url.toByteArray())
-
-        return url // "https://d12fidohs5rlxk.cloudfront.net/preset:sharp/rs:fit:$imgPx:$imgPx:0/gravity:sm/$base64"
-    }
-}
-
-@Composable
-fun AsyncImageProxy(
-    model: ResizeImage,
-    contentDescription: String?,
-    modifier: Modifier = Modifier,
-    placeholder: Painter? = null,
-    error: Painter? = null,
-    fallback: Painter? = error,
-    onLoading: ((AsyncImagePainter.State.Loading) -> Unit)? = null,
-    onSuccess: ((AsyncImagePainter.State.Success) -> Unit)? = null,
-    onError: ((AsyncImagePainter.State.Error) -> Unit)? = null,
-    alignment: Alignment = Alignment.Center,
-    contentScale: ContentScale = ContentScale.Fit,
-    alpha: Float = DefaultAlpha,
-    colorFilter: ColorFilter? = null,
-    filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
-) {
-    if (model.url == null) {
-        AsyncImage(
-            model = model.url,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = placeholder,
-            error = error,
-            fallback = fallback,
-            onLoading = onLoading,
-            onSuccess = onSuccess,
-            onError = onError,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        AsyncImage(
-            model = model.proxyUrl(),
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = placeholder,
-            error = error,
-            fallback = fallback,
-            onLoading = onLoading,
-            onSuccess = onSuccess,
-            onError = onError,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    }
-}

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

@@ -0,0 +1,197 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat.startActivity
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.CashuProcessor
+import com.vitorpamplona.amethyst.service.CashuToken
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
+import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun CashuPreview(cashutoken: String, accountViewModel: AccountViewModel) {
+    var cachuData by remember { mutableStateOf<GenericLoadable<CashuToken>>(GenericLoadable.Loading<CashuToken>()) }
+
+    LaunchedEffect(key1 = cashutoken) {
+        launch(Dispatchers.IO) {
+            val newCachuData = CashuProcessor().parse(cashutoken)
+            launch(Dispatchers.Main) {
+                cachuData = newCachuData
+            }
+        }
+    }
+
+    Crossfade(targetState = cachuData) {
+        when (it) {
+            is GenericLoadable.Loaded<CashuToken> -> CashuPreview(it.loaded, accountViewModel)
+            is GenericLoadable.Error<CashuToken> -> Text(
+                text = "$cashutoken ",
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+            else -> {}
+        }
+    }
+}
+
+@Composable
+fun CashuPreview(token: CashuToken, accountViewModel: AccountViewModel) {
+    val lud16 = remember(accountViewModel) {
+        accountViewModel.account.userProfile().info?.lud16
+    }
+
+    val useWebService = false
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val clipboardManager = LocalClipboardManager.current
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 30.dp, end = 30.dp)
+            .clip(shape = QuoteBorder)
+            .border(1.dp, MaterialTheme.colors.subtleBorder, QuoteBorder)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(30.dp)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.cashu),
+                    null,
+                    modifier = Modifier.size(20.dp),
+                    tint = Color.Unspecified
+                )
+
+                Text(
+                    text = stringResource(R.string.cashu),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier.padding(start = 10.dp)
+                )
+            }
+
+            Divider()
+
+            token.totalAmount.let {
+                Text(
+                    text = "$it ${stringResource(id = R.string.sats)}",
+                    fontSize = 25.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 10.dp)
+                )
+            }
+
+            Row(
+
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 10.dp)
+            ) {
+                Button(
+
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 2.dp),
+                    onClick = {
+                        if (lud16 != null) {
+                            scope.launch(Dispatchers.IO) {
+                                CashuProcessor().melt(
+                                    token,
+                                    lud16,
+                                    onSuccess = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
+                                    },
+                                    onError = {
+                                        scope.launch {
+                                            Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                                        }
+                                    }
+                                )
+                            }
+                        } else {
+                            scope.launch {
+                                Toast.makeText(
+                                    context,
+                                    "No Lightning Address set",
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        }
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text(
+                        stringResource(R.string.cashu_redeem),
+                        color = Color.White,
+                        fontSize = 18.sp
+                    )
+                }
+                Button(
+                    modifier = Modifier
+                        .padding(vertical = 10.dp).padding(horizontal = 1.dp),
+                    onClick = {
+                        if (useWebService) {
+                            // In case we want to use the cashu.me webservice
+                            val url = "https://redeem.cashu.me?token=$token&lightning=$lud16&autopay=false"
+                            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                            startActivity(context, intent, null)
+                        } else {
+                            // Copying the token to clipboard for now
+                            var orignaltoken = token.token
+                            clipboardManager.setText(AnnotatedString("$orignaltoken"))
+                            scope.launch {
+                                Toast.makeText(context, "Copied token to clipboard", Toast.LENGTH_SHORT).show()
+                            }
+                        }
+                    },
+                    shape = QuoteBorder,
+                    colors = ButtonDefaults.buttonColors(
+                        backgroundColor = MaterialTheme.colors.primary
+                    )
+                ) {
+                    Text("⎘", color = Color.White, fontSize = 18.sp)
+                }
+            }
+        }
+    }
+}

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

@@ -7,6 +7,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.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickableEmail(email: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$email "),
+        text = remember { AnnotatedString(email) },
         onClick = { runCatching { context.sendMail(email) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

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

@@ -7,6 +7,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.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 
@@ -15,7 +16,7 @@ fun ClickablePhone(phone: String) {
     val context = LocalContext.current
 
     ClickableText(
-        text = AnnotatedString("$phone "),
+        text = remember { AnnotatedString(phone) },
         onClick = { runCatching { context.dial(phone) } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
     )

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

@@ -50,6 +50,7 @@ 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 com.vitorpamplona.amethyst.ui.note.toShortenHex
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
@@ -78,7 +79,7 @@ fun ClickableRoute(
         else -> {
             Text(
                 remember {
-                    "@${nip19.hex}${nip19.additionalChars} "
+                    "@${nip19.hex}${nip19.additionalChars}"
                 }
             )
         }
@@ -92,8 +93,8 @@ private fun LoadNote(
 ) {
     var noteBase by remember(hex) { mutableStateOf(LocalCache.getNoteIfExists(hex)) }
 
-    LaunchedEffect(key1 = hex) {
-        if (noteBase == null) {
+    if (noteBase == null) {
+        LaunchedEffect(key1 = hex) {
             launch(Dispatchers.IO) {
                 noteBase = LocalCache.checkGetOrCreateNote(hex)
             }
@@ -111,7 +112,16 @@ private fun DisplayEvent(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -121,7 +131,16 @@ private fun DisplayNote(
     nav: (String) -> Unit
 ) {
     LoadNote(nip19.hex) {
-        DisplayNoteLink(it, nip19, nav)
+        if (it != null) {
+            DisplayNoteLink(it, nip19, nav)
+        } else {
+            CreateClickableText(
+                clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
+                suffix = nip19.additionalChars,
+                route = remember(nip19) { "Event/${nip19.hex}" },
+                nav = nav
+            )
+        }
     }
 }
 
@@ -137,7 +156,7 @@ private fun DisplayNoteLink(
 
     val channelHex = remember(noteState) { note.channelHex() }
     val noteIdDisplayNote = remember(noteState) { "@${note.idDisplayNote()}" }
-    val addedCharts = remember { "${nip19.additionalChars} " }
+    val addedCharts = remember { "${nip19.additionalChars}" }
 
     if (note.event is ChannelCreateEvent || nip19.kind == ChannelCreateEvent.kind) {
         CreateClickableText(
@@ -186,8 +205,8 @@ private fun DisplayAddress(
 ) {
     var noteBase by remember(nip19) { mutableStateOf(LocalCache.getNoteIfExists(nip19.hex)) }
 
-    LaunchedEffect(key1 = nip19.hex) {
-        if (noteBase == null) {
+    if (noteBase == null) {
+        LaunchedEffect(key1 = nip19.hex) {
             launch(Dispatchers.IO) {
                 noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)
             }
@@ -199,7 +218,7 @@ private fun DisplayAddress(
 
         val route = remember(noteState) { "Note/${nip19.hex}" }
         val displayName = remember(noteState) { "@${noteState?.note?.idDisplayNote()}" }
-        val addedCharts = remember { "${nip19.additionalChars} " }
+        val addedCharts = remember { "${nip19.additionalChars}" }
 
         CreateClickableText(
             clickablePart = displayName,
@@ -212,7 +231,7 @@ private fun DisplayAddress(
     if (noteBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -225,8 +244,8 @@ private fun DisplayUser(
 ) {
     var userBase by remember(nip19) { mutableStateOf(LocalCache.getUserIfExists(nip19.hex)) }
 
-    LaunchedEffect(key1 = nip19.hex) {
-        if (userBase == null) {
+    if (userBase == null) {
+        LaunchedEffect(key1 = nip19.hex) {
             launch(Dispatchers.IO) {
                 userBase = LocalCache.checkGetOrCreateUser(nip19.hex)
             }
@@ -240,7 +259,7 @@ private fun DisplayUser(
     if (userBase == null) {
         Text(
             remember {
-                "@${nip19.hex}${nip19.additionalChars} "
+                "@${nip19.hex}${nip19.additionalChars}"
             }
         )
     }
@@ -268,16 +287,17 @@ private fun RenderUserAsClickableText(
     }
 
     val addedCharts = remember(nip19) {
-        "${nip19.additionalChars} "
+        "${nip19.additionalChars}"
     }
 
     userDisplayName?.let {
         CreateClickableTextWithEmoji(
             clickablePart = it,
             suffix = addedCharts,
-            tags = userTags,
+            maxLines = 1,
             route = route,
-            nav = nav
+            nav = nav,
+            tags = userTags
         )
     }
 }
@@ -285,25 +305,41 @@ private fun RenderUserAsClickableText(
 @Composable
 fun CreateClickableText(
     clickablePart: String,
-    suffix: String,
+    suffix: String?,
+    maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
     nav: (String) -> Unit
 ) {
-    ClickableText(
-        text = buildAnnotatedString {
-            withStyle(
-                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()
-            ) {
+    val currentStyle = LocalTextStyle.current
+    val primaryColor = MaterialTheme.colors.primary
+    val onBackgroundColor = MaterialTheme.colors.onBackground
+
+    val clickablePartStyle = remember(primaryColor, overrideColor) {
+        currentStyle.copy(color = overrideColor ?: primaryColor, fontWeight = fontWeight).toSpanStyle()
+    }
+
+    val nonClickablePartStyle = remember(onBackgroundColor, overrideColor) {
+        currentStyle.copy(color = overrideColor ?: onBackgroundColor, fontWeight = fontWeight).toSpanStyle()
+    }
+
+    val text = remember(clickablePartStyle, nonClickablePartStyle, clickablePart, suffix) {
+        buildAnnotatedString {
+            withStyle(clickablePartStyle) {
                 append(clickablePart)
             }
-            withStyle(
-                LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle()
-            ) {
-                append(suffix)
+            if (!suffix.isNullOrBlank()) {
+                withStyle(nonClickablePartStyle) {
+                    append(suffix)
+                }
             }
-        },
+        }
+    }
+
+    ClickableText(
+        text = text,
+        maxLines = maxLines,
         onClick = { nav(route) }
     )
 }
@@ -381,8 +417,8 @@ fun CreateTextWithEmoji(
 ) {
     var emojiList by remember(text) { mutableStateOf<ImmutableList<Renderable>>(persistentListOf()) }
 
-    LaunchedEffect(key1 = text) {
-        if (emojis.isNotEmpty()) {
+    if (emojis.isNotEmpty()) {
+        LaunchedEffect(key1 = text) {
             launch(Dispatchers.Default) {
                 val newEmojiList = assembleAnnotatedList(text, emojis)
                 if (newEmojiList.isNotEmpty()) {
@@ -410,14 +446,17 @@ fun CreateTextWithEmoji(
             modifier = modifier
         )
     } else {
-        val style = LocalTextStyle.current.merge(
-            TextStyle(
-                color = textColor,
-                textAlign = textAlign,
-                fontWeight = fontWeight,
-                fontSize = fontSize
-            )
-        ).toSpanStyle()
+        val currentStyle = LocalTextStyle.current
+        val style = remember(currentStyle) {
+            currentStyle.merge(
+                TextStyle(
+                    color = textColor,
+                    textAlign = textAlign,
+                    fontWeight = fontWeight,
+                    fontSize = fontSize
+                )
+            ).toSpanStyle()
+        }
 
         InLineIconRenderer(emojiList, style, maxLines, overflow, modifier)
     }
@@ -426,6 +465,7 @@ fun CreateTextWithEmoji(
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
+    maxLines: Int = Int.MAX_VALUE,
     tags: ImmutableListOfLists<String>?,
     style: TextStyle,
     onClick: (Int) -> Unit
@@ -448,29 +488,37 @@ fun CreateClickableTextWithEmoji(
 
     if (emojiList.isEmpty()) {
         ClickableText(
-            AnnotatedString(clickablePart),
+            text = AnnotatedString(clickablePart),
             style = style,
+            maxLines = maxLines,
             onClick = onClick
         )
     } else {
-        ClickableInLineIconRenderer(emojiList, style.toSpanStyle()) {
+        ClickableInLineIconRenderer(emojiList, maxLines, style.toSpanStyle()) {
             onClick(it)
         }
     }
 }
 
+@Immutable
+data class DoubleEmojiList(
+    val part1: ImmutableList<Renderable>,
+    val part2: ImmutableList<Renderable>
+)
+
 @Composable
 fun CreateClickableTextWithEmoji(
     clickablePart: String,
-    suffix: String,
-    tags: ImmutableListOfLists<String>?,
+    suffix: String?,
+    maxLines: Int = Int.MAX_VALUE,
     overrideColor: Color? = null,
     fontWeight: FontWeight = FontWeight.Normal,
     route: String,
-    nav: (String) -> Unit
+    nav: (String) -> Unit,
+    tags: ImmutableListOfLists<String>?
 ) {
     var emojiLists by remember(clickablePart) {
-        mutableStateOf<Pair<ImmutableList<Renderable>, ImmutableList<Renderable>>?>(null)
+        mutableStateOf<DoubleEmojiList?>(null)
     }
 
     LaunchedEffect(key1 = clickablePart) {
@@ -480,23 +528,31 @@ fun CreateClickableTextWithEmoji(
 
             if (emojis.isNotEmpty()) {
                 val newEmojiList1 = assembleAnnotatedList(clickablePart, emojis)
-                val newEmojiList2 = assembleAnnotatedList(suffix, emojis)
+                val newEmojiList2 = suffix?.let { assembleAnnotatedList(it, emojis) } ?: emptyList<Renderable>()
 
                 if (newEmojiList1.isNotEmpty() || newEmojiList2.isNotEmpty()) {
-                    emojiLists = Pair(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
+                    emojiLists = DoubleEmojiList(newEmojiList1.toImmutableList(), newEmojiList2.toImmutableList())
                 }
             }
         }
     }
 
     if (emojiLists == null) {
-        CreateClickableText(clickablePart, suffix, overrideColor, fontWeight, route, nav)
+        CreateClickableText(clickablePart, suffix, maxLines, overrideColor, fontWeight, route, nav)
     } else {
-        ClickableInLineIconRenderer(emojiLists!!.first, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()) {
+        ClickableInLineIconRenderer(
+            emojiLists!!.part1,
+            maxLines,
+            LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.primary, fontWeight = fontWeight).toSpanStyle()
+        ) {
             nav(route)
         }
 
-        InLineIconRenderer(emojiLists!!.second, LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle())
+        InLineIconRenderer(
+            emojiLists!!.part2,
+            LocalTextStyle.current.copy(color = overrideColor ?: MaterialTheme.colors.onBackground, fontWeight = fontWeight).toSpanStyle(),
+            maxLines
+        )
     }
 }
 
@@ -521,7 +577,12 @@ class TextType(val text: String) : Renderable()
 class ImageUrlType(val url: String) : Renderable()
 
 @Composable
-fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style: SpanStyle, onClick: (Int) -> Unit) {
+fun ClickableInLineIconRenderer(
+    wordsInOrder: ImmutableList<Renderable>,
+    maxLines: Int = Int.MAX_VALUE,
+    style: SpanStyle,
+    onClick: (Int) -> Unit
+) {
     val inlineContent = wordsInOrder.mapIndexedNotNull { idx, value ->
         if (value is ImageUrlType) {
             Pair(
@@ -574,6 +635,7 @@ fun ClickableInLineIconRenderer(wordsInOrder: ImmutableList<Renderable>, style:
         text = annotatedText,
         modifier = pressIndicator,
         inlineContent = inlineContent,
+        maxLines = maxLines,
         onTextLayout = {
             layoutResult.value = it
         }

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
@@ -25,13 +26,16 @@ fun MayBeWithdrawal(lnurlWord: String) {
         }
     }
 
-    lnWithdrawal?.let {
-        ClickableWithdrawal(withdrawalString = it)
+    Crossfade(targetState = lnWithdrawal) {
+        if (it != null) {
+            ClickableWithdrawal(withdrawalString = it)
+        } else {
+            Text(
+                text = lnurlWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnurlWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -19,13 +20,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.graphics.Brush
 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.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.note.getGradient
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
@@ -80,16 +80,7 @@ fun ExpandableRichTextViewer(
                 modifier = Modifier
                     .align(Alignment.BottomCenter)
                     .fillMaxWidth()
-                    .drawBehind {
-                        drawRect(
-                            Brush.verticalGradient(
-                                colors = listOf(
-                                    backgroundColor.value.copy(alpha = 0f),
-                                    backgroundColor.value
-                                )
-                            )
-                        )
-                    }
+                    .background(getGradient(backgroundColor))
             ) {
                 ShowMoreButton() {
                     showFullText = !showFullText

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

@@ -0,0 +1,19 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed class GenericLoadable<T> {
+
+    @Immutable
+    class Loading<T> : GenericLoadable<T>()
+
+    @Immutable
+    class Loaded<T>(val loaded: T) : GenericLoadable<T>()
+
+    @Immutable
+    class Empty<T> : GenericLoadable<T>()
+
+    @Immutable
+    class Error<T>(val errorMessage: String) : GenericLoadable<T>()
+}

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -27,7 +28,7 @@ import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.launch
 import java.text.NumberFormat
 
 @Composable
@@ -35,7 +36,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
     var lnInvoice by remember { mutableStateOf<Pair<String, String?>?>(null) }
 
     LaunchedEffect(key1 = lnbcWord) {
-        withContext(Dispatchers.IO) {
+        launch(Dispatchers.IO) {
             val myInvoice = LnInvoiceUtil.findInvoice(lnbcWord)
             if (myInvoice != null) {
                 val myInvoiceAmount = try {
@@ -50,13 +51,16 @@ fun MayBeInvoicePreview(lnbcWord: String) {
         }
     }
 
-    lnInvoice?.let {
-        InvoicePreview(it.first, it.second)
+    Crossfade(targetState = lnInvoice) {
+        if (it != null) {
+            InvoicePreview(it.first, it.second)
+        } else {
+            Text(
+                text = lnbcWord,
+                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+            )
+        }
     }
-        ?: Text(
-            text = "$lnbcWord ",
-            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-        )
 }
 
 @Composable

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

@@ -10,6 +10,7 @@ import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
 import com.abedelazizshe.lightcompressorlibrary.VideoQuality
 import com.abedelazizshe.lightcompressorlibrary.config.AppSpecificStorageConfiguration
 import com.abedelazizshe.lightcompressorlibrary.config.Configuration
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import id.zelory.compressor.Compressor
 import id.zelory.compressor.constraint.default
 import java.io.File
@@ -24,6 +25,8 @@ class MediaCompressor {
         onReady: (Uri, String?, Long?) -> Unit,
         onError: (String) -> Unit
     ) {
+        checkNotInMainThread()
+
         if (contentType?.startsWith("video", true) == true) {
             VideoCompressor.start(
                 context = applicationContext, // => This is required

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

@@ -2,6 +2,8 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Context
 import android.net.Uri
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import coil.ImageLoader
@@ -31,6 +33,8 @@ private fun bytesToRGB(b1: Byte, b2: Byte, b3: Byte): Color {
 }
 
 private fun svgString(msg: String): String {
+    checkNotInMainThread()
+
     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])
@@ -58,6 +62,7 @@ private fun svgString(msg: String): String {
 </svg>"""
 }
 
+@Stable
 class HashImageFetcher(
     private val context: Context,
     private val data: Uri
@@ -93,6 +98,7 @@ object Robohash {
     }
 }
 
+@Immutable
 private data class Part(val style: String, val paths: String)
 
 private const val background = """<polyline class="cls-bg" points="150.3 7.4 55.1 97.9 55.1 203.1 150.3 293.6 245.9 203.1 245.9 97.9 150.3 7.4"/>"""

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

@@ -10,16 +10,13 @@ import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.Dp
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
-import java.util.Date
 
 @Composable
 fun RobohashAsyncImage(
     robot: String,
-    robotSize: Dp,
     modifier: Modifier = Modifier,
     contentDescription: String? = null,
     transform: (AsyncImagePainter.State) -> AsyncImagePainter.State = AsyncImagePainter.DefaultTransform,
@@ -50,13 +47,10 @@ fun RobohashAsyncImage(
     )
 }
 
-var imageErrors = mapOf<String, Long>()
-
 @Composable
 fun RobohashFallbackAsyncImage(
     robot: String,
-    robotSize: Dp,
-    model: String,
+    model: String?,
     contentDescription: String?,
     modifier: Modifier = Modifier,
     alignment: Alignment = Alignment.Center,
@@ -65,49 +59,30 @@ fun RobohashFallbackAsyncImage(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    val errorCache = remember(imageErrors) { imageErrors[model] }
+    val context = LocalContext.current
+    val painter = rememberAsyncImagePainter(
+        model = Robohash.imageRequest(context, robot)
+    )
 
-    if (errorCache != null && (Date().time / 1000) - errorCache < (60 * 5)) {
-        RobohashAsyncImage(
-            robot = robot,
-            robotSize = robotSize,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        val context = LocalContext.current
-        val painter = rememberAsyncImagePainter(
-            model = Robohash.imageRequest(context, robot)
-        )
-
-        AsyncImage(
-            model = model,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            placeholder = painter,
-            fallback = painter,
-            error = painter,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality,
-            onError = {
-                imageErrors = imageErrors + Pair(model, Date().time / 1000)
-            }
-        )
-    }
+    AsyncImage(
+        model = model,
+        contentDescription = contentDescription,
+        modifier = modifier,
+        placeholder = painter,
+        fallback = painter,
+        error = painter,
+        alignment = alignment,
+        contentScale = contentScale,
+        alpha = alpha,
+        colorFilter = colorFilter,
+        filterQuality = filterQuality
+    )
 }
 
 @Composable
 fun RobohashAsyncImageProxy(
     robot: String,
-    model: ResizeImage,
+    model: String?,
     contentDescription: String?,
     modifier: Modifier = Modifier,
     alignment: Alignment = Alignment.Center,
@@ -116,32 +91,15 @@ fun RobohashAsyncImageProxy(
     colorFilter: ColorFilter? = null,
     filterQuality: FilterQuality = DrawScope.DefaultFilterQuality
 ) {
-    val proxy = remember(model) { model.proxyUrl() }
-
-    if (proxy == null) {
-        RobohashAsyncImage(
-            robot = robot,
-            robotSize = model.size,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    } else {
-        RobohashFallbackAsyncImage(
-            robot = robot,
-            robotSize = model.size,
-            model = proxy,
-            contentDescription = contentDescription,
-            modifier = modifier,
-            alignment = alignment,
-            contentScale = contentScale,
-            alpha = alpha,
-            colorFilter = colorFilter,
-            filterQuality = filterQuality
-        )
-    }
+    RobohashFallbackAsyncImage(
+        robot = robot,
+        model = model,
+        contentDescription = contentDescription,
+        modifier = modifier,
+        alignment = alignment,
+        contentScale = contentScale,
+        alpha = alpha,
+        colorFilter = colorFilter,
+        filterQuality = filterQuality
+    )
 }

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

@@ -33,19 +33,34 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 
 @Composable
 fun SensitivityWarning(
-    hasSensitiveContent: Boolean,
+    note: Note,
+    accountViewModel: AccountViewModel,
+    content: @Composable () -> Unit
+) {
+    val hasSensitiveContent = remember(note.event) { note.event?.isSensitive() ?: false }
+
+    if (hasSensitiveContent) {
+        SensitivityWarning(accountViewModel, content)
+    } else {
+        content()
+    }
+}
+
+@Composable
+fun SensitivityWarning(
     accountViewModel: AccountViewModel,
     content: @Composable () -> Unit
 ) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
 
     var showContentWarningNote by remember(accountState) {
-        mutableStateOf(accountState?.account?.showSensitiveContent != true && hasSensitiveContent)
+        mutableStateOf(accountState?.account?.showSensitiveContent != true)
     }
 
     if (showContentWarningNote) {

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

@@ -29,8 +29,8 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 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 com.vitorpamplona.amethyst.ui.theme.Font14SP
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -120,7 +120,7 @@ fun SpinnerSelectionDialog(
                                     modifier = Modifier
                                         .fillMaxWidth()
                                 ) {
-                                    Text(text = it, color = Color.Gray, fontSize = 14.sp)
+                                    Text(text = it, color = Color.Gray, fontSize = Font14SP)
                                 }
                             }
                         }

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

@@ -21,11 +21,13 @@ fun UrlPreview(url: String, urlText: String) {
     }
 
     // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
-    LaunchedEffect(url) {
-        if (urlPreviewState == UrlPreviewState.Loading) {
+    if (urlPreviewState == UrlPreviewState.Loading) {
+        LaunchedEffect(url) {
             launch(Dispatchers.IO) {
                 UrlCachedPreviewer.previewInfo(url) {
-                    urlPreviewState = it
+                    launch(Dispatchers.Main) {
+                        urlPreviewState = it
+                    }
                 }
             }
         }

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

@@ -62,6 +62,8 @@ import com.vitorpamplona.amethyst.VideoCache
 import com.vitorpamplona.amethyst.service.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
 public var DefaultMutedSetting = mutableStateOf(true)
 
@@ -97,12 +99,26 @@ fun LoadThumbAndThenVideoView(videoUri: String, description: String? = null, thu
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
     description: String? = null,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
 ) {
     var exoPlayerData by remember { mutableStateOf<VideoPlayer?>(null) }
     val defaultToStart by remember { mutableStateOf(DefaultMutedSetting.value) }
@@ -127,6 +143,7 @@ fun VideoView(
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 fun VideoView(
     videoUri: String,
@@ -135,6 +152,21 @@ fun VideoView(
     defaultToStart: Boolean = false,
     thumb: VideoThumb? = null,
     onDialog: ((Boolean) -> Unit)? = null
+) {
+    val (value, elapsed) = measureTimedValue {
+        VideoView1(videoUri, description, exoPlayerData, defaultToStart, thumb, onDialog)
+    }
+    Log.d("Rendering Metrics", "VideoView $elapsed $videoUri")
+}
+
+@Composable
+fun VideoView1(
+    videoUri: String,
+    description: String? = null,
+    exoPlayerData: VideoPlayer,
+    defaultToStart: Boolean = false,
+    thumb: VideoThumb? = null,
+    onDialog: ((Boolean) -> Unit)? = null
 ) {
     val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
 

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

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
@@ -25,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.actions.NewPostViewModel
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
@@ -33,12 +33,10 @@ fun ZapRaiserRequest(
     newPostViewModel: NewPostViewModel
 ) {
     Column(
-        modifier = Modifier
-            .fillMaxWidth()
+        modifier = Modifier.fillMaxWidth()
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
+            modifier = Modifier.fillMaxWidth()
         ) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
@@ -49,7 +47,7 @@ fun ZapRaiserRequest(
                 Icon(
                     painter = painterResource(R.drawable.lightning),
                     null,
-                    modifier = Modifier.size(20.dp),
+                    modifier = Size20Modifier,
                     tint = Color.Unspecified
                 )
 

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

@@ -1,17 +1,16 @@
 package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Context
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 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
@@ -25,7 +24,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.pager.PagerState
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.Icon
@@ -37,8 +36,10 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Report
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -46,11 +47,11 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.Placeholder
@@ -59,12 +60,12 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 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.compose.AsyncImagePainter
 import coil.imageLoader
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.toHexKey
@@ -73,9 +74,8 @@ import com.vitorpamplona.amethyst.ui.actions.CloseButton
 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.QuoteBorder
-import com.vitorpamplona.amethyst.ui.theme.hashVerified
-import com.vitorpamplona.amethyst.ui.theme.subtleBorder
+import com.vitorpamplona.amethyst.ui.theme.Font17SP
+import com.vitorpamplona.amethyst.ui.theme.imageModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
@@ -175,14 +175,7 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
         mutableStateOf(false)
     }
 
-    var mainImageModifier = Modifier
-        .fillMaxWidth()
-        .clip(shape = QuoteBorder)
-        .border(
-            1.dp,
-            MaterialTheme.colors.subtleBorder,
-            QuoteBorder
-        )
+    var mainImageModifier = MaterialTheme.colors.imageModifier
 
     if (content is ZoomableUrlContent) {
         mainImageModifier = mainImageModifier.combinedClickable(
@@ -215,90 +208,57 @@ fun ZoomableContentView(content: ZoomableContent, images: ImmutableList<Zoomable
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun LocalImageView(
     content: ZoomableLocalImage,
     mainImageModifier: Modifier
 ) {
-    BoxWithConstraints(contentAlignment = Alignment.Center) {
-        // store the dialog open or close state
-        var imageLoadingState by remember {
-            mutableStateOf<Boolean?>(null)
-        }
+    if (content.localFile != null && content.localFile.exists()) {
+        BoxWithConstraints(contentAlignment = Alignment.Center) {
+            val myModifier = remember {
+                mainImageModifier
+                    .widthIn(max = maxWidth)
+                    .heightIn(max = maxHeight)
+                    .run {
+                        aspectRatio(content.dim)?.let { ratio ->
+                            this.aspectRatio(ratio, false)
+                        } ?: this
+                    }
+            }
 
-        val myModifier = remember {
-            mainImageModifier
-                .widthIn(max = maxWidth)
-                .heightIn(max = maxHeight)
-                .run {
-                    aspectRatio(content.dim)?.let { ratio ->
-                        this.aspectRatio(ratio, false)
-                    } ?: this
-                }
-        }
+            val contentScale = remember {
+                if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
+            }
 
-        val contentScale = remember {
-            if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
-        }
+            val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+            val painterState = remember {
+                mutableStateOf<AsyncImagePainter.State?>(null)
+            }
 
-        if (content.localFile != null && content.localFile.exists()) {
             AsyncImage(
                 model = content.localFile,
                 contentDescription = content.description,
                 contentScale = contentScale,
                 modifier = myModifier,
-                onError = {
-                    if (imageLoadingState != false) {
-                        imageLoadingState = false
-                    }
-                },
-                onSuccess = {
-                    if (imageLoadingState != true) {
-                        imageLoadingState = true
-                    }
+                onState = {
+                    painterState.value = it
                 }
             )
-        }
 
-        if (imageLoadingState == true) {
-            if (content.isVerified != null) {
-                HashVerificationSymbol(content.isVerified, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingState == false || content.localFile == null || !content.localFile.exists()) {
-            BlankNote()
-        } else {
-            if (content.blurhash != null) {
-                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
-            } else {
-                FlowRow() {
-                    DisplayUrlWithLoadingSymbol(content)
-                }
-            }
+            AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
         }
+    } else {
+        BlankNote()
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun UrlImageView(
     content: ZoomableUrlImage,
     mainImageModifier: Modifier
 ) {
-    val scope = rememberCoroutineScope()
-
     BoxWithConstraints(contentAlignment = Alignment.Center) {
-        val context = LocalContext.current
-
-        // store the dialog open or close state
-        var imageLoadingStatus by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
-        var verifiedHash by remember {
-            mutableStateOf<Boolean?>(null)
-        }
-
         val myModifier = remember {
             mainImageModifier
                 .widthIn(max = maxWidth)
@@ -314,35 +274,37 @@ private fun UrlImageView(
             if (maxHeight.isFinite) ContentScale.Fit else ContentScale.FillWidth
         }
 
+        val verifierModifier = Modifier.align(Alignment.TopEnd)
+
+        val painterState = remember {
+            mutableStateOf<AsyncImagePainter.State?>(null)
+        }
+
         AsyncImage(
             model = content.url,
             contentDescription = content.description,
             contentScale = contentScale,
             modifier = myModifier,
-            onError = {
-                if (imageLoadingStatus != false) {
-                    imageLoadingStatus = false
-                }
-            },
-            onSuccess = {
-                if (verifiedHash == null) {
-                    scope.launch(Dispatchers.IO) {
-                        verifiedHash = verifyHash(content, context)
-                    }
-                }
-                if (imageLoadingStatus != true) {
-                    imageLoadingStatus = true
-                }
+            onState = {
+                painterState.value = it
             }
         )
 
-        if (imageLoadingStatus == true) {
-            verifiedHash?.let {
-                HashVerificationSymbol(it, Modifier.align(Alignment.TopEnd))
-            }
-        } else if (imageLoadingStatus == false) {
-            ClickableUrl(urlText = "${content.url} ", url = content.url)
-        } else {
+        AddedImageFeatures(painterState, content, contentScale, myModifier, verifierModifier)
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableLocalImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
             if (content.blurhash != null) {
                 DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
             } else {
@@ -351,6 +313,70 @@ private fun UrlImageView(
                 }
             }
         }
+
+        is AsyncImagePainter.State.Error -> {
+            BlankNote()
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.isVerified != null) {
+                HashVerificationSymbol(content.isVerified, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
+    }
+}
+
+@Composable
+@OptIn(ExperimentalLayoutApi::class)
+private fun AddedImageFeatures(
+    painter: MutableState<AsyncImagePainter.State?>,
+    content: ZoomableUrlImage,
+    contentScale: ContentScale,
+    myModifier: Modifier,
+    verifiedModifier: Modifier
+) {
+    var verifiedHash by remember {
+        mutableStateOf<Boolean?>(null)
+    }
+
+    when (painter.value) {
+        null, is AsyncImagePainter.State.Loading -> {
+            if (content.blurhash != null) {
+                DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
+            } else {
+                FlowRow() {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
+        }
+
+        is AsyncImagePainter.State.Error -> {
+            ClickableUrl(urlText = "${content.url} ", url = content.url)
+        }
+
+        is AsyncImagePainter.State.Success -> {
+            if (content.hash != null) {
+                val context = LocalContext.current
+                LaunchedEffect(key1 = content.url) {
+                    launch(Dispatchers.IO) {
+                        val newVerifiedHash = verifyHash(content, context)
+                        if (newVerifiedHash != verifiedHash) {
+                            verifiedHash = newVerifiedHash
+                        }
+                    }
+                }
+            }
+
+            verifiedHash?.let {
+                HashVerificationSymbol(it, verifiedModifier)
+            }
+        }
+
+        else -> {
+        }
     }
 }
 
@@ -386,7 +412,7 @@ private fun DisplayUrlWithLoadingSymbol(content: ZoomableContent) {
 @Composable
 private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
     if (content is ZoomableUrlContent) {
-        ClickableUrl(urlText = "${content.url} ", url = content.url)
+        ClickableUrl(urlText = remember { "${content.url} " }, url = content.url)
     } else {
         Text("Loading content... ")
     }
@@ -405,8 +431,8 @@ private fun DisplayUrlWithLoadingSymbolWait(content: ZoomableContent) {
             myId,
             InlineTextContent(
                 Placeholder(
-                    width = 17.sp,
-                    height = 17.sp,
+                    width = Font17SP,
+                    height = Font17SP,
                     placeholderVerticalAlign = PlaceholderVerticalAlign.Center
                 )
             ) {
@@ -448,13 +474,34 @@ private fun DisplayBlurHash(
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<ZoomableContent> = listOf(imageUrl).toImmutableList(), onDismiss: () -> Unit) {
+    val view = LocalView.current
+
+    DisposableEffect(key1 = Unit) {
+        if (Build.VERSION.SDK_INT >= 30) {
+            view.windowInsetsController?.hide(
+                android.view.WindowInsets.Type.systemBars()
+            )
+        }
+
+        onDispose {
+            if (Build.VERSION.SDK_INT >= 30) {
+                view.windowInsetsController?.show(
+                    android.view.WindowInsets.Type.systemBars()
+                )
+            }
+        }
+    }
+
     Dialog(
         onDismissRequest = onDismiss,
-        properties = DialogProperties(usePlatformDefaultWidth = false)
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            decorFitsSystemWindows = false
+        )
     ) {
         Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-            Column() {
-                val pagerState: PagerState = remember { PagerState() }
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter) {
+                val pagerState: PagerState = rememberPagerState()
 
                 LaunchedEffect(key1 = pagerState, key2 = imageUrl) {
                     val page = allImages.indexOf(imageUrl)
@@ -463,6 +510,18 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                     }
                 }
 
+                if (allImages.size > 1) {
+                    SlidingCarousel(
+                        pagerState = pagerState,
+                        itemsCount = allImages.size,
+                        itemContent = { index ->
+                            RenderImageOrVideo(allImages[index])
+                        }
+                    )
+                } else {
+                    RenderImageOrVideo(imageUrl)
+                }
+
                 Row(
                     modifier = Modifier
                         .padding(10.dp)
@@ -479,18 +538,6 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: ImmutableList<Zoom
                         SaveToGallery(localFile = myContent.localFile, mimeType = myContent.mimeType)
                     }
                 }
-
-                if (allImages.size > 1) {
-                    SlidingCarousel(
-                        pagerState = pagerState,
-                        itemsCount = allImages.size,
-                        itemContent = { index ->
-                            RenderImageOrVideo(allImages[index])
-                        }
-                    )
-                } else {
-                    RenderImageOrVideo(imageUrl)
-                }
             }
         }
     }
@@ -549,15 +596,7 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
             .height(40.dp)
             .padding(10.dp)
     ) {
-        Box(
-            Modifier
-                .clip(CircleShape)
-                .fillMaxSize(0.6f)
-                .align(Alignment.Center)
-                .background(MaterialTheme.colors.background)
-        )
-
-        if (verifiedHash == true) {
+        if (verifiedHash) {
             IconButton(
                 onClick = {
                     scope.launch {
@@ -572,11 +611,11 @@ private fun HashVerificationSymbol(verifiedHash: Boolean, modifier: Modifier) {
                 Icon(
                     painter = painterResource(R.drawable.ic_verified),
                     "Hash Verified",
-                    tint = MaterialTheme.colors.hashVerified,
+                    tint = Color.Unspecified,
                     modifier = Modifier.size(30.dp)
                 )
             }
-        } else if (verifiedHash == false) {
+        } else {
             IconButton(
                 onClick = {
                     scope.launch {

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

@@ -34,9 +34,9 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
 
         val publicChannels = account.followingChannels().map { it ->
             it.notes.values
-                .filter { account.isAcceptable(it) }
+                .filter { account.isAcceptable(it) && it.event != null }
                 .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-                .lastOrNull { it.event != null }
+                .lastOrNull()
         }
 
         return (privateMessages + publicChannels)

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

@@ -15,9 +15,11 @@ abstract class FeedFilter<T> {
         }
 
         Log.d("Time", "${this.javaClass.simpleName} Full Feed in $elapsed with ${feed.size} objects")
-        return feed.take(1000)
+        return feed.take(limit())
     }
 
+    open fun limit() = 1000
+
     /**
      * Returns a string that serves as the key to invalidate the list if it changes.
      */
@@ -38,7 +40,7 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
             val newItemsToBeAdded = applyFilter(newItems)
             if (newItemsToBeAdded.isNotEmpty()) {
                 val newList = oldList.toSet() + newItemsToBeAdded
-                sort(newList).take(1000)
+                sort(newList).take(limit())
             } else {
                 oldList
             }

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

@@ -1,53 +0,0 @@
-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.*
-
-class GlobalFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
-
-    override fun feedKey(): String {
-        return account.userProfile().pubkeyHex
-    }
-
-    override fun feed(): List<Note> {
-        val notes = innerApplyFilter(LocalCache.notes.values)
-        val longFormNotes = innerApplyFilter(LocalCache.addressables.values)
-
-        return sort(notes + longFormNotes)
-    }
-
-    override fun applyFilter(collection: Set<Note>): Set<Note> {
-        return innerApplyFilter(collection)
-    }
-
-    private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
-        val followChannels = account.followingChannels
-        val followUsers = account.followingKeySet()
-        val now = System.currentTimeMillis() / 1000
-
-        return collection
-            .asSequence()
-            .filter {
-                (it.event is BaseTextNoteEvent || it.event is AudioTrackEvent) && it.replyTo.isNullOrEmpty()
-            }
-            .filter {
-                val channel = it.channelHex()
-                // does not show events already in the public chat list
-                (channel == null || channel !in followChannels) &&
-                    // does not show people the user already follows
-                    (it.author?.pubkeyHex !in followUsers)
-            }
-            .filter { account.isAcceptable(it) }
-            .filter {
-                // Do not show notes with the creation time exceeding the current time, as they will always stay at the top of the global feed, which is cheating.
-                it.createdAt()!! <= now
-            }
-            .toSet()
-    }
-
-    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/HomeConversationsFeedFilter.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -23,16 +24,21 @@ class HomeConversationsFeedFilter(val account: Account) : AdditiveFeedFilter<Not
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
+        val now = System.currentTimeMillis() / 1000
+
         return collection
             .asSequence()
             .filter {
                 (it.event is TextNoteEvent || it.event is PollNoteEvent || it.event is ChannelMessageEvent || it.event is LiveActivitiesChatMessageEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (it.event?.isTaggedHashes(followingTagSet) ?: false)) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || it.event?.isTaggedHashes(followingTagSet) ?: false) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it) } ?: true &&
+                    ((it.event?.createdAt() ?: 0) < now) &&
                     !it.isNewThread()
             }
             .toSet()

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

@@ -1,19 +1,20 @@
 package com.vitorpamplona.amethyst.ui.dal
 
-import android.util.Log
-import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.OnlineChecker
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
-import okhttp3.Request
 import java.util.Date
 
 class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
     override fun feedKey(): String {
-        return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList
+        val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList)?.size ?: 0
+        val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList)?.size ?: 0
+
+        return account.userProfile().pubkeyHex + "-" + account.defaultHomeFollowList + "-" + followingKeySet + "-" + followingTagSet
     }
 
     override fun feed(): List<Note> {
@@ -29,41 +30,28 @@ class HomeLiveActivitiesFeedFilter(val account: Account) : AdditiveFeedFilter<No
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
         checkNotInMainThread()
 
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
-        val fortyEightHrs = (Date().time / 1000) - 60 * 60 * 48 // hrs
+        val twoHrs = (Date().time / 1000) - 60 * 60 * 2 // hrs
 
         return collection
             .asSequence()
             .filter { it ->
                 val noteEvent = it.event
-                (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > fortyEightHrs && noteEvent.status() == "live" && checkIfOnline(noteEvent.streaming())) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                (noteEvent is LiveActivitiesEvent && noteEvent.createdAt > twoHrs && noteEvent.status() == "live" && OnlineChecker.isOnline(noteEvent.streaming())) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true
             }
             .toSet()
     }
 
+    override fun limit() = 2
+
     override fun sort(collection: Set<Note>): List<Note> {
         return collection.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
     }
 }
-
-fun checkIfOnline(url: String?): Boolean {
-    if (url.isNullOrBlank()) return false
-
-    val request = Request.Builder()
-        .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
-        .url(url)
-        .get()
-        .build()
-
-    return try {
-        HttpClient.getHttpClient().newCall(request).execute().code == 200
-    } catch (e: Exception) {
-        Log.e("LiveActivities", "Failed to check streaming url $url", e)
-        false
-    }
-}

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

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.AudioTrackEvent
@@ -10,6 +11,7 @@ import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
 import com.vitorpamplona.amethyst.service.model.PollNoteEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
+import java.util.Date
 
 class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
     override fun feedKey(): String {
@@ -28,9 +30,12 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultHomeFollowList == GLOBAL_FOLLOWS
+
         val followingKeySet = account.selectedUsersFollowList(account.defaultHomeFollowList) ?: emptySet()
         val followingTagSet = account.selectedTagsFollowList(account.defaultHomeFollowList) ?: emptySet()
 
+        val oneMinuteInTheFuture = Date().time / 1000 + (1 * 60) // one minute in the future.
         val oneHr = 60 * 60
 
         return collection
@@ -38,9 +43,10 @@ class HomeNewThreadFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
             .filter { it ->
                 val noteEvent = it.event
                 (noteEvent is TextNoteEvent || noteEvent is RepostEvent || noteEvent is GenericRepostEvent || noteEvent is LongTextNoteEvent || noteEvent is PollNoteEvent || noteEvent is HighlightEvent || noteEvent is AudioTrackEvent) &&
-                    (it.author?.pubkeyHex in followingKeySet || (noteEvent.isTaggedHashes(followingTagSet))) &&
+                    (isGlobal || it.author?.pubkeyHex in followingKeySet || noteEvent.isTaggedHashes(followingTagSet)) &&
                     // && account.isAcceptable(it)  // This filter follows only. No need to check if acceptable
                     it.author?.let { !account.isHidden(it.pubkeyHex) } ?: true &&
+                    ((it.event?.createdAt() ?: 0) < oneMinuteInTheFuture) &&
                     it.isNewThread() &&
                     (
                         (noteEvent !is RepostEvent && noteEvent !is GenericRepostEvent) || // not a repost

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

@@ -1,29 +0,0 @@
-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.PeopleListEvent
-
-object PeopleListFeedFilter : FeedFilter<Note>() {
-    lateinit var account: Account
-
-    override fun feedKey(): String {
-        return account.userProfile().pubkeyHex
-    }
-
-    override fun feed(): List<Note> {
-        val privKey = account.loggedIn.privKey ?: return emptyList()
-
-        val lists = LocalCache.addressables.values
-            .asSequence()
-            .filter {
-                (it.event is PeopleListEvent)
-            }
-            .toSet()
-
-        return lists
-            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-            .reversed()
-    }
-}

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

@@ -5,25 +5,17 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
-object UserProfileBookmarksFeedFilter : FeedFilter<Note>() {
-    lateinit var account: Account
-    var user: User? = null
-
+class UserProfileBookmarksFeedFilter(val user: User, val account: Account) : FeedFilter<Note>() {
     override fun feedKey(): String {
-        return account.userProfile().pubkeyHex + "-" + user?.pubkeyHex
-    }
-
-    fun loadUserProfile(accountLoggedIn: Account, user: User?) {
-        account = accountLoggedIn
-        this.user = user
+        return account.userProfile().pubkeyHex + "-" + user.pubkeyHex
     }
 
     override fun feed(): List<Note> {
-        val notes = user?.latestBookmarkList?.taggedEvents()?.mapNotNull {
+        val notes = user.latestBookmarkList?.taggedEvents()?.mapNotNull {
             LocalCache.checkGetOrCreateNote(it)
         }?.toSet() ?: emptySet()
 
-        val addresses = user?.latestBookmarkList?.taggedAddresses()?.map {
+        val addresses = user.latestBookmarkList?.taggedAddresses()?.map {
             LocalCache.getOrCreateAddressableNote(it)
         }?.toSet() ?: emptySet()
 

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

@@ -4,23 +4,15 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 
-object UserProfileConversationsFeedFilter : FeedFilter<Note>() {
-    var account: Account? = null
-    var user: User? = null
-
+class UserProfileConversationsFeedFilter(val user: User, val account: Account) : FeedFilter<Note>() {
     override fun feedKey(): String {
-        return account?.userProfile()?.pubkeyHex + "-" + user?.pubkeyHex
-    }
-
-    fun loadUserProfile(accountLoggedIn: Account, user: User?) {
-        account = accountLoggedIn
-        this.user = user
+        return account.userProfile().pubkeyHex + "-" + user.pubkeyHex
     }
 
     override fun feed(): List<Note> {
-        return user?.notes
-            ?.filter { account?.isAcceptable(it) == true && !it.isNewThread() }
-            ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-            ?.reversed() ?: emptyList()
+        return user.notes
+            .filter { account.isAcceptable(it) == true && !it.isNewThread() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+            .reversed() ?: emptyList()
     }
 }

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

@@ -8,27 +8,19 @@ import com.vitorpamplona.amethyst.service.model.AppRecommendationEvent
 import com.vitorpamplona.amethyst.service.model.BookmarkListEvent
 import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 
-object UserProfileNewThreadFeedFilter : FeedFilter<Note>() {
-    var account: Account? = null
-    var user: User? = null
-
+class UserProfileNewThreadFeedFilter(val user: User, val account: Account) : FeedFilter<Note>() {
     override fun feedKey(): String {
-        return account?.userProfile()?.pubkeyHex + "-" + user?.pubkeyHex
-    }
-
-    fun loadUserProfile(accountLoggedIn: Account, user: User) {
-        account = accountLoggedIn
-        this.user = user
+        return account.userProfile().pubkeyHex + "-" + user.pubkeyHex
     }
 
     override fun feed(): List<Note> {
         val longFormNotes = LocalCache.addressables.values
             .filter { it.author == user && (it.event !is PeopleListEvent && it.event !is BookmarkListEvent && it.event !is AppRecommendationEvent) }
 
-        return user?.notes
-            ?.plus(longFormNotes)
-            ?.filter { account?.isAcceptable(it) == true && it.isNewThread() }
-            ?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-            ?.reversed() ?: emptyList()
+        return user.notes
+            .plus(longFormNotes)
+            .filter { account.isAcceptable(it) == true && it.isNewThread() }
+            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+            .reversed() ?: emptyList()
     }
 }

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

@@ -5,21 +5,13 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 
-object UserProfileReportsFeedFilter : FeedFilter<Note>() {
-    var user: User? = null
-
+class UserProfileReportsFeedFilter(val user: User) : FeedFilter<Note>() {
     override fun feedKey(): String {
-        return user?.pubkeyHex ?: ""
-    }
-
-    fun loadUserProfile(user: User?) {
-        this.user = user
+        return user.pubkeyHex ?: ""
     }
 
     override fun feed(): List<Note> {
-        val myUser = user ?: return emptyList()
-
-        val reportNotes = LocalCache.notes.values.filter { (it.event as? ReportEvent)?.isTaggedUser(myUser.pubkeyHex) == true }
+        val reportNotes = LocalCache.notes.values.filter { (it.event as? ReportEvent)?.isTaggedUser(user.pubkeyHex) == true }
 
         return reportNotes
             .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))

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

@@ -8,12 +8,11 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.AlertDialog
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
@@ -35,7 +34,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-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
@@ -43,6 +41,7 @@ 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 androidx.lifecycle.map
 import com.vitorpamplona.amethyst.AccountInfo
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
@@ -52,12 +51,12 @@ 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
 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 com.vitorpamplona.amethyst.ui.theme.AccountPictureModifier
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -131,23 +130,28 @@ fun DisplayAccount(
     accountViewModel: AccountViewModel,
     accountStateViewModel: AccountStateViewModel
 ) {
-    var baseUser by remember { mutableStateOf<User?>(null) }
+    var baseUser by remember { mutableStateOf<User?>(LocalCache.getUserIfExists(decodePublicKey(acc.npub).toHexKey())) }
 
-    LaunchedEffect(key1 = acc.npub) {
-        launch(Dispatchers.IO) {
-            baseUser = try {
-                LocalCache.getOrCreateUser(decodePublicKey(acc.npub).toHexKey())
-            } catch (e: Exception) {
-                null
+    if (baseUser == 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),
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable {
+                    accountStateViewModel.switchUser(acc.npub)
+                }
+                .padding(16.dp, 16.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
             Row(
@@ -159,7 +163,9 @@ fun DisplayAccount(
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     Box(
-                        modifier = Modifier.width(55.dp).padding(0.dp)
+                        modifier = Modifier
+                            .width(55.dp)
+                            .padding(0.dp)
                     ) {
                         AccountPicture(it)
                     }
@@ -197,21 +203,15 @@ private fun ActiveMarker(acc: AccountInfo, accountViewModel: AccountViewModel) {
 
 @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)
-        }
-    }
+    val profilePicture by user.live().metadata.map {
+        it.user.profilePicture()
+    }.observeAsState()
 
     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)
+        modifier = AccountPictureModifier
     )
 }
 
@@ -220,17 +220,13 @@ 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()
-        }
-    }
+    val displayName by user.live().metadata.map {
+        user.bestDisplayName()
+    }.observeAsState()
+
+    val tags by user.live().metadata.map {
+        user.info?.latestMetadata?.tags?.toImmutableListOfLists()
+    }.observeAsState()
 
     displayName?.let {
         CreateTextWithEmoji(
@@ -251,8 +247,42 @@ private fun LogoutButton(
     acc: AccountInfo,
     accountStateViewModel: AccountStateViewModel
 ) {
+    var logoutDialog by remember { mutableStateOf(false) }
+    if (logoutDialog) {
+        AlertDialog(
+            title = {
+                Text(text = stringResource(R.string.log_out))
+            },
+            text = {
+                Text(text = stringResource(R.string.are_you_sure_you_want_to_log_out))
+            },
+            onDismissRequest = {
+                logoutDialog = false
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        logoutDialog = false
+                        accountStateViewModel.logOff(acc.npub)
+                    }
+                ) {
+                    Text(text = stringResource(R.string.log_out))
+                }
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = {
+                        logoutDialog = false
+                    }
+                ) {
+                    Text(text = stringResource(R.string.cancel))
+                }
+            }
+        )
+    }
+
     IconButton(
-        onClick = { accountStateViewModel.logOff(acc.npub) }
+        onClick = { logoutDialog = true }
     ) {
         Icon(
             imageVector = Icons.Default.Logout,

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

@@ -48,7 +48,6 @@ val bottomNavigationItems = listOf(
     Route.Home,
     Route.Message,
     Route.Video,
-    Route.Search,
     Route.Notification
 )
 

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

@@ -12,7 +12,6 @@ import androidx.navigation.compose.composable
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
-import com.vitorpamplona.amethyst.ui.screen.NostrGlobalFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedLiveActivitiesViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
@@ -42,7 +41,6 @@ fun AppNavigation(
     liveActivitiesViewModel: NostrHomeFeedLiveActivitiesViewModel,
     knownFeedViewModel: NostrChatroomListKnownFeedViewModel,
     newFeedViewModel: NostrChatroomListNewFeedViewModel,
-    searchFeedViewModel: NostrGlobalFeedViewModel,
     videoFeedViewModel: NostrVideoFeedViewModel,
     notifFeedViewModel: NotificationViewModel,
     userReactionsStatsModel: UserReactionsViewModel,
@@ -111,7 +109,6 @@ fun AppNavigation(
         Route.Search.let { route ->
             composable(route.route, route.arguments, content = {
                 SearchScreen(
-                    searchFeedViewModel = searchFeedViewModel,
                     accountViewModel = accountViewModel,
                     nav = nav
                 )

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

@@ -46,8 +46,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import coil.Coil
@@ -60,7 +60,6 @@ import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomDataSource
 import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHashtagDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
@@ -73,10 +72,7 @@ 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
-import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
-import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
@@ -96,7 +92,8 @@ fun AppTopBar(
     followLists: FollowListViewModel,
     navEntryState: State<NavBackStackEntry?>,
     scaffoldState: ScaffoldState,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
 ) {
     val currentRoute by remember(navEntryState.value) {
         derivedStateOf {
@@ -104,7 +101,7 @@ fun AppTopBar(
         }
     }
 
-    RenderTopRouteBar(currentRoute, followLists, scaffoldState, accountViewModel)
+    RenderTopRouteBar(currentRoute, followLists, scaffoldState, accountViewModel, nav)
 }
 
 @Composable
@@ -112,16 +109,17 @@ private fun RenderTopRouteBar(
     currentRoute: String?,
     followLists: FollowListViewModel,
     scaffoldState: ScaffoldState,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
 ) {
     when (currentRoute) {
         Route.Channel.base -> NoTopBar()
         Route.Room.base -> NoTopBar()
         // Route.Profile.route -> TopBarWithBackButton(nav)
-        Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel)
-        Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel)
-        Route.Notification.base -> NotificationTopBar(followLists, scaffoldState, accountViewModel)
-        else -> MainTopBar(scaffoldState, accountViewModel)
+        Route.Home.base -> HomeTopBar(followLists, scaffoldState, accountViewModel, nav)
+        Route.Video.base -> StoriesTopBar(followLists, scaffoldState, accountViewModel, nav)
+        Route.Notification.base -> NotificationTopBar(followLists, scaffoldState, accountViewModel, nav)
+        else -> MainTopBar(scaffoldState, accountViewModel, nav)
     }
 }
 
@@ -130,15 +128,11 @@ fun NoTopBar() {
 }
 
 @Composable
-fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
-        val accountState by accountViewModel.accountLiveData.observeAsState()
-
-        val list by remember(accountState) {
-            derivedStateOf {
-                accountState?.account?.defaultStoriesFollowList ?: GLOBAL_FOLLOWS
-            }
-        }
+fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+        val list by accountViewModel.accountLiveData.map {
+            it.account.defaultStoriesFollowList
+        }.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
             followLists,
@@ -151,20 +145,16 @@ fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState
 }
 
 @Composable
-fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
-        val accountState by accountViewModel.accountLiveData.observeAsState()
-
-        val list by remember(accountState) {
-            derivedStateOf {
-                accountState?.account?.defaultHomeFollowList ?: GLOBAL_FOLLOWS
-            }
-        }
+fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+        val list by accountViewModel.accountLiveData.map {
+            it.account.defaultHomeFollowList
+        }.observeAsState(KIND3_FOLLOWS)
 
         FollowList(
             followLists,
             list,
-            false
+            true
         ) { listName ->
             accountViewModel.account.changeDefaultHomeFollowList(listName)
         }
@@ -172,15 +162,11 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
 }
 
 @Composable
-fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    GenericTopBar(scaffoldState, accountViewModel) { accountViewModel ->
-        val accountState by accountViewModel.accountLiveData.observeAsState()
-
-        val list by remember(accountState) {
-            derivedStateOf {
-                accountState?.account?.defaultNotificationFollowList ?: GLOBAL_FOLLOWS
-            }
-        }
+fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+        val list by accountViewModel.accountLiveData.map {
+            it.account.defaultNotificationFollowList
+        }.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
             followLists,
@@ -193,25 +179,17 @@ fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: Scaffold
 }
 
 @Composable
-fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    GenericTopBar(scaffoldState, accountViewModel) {
+fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    GenericTopBar(scaffoldState, accountViewModel, nav) {
         AmethystIcon()
     }
 }
 
 @OptIn(coil.annotation.ExperimentalCoilApi::class)
 @Composable
-fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, content: @Composable (AccountViewModel) -> Unit) {
+fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit, content: @Composable (AccountViewModel) -> Unit) {
     val coroutineScope = rememberCoroutineScope()
 
-    var wantsToEditRelays by remember {
-        mutableStateOf(false)
-    }
-
-    if (wantsToEditRelays) {
-        NewRelayListView({ wantsToEditRelays = false }, accountViewModel)
-    }
-
     Column(modifier = Modifier.height(50.dp)) {
         TopAppBar(
             elevation = 0.dp,
@@ -232,10 +210,6 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                         ) {
                             content(accountViewModel)
                         }
-
-                        RelayStatus(
-                            { wantsToEditRelays = true }
-                        )
                     }
                 }
             },
@@ -247,7 +221,9 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                 }
             },
             actions = {
-                RelayIcon { wantsToEditRelays = true }
+                SearchIcon() {
+                    nav(Route.Search.route)
+                }
             }
         )
         Divider(thickness = 0.25.dp)
@@ -255,80 +231,14 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
 }
 
 @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) {
+private fun SearchIcon(onClick: () -> Unit) {
     IconButton(
-        onClick = onClick,
-        modifier = Modifier
+        onClick = onClick
     ) {
         Icon(
-            painter = painterResource(R.drawable.relays),
-            null,
-            modifier = Modifier.size(24.dp),
+            painter = painterResource(R.drawable.ic_search),
+            contentDescription = null,
+            modifier = Modifier.size(22.dp),
             tint = Color.Unspecified
         )
     }
@@ -342,7 +252,7 @@ private fun LoggedInUserPictureDrawer(
     val accountUserState by accountViewModel.account.userProfile().live().metadata.observeAsState()
 
     val pubkeyHex = remember { accountUserState?.user?.pubkeyHex ?: "" }
-    val profilePicture = remember(accountUserState) { ResizeImage(accountUserState?.user?.profilePicture(), 34.dp) }
+    val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture() }
 
     IconButton(
         onClick = onClick,
@@ -424,6 +334,7 @@ class FollowListViewModel(val account: Account) : ViewModel() {
     var collectorJob: Job? = null
 
     init {
+        Log.d("Init", "App Top Bar")
         refresh()
         collectorJob = viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect { newNotes ->
@@ -543,7 +454,6 @@ fun AmethystIcon() {
             NostrChannelDataSource.printCounter()
             NostrChatroomDataSource.printCounter()
             NostrChatroomListDataSource.printCounter()
-            NostrGlobalDataSource.printCounter()
             NostrHashtagDataSource.printCounter()
             NostrHomeDataSource.printCounter()
             NostrSearchEventOrUserDataSource.printCounter()

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

@@ -34,6 +34,7 @@ import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -52,6 +53,7 @@ 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 androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
@@ -60,14 +62,17 @@ 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.NewRelayListView
 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.RelayPoolViewModel
 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 com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Size16dp
+import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -122,12 +127,11 @@ fun ProfileContent(
     val coroutineScope = rememberCoroutineScope()
 
     val accountUserState by baseAccountUser.live().metadata.observeAsState()
-    val accountUser = remember(accountUserState) { accountUserState?.user } ?: return
 
     val profilePubHex = remember(accountUserState) { accountUserState?.user?.pubkeyHex } ?: return
 
     val profileBanner = remember(accountUserState) { accountUserState?.user?.info?.banner?.ifBlank { null } }
-    val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture()?.ifBlank { null }?.let { ResizeImage(it, 100.dp) } }
+    val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture() }
     val bestUserName = remember(accountUserState) { accountUserState?.user?.bestUsername() }
     val bestDisplayName = remember(accountUserState) { accountUserState?.user?.bestDisplayName() }
     val tags = remember(accountUserState) { accountUserState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists() }
@@ -303,6 +307,12 @@ fun ListContent(
     var conectOrbotDialogOpen by remember { mutableStateOf(false) }
     var proxyPort = remember { mutableStateOf(account.proxyPort.toString()) }
 
+    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
+
+    var wantsToEditRelays by remember {
+        mutableStateOf(false)
+    }
+
     Column(
         modifier = modifier
             .fillMaxHeight()
@@ -326,6 +336,16 @@ fun ListContent(
             route = Route.Bookmarks.route
         )
 
+        IconRowRelays(
+            relayViewModel = relayViewModel,
+            onClick = {
+                coroutineScope.launch {
+                    scaffoldState.drawerState.close()
+                }
+                wantsToEditRelays = true
+            }
+        )
+
         NavigationRow(
             title = stringResource(R.string.security_filters),
             icon = Route.BlockedUsers.icon,
@@ -433,6 +453,10 @@ fun ListContent(
             }
         )
     }
+
+    if (wantsToEditRelays) {
+        NewRelayListView({ wantsToEditRelays = false }, accountViewModel, nav = nav)
+    }
 }
 
 private fun enableTor(
@@ -448,6 +472,44 @@ private fun enableTor(
     ServiceManager.start(context)
 }
 
+@Composable
+private fun RelayStatus(
+    relayViewModel: RelayPoolViewModel
+) {
+    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)
+}
+
+@Composable
+private fun RenderRelayStatus(
+    connectedRelaysText: String,
+    isConnected: Boolean
+) {
+    Text(
+        text = connectedRelaysText,
+        color = if (isConnected) {
+            MaterialTheme.colors.placeholderText
+        } else {
+            Color.Red
+        },
+        style = MaterialTheme.typography.subtitle1
+    )
+}
+
 @Composable
 fun NavigationRow(
     title: String,
@@ -498,6 +560,39 @@ fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit, onLongCl
     }
 }
 
+@Composable
+fun IconRowRelays(relayViewModel: RelayPoolViewModel, onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 15.dp, horizontal = 25.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.relays),
+                null,
+                modifier = Modifier.size(22.dp),
+                tint = MaterialTheme.colors.onSurface
+            )
+
+            Text(
+                modifier = Modifier.padding(start = 16.dp),
+                text = stringResource(id = R.string.relays),
+                fontSize = 18.sp
+            )
+
+            Spacer(modifier = Modifier.width(Size16dp))
+
+            RelayStatus(relayViewModel = relayViewModel)
+        }
+    }
+}
+
 @Composable
 fun BottomContent(user: User, scaffoldState: ScaffoldState, nav: (String) -> Unit) {
     val coroutineScope = rememberCoroutineScope()

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

@@ -13,6 +13,7 @@ import androidx.navigation.navArgument
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
@@ -41,9 +42,14 @@ sealed class Route(
         hasNewItems = { accountViewModel, newNotes -> HomeLatestItem.hasNewItems(accountViewModel, newNotes) }
     )
 
+    object Global : Route(
+        route = "Global",
+        icon = R.drawable.ic_globe
+    )
+
     object Search : Route(
         route = "Search",
-        icon = R.drawable.ic_globe
+        icon = R.drawable.ic_search
     )
 
     object Video : Route(
@@ -165,6 +171,8 @@ object HomeLatestItem : LatestItem() {
         account: Account,
         newNotes: Set<Note>
     ): Boolean {
+        checkNotInMainThread()
+
         val lastTime = account.loadLastRead("HomeFollows")
 
         val newestItem = updateNewestItem(newNotes, account, HomeNewThreadFeedFilter(account))
@@ -178,6 +186,8 @@ object NotificationLatestItem : LatestItem() {
         account: Account,
         newNotes: Set<Note>
     ): Boolean {
+        checkNotInMainThread()
+
         val lastTime = account.loadLastRead("Notification")
 
         val newestItem = updateNewestItem(newNotes, account, NotificationFeedFilter(account))
@@ -191,6 +201,8 @@ object MessagesLatestItem : LatestItem() {
         account: Account,
         newNotes: Set<Note>
     ): Boolean {
+        checkNotInMainThread()
+
         // Checks if the current newest item is still unread.
         // If so, there is no need to check anything else
         if (isNew(getNewestItem(account), account)) {

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

@@ -1,6 +1,7 @@
 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
@@ -26,7 +27,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalContext
@@ -79,9 +79,7 @@ fun BadgeCompose(likeSetCard: BadgeCard, isInnerNote: Boolean = false, routeForL
 
         Column(
             modifier = Modifier
-                .drawBehind {
-                    drawRect(backgroundColor.value)
-                }
+                .background(backgroundColor.value)
                 .combinedClickable(
                     onClick = {
                         scope.launch {

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

@@ -1,11 +1,13 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -18,6 +20,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -39,17 +42,27 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Channel
+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.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
-import com.vitorpamplona.amethyst.ui.components.ResizeImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.ChatHeadlineBorders
+import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Height4dpModifier
+import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
+import com.vitorpamplona.amethyst.ui.theme.Size75dp
+import com.vitorpamplona.amethyst.ui.theme.StdTopPadding
+import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -60,30 +73,73 @@ fun ChatroomCompose(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val noteState by baseNote.live().metadata.observeAsState()
-    val note = noteState?.note
+    val isBlank by baseNote.live().metadata.map {
+        it.note.event == null
+    }.observeAsState(baseNote.event == null)
 
-    val channelHex by remember(noteState) {
+    if (isBlank) {
+        BlankNote(Modifier)
+    } else {
+        ChatroomComposeChannelOrUser(baseNote, accountViewModel, nav)
+    }
+}
+
+@Composable
+fun ChatroomComposeChannelOrUser(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val channelHex by remember(baseNote) {
         derivedStateOf {
-            noteState?.note?.channelHex()
+            baseNote.channelHex()
         }
     }
 
-    if (note?.event == null) {
-        BlankNote(Modifier)
-    } else if (channelHex != null) {
-        LoadChannel(baseChannelHex = channelHex!!) { channel ->
-            ChannelRoomCompose(note, channel, accountViewModel, nav)
-        }
+    if (channelHex != null) {
+        ChatroomChannel(channelHex, baseNote, accountViewModel, nav)
     } else {
-        val userRoomHex = remember(noteState, accountViewModel) {
-            (note.event as? PrivateDmEvent)?.talkingWith(accountViewModel.userProfile().pubkeyHex)
-        } ?: return
+        ChatroomDirectMessage(baseNote, accountViewModel, nav)
+    }
+}
 
-        LoadUser(userRoomHex) { user ->
-            UserRoomCompose(note, user, accountViewModel, nav)
+@Composable
+private fun ChatroomDirectMessage(
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val userRoomHex by remember(baseNote) {
+        derivedStateOf {
+            (baseNote.event as? PrivateDmEvent)?.talkingWith(accountViewModel.userProfile().pubkeyHex)
         }
     }
+
+    userRoomHex?.let {
+        LoadUser(it) { baseUser ->
+            Crossfade(baseUser) { user ->
+                if (user != null) {
+                    UserRoomCompose(baseNote, user, accountViewModel, nav)
+                } else {
+                    Box(Modifier.height(Size75dp).fillMaxWidth()) {
+                        // Makes sure just a max amount of objects are loaded.
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ChatroomChannel(
+    channelHex: HexKey?,
+    baseNote: Note,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LoadChannel(baseChannelHex = channelHex!!) { channel ->
+        ChannelRoomCompose(baseNote, channel, accountViewModel, nav)
+    }
 }
 
 @Composable
@@ -126,11 +182,11 @@ private fun ChannelRoomCompose(
         noteEvent?.content()
     }
 
-    var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+    var hasNewMessages = remember { mutableStateOf<Boolean>(false) }
 
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
-        if (hasNewMessages != newHasNewMessages) {
-            hasNewMessages = newHasNewMessages
+        if (hasNewMessages.value != newHasNewMessages) {
+            hasNewMessages.value = newHasNewMessages
         }
     }
 
@@ -138,29 +194,7 @@ private fun ChannelRoomCompose(
         channelIdHex = chanHex,
         channelPicture = channelPicture,
         channelTitle = { modifier ->
-            Text(
-                text = buildAnnotatedString {
-                    withStyle(
-                        SpanStyle(
-                            fontWeight = FontWeight.Bold
-                        )
-                    ) {
-                        append(channelName)
-                    }
-
-                    withStyle(
-                        SpanStyle(
-                            color = MaterialTheme.colors.placeholderText,
-                            fontWeight = FontWeight.Normal
-                        )
-                    ) {
-                        append(" ${stringResource(id = R.string.public_chat)}")
-                    }
-                },
-                fontWeight = FontWeight.Bold,
-                modifier = modifier,
-                style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
-            )
+            ChannelTitleWithBoostInfo(channelName, modifier)
         },
         channelLastTime = remember(note) { note.createdAt() },
         channelLastContent = remember(note) { "$authorName: $description" },
@@ -169,6 +203,39 @@ private fun ChannelRoomCompose(
     )
 }
 
+@Composable
+private fun ChannelTitleWithBoostInfo(channelName: String, modifier: Modifier) {
+    val boosted = stringResource(id = R.string.public_chat)
+    val placeHolderColor = MaterialTheme.colors.placeholderText
+    val channelNameAndBoostInfo = remember {
+        buildAnnotatedString {
+            withStyle(
+                SpanStyle(
+                    fontWeight = FontWeight.Bold
+                )
+            ) {
+                append(channelName)
+            }
+
+            withStyle(
+                SpanStyle(
+                    color = placeHolderColor,
+                    fontWeight = FontWeight.Normal
+                )
+            ) {
+                append(" $boosted")
+            }
+        }
+    }
+
+    Text(
+        text = channelNameAndBoostInfo,
+        fontWeight = FontWeight.Bold,
+        modifier = modifier,
+        style = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
+    )
+}
+
 @Composable
 private fun UserRoomCompose(
     note: Note,
@@ -176,29 +243,41 @@ private fun UserRoomCompose(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    var hasNewMessages by remember { mutableStateOf<Boolean>(false) }
+    val hasNewMessages = remember { mutableStateOf<Boolean>(false) }
 
     val route = remember(user) {
         "Room/${user.pubkeyHex}"
     }
 
+    val createAt by remember(note) {
+        derivedStateOf {
+            note.createdAt()
+        }
+    }
+
+    val content by remember(note) {
+        derivedStateOf {
+            accountViewModel.decrypt(note)
+        }
+    }
+
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
-        if (hasNewMessages != newHasNewMessages) {
-            hasNewMessages = newHasNewMessages
+        if (hasNewMessages.value != newHasNewMessages) {
+            hasNewMessages.value = newHasNewMessages
         }
     }
 
     ChannelName(
         channelPicture = {
-            UserPicture(
-                user,
+            NonClickableUserPicture(
+                baseUser = user,
                 accountViewModel = accountViewModel,
-                size = 55.dp
+                size = Size55dp
             )
         },
         channelTitle = { UsernameDisplay(user, it) },
-        channelLastTime = remember(note) { note.createdAt() },
-        channelLastContent = remember(note) { accountViewModel.decrypt(note) },
+        channelLastTime = createAt,
+        channelLastContent = content,
         hasNewMessages = hasNewMessages,
         onClick = { nav(route) }
     )
@@ -224,22 +303,20 @@ private fun WatchNotificationChanges(
 }
 
 @Composable
-fun LoadUser(baseUserHex: String, content: @Composable (User) -> Unit) {
+fun LoadUser(baseUserHex: String, content: @Composable (User?) -> Unit) {
     var user by remember(baseUserHex) {
         mutableStateOf<User?>(LocalCache.getUserIfExists(baseUserHex))
     }
 
-    LaunchedEffect(key1 = baseUserHex) {
-        if (user == null) {
+    if (user == null) {
+        LaunchedEffect(key1 = baseUserHex) {
             launch(Dispatchers.IO) {
                 user = LocalCache.checkGetOrCreateUser(baseUserHex)
             }
         }
     }
 
-    user?.let {
-        content(it)
-    }
+    content(user)
 }
 
 @Composable
@@ -249,19 +326,21 @@ fun ChannelName(
     channelTitle: @Composable (Modifier) -> Unit,
     channelLastTime: Long?,
     channelLastContent: String?,
-    hasNewMessages: Boolean,
+    hasNewMessages: MutableState<Boolean>,
     onClick: () -> Unit
 ) {
     ChannelName(
         channelPicture = {
             RobohashAsyncImageProxy(
                 robot = channelIdHex,
-                model = ResizeImage(channelPicture, 55.dp),
+                model = channelPicture,
                 contentDescription = stringResource(R.string.channel_image),
-                modifier = Modifier
-                    .width(55.dp)
-                    .height(55.dp)
-                    .clip(shape = CircleShape)
+                modifier = remember {
+                    Modifier
+                        .width(Size55dp)
+                        .height(Size55dp)
+                        .clip(shape = CircleShape)
+                }
             )
         },
         channelTitle,
@@ -278,71 +357,98 @@ fun ChannelName(
     channelTitle: @Composable (Modifier) -> Unit,
     channelLastTime: Long?,
     channelLastContent: String?,
-    hasNewMessages: Boolean,
+    hasNewMessages: MutableState<Boolean>,
     onClick: () -> Unit
 ) {
-    val context = LocalContext.current
-    Column(modifier = Modifier.clickable(onClick = onClick)) {
-        Row(
-            modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)
-        ) {
-            channelPicture()
+    Column(modifier = remember { Modifier.clickable(onClick = onClick) }) {
+        Row(modifier = ChatHeadlineBorders) {
+            Column(Size55Modifier) {
+                channelPicture()
+            }
+
+            Spacer(modifier = DoubleHorzSpacer)
 
             Column(
-                modifier = Modifier.padding(start = 10.dp),
+                modifier = Modifier.fillMaxWidth(),
                 verticalArrangement = Arrangement.SpaceAround
             ) {
                 Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(bottom = 4.dp)
+                    verticalAlignment = Alignment.CenterVertically
                 ) {
-                    channelTitle(Modifier.weight(1f))
-
-                    channelLastTime?.let {
-                        Text(
-                            timeAgo(channelLastTime, context),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f)
-                        )
-                    }
+                    FirstRow(channelTitle, channelLastTime, remember { Modifier.weight(1f) })
                 }
 
+                Spacer(modifier = Height4dpModifier)
+
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    if (channelLastContent != null) {
-                        Text(
-                            channelLastContent,
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
-                            modifier = Modifier.weight(1f)
-                        )
-                    } else {
-                        Text(
-                            stringResource(R.string.referenced_event_not_found),
-                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f),
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                            modifier = Modifier.weight(1f)
-                        )
-                    }
-
-                    if (hasNewMessages) {
-                        NewItemsBubble()
-                    }
+                    SecondRow(channelLastContent, hasNewMessages, remember { Modifier.weight(1f) })
                 }
             }
         }
 
         Divider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = 0.25.dp
+            modifier = StdTopPadding,
+            thickness = DividerThickness
         )
     }
 }
 
+@Composable
+private fun SecondRow(channelLastContent: String?, hasNewMessages: MutableState<Boolean>, modifier: Modifier) {
+    if (channelLastContent != null) {
+        Text(
+            channelLastContent,
+            color = MaterialTheme.colors.grayText,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            style = LocalTextStyle.current.copy(textDirection = TextDirection.Content),
+            modifier = modifier
+        )
+    } else {
+        Text(
+            stringResource(R.string.referenced_event_not_found),
+            color = MaterialTheme.colors.grayText,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = modifier
+        )
+    }
+
+    if (hasNewMessages.value) {
+        NewItemsBubble()
+    }
+}
+
+@Composable
+private fun FirstRow(
+    channelTitle: @Composable (Modifier) -> Unit,
+    channelLastTime: Long?,
+    modifier: Modifier
+) {
+    channelTitle(modifier)
+    TimeAgo(channelLastTime)
+}
+
+@Composable
+private fun TimeAgo(channelLastTime: Long?) {
+    if (channelLastTime == null) return
+
+    val context = LocalContext.current
+    val timeAgo by remember(channelLastTime) {
+        derivedStateOf {
+            timeAgo(channelLastTime, context)
+        }
+    }
+    Text(
+        text = timeAgo,
+        color = MaterialTheme.colors.grayText,
+        maxLines = 1
+    )
+}
+
 @Composable
 fun NewItemsBubble() {
     Box(
@@ -359,6 +465,7 @@ fun NewItemsBubble() {
             color = Color.White,
             textAlign = TextAlign.Center,
             fontSize = 12.sp,
+            maxLines = 1,
             modifier = Modifier
                 .wrapContentHeight()
                 .align(Alignment.Center)

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

@@ -1,8 +1,11 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -24,8 +27,8 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
@@ -33,54 +36,58 @@ 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.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 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 androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.RelayInformation
+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
 import com.vitorpamplona.amethyst.ui.actions.ImmutableListOfLists
+import com.vitorpamplona.amethyst.ui.actions.RelayInformationDialog
+import com.vitorpamplona.amethyst.ui.actions.loadRelayInfo
 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
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 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.ChatBubbleMaxSizeModifier
 import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeMe
 import com.vitorpamplona.amethyst.ui.theme.ChatBubbleShapeThem
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
 import com.vitorpamplona.amethyst.ui.theme.RelayIconFilter
 import com.vitorpamplona.amethyst.ui.theme.Size13dp
 import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
-import com.vitorpamplona.amethyst.ui.theme.Size16dp
+import com.vitorpamplona.amethyst.ui.theme.Size15dp
+import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -94,30 +101,33 @@ fun ChatroomMessageCompose(
     nav: (String) -> Unit,
     onWantsToReply: (Note) -> Unit
 ) {
-    val noteState by baseNote.live().metadata.observeAsState()
-    val noteEvent = remember(noteState) { noteState?.note?.event }
+    val isBlank by baseNote.live().metadata.map {
+        it.note.event == null
+    }.observeAsState(baseNote.event == null)
 
-    if (noteEvent == null) {
-        LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
-            BlankNote(
-                remember {
-                    Modifier.combinedClickable(
-                        onClick = { },
-                        onLongClick = showPopup
-                    )
-                }
+    Crossfade(targetState = isBlank) {
+        if (it) {
+            LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
+                BlankNote(
+                    remember {
+                        Modifier.combinedClickable(
+                            onClick = { },
+                            onLongClick = showPopup
+                        )
+                    }
+                )
+            }
+        } else {
+            CheckHiddenChatMessage(
+                baseNote,
+                routeForLastRead,
+                innerQuote,
+                parentBackgroundColor,
+                accountViewModel,
+                nav,
+                onWantsToReply
             )
         }
-    } else {
-        CheckHiddenChatMessage(
-            baseNote,
-            routeForLastRead,
-            innerQuote,
-            parentBackgroundColor,
-            accountViewModel,
-            nav,
-            onWantsToReply
-        )
     }
 }
 
@@ -188,32 +198,34 @@ fun LoadedChatMessageCompose(
         }
     }
 
-    if (showHiddenNote) {
-        HiddenNote(
-            state.relevantReports,
-            accountViewModel,
-            Modifier,
-            innerQuote,
-            nav,
-            onClick = { showReportedNote = true }
-        )
-    } else {
-        val canPreview by remember(state, showReportedNote) {
-            derivedStateOf {
-                (!state.isAcceptable && showReportedNote) || state.canPreview
+    Crossfade(targetState = showHiddenNote) {
+        if (it) {
+            HiddenNote(
+                state.relevantReports,
+                accountViewModel,
+                Modifier,
+                innerQuote,
+                nav,
+                onClick = { showReportedNote = true }
+            )
+        } else {
+            val canPreview by remember(state, showReportedNote) {
+                derivedStateOf {
+                    (!state.isAcceptable && showReportedNote) || state.canPreview
+                }
             }
-        }
 
-        NormalChatNote(
-            baseNote,
-            routeForLastRead,
-            innerQuote,
-            canPreview,
-            parentBackgroundColor,
-            accountViewModel,
-            nav,
-            onWantsToReply
-        )
+            NormalChatNote(
+                baseNote,
+                routeForLastRead,
+                innerQuote,
+                canPreview,
+                parentBackgroundColor,
+                accountViewModel,
+                nav,
+                onWantsToReply
+            )
+        }
     }
 }
 
@@ -231,7 +243,7 @@ fun NormalChatNote(
 ) {
     val drawAuthorInfo by remember {
         derivedStateOf {
-            (innerQuote || !accountViewModel.isLoggedUser(note.author)) && note.event !is PrivateDmEvent
+            note.event !is PrivateDmEvent && (innerQuote || !accountViewModel.isLoggedUser(note.author))
         }
     }
 
@@ -261,11 +273,11 @@ fun NormalChatNote(
         }
     }
 
-    LaunchedEffect(key1 = routeForLastRead) {
-        routeForLastRead?.let {
+    if (routeForLastRead != null) {
+        LaunchedEffect(key1 = routeForLastRead) {
             val createdAt = note.createdAt()
             if (createdAt != null) {
-                accountViewModel.account.markAsRead(it, createdAt)
+                accountViewModel.account.markAsRead(routeForLastRead, createdAt)
             }
         }
     }
@@ -290,11 +302,11 @@ fun NormalChatNote(
             modifier = modif,
             horizontalArrangement = alignment
         ) {
-            val availableBubbleSize = remember { mutableStateOf(IntSize.Zero) }
+            val availableBubbleSize = remember { mutableStateOf(0) }
             var popupExpanded by remember { mutableStateOf(false) }
 
             val modif2 = remember {
-                if (innerQuote) Modifier else Modifier.fillMaxWidth(0.85f)
+                if (innerQuote) Modifier else ChatBubbleMaxSizeModifier
             }
 
             val clickableModifier = remember {
@@ -312,7 +324,9 @@ fun NormalChatNote(
             Row(
                 horizontalArrangement = alignment,
                 modifier = modif2.onSizeChanged {
-                    availableBubbleSize.value = it
+                    if (availableBubbleSize.value != it.width) {
+                        availableBubbleSize.value = it.width
+                    }
                 }
             ) {
                 Surface(
@@ -354,58 +368,90 @@ private fun RenderBubble(
     backgroundBubbleColor: MutableState<Color>,
     onWantsToReply: (Note) -> Unit,
     canPreview: Boolean,
-    availableBubbleSize: MutableState<IntSize>,
+    availableBubbleSize: MutableState<Int>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val bubbleSize = remember { mutableStateOf(IntSize.Zero) }
+    val bubbleSize = remember { mutableStateOf(0) }
 
     val bubbleModifier = remember {
         Modifier
             .padding(start = 10.dp, end = 5.dp, bottom = 5.dp)
             .onSizeChanged {
-                bubbleSize.value = it
+                if (bubbleSize.value != it.width) {
+                    bubbleSize.value = it.width
+                }
             }
     }
 
     Column(modifier = bubbleModifier) {
-        if (drawAuthorInfo) {
-            DrawAuthorInfo(
-                baseNote,
-                alignment,
-                nav
-            )
-        } else {
-            Spacer(modifier = StdVertSpacer)
-        }
+        MessageBubbleLines(
+            drawAuthorInfo,
+            baseNote,
+            alignment,
+            nav,
+            innerQuote,
+            backgroundBubbleColor,
+            accountViewModel,
+            onWantsToReply,
+            canPreview,
+            bubbleSize,
+            availableBubbleSize
+        )
+    }
+}
 
-        RenderReplyRow(
-            note = baseNote,
-            innerQuote = innerQuote,
-            backgroundBubbleColor = backgroundBubbleColor,
+@Composable
+private fun MessageBubbleLines(
+    drawAuthorInfo: Boolean,
+    baseNote: Note,
+    alignment: Arrangement.Horizontal,
+    nav: (String) -> Unit,
+    innerQuote: Boolean,
+    backgroundBubbleColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    onWantsToReply: (Note) -> Unit,
+    canPreview: Boolean,
+    bubbleSize: MutableState<Int>,
+    availableBubbleSize: MutableState<Int>
+) {
+    if (drawAuthorInfo) {
+        DrawAuthorInfo(
+            baseNote,
+            alignment,
+            nav
+        )
+    } else {
+        Spacer(modifier = StdVertSpacer)
+    }
+
+    RenderReplyRow(
+        note = baseNote,
+        innerQuote = innerQuote,
+        backgroundBubbleColor = backgroundBubbleColor,
+        accountViewModel = accountViewModel,
+        nav = nav,
+        onWantsToReply = onWantsToReply
+    )
+
+    NoteRow(
+        note = baseNote,
+        canPreview = canPreview,
+        backgroundBubbleColor = backgroundBubbleColor,
+        accountViewModel = accountViewModel,
+        nav = nav
+    )
+
+    ConstrainedStatusRow(
+        bubbleSize = bubbleSize,
+        availableBubbleSize = availableBubbleSize
+    ) {
+        StatusRow(
+            baseNote = baseNote,
             accountViewModel = accountViewModel,
             nav = nav,
             onWantsToReply = onWantsToReply
         )
-
-        NoteRow(
-            note = baseNote,
-            canPreview = canPreview,
-            backgroundBubbleColor = backgroundBubbleColor,
-            accountViewModel = accountViewModel,
-            nav = nav
-        )
-
-        ConstrainedStatusRow(
-            bubbleSize = bubbleSize,
-            availableBubbleSize = availableBubbleSize
-        ) {
-            StatusRow(
-                baseNote = baseNote,
-                accountViewModel = accountViewModel,
-                onWantsToReply = onWantsToReply
-            )
-        }
     }
 }
 
@@ -418,25 +464,42 @@ private fun RenderReplyRow(
     nav: (String) -> Unit,
     onWantsToReply: (Note) -> Unit
 ) {
-    val replyTo by remember {
+    val hasReply by remember {
         derivedStateOf {
-            note.replyTo?.lastOrNull()
+            !innerQuote && note.replyTo?.lastOrNull() != null
         }
     }
-    if (!innerQuote && replyTo != null) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            replyTo?.let { note ->
-                ChatroomMessageCompose(
-                    note,
-                    null,
-                    innerQuote = true,
-                    parentBackgroundColor = backgroundBubbleColor,
-                    accountViewModel = accountViewModel,
-                    nav = nav,
-                    onWantsToReply = onWantsToReply
-                )
+
+    if (hasReply) {
+        RenderReply(note, backgroundBubbleColor, accountViewModel, nav, onWantsToReply)
+    }
+}
+
+@Composable
+private fun RenderReply(
+    note: Note,
+    backgroundBubbleColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    onWantsToReply: (Note) -> Unit
+) {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        val replyTo by remember {
+            derivedStateOf {
+                note.replyTo?.lastOrNull()
             }
         }
+        replyTo?.let { note ->
+            ChatroomMessageCompose(
+                note,
+                null,
+                innerQuote = true,
+                parentBackgroundColor = backgroundBubbleColor,
+                accountViewModel = accountViewModel,
+                nav = nav,
+                onWantsToReply = onWantsToReply
+            )
+        }
     }
 }
 
@@ -473,23 +536,22 @@ private fun NoteRow(
 
 @Composable
 private fun ConstrainedStatusRow(
-    bubbleSize: MutableState<IntSize>,
-    availableBubbleSize: MutableState<IntSize>,
+    bubbleSize: MutableState<Int>,
+    availableBubbleSize: MutableState<Int>,
     content: @Composable () -> Unit
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween,
-        modifier = Modifier
-            .padding(top = 5.dp)
-            .then(
-                with(LocalDensity.current) {
-                    Modifier.widthIn(
-                        bubbleSize.value.width.toDp(),
-                        availableBubbleSize.value.width.toDp()
-                    )
-                }
-            )
+        modifier = with(LocalDensity.current) {
+            Modifier
+                .height(26.dp)
+                .padding(top = 5.dp)
+                .widthIn(
+                    bubbleSize.value.toDp(),
+                    availableBubbleSize.value.toDp()
+                )
+        }
     ) {
         content()
     }
@@ -499,38 +561,52 @@ private fun ConstrainedStatusRow(
 private fun StatusRow(
     baseNote: Note,
     accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
     onWantsToReply: (Note) -> Unit
 ) {
-    val grayTint = MaterialTheme.colors.placeholderText
-    val time = remember { baseNote.createdAt() ?: 0 }
-
-    Row(verticalAlignment = Alignment.CenterVertically) {
-        ChatTimeAgo(time)
-        RelayBadges(baseNote)
-        Spacer(modifier = DoubleHorzSpacer)
+    Column(modifier = ReactionRowHeightChat) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = ReactionRowHeightChat) {
+            ChatTimeAgo(baseNote)
+            RelayBadges(baseNote, accountViewModel, nav = nav)
+            Spacer(modifier = DoubleHorzSpacer)
+        }
     }
 
-    Row(verticalAlignment = Alignment.CenterVertically) {
-        LikeReaction(baseNote, grayTint, accountViewModel)
-        Spacer(modifier = StdHorzSpacer)
-        ZapReaction(baseNote, grayTint, accountViewModel)
-        Spacer(modifier = StdHorzSpacer)
-        ReplyReaction(baseNote, grayTint, accountViewModel, showCounter = false, iconSize = Size16dp) {
-            onWantsToReply(baseNote)
+    Column(modifier = ReactionRowHeightChat) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = ReactionRowHeightChat) {
+            LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            Spacer(modifier = StdHorzSpacer)
+            ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            Spacer(modifier = DoubleHorzSpacer)
+            ReplyReaction(
+                baseNote = baseNote,
+                grayTint = MaterialTheme.colors.placeholderText,
+                accountViewModel = accountViewModel,
+                showCounter = false,
+                iconSize = Size15dp
+            ) {
+                onWantsToReply(baseNote)
+            }
+            Spacer(modifier = StdHorzSpacer)
         }
     }
 }
 
 @Composable
-fun ChatTimeAgo(time: Long) {
+fun ChatTimeAgo(baseNote: Note) {
     val context = LocalContext.current
 
-    val timeStr = remember { timeAgoShort(time, context = context) }
+    val timeStr by remember(baseNote) {
+        derivedStateOf {
+            timeAgoShort(baseNote.createdAt() ?: 0, context = context)
+        }
+    }
 
     Text(
-        timeStr,
+        text = timeStr,
         color = MaterialTheme.colors.placeholderText,
-        fontSize = 12.sp
+        fontSize = 12.sp,
+        maxLines = 1
     )
 }
 
@@ -547,10 +623,8 @@ private fun RenderRegularTextNote(
     val modifier = remember { Modifier.padding(top = 5.dp) }
 
     if (eventContent != null) {
-        val hasSensitiveContent = remember(note.event) { note.event?.isSensitive() ?: false }
-
         SensitivityWarning(
-            hasSensitiveContent = hasSensitiveContent,
+            note = note,
             accountViewModel = accountViewModel
         ) {
             TranslatableRichTextViewer(
@@ -630,140 +704,233 @@ private fun DrawAuthorInfo(
     alignment: Arrangement.Horizontal,
     nav: (String) -> Unit
 ) {
-    val userState by baseNote.author!!.live().metadata.observeAsState()
-
-    val pubkeyHex = remember { baseNote.author?.pubkeyHex } ?: return
-    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?.toImmutableListOfLists() }
-
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = alignment,
         modifier = Modifier.padding(top = 5.dp)
     ) {
-        RobohashAsyncImageProxy(
-            robot = pubkeyHex,
-            model = userProfilePicture,
-            contentDescription = stringResource(id = R.string.profile_image),
-            modifier = remember {
-                Modifier
-                    .width(25.dp)
-                    .height(25.dp)
-                    .clip(shape = CircleShape)
-                    .clickable(onClick = {
-                        nav(route)
-                    })
-            }
-        )
-
-        userDisplayName?.let {
-            Spacer(modifier = StdHorzSpacer)
-
-            CreateClickableTextWithEmoji(
-                clickablePart = it,
-                suffix = "",
-                tags = userTags,
-                fontWeight = FontWeight.Bold,
-                overrideColor = MaterialTheme.colors.onBackground,
-                route = route,
-                nav = nav
-            )
-
-            Spacer(modifier = StdHorzSpacer)
-            DrawPlayName(it)
-        }
+        DisplayAndWatchNoteAuthor(baseNote, nav)
     }
 }
 
-@Immutable
-data class RelayBadgesState(
-    val shouldDisplayExpandButton: Boolean,
-    val noteRelays: ImmutableList<String>,
-    val noteRelaysSimple: ImmutableList<String>
-)
+@Composable
+private fun DisplayAndWatchNoteAuthor(
+    baseNote: Note,
+    nav: (String) -> Unit
+) {
+    val author = remember {
+        baseNote.author
+    }
+    author?.let {
+        WatchAndDisplayUser(it, nav)
+    }
+}
+
+@Composable
+private fun WatchAndDisplayUser(
+    author: User,
+    nav: (String) -> Unit
+) {
+    val pubkeyHex = remember { author.pubkeyHex }
+    val route = remember { "User/${author.pubkeyHex}" }
+
+    val userState by author.live().metadata.observeAsState()
+
+    val userDisplayName by remember(userState) {
+        derivedStateOf {
+            userState?.user?.toBestDisplayName()
+        }
+    }
+
+    val userProfilePicture by remember(userState) {
+        derivedStateOf {
+            userState?.user?.profilePicture()
+        }
+    }
+
+    val userTags by remember(userState) {
+        derivedStateOf {
+            userState?.user?.info?.latestMetadata?.tags?.toImmutableListOfLists()
+        }
+    }
+
+    UserIcon(pubkeyHex, userProfilePicture, nav, route)
+
+    userDisplayName?.let {
+        DisplayMessageUsername(it, userTags, route, nav)
+    }
+}
+
+@Composable
+private fun UserIcon(
+    pubkeyHex: String,
+    userProfilePicture: String?,
+    nav: (String) -> Unit,
+    route: String
+) {
+    RobohashAsyncImageProxy(
+        robot = pubkeyHex,
+        model = userProfilePicture,
+        contentDescription = stringResource(id = R.string.profile_image),
+        modifier = remember {
+            Modifier
+                .width(Size25dp)
+                .height(Size25dp)
+                .clip(shape = CircleShape)
+                .clickable(onClick = {
+                    nav(route)
+                })
+        }
+    )
+}
+
+@Composable
+private fun DisplayMessageUsername(
+    userDisplayName: String,
+    userTags: ImmutableListOfLists<String>?,
+    route: String,
+    nav: (String) -> Unit
+) {
+    Spacer(modifier = StdHorzSpacer)
+    CreateClickableTextWithEmoji(
+        clickablePart = userDisplayName,
+        suffix = "",
+        maxLines = 1,
+        tags = userTags,
+        fontWeight = FontWeight.Bold,
+        overrideColor = MaterialTheme.colors.onBackground, // we do not want clickable names in purple here.
+        route = route,
+        nav = nav
+    )
+
+    Spacer(modifier = StdHorzSpacer)
+    DrawPlayName(userDisplayName)
+}
+
+@Composable
+private fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val expanded = remember { mutableStateOf(false) }
+
+    RenderRelayList(baseNote, expanded, accountViewModel, nav)
+
+    RenderExpandButton(baseNote, expanded) {
+        ChatRelayExpandButton { expanded.value = true }
+    }
+}
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-private fun RelayBadges(baseNote: Note) {
-    val noteRelaysState by baseNote.live().relays.observeAsState()
+fun RenderRelayList(baseNote: Note, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val noteRelays by baseNote.live().relays.map {
+        it.note.relays
+    }.observeAsState(baseNote.relays)
 
-    val state: RelayBadgesState by remember(noteRelaysState) {
-        val newShouldDisplayExpandButton = (noteRelaysState?.note?.relays?.size ?: 0) > 3
-        val noteRelays = noteRelaysState?.note?.relays?.toImmutableList() ?: persistentListOf()
-        val noteRelaysSimple = noteRelaysState?.note?.relays?.take(3)?.toImmutableList() ?: persistentListOf()
-
-        mutableStateOf(RelayBadgesState(newShouldDisplayExpandButton, noteRelays, noteRelaysSimple))
-    }
-
-    var expanded by remember { mutableStateOf(false) }
-
-    val relaysToDisplay by remember(noteRelaysState) {
-        derivedStateOf {
-            if (expanded) state.noteRelays else state.noteRelaysSimple
+    FlowRow(StdStartPadding) {
+        val relaysToDisplay = remember(noteRelays, expanded.value) {
+            if (expanded.value) noteRelays else noteRelays.take(3)
         }
-    }
-
-    FlowRow(Modifier.padding(start = 10.dp)) {
         relaysToDisplay.forEach {
-            RenderRelay(it)
-        }
-    }
-
-    if (state.shouldDisplayExpandButton && !expanded) {
-        IconButton(
-            modifier = Size15Modifier,
-            onClick = { expanded = true }
-        ) {
-            Icon(
-                imageVector = Icons.Default.ChevronRight,
-                null,
-                modifier = Size15Modifier,
-                tint = MaterialTheme.colors.placeholderText
-            )
+            RenderRelay(it, accountViewModel, nav)
         }
     }
 }
 
 @Composable
-fun RenderRelay(dirtyUrl: String) {
-    val uri = LocalUriHandler.current
-    val website = remember(dirtyUrl) {
-        val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
-        "https://$cleanUrl"
+fun RenderExpandButton(
+    baseNote: Note,
+    expanded: MutableState<Boolean>,
+    content: @Composable () -> Unit
+) {
+    val showExpandButton by baseNote.live().relays.map {
+        it.note.relays.size > 3
+    }.observeAsState(baseNote.relays.size > 3)
+
+    if (showExpandButton && !expanded.value) {
+        content()
     }
-    val iconUrl = remember(dirtyUrl) {
-        val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
-        "https://$cleanUrl/favicon.ico"
+}
+
+@Composable
+fun ChatRelayExpandButton(onClick: () -> Unit) {
+    IconButton(
+        modifier = Size15Modifier,
+        onClick = onClick
+    ) {
+        Icon(
+            imageVector = Icons.Default.ChevronRight,
+            null,
+            modifier = Size15Modifier,
+            tint = MaterialTheme.colors.placeholderText
+        )
     }
+}
+
+@Composable
+fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val iconUrl by remember(dirtyUrl) {
+        derivedStateOf {
+            val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
+            "https://$cleanUrl/favicon.ico"
+        }
+    }
+
+    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+
+    if (relayInfo != null) {
+        RelayInformationDialog(
+            onClose = {
+                relayInfo = null
+            },
+            relayInfo = relayInfo!!,
+            accountViewModel,
+            nav
+        )
+    }
+
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val interactionSource = remember { MutableInteractionSource() }
+    val ripple = rememberRipple(bounded = false, radius = Size15dp)
 
     val clickableModifier = remember(dirtyUrl) {
         Modifier
             .padding(1.dp)
-            .size(15.dp)
-            .clickable(onClick = { uri.openUri(website) })
-    }
-
-    val backgroundColor = MaterialTheme.colors.background
-
-    val iconModifier = remember(dirtyUrl) {
-        Modifier
-            .size(13.dp)
-            .clip(shape = CircleShape)
-            .drawBehind { drawRect(backgroundColor) }
+            .size(Size15dp)
+            .clickable(
+                role = Role.Button,
+                interactionSource = interactionSource,
+                indication = ripple,
+                onClick = {
+                    loadRelayInfo(dirtyUrl, context, scope) {
+                        relayInfo = it
+                    }
+                }
+            )
     }
 
     Box(
         modifier = clickableModifier
     ) {
-        RobohashFallbackAsyncImage(
-            robot = iconUrl,
-            robotSize = Size13dp,
-            model = iconUrl,
-            contentDescription = stringResource(id = R.string.relay_icon),
-            colorFilter = RelayIconFilter,
-            modifier = iconModifier
-        )
+        RenderRelayIcon(iconUrl)
     }
 }
+
+@Composable
+private fun RenderRelayIcon(iconUrl: String) {
+    val backgroundColor = MaterialTheme.colors.background
+
+    val iconModifier = remember {
+        Modifier
+            .size(Size13dp)
+            .clip(shape = CircleShape)
+            .background(backgroundColor)
+    }
+
+    RobohashFallbackAsyncImage(
+        robot = iconUrl,
+        model = iconUrl,
+        contentDescription = stringResource(id = R.string.relay_icon),
+        colorFilter = RelayIconFilter,
+        modifier = iconModifier
+    )
+}

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

@@ -22,7 +22,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.painterResource
@@ -70,11 +69,7 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(
-                    backgroundColor.value
-                )
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,

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

@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.util.Log
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -10,7 +12,6 @@ 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
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -35,36 +36,51 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 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 androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.UserMetadata
+import com.vitorpamplona.amethyst.service.firstFullChar
 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.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.MultiSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifier
+import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifierSmaller
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size18dp
+import com.vitorpamplona.amethyst.ui.theme.Size25dp
+import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
+import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
+import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifier
+import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifierWithPadding
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import com.vitorpamplona.amethyst.ui.theme.overPictureBackground
+import com.vitorpamplona.amethyst.ui.theme.profile35dpModifier
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalTime::class)
 @Composable
 fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val baseNote = remember { multiSetCard.note }
@@ -89,16 +105,16 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
             }
 
             if (backgroundColor.value != newBackgroundColor) {
-                backgroundColor.value = newBackgroundColor
+                launch(Dispatchers.Main) {
+                    backgroundColor.value = newBackgroundColor
+                }
             }
         }
     }
 
     val columnModifier = remember(backgroundColor.value) {
         Modifier
-            .drawBehind {
-                drawRect(backgroundColor.value)
-            }
+            .background(backgroundColor.value)
             .padding(
                 start = 12.dp,
                 end = 12.dp,
@@ -116,32 +132,39 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
     }
 
     Column(modifier = columnModifier) {
-        Galeries(multiSetCard, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            Galeries(multiSetCard, backgroundColor, accountViewModel, nav)
+        }
+        Log.d("Rendering Metrics", "All Galeries: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed - ")
 
         Row(remember { Modifier.fillMaxWidth() }) {
-            Spacer(modifier = remember { Modifier.width(65.dp) })
+            Spacer(modifier = WidthAuthorPictureModifierWithPadding)
 
-            NoteCompose(
-                baseNote = baseNote,
-                routeForLastRead = null,
-                modifier = remember { Modifier.padding(top = 5.dp) },
-                isBoostedNote = true,
-                parentBackgroundColor = backgroundColor,
-                accountViewModel = accountViewModel,
-                nav = nav
-            )
+            val (value, elapsed) = measureTimedValue {
+                NoteCompose(
+                    baseNote = baseNote,
+                    routeForLastRead = null,
+                    modifier = remember { Modifier.padding(top = 5.dp) },
+                    isBoostedNote = true,
+                    parentBackgroundColor = backgroundColor,
+                    accountViewModel = accountViewModel,
+                    nav = nav
+                )
+            }
+            Log.d("Rendering Metrics", "Complete: ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
 
             NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
         }
     }
 }
 
+@OptIn(ExperimentalTime::class)
 @Composable
 private fun Galeries(
     multiSetCard: MultiSetCard,
     backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
 ) {
     val zapEvents by remember { derivedStateOf { multiSetCard.zapEvents } }
     val boostEvents by remember { derivedStateOf { multiSetCard.boostEvents } }
@@ -152,17 +175,26 @@ private fun Galeries(
     val hasLikeEvents by remember { derivedStateOf { multiSetCard.likeEvents.isNotEmpty() } }
 
     if (hasZapEvents) {
-        RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
+        }
+        Log.d("Rendering Metrics", "Galeries Zaps:   ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 
     if (hasBoostEvents) {
-        RenderBoostGallery(boostEvents, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            RenderBoostGallery(boostEvents, nav, accountViewModel)
+        }
+        Log.d("Rendering Metrics", "Galeries Repost: ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 
     if (hasLikeEvents) {
-        likeEvents.forEach {
-            RenderLikeGallery(it.key, it.value, backgroundColor, nav, accountViewModel)
+        val (value, elapsed) = measureTimedValue {
+            likeEvents.forEach {
+                RenderLikeGallery(it.key, it.value, nav, accountViewModel)
+            }
         }
+        Log.d("Rendering Metrics", "Galeries Like:   ${multiSetCard.note.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
     }
 }
 
@@ -170,39 +202,23 @@ private fun Galeries(
 fun RenderLikeGallery(
     reactionType: String,
     likeEvents: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    val isNotEmpty = remember(likeEvents) {
-        likeEvents.isNotEmpty()
-    }
-
-    val shortReaction by remember {
-        derivedStateOf {
-            reactionType.take(2)
-        }
-    }
-
-    if (isNotEmpty) {
-        Row(remember { Modifier.fillMaxWidth() }) {
+    if (likeEvents.isNotEmpty()) {
+        Row(Modifier.fillMaxWidth()) {
             Box(
-                modifier = remember {
-                    Modifier
-                        .width(55.dp)
-                        .padding(end = 5.dp)
-                }
+                modifier = NotificationIconModifier
             ) {
                 val modifier = remember {
-                    Modifier
-                        .align(Alignment.TopEnd)
+                    Modifier.align(Alignment.TopEnd)
                 }
 
-                when (shortReaction) {
+                when (val shortReaction = reactionType.firstFullChar()) {
                     "+" -> Icon(
                         painter = painterResource(R.drawable.ic_liked),
                         null,
-                        modifier = remember { modifier.size(18.dp) },
+                        modifier = modifier.size(Size18dp),
                         tint = Color.Unspecified
                     )
                     "-" -> Text(text = "\uD83D\uDC4E", modifier = modifier)
@@ -210,7 +226,7 @@ fun RenderLikeGallery(
                 }
             }
 
-            AuthorGallery(likeEvents, backgroundColor, nav, accountViewModel)
+            AuthorGallery(likeEvents, nav, accountViewModel)
         }
     }
 }
@@ -232,21 +248,17 @@ fun RenderZapGallery(
 @Composable
 private fun ZapIcon() {
     Box(
-        modifier = remember {
-            Modifier
-                .width(55.dp)
-                .padding(0.dp)
-        }
+        modifier = WidthAuthorPictureModifier
     ) {
         Icon(
             imageVector = Icons.Default.Bolt,
             contentDescription = "Zaps",
             tint = BitcoinOrange,
-            modifier = remember {
-                Modifier
-                    .size(25.dp)
-                    .align(Alignment.TopEnd)
-            }
+            modifier =
+            Modifier
+                .size(Size25dp)
+                .align(Alignment.TopEnd)
+
         )
     }
 }
@@ -254,21 +266,14 @@ private fun ZapIcon() {
 @Composable
 fun RenderBoostGallery(
     boostEvents: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
     Row(
-        modifier = remember {
-            Modifier.fillMaxWidth()
-        }
+        modifier = Modifier.fillMaxWidth()
     ) {
         Box(
-            modifier = remember {
-                Modifier
-                    .width(55.dp)
-                    .padding(end = 4.dp)
-            }
+            modifier = NotificationIconModifierSmaller
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_retweeted),
@@ -282,7 +287,7 @@ fun RenderBoostGallery(
             )
         }
 
-        AuthorGallery(boostEvents, backgroundColor, nav, accountViewModel)
+        AuthorGallery(boostEvents, nav, accountViewModel)
     }
 }
 
@@ -294,15 +299,27 @@ fun AuthorGalleryZaps(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+    Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach {
-                AuthorPictureAndComment(it.request, it.response, backgroundColor, nav, accountViewModel)
+                ParseAuthorCommentAndAmount(it, backgroundColor, nav, accountViewModel)
             }
         }
     }
 }
 
+@Composable
+private fun ParseAuthorCommentAndAmount(
+    zap: CombinedZap,
+    backgroundColor: MutableState<Color>,
+    nav: (String) -> Unit,
+    accountViewModel: AccountViewModel
+) {
+    ParseAuthorCommentAndAmount(zap.request, zap.response, accountViewModel) { state ->
+        RenderState(state, backgroundColor, accountViewModel, nav)
+    }
+}
+
 @Immutable
 data class ZapAmountCommentNotification(
     val user: User?,
@@ -311,12 +328,11 @@ data class ZapAmountCommentNotification(
 )
 
 @Composable
-private fun AuthorPictureAndComment(
+private fun ParseAuthorCommentAndAmount(
     zapRequest: Note,
     zapEvent: Note?,
-    backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    onReady: @Composable (MutableState<ZapAmountCommentNotification>) -> Unit
 ) {
     val content = remember {
         mutableStateOf(
@@ -329,29 +345,44 @@ private fun AuthorPictureAndComment(
     }
 
     LaunchedEffect(key1 = zapRequest.idHex, key2 = zapEvent?.idHex) {
-        launch(Dispatchers.Default) {
+        launch(Dispatchers.IO) {
             (zapRequest.event as? LnZapRequestEvent)?.let {
                 val decryptedContent = accountViewModel.decryptZap(zapRequest)
                 val amount = (zapEvent?.event as? LnZapEvent)?.amount
                 if (decryptedContent != null) {
                     val newAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                    content.value = ZapAmountCommentNotification(newAuthor, decryptedContent.content.ifBlank { null }, showAmountAxis(amount))
+                    val newState = ZapAmountCommentNotification(newAuthor, decryptedContent.content.ifBlank { null }, showAmountAxis(amount))
+
+                    launch(Dispatchers.Main) { content.value = newState }
                 } else {
                     if (!zapRequest.event?.content().isNullOrBlank() || amount != null) {
-                        content.value = ZapAmountCommentNotification(zapRequest.author, zapRequest.event?.content()?.ifBlank { null }, showAmountAxis(amount))
+                        val newState = ZapAmountCommentNotification(zapRequest.author, zapRequest.event?.content()?.ifBlank { null }, showAmountAxis(amount))
+                        launch(Dispatchers.Main) { content.value = newState }
                     }
                 }
             }
         }
     }
 
+    onReady(content)
+}
+
+@Composable
+private fun RenderState(
+    content: MutableState<ZapAmountCommentNotification>,
+    backgroundColor: MutableState<Color>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
     Row(
         modifier = Modifier.clickable {
-            nav("User/${content.value.user?.pubkeyHex}")
+            content.value.user?.let {
+                nav(routeFor(it))
+            }
         },
         verticalAlignment = Alignment.CenterVertically
     ) {
-        AuthorPictureAndComment(
+        DisplayAuthorCommentAndAmount(
             authorComment = content,
             backgroundColor = backgroundColor,
             nav = nav,
@@ -361,91 +392,88 @@ private fun AuthorPictureAndComment(
 }
 
 val amountBoxModifier = Modifier
-    .fillMaxSize()
+    .size(Size35dp)
     .clip(shape = CircleShape)
 
-val textBoxModifier = Modifier.padding(start = 5.dp).fillMaxWidth()
-
-val simpleModifier = Modifier
-
-val sizedModifier = Modifier.size(Size35dp)
+val textBoxModifier = Modifier
+    .padding(start = 5.dp)
+    .fillMaxWidth()
 
 val bottomPadding1dp = Modifier.padding(bottom = 1.dp)
 
 val commentTextSize = 12.sp
 
 @Composable
-private fun AuthorPictureAndComment(
+private fun DisplayAuthorCommentAndAmount(
     authorComment: MutableState<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Box(modifier = sizedModifier, contentAlignment = Alignment.BottomCenter) {
-        DisplayPicture(authorComment, accountViewModel)
-        DisplayAmount(authorComment)
+    Box(modifier = Size35Modifier, contentAlignment = Alignment.BottomCenter) {
+        CrossfadeToDisplayPicture(authorComment, accountViewModel)
+        CrossfadeToDisplayAmount(authorComment)
     }
 
-    DisplayComment(authorComment, backgroundColor, nav, accountViewModel)
+    CrossfadeToDisplayComment(authorComment, backgroundColor, nav, accountViewModel)
 }
 
 @Composable
-fun DisplayPicture(authorComment: MutableState<ZapAmountCommentNotification>, accountViewModel: AccountViewModel) {
-    authorComment.value.user?.let {
-        FastNoteAuthorPicture(
-            author = it,
-            size = Size35dp,
-            accountViewModel = accountViewModel,
-            pictureModifier = simpleModifier
-        )
+fun CrossfadeToDisplayPicture(authorComment: MutableState<ZapAmountCommentNotification>, accountViewModel: AccountViewModel) {
+    Crossfade(authorComment.value) {
+        WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(it.user, accountViewModel)
     }
 }
 
 @Composable
-fun DisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
-    authorComment.value.amount?.let {
-        Box(
-            modifier = amountBoxModifier,
-            contentAlignment = Alignment.BottomCenter
-        ) {
-            val backgroundColor = MaterialTheme.colors.overPictureBackground
+fun CrossfadeToDisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
+    Crossfade(authorComment.value, modifier = amountBoxModifier) {
+        it.amount?.let {
             Box(
-                modifier = remember {
-                    Modifier
-                        .fillMaxWidth()
-                        .drawBehind { drawRect(backgroundColor) }
-                },
+                modifier = amountBoxModifier,
                 contentAlignment = Alignment.BottomCenter
             ) {
-                Text(
-                    text = it,
-                    fontWeight = FontWeight.Bold,
-                    color = MaterialTheme.colors.secondaryVariant,
-                    fontSize = commentTextSize,
-                    modifier = bottomPadding1dp
-                )
+                val backgroundColor = MaterialTheme.colors.overPictureBackground
+                Box(
+                    modifier = remember {
+                        Modifier
+                            .width(Size35dp)
+                            .background(backgroundColor)
+                    },
+                    contentAlignment = Alignment.BottomCenter
+                ) {
+                    Text(
+                        text = it,
+                        fontWeight = FontWeight.Bold,
+                        color = MaterialTheme.colors.secondaryVariant,
+                        fontSize = commentTextSize,
+                        modifier = bottomPadding1dp
+                    )
+                }
             }
         }
     }
 }
 
 @Composable
-fun DisplayComment(
+fun CrossfadeToDisplayComment(
     authorComment: MutableState<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    authorComment.value.comment?.let {
-        TranslatableRichTextViewer(
-            content = it,
-            canPreview = true,
-            tags = remember { ImmutableListOfLists() },
-            modifier = textBoxModifier,
-            backgroundColor = backgroundColor,
-            accountViewModel = accountViewModel,
-            nav = nav
-        )
+    Crossfade(authorComment.value) {
+        it.comment?.let {
+            TranslatableRichTextViewer(
+                content = it,
+                canPreview = true,
+                tags = remember { ImmutableListOfLists() },
+                modifier = textBoxModifier,
+                backgroundColor = backgroundColor,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
+        }
     }
 }
 
@@ -453,14 +481,13 @@ fun DisplayComment(
 @Composable
 fun AuthorGallery(
     authorNotes: ImmutableList<Note>,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+    Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach { note ->
-                BoxedAuthor(note, backgroundColor, nav, accountViewModel)
+                BoxedAuthor(note, nav, accountViewModel)
             }
         }
     }
@@ -469,84 +496,78 @@ fun AuthorGallery(
 @Composable
 private fun BoxedAuthor(
     note: Note,
-    backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Box(sizedModifier) {
-        NotePictureAndComment(note, backgroundColor, nav, accountViewModel)
-    }
-}
-
-@Composable
-private fun NotePictureAndComment(
-    baseNote: Note,
-    backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
-) {
-    val author = remember(baseNote) {
-        mutableStateOf(
-            ZapAmountCommentNotification(
-                user = baseNote.author,
-                comment = null,
-                amount = null
-            )
-        )
-    }
-
-    val modifier = remember(baseNote) {
-        Modifier.clickable {
-            nav("User/${baseNote.author?.pubkeyHex}")
-        }
-    }
-
-    Row(
-        modifier = modifier,
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        AuthorPictureAndComment(authorComment = author, backgroundColor, nav, accountViewModel)
-    }
-}
-
-@Composable
-fun FastNoteAuthorPicture(
-    author: User,
-    size: Dp,
-    pictureModifier: Modifier = Modifier,
-    accountViewModel: AccountViewModel
-) {
-    var profilePicture by remember {
-        mutableStateOf(author.info?.picture)
-    }
-
-    val authorPubKey = remember {
-        author.pubkeyHex
-    }
-
-    WatchUserMetadata(author) {
-        if (it.picture != profilePicture) {
-            profilePicture = it.picture
-        }
-    }
-
-    UserPicture(
-        userHex = authorPubKey,
-        userPicture = profilePicture,
-        size = size,
-        modifier = pictureModifier,
-        accountViewModel = accountViewModel
-    )
-}
-
-@Composable
-fun WatchUserMetadata(userBase: User, onMetadataChanges: (UserMetadata) -> Unit) {
-    val userState by userBase.live().metadata.observeAsState()
-    LaunchedEffect(key1 = userState) {
-        launch(Dispatchers.Default) {
-            userState?.user?.info?.let {
-                onMetadataChanges(it)
+    Box(modifier = Size35Modifier.clickable(onClick = { nav(authorRouteFor(note)) })) {
+        WatchNoteAuthor(note) { targetAuthor ->
+            Crossfade(targetState = targetAuthor, modifier = Size35Modifier) { author ->
+                WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(author, accountViewModel)
             }
         }
     }
 }
+
+@Composable
+fun WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(
+    author: User?,
+    accountViewModel: AccountViewModel
+) {
+    if (author != null) {
+        WatchUserMetadataAndFollowsAndRenderUserProfilePicture(author, accountViewModel)
+    } else {
+        DisplayBlankAuthor(Size35dp)
+    }
+}
+
+@Composable
+fun WatchUserMetadataAndFollowsAndRenderUserProfilePicture(
+    author: User,
+    accountViewModel: AccountViewModel
+) {
+    WatchUserMetadata(author) { baseUserPicture ->
+        Crossfade(targetState = baseUserPicture) { userPicture ->
+            RobohashAsyncImageProxy(
+                robot = author.pubkeyHex,
+                model = userPicture,
+                contentDescription = stringResource(id = R.string.profile_image),
+                modifier = MaterialTheme.colors.profile35dpModifier,
+                contentScale = ContentScale.Crop
+            )
+        }
+    }
+
+    WatchFollows(author.pubkeyHex, accountViewModel) { isFollowing ->
+        Crossfade(targetState = isFollowing) {
+            if (it) {
+                Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
+                    FollowingIcon(Size10dp)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun WatchNoteAuthor(
+    baseNote: Note,
+    onContent: @Composable (User?) -> Unit
+) {
+    val author by baseNote.live().metadata.map {
+        it.note.author
+    }.observeAsState(baseNote.author)
+
+    onContent(author)
+}
+
+@Composable
+private fun WatchUserMetadata(
+    author: User,
+    onNewMetadata: @Composable (String?) -> Unit
+) {
+    val userProfile by author.live().metadata.map {
+        it.user.profilePicture()
+    }.distinctUntilChanged().observeAsState(author.profilePicture())
+
+    onNewMetadata(userProfile)
+}

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
@@ -28,6 +29,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -52,8 +54,8 @@ fun nip05VerificationAsAState(user: UserMetadata, pubkeyHex: String): MutableSta
         mutableStateOf(default)
     }
 
-    LaunchedEffect(key1 = user.nip05) {
-        if (nip05Verified.value == null) {
+    if (nip05Verified.value == null) {
+        LaunchedEffect(key1 = user.nip05) {
             launch(Dispatchers.IO) {
                 user.nip05?.ifBlank { null }?.let { nip05 ->
                     Nip05Verifier().verifyNip05(
@@ -109,20 +111,12 @@ fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifie
 
 @Composable
 fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier) {
-    val userState by baseUser.live().metadata.observeAsState()
-    val isValidNIP05 by remember(userState) {
-        derivedStateOf {
-            userState?.user?.nip05()?.split("@")?.size == 2
-        }
-    }
-    val nip05 by remember(userState) {
-        derivedStateOf {
-            userState?.user?.nip05()
-        }
-    }
+    val nip05 by baseUser.live().metadata.map {
+        it.user.nip05()
+    }.observeAsState(baseUser.nip05())
 
-    if (isValidNIP05) {
-        nip05?.let {
+    Crossfade(targetState = nip05, modifier = columnModifier) {
+        if (it != null) {
             DisplayNIP05Line(it, baseUser, columnModifier)
         }
     }
@@ -131,9 +125,11 @@ fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifie
 @Composable
 private fun DisplayNIP05Line(nip05: String, baseUser: User, columnModifier: Modifier = Modifier) {
     Column(modifier = columnModifier) {
-        Row(verticalAlignment = Alignment.CenterVertically) {
-            val nip05Verified = nip05VerificationAsAState(baseUser.info!!, baseUser.pubkeyHex)
-            DisplayNIP05(nip05, nip05Verified)
+        val nip05Verified = nip05VerificationAsAState(baseUser.info!!, baseUser.pubkeyHex)
+        Crossfade(targetState = nip05Verified) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                DisplayNIP05(nip05, it)
+            }
         }
     }
 }
@@ -145,12 +141,17 @@ private fun DisplayNIP05(
 ) {
     val uri = LocalUriHandler.current
     val (user, domain) = remember(nip05) {
-        nip05.split("@")
+        val parts = nip05.split("@")
+        if (parts.size == 1) {
+            listOf("_", parts[0])
+        } else {
+            listOf(parts[0], parts[1])
+        }
     }
 
     if (user != "_") {
         Text(
-            text = AnnotatedString(user),
+            text = remember(nip05) { AnnotatedString(user) },
             color = MaterialTheme.colors.placeholderText,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis
@@ -160,7 +161,7 @@ private fun DisplayNIP05(
     NIP05VerifiedSymbol(nip05Verified)
 
     ClickableText(
-        text = AnnotatedString(domain),
+        text = remember(nip05) { AnnotatedString(domain) },
         onClick = { runCatching { uri.openUri("https://$domain") } },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(0.52f)),
         maxLines = 1,
@@ -181,7 +182,7 @@ private fun NIP05VerifiedSymbol(nip05Verified: MutableState<Boolean?>) {
         )
     } else if (nip05Verified.value == true) {
         Icon(
-            painter = painterResource(R.drawable.ic_verified),
+            painter = painterResource(R.drawable.ic_verified_transparent),
             "NIP-05 Verified",
             tint = Nip05.copy(0.52f),
             modifier = Modifier
@@ -205,7 +206,7 @@ fun DisplayNip05ProfileStatus(user: User) {
     val uri = LocalUriHandler.current
 
     user.nip05()?.let { nip05 ->
-        if (nip05.split("@").size == 2) {
+        if (nip05.split("@").size <= 2) {
             val nip05Verified by nip05VerificationAsAState(user.info!!, user.pubkeyHex)
             Row(verticalAlignment = Alignment.CenterVertically) {
                 if (nip05Verified == null) {
@@ -217,7 +218,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                     )
                 } else if (nip05Verified == true) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_verified),
+                        painter = painterResource(R.drawable.ic_verified_transparent),
                         "NIP-05 Verified",
                         tint = Nip05,
                         modifier = Modifier.size(16.dp)
@@ -233,9 +234,18 @@ fun DisplayNip05ProfileStatus(user: User) {
 
                 var domainPadStart = 5.dp
 
-                if (nip05.split("@")[0] != "_") {
+                val (user, domain) = remember(nip05) {
+                    val parts = nip05.split("@")
+                    if (parts.size == 1) {
+                        listOf("_", parts[0])
+                    } else {
+                        listOf(parts[0], parts[1])
+                    }
+                }
+
+                if (user != "_") {
                     Text(
-                        text = AnnotatedString(nip05.split("@")[0] + "@"),
+                        text = remember { AnnotatedString(user + "@") },
                         modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp),
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis
@@ -244,7 +254,7 @@ fun DisplayNip05ProfileStatus(user: User) {
                 }
 
                 ClickableText(
-                    text = AnnotatedString(nip05.split("@")[1]),
+                    text = AnnotatedString(domain),
                     onClick = { nip05.let { runCatching { uri.openUri("https://${it.split("@")[1]}") } } },
                     style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
                     modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = domainPadStart),

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

@@ -36,11 +36,10 @@ import androidx.compose.material.icons.filled.PersonRemove
 import androidx.compose.material.icons.filled.Report
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.MutableState
 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.draw.shadow
@@ -112,8 +111,8 @@ private fun VerticalDivider(color: Color) =
 
 @Composable
 fun LongPressToQuickAction(baseNote: Note, accountViewModel: AccountViewModel, content: @Composable (() -> Unit) -> Unit) {
-    var popupExpanded = remember { mutableStateOf(false) }
-    val showPopup = remember(popupExpanded) { { popupExpanded.value = true } }
+    val popupExpanded = remember { mutableStateOf(false) }
+    val showPopup = remember { { popupExpanded.value = true } }
 
     content(showPopup)
 
@@ -122,192 +121,241 @@ fun LongPressToQuickAction(baseNote: Note, accountViewModel: AccountViewModel, c
 
 @Composable
 fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit, accountViewModel: AccountViewModel) {
-    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 showSelectTextDialog = remember { mutableStateOf(false) }
+    val showDeleteAlertDialog = remember { mutableStateOf(false) }
+    val showBlockAlertDialog = remember { mutableStateOf(false) }
+    val showReportDialog = remember { mutableStateOf(false) }
 
     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()
+        RenderMainPopup(
+            accountViewModel,
+            note,
+            onDismiss,
+            showBlockAlertDialog,
+            showDeleteAlertDialog,
+            showReportDialog
+        )
+    }
 
-        val backgroundColor = if (MaterialTheme.colors.isLight) {
-            MaterialTheme.colors.primary
-        } else {
-            MaterialTheme.colors.secondaryButtonBackground
+    if (showSelectTextDialog.value) {
+        accountViewModel.decrypt(note)?.let {
+            SelectTextDialog(it) { showSelectTextDialog.value = false }
         }
+    }
 
-        val showToast = { stringResource: Int ->
-            scope.launch {
-                Toast.makeText(
-                    context,
-                    context.getString(stringResource),
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
+    if (showDeleteAlertDialog.value) {
+        DeleteAlertDialog(note, accountViewModel) {
+            showDeleteAlertDialog.value = false
+            onDismiss()
         }
+    }
 
-        val isOwnNote = accountViewModel.isLoggedUser(note.author)
-        val isFollowingUser = !isOwnNote && accountViewModel.isFollowing(note.author)
+    if (showBlockAlertDialog.value) {
+        BlockAlertDialog(note, accountViewModel) {
+            showBlockAlertDialog.value = false
+            onDismiss()
+        }
+    }
 
-        Popup(onDismissRequest = onDismiss, alignment = Alignment.Center) {
-            Card(
-                modifier = Modifier.shadow(elevation = 6.dp, shape = cardShape),
-                shape = cardShape,
-                backgroundColor = backgroundColor
-            ) {
-                Column(modifier = Modifier.width(IntrinsicSize.Min)) {
-                    Row(modifier = Modifier.height(IntrinsicSize.Min)) {
-                        NoteQuickActionItem(
-                            icon = Icons.Default.ContentCopy,
-                            label = stringResource(R.string.quick_action_copy_text)
-                        ) {
-                            scope.launch(Dispatchers.IO) {
-                                clipboardManager.setText(
-                                    AnnotatedString(
-                                        accountViewModel.decrypt(note) ?: ""
-                                    )
+    if (showReportDialog.value) {
+        ReportNoteDialog(note, accountViewModel) {
+            showReportDialog.value = false
+            onDismiss()
+        }
+    }
+}
+
+@Composable
+private fun RenderMainPopup(
+    accountViewModel: AccountViewModel,
+    note: Note,
+    onDismiss: () -> Unit,
+    showBlockAlertDialog: MutableState<Boolean>,
+    showDeleteAlertDialog: MutableState<Boolean>,
+    showReportDialog: MutableState<Boolean>
+) {
+    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.secondaryButtonBackground
+    }
+
+    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)
+
+    Popup(onDismissRequest = onDismiss, alignment = Alignment.Center) {
+        Card(
+            modifier = Modifier.shadow(elevation = 6.dp, shape = cardShape),
+            shape = cardShape,
+            backgroundColor = backgroundColor
+        ) {
+            Column(modifier = Modifier.width(IntrinsicSize.Min)) {
+                Row(modifier = Modifier.height(IntrinsicSize.Min)) {
+                    NoteQuickActionItem(
+                        icon = Icons.Default.ContentCopy,
+                        label = stringResource(R.string.quick_action_copy_text)
+                    ) {
+                        scope.launch(Dispatchers.IO) {
+                            clipboardManager.setText(
+                                AnnotatedString(
+                                    accountViewModel.decrypt(note) ?: ""
                                 )
-                                showToast(R.string.copied_note_text_to_clipboard)
-                                onDismiss()
-                            }
-                        }
-                        VerticalDivider(primaryLight)
-                        NoteQuickActionItem(Icons.Default.AlternateEmail, stringResource(R.string.quick_action_copy_user_id)) {
-                            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)) {
-                            scope.launch(Dispatchers.IO) {
-                                clipboardManager.setText(AnnotatedString("nostr:${note.toNEvent()}"))
-                                showToast(R.string.copied_note_id_to_clipboard)
-                                onDismiss()
-                            }
-                        }
-
-                        if (!isOwnNote) {
-                            VerticalDivider(primaryLight)
-
-                            NoteQuickActionItem(Icons.Default.Block, stringResource(R.string.quick_action_block)) {
-                                if (accountViewModel.hideBlockAlertDialog) {
-                                    scope.launch(Dispatchers.IO) {
-                                        note.author?.let { accountViewModel.hide(it) }
-                                        onDismiss()
-                                    }
-                                } else {
-                                    showBlockAlertDialog = true
-                                }
-                            }
-                        }
-                    }
-                    Divider(
-                        color = primaryLight,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .width(1.dp)
-                    )
-                    Row(modifier = Modifier.height(IntrinsicSize.Min)) {
-                        if (isOwnNote) {
-                            NoteQuickActionItem(Icons.Default.Delete, stringResource(R.string.quick_action_delete)) {
-                                if (accountViewModel.hideDeleteRequestDialog) {
-                                    scope.launch(Dispatchers.IO) {
-                                        accountViewModel.delete(note)
-                                        onDismiss()
-                                    }
-                                } else {
-                                    showDeleteAlertDialog = true
-                                }
-                            }
-                        } else if (isFollowingUser) {
-                            NoteQuickActionItem(Icons.Default.PersonRemove, stringResource(R.string.quick_action_unfollow)) {
-                                scope.launch(Dispatchers.IO) {
-                                    accountViewModel.unfollow(note.author!!)
-                                    onDismiss()
-                                }
-                            }
-                        } else {
-                            NoteQuickActionItem(Icons.Default.PersonAdd, stringResource(R.string.quick_action_follow)) {
-                                scope.launch(Dispatchers.IO) {
-                                    accountViewModel.follow(note.author!!)
-                                    onDismiss()
-                                }
-                            }
-                        }
-
-                        VerticalDivider(primaryLight)
-                        NoteQuickActionItem(
-                            icon = ImageVector.vectorResource(id = R.drawable.relays),
-                            label = stringResource(R.string.broadcast)
-                        ) {
-                            scope.launch(Dispatchers.IO) {
-                                accountViewModel.broadcast(note)
-                                // showSelectTextDialog = true
-                                onDismiss()
-                            }
-                        }
-                        VerticalDivider(primaryLight)
-                        NoteQuickActionItem(icon = Icons.Default.Share, label = stringResource(R.string.quick_action_share)) {
-                            val sendIntent = Intent().apply {
-                                action = Intent.ACTION_SEND
-                                type = "text/plain"
-                                putExtra(
-                                    Intent.EXTRA_TEXT,
-                                    externalLinkForNote(note)
-                                )
-                                putExtra(Intent.EXTRA_TITLE, context.getString(R.string.quick_action_share_browser_link))
-                            }
-
-                            val shareIntent = Intent.createChooser(sendIntent, context.getString(R.string.quick_action_share))
-                            ContextCompat.startActivity(context, shareIntent, null)
+                            )
+                            showToast(R.string.copied_note_text_to_clipboard)
                             onDismiss()
                         }
+                    }
+                    VerticalDivider(primaryLight)
+                    NoteQuickActionItem(
+                        Icons.Default.AlternateEmail,
+                        stringResource(R.string.quick_action_copy_user_id)
+                    ) {
+                        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)
+                    ) {
+                        scope.launch(Dispatchers.IO) {
+                            clipboardManager.setText(AnnotatedString("nostr:${note.toNEvent()}"))
+                            showToast(R.string.copied_note_id_to_clipboard)
+                            onDismiss()
+                        }
+                    }
 
-                        if (!isOwnNote) {
-                            VerticalDivider(primaryLight)
+                    if (!isOwnNote) {
+                        VerticalDivider(primaryLight)
 
-                            NoteQuickActionItem(Icons.Default.Report, stringResource(R.string.quick_action_report)) {
-                                showReportDialog = true
+                        NoteQuickActionItem(
+                            Icons.Default.Block,
+                            stringResource(R.string.quick_action_block)
+                        ) {
+                            if (accountViewModel.hideBlockAlertDialog) {
+                                scope.launch(Dispatchers.IO) {
+                                    note.author?.let { accountViewModel.hide(it) }
+                                    onDismiss()
+                                }
+                            } else {
+                                showBlockAlertDialog.value = true
                             }
                         }
                     }
                 }
+                Divider(
+                    color = primaryLight,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .width(1.dp)
+                )
+                Row(modifier = Modifier.height(IntrinsicSize.Min)) {
+                    if (isOwnNote) {
+                        NoteQuickActionItem(
+                            Icons.Default.Delete,
+                            stringResource(R.string.quick_action_delete)
+                        ) {
+                            if (accountViewModel.hideDeleteRequestDialog) {
+                                scope.launch(Dispatchers.IO) {
+                                    accountViewModel.delete(note)
+                                    onDismiss()
+                                }
+                            } else {
+                                showDeleteAlertDialog.value = true
+                            }
+                        }
+                    } else if (isFollowingUser) {
+                        NoteQuickActionItem(
+                            Icons.Default.PersonRemove,
+                            stringResource(R.string.quick_action_unfollow)
+                        ) {
+                            scope.launch(Dispatchers.IO) {
+                                accountViewModel.unfollow(note.author!!)
+                                onDismiss()
+                            }
+                        }
+                    } else {
+                        NoteQuickActionItem(
+                            Icons.Default.PersonAdd,
+                            stringResource(R.string.quick_action_follow)
+                        ) {
+                            scope.launch(Dispatchers.IO) {
+                                accountViewModel.follow(note.author!!)
+                                onDismiss()
+                            }
+                        }
+                    }
+
+                    VerticalDivider(primaryLight)
+                    NoteQuickActionItem(
+                        icon = ImageVector.vectorResource(id = R.drawable.relays),
+                        label = stringResource(R.string.broadcast)
+                    ) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.broadcast(note)
+                            // showSelectTextDialog = true
+                            onDismiss()
+                        }
+                    }
+                    VerticalDivider(primaryLight)
+                    NoteQuickActionItem(
+                        icon = Icons.Default.Share,
+                        label = stringResource(R.string.quick_action_share)
+                    ) {
+                        val sendIntent = Intent().apply {
+                            action = Intent.ACTION_SEND
+                            type = "text/plain"
+                            putExtra(
+                                Intent.EXTRA_TEXT,
+                                externalLinkForNote(note)
+                            )
+                            putExtra(
+                                Intent.EXTRA_TITLE,
+                                context.getString(R.string.quick_action_share_browser_link)
+                            )
+                        }
+
+                        val shareIntent = Intent.createChooser(
+                            sendIntent,
+                            context.getString(R.string.quick_action_share)
+                        )
+                        ContextCompat.startActivity(context, shareIntent, null)
+                        onDismiss()
+                    }
+
+                    if (!isOwnNote) {
+                        VerticalDivider(primaryLight)
+
+                        NoteQuickActionItem(
+                            Icons.Default.Report,
+                            stringResource(R.string.quick_action_report)
+                        ) {
+                            showReportDialog.value = true
+                        }
+                    }
+                }
             }
         }
     }
-
-    if (showSelectTextDialog) {
-        accountViewModel.decrypt(note)?.let {
-            SelectTextDialog(it) { showSelectTextDialog = false }
-        }
-    }
-
-    if (showDeleteAlertDialog) {
-        DeleteAlertDialog(note, accountViewModel) {
-            showDeleteAlertDialog = false
-            onDismiss()
-        }
-    }
-
-    if (showBlockAlertDialog) {
-        BlockAlertDialog(note, accountViewModel) {
-            showBlockAlertDialog = false
-            onDismiss()
-        }
-    }
-
-    if (showReportDialog) {
-        ReportNoteDialog(note, accountViewModel) {
-            showReportDialog = false
-            onDismiss()
-        }
-    }
 }
 
 @Composable

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

@@ -20,7 +20,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Popup
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
@@ -32,6 +31,7 @@ import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -428,9 +428,12 @@ fun ZapVote(
 
     // only show tallies after a user has zapped note
     if (!pollViewModel.canZap()) {
+        val amountStr = remember(poolOption.zappedValue) {
+            showAmount(poolOption.zappedValue)
+        }
         Text(
-            showAmount(poolOption.zappedValue),
-            fontSize = 14.sp,
+            text = amountStr,
+            fontSize = Font14SP,
             color = MaterialTheme.colors.placeholderText,
             modifier = modifier
         )

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

@@ -7,5 +7,6 @@ fun ByteArray.toShortenHex(): String {
 }
 
 fun String.toShortenHex(): String {
+    if (length <= 16) return this
     return replaceRange(8, length - 8, ":")
 }

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

@@ -11,8 +11,10 @@ import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -37,9 +39,6 @@ fun RelayCompose(
     onAddRelay: () -> Unit,
     onRemoveRelay: () -> Unit
 ) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
     val context = LocalContext.current
 
     Column() {
@@ -60,8 +59,14 @@ fun RelayCompose(
                         overflow = TextOverflow.Ellipsis
                     )
 
+                    val lastTime by remember(relay.lastEvent) {
+                        derivedStateOf {
+                            timeAgo(relay.lastEvent, context = context)
+                        }
+                    }
+
                     Text(
-                        timeAgo(relay.lastEvent, context = context),
+                        text = lastTime,
                         maxLines = 1
                     )
                 }
@@ -75,11 +80,7 @@ fun RelayCompose(
             }
 
             Column(modifier = Modifier.padding(start = 10.dp)) {
-                if (account.activeRelays()?.none { it.url == relay.url } == true) {
-                    AddRelayButton { onAddRelay() }
-                } else {
-                    RemoveRelayButton { onRemoveRelay() }
-                }
+                RelayOptions(accountViewModel, relay, onAddRelay, onRemoveRelay)
             }
         }
 
@@ -90,6 +91,26 @@ fun RelayCompose(
     }
 }
 
+@Composable
+private fun RelayOptions(
+    accountViewModel: AccountViewModel,
+    relay: RelayInfo,
+    onAddRelay: () -> Unit,
+    onRemoveRelay: () -> Unit
+) {
+    val userState by accountViewModel.userRelays.observeAsState()
+
+    val isNotUsingRelay = remember(userState) {
+        accountViewModel.account.activeRelays()?.none { it.url == relay.url } == true
+    }
+
+    if (isNotUsingRelay) {
+        AddRelayButton(onAddRelay)
+    } else {
+        RemoveRelayButton(onRemoveRelay)
+    }
+}
+
 @Composable
 fun AddRelayButton(onClick: () -> Unit) {
     Button(

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

@@ -45,6 +45,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.service.firstFullChar
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -64,7 +65,7 @@ class UpdateReactionTypeViewModel(val account: Account) : ViewModel() {
     }
 
     fun addChoice() {
-        val newValue = nextChoice.text.trim().take(2)
+        val newValue = nextChoice.text.trim().firstFullChar()
         reactionSet = reactionSet + newValue
 
         nextChoice = TextFieldValue("")

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

@@ -60,7 +60,6 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.ViewModel
@@ -78,6 +77,7 @@ 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 com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -415,7 +415,7 @@ fun UpdateZapAmountDialog(onClose: () -> Unit, nip47uri: String? = null, account
                                 stringResource(id = R.string.wallet_connect_service_explainer),
                                 Modifier.weight(1f),
                                 color = MaterialTheme.colors.placeholderText,
-                                fontSize = 14.sp
+                                fontSize = Font14SP
                             )
                         }
 

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

@@ -6,22 +6,26 @@ import androidx.compose.foundation.layout.Row
 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.remember
 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.theme.Size55dp
 
 @Composable
 fun UserCompose(
     baseUser: User,
-    overallModifier: Modifier = Modifier
-        .padding(
-            start = 12.dp,
-            end = 12.dp,
-            top = 10.dp
-        ),
+    overallModifier: Modifier = remember {
+        Modifier
+            .padding(
+                start = 12.dp,
+                end = 12.dp,
+                top = 10.dp
+            )
+    },
+    showDiviser: Boolean = true,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
@@ -35,9 +39,9 @@ fun UserCompose(
             modifier = overallModifier,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            UserPicture(baseUser, nav, accountViewModel, 55.dp)
+            UserPicture(baseUser, Size55dp, accountViewModel = accountViewModel, nav = nav)
 
-            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+            Column(modifier = remember { Modifier.padding(start = 10.dp).weight(1f) }) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     UsernameDisplay(baseUser)
                 }
@@ -45,14 +49,16 @@ fun UserCompose(
                 AboutDisplay(baseUser)
             }
 
-            Column(modifier = Modifier.padding(start = 10.dp)) {
+            Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
                 UserActionOptions(baseUser, accountViewModel)
             }
         }
 
-        Divider(
-            modifier = Modifier.padding(top = 10.dp),
-            thickness = 0.25.dp
-        )
+        if (showDiviser) {
+            Divider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = 0.25.dp
+            )
+        }
     }
 }

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

@@ -1,10 +1,10 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.util.Log
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 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
@@ -49,6 +49,9 @@ 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
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -81,7 +84,7 @@ fun UserReactionsRow(
             Icon(
                 imageVector = Icons.Default.ExpandMore,
                 null,
-                modifier = Modifier.size(20.dp),
+                modifier = Size20Modifier,
                 tint = MaterialTheme.colors.placeholderText
             )
         }
@@ -162,6 +165,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     fun today() = sdf.format(LocalDateTime.now())
 
     private suspend fun initializeSuspend() {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = mutableMapOf<String, Int>()
@@ -211,6 +216,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     suspend fun addToStatsSuspend(newNotes: Set<Note>) {
+        checkNotInMainThread()
+
         val currentUser = user.pubkeyHex
 
         val reactions = this._reactions.value.toMutableMap()
@@ -267,6 +274,8 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     }
 
     private suspend fun refreshChartModel() {
+        checkNotInMainThread()
+
         val day = 24 * 60 * 60L
         val now = LocalDateTime.now()
         val displayAxisFormatter = DateTimeFormatter.ofPattern("EEE")
@@ -293,6 +302,7 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
     var collectorJob: Job? = null
 
     init {
+        Log.d("Init", "User Reactions Row")
         viewModelScope.launch(Dispatchers.IO) {
             initializeSuspend()
 
@@ -335,11 +345,11 @@ fun UserReplyReaction(
     Icon(
         painter = painterResource(R.drawable.ic_comment),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = RoyalBlue
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -357,11 +367,11 @@ fun UserBoostReaction(
     Icon(
         painter = painterResource(R.drawable.ic_retweeted),
         null,
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
         showCounts,
@@ -379,14 +389,14 @@ fun UserLikeReaction(
     Icon(
         painter = painterResource(R.drawable.ic_liked),
         null,
-        modifier = Modifier.size(20.dp),
+        modifier = Size20Modifier,
         tint = Color.Unspecified
     )
 
-    Spacer(modifier = Modifier.width(10.dp))
+    Spacer(modifier = StdHorzSpacer)
 
     Text(
-        showCounts,
+        text = showCounts,
         fontWeight = FontWeight.Bold,
         fontSize = 18.sp
     )
@@ -399,7 +409,7 @@ fun UserZapReaction(
     Icon(
         imageVector = Icons.Default.Bolt,
         contentDescription = stringResource(R.string.zaps),
-        modifier = Modifier.size(24.dp),
+        modifier = Size24Modifier,
         tint = BitcoinOrange
     )