Version 0.9.5

Removing unnecessary observables
Remove blinking
2026-08-03 13:26:17 +00:00 · 2023-01-21 13:53:48 -03:00 · 2023-01-21 13:53:38 -03:00 · 2023-01-21 13:53:12 -03:00 · 2023-01-21 13:37:57 -03:00 · 2023-01-21 13:32:22 -03:00
77 changed files with 2122 additions and 560 deletions
@@ -0,0 +1,11 @@
+# Amethyst Privacy Policy
+
+Effective as of Jan 20, 2023.
+
+The Amethyst app for Android does not collect or process any personal information from its users. The app is used to connect to third-party Nostr servers (also called Relays) that may or may not collect personal information and are not covered by this privacy policy. Each third-party relay server comes equipped with its own privacy policy that can be viewed through the app or through that server's website. The developers of this open source project or maintainers of the distribution channels (app stores) do not have access to the data located in the user's phone. Accounts are fully maintained by the user. We do not have control over them. 
+
+Data from connected accounts is only stored locally on the device when it is required for functionality and performance of Amethyst. This data is strictly confidental and cannot be accessed by other apps (on non-rooted devices). Phone data can be deleted by clearing Amethyst's local storage or uninstalling the app.
+
+We reserve the right to modify this Privacy Policy at any time. Any modifications to this Privacy Policy will be effective upon our posting the new terms and/or upon implementation of the new changes on the Service (or as otherwise indicated at the time of posting). In all cases, your continued use of the app after the posting of any modified Privacy Policy indicates your acceptance of the terms of the modified Privacy Policy.
+
+If you have any questions about Amethyst or this privacy policy, you can send a message to amethyst@vitorpamplona.com
@@ -11,8 +11,8 @@ android {
        applicationId "com.vitorpamplona.amethyst"
        minSdk 26
        targetSdk 33
-        versionCode 8
-        versionName "0.8"
+        versionCode 16
+        versionName "0.9.5"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@@ -22,7 +22,7 @@ android {

    buildTypes {
        release {
-            minifyEnabled false
+            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
    }
@@ -48,7 +48,7 @@ android {

 dependencies {
    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04'
    implementation 'androidx.activity:activity-compose:1.6.1'
    implementation "androidx.compose.ui:ui:$compose_ui_version"
    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
@@ -61,7 +61,7 @@ dependencies {
    implementation "androidx.compose.material:material-icons-extended:1.3.1"

    // Input
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha04'

    // Swipe Refresh
    implementation 'com.google.accompanist:accompanist-swiperefresh:0.24.13-rc'
@@ -81,7 +81,7 @@ dependencies {

    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
    // Websockets API
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'

    // Json Serialization
    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1'
@@ -18,4 +18,10 @@

 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+# For the Secp256k1 library
+-keep class fr.acinq.secp256k1.jni.** { *; }
+# For the NostrPostr library
+-keep class nostr.postr.** { *; }
+-keep class com.vitorpamplona.amethyst.model.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }
@@ -14,6 +14,7 @@
        android:enableOnBackInvokedCallback="true"
        android:supportsRtl="true"
        android:theme="@style/Theme.Amethyst"
+        android:largeHeap="true"
        tools:targetApi="31">
        <activity
            android:name=".ui.MainActivity"
@@ -2,20 +2,27 @@ package com.vitorpamplona.amethyst.model

 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.Constants
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import java.util.Date
 import nostr.postr.Contact
 import nostr.postr.Persona
 import nostr.postr.Utils
 import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.events.MetadataEvent
 import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex

 val DefaultChannels = setOf(
-  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb" // -> Anigma's Nostr
+  "25e5c82273a271cb1a840d0060391a0bf4965cafeb029d5ab55350b418953fbb", // -> Anigma's Nostr
+  "42224859763652914db53052103f0b744df79dfc4efef7e950fc0802fc3df3c5"  // -> Amethyst's Group
 )

 class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> = DefaultChannels.toMutableSet()) {
@@ -33,6 +40,23 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
    return loggedIn.privKey != null
  }

+  fun sendNewUserMetadata(toString: String) {
+    if (!isWriteable()) return
+
+    loggedIn.privKey?.let {
+      val createdAt = Date().time / 1000
+      val content = toString
+      val pubKey = Utils.pubkeyCreate(it)
+      val tags = listOf<List<String>>()
+      val id = Event.generateId(pubKey, createdAt, MetadataEvent.kind, tags, content)
+      val sig = Utils.sign(id, it)
+      val event = MetadataEvent(id, pubKey, createdAt, tags, content, sig)
+
+      Client.send(event)
+      LocalCache.consume(event)
+    }
+  }
+
  fun reactTo(note: Note) {
    if (!isWriteable()) return

@@ -67,7 +91,7 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
  fun follow(user: User) {
    if (!isWriteable()) return

-    val lastestContactList = userProfile().lastestContactList
+    val lastestContactList = userProfile().latestContactList
    val event = if (lastestContactList != null) {
      ContactListEvent.create(lastestContactList.follows.plus(Contact(user.pubkeyHex, null)), lastestContactList.relayUse, loggedIn.privKey!!)
    } else {
@@ -82,7 +106,7 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
  fun unfollow(user: User) {
    if (!isWriteable()) return

-    val lastestContactList = userProfile().lastestContactList
+    val lastestContactList = userProfile().latestContactList
    if (lastestContactList != null) {
      val event = ContactListEvent.create(lastestContactList.follows.filter { it.pubKeyHex != user.pubkeyHex }, lastestContactList.relayUse, loggedIn.privKey!!)
      Client.send(event)
@@ -90,36 +114,20 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
    }
  }

-  fun sendPost(message: String, originalNote: Note?, modifiedMentions: List<User>?) {
+  fun sendPost(message: String, replyTo: List<Note>?, mentions: List<User>?) {
    if (!isWriteable()) return

-    val replyToEvent = originalNote?.event
-    if (replyToEvent is TextNoteEvent) {
-      val modifiedMentionsHex = modifiedMentions?.map { it.pubkeyHex }?.toSet() ?: emptySet()
+    val repliesToHex = replyTo?.map { it.idHex }
+    val mentionsHex = mentions?.map { it.pubkeyHex }

-      val repliesTo = replyToEvent.replyTos.plus(replyToEvent.id.toHex())
-      val mentions = replyToEvent.mentions.plus(replyToEvent.pubKey.toHex()).plus(modifiedMentionsHex).filter {
-        it in modifiedMentionsHex
-      }
-
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = repliesTo,
-        mentions = mentions,
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    } else {
-      val signedEvent = TextNoteEvent.create(
-        msg = message,
-        replyTos = null,
-        mentions = modifiedMentions?.map { it.pubkeyHex } ?: emptyList(),
-        privateKey = loggedIn.privKey!!
-      )
-      Client.send(signedEvent)
-      LocalCache.consume(signedEvent)
-    }
+    val signedEvent = TextNoteEvent.create(
+      msg = message,
+      replyTos = repliesToHex,
+      mentions = mentionsHex,
+      privateKey = loggedIn.privKey!!
+    )
+    Client.send(signedEvent)
+    LocalCache.consume(signedEvent)
  }

  fun sendChannelMeesage(message: String, toChannel: String, replyingTo: Note? = null) {
@@ -149,6 +157,53 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
    LocalCache.consume(signedEvent)
  }

+  fun sendCreateNewChannel(name: String, about: String, picture: String, accountStateViewModel: AccountStateViewModel) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelCreateEvent.create(
+      channelInfo = metadata,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    joinChannel(event.id.toHex(), accountStateViewModel)
+  }
+
+  fun joinChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+    followingChannels.add(idHex)
+    accountStateViewModel.saveToEncryptedStorage(this)
+  }
+
+  fun leaveChannel(idHex: String, accountStateViewModel: AccountStateViewModel) {
+    followingChannels.remove(idHex)
+    accountStateViewModel.saveToEncryptedStorage(this)
+  }
+
+  fun sendChangeChannel(name: String, about: String, picture: String, channel: Channel) {
+    if (!isWriteable()) return
+
+    val metadata = ChannelCreateEvent.ChannelData(
+      name, about, picture
+    )
+
+    val event = ChannelMetadataEvent.create(
+      newChannelInfo = metadata,
+      originalChannelIdHex = channel.idHex,
+      privateKey = loggedIn.privKey!!
+    )
+
+    Client.send(event)
+    LocalCache.consume(event)
+
+    followingChannels.add(event.id.toHex())
+  }
+
  fun decryptContent(note: Note): String? {
    val event = note.event
    return if (event is PrivateDmEvent && loggedIn.privKey != null) {
@@ -185,6 +240,8 @@ class Account(val loggedIn: Persona, val followingChannels: MutableSet<String> =
  private fun refreshObservers() {
    live.refresh()
  }
+
+
 }

 class AccountLiveData(private val account: Account): LiveData<AccountState>(AccountState(account)) {
@@ -13,6 +13,7 @@ class Channel(val id: ByteArray) {
    val idHex = id.toHexKey()
    val idDisplayHex = id.toShortenHex()

+    var creator: User? = null
    var info = ChannelCreateEvent.ChannelData(null, null, null)

    var updatedMetadataAt: Long = 0;
@@ -28,9 +29,10 @@ class Channel(val id: ByteArray) {
        }
    }

-    fun updateChannelInfo(channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
-        info = channelInfo
-        updatedMetadataAt = updatedAt
+    fun updateChannelInfo(creator: User, channelInfo: ChannelCreateEvent.ChannelData, updatedAt: Long) {
+        this.creator = creator
+        this.info = channelInfo
+        this.updatedMetadataAt = updatedAt

        live.refresh()
    }
@@ -40,6 +42,11 @@ class Channel(val id: ByteArray) {
        return info.picture ?: "https://robohash.org/${idHex}.png"
    }

+    fun anyNameStartsWith(prefix: String): Boolean {
+        return listOfNotNull(info.name, info.about)
+            .filter { it.startsWith(prefix, true) }.isNotEmpty()
+    }
+
    // Observers line up here.
    val live: ChannelLiveData = ChannelLiveData(this)

@@ -24,6 +24,7 @@ import nostr.postr.events.PrivateDmEvent
 import nostr.postr.events.RecommendRelayEvent
 import nostr.postr.events.TextNoteEvent
 import nostr.postr.toHex
+import nostr.postr.toNpub


 object LocalCache {
@@ -65,11 +66,11 @@ object LocalCache {


  fun consume(event: MetadataEvent) {
-    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
-
    // new event
    val oldUser = getOrCreateUser(event.pubKey)
    if (event.createdAt > oldUser.updatedMetadataAt) {
+      //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
+
      val newUser = try {
        metadataParser.readValue<UserMetadata>(ByteArrayInputStream(event.content.toByteArray(Charsets.UTF_8)), UserMetadata::class.java)
      } catch (e: Exception) {
@@ -79,6 +80,7 @@ object LocalCache {
      }

      oldUser.updateUserInfo(newUser, event.createdAt)
+      oldUser.latestMetadata = event
    } else {
      //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
    }
@@ -101,7 +103,7 @@ object LocalCache {

    note.loadEvent(event, author, mentions, replyTo)

-    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Note (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${note.event?.content?.take(100)} ${formattedDateTime(event.createdAt)}")

    // Prepares user's profile view.
    author.notes.add(note)
@@ -119,8 +121,6 @@ object LocalCache {
      it.addReply(note)
    }

-    UrlCachedPreviewer.preloadPreviewsFor(note)
-
    refreshObservers()
  }

@@ -148,7 +148,7 @@ object LocalCache {
        event.createdAt
      )

-      user.lastestContactList = event
+      user.latestContactList = event
    }

    refreshObservers()
@@ -188,7 +188,7 @@ object LocalCache {
    // Already processed this event.
    if (note.event != null) return

-    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+    //Log.d("TN", "New Boost (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")

    val author = getOrCreateUser(event.pubKey)
    val mentions = event.originalAuthor.map { getOrCreateUser(decodePublicKey(it)) }.toList()
@@ -246,13 +246,23 @@ object LocalCache {
  }

  fun consume(event: ChannelCreateEvent) {
+    //Log.d("MT", "New Event ${event.content} ${event.id.toHex()}")
    // new event
    val oldChannel = getOrCreateChannel(event.id.toHex())
+    val author = getOrCreateUser(event.pubKey)
    if (event.createdAt > oldChannel.updatedMetadataAt) {
-      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), mutableListOf())
+      }
    } else {
      // older data, does nothing
    }
+
+    refreshObservers()
  }
  fun consume(event: ChannelMetadataEvent) {
    //Log.d("MT", "New User ${users.size} ${event.contactMetaData.name}")
@@ -260,11 +270,20 @@ object LocalCache {

    // new event
    val oldChannel = getOrCreateChannel(event.channel)
+    val author = getOrCreateUser(event.pubKey)
    if (event.createdAt > oldChannel.updatedMetadataAt) {
-      oldChannel.updateChannelInfo(event.channelInfo, event.createdAt)
+      if (oldChannel.creator == null || oldChannel.creator == author) {
+        oldChannel.updateChannelInfo(author, event.channelInfo, event.createdAt)
+
+        val note = oldChannel.getOrCreateNote(event.id.toHex())
+        note.channel = oldChannel
+        note.loadEvent(event, author, emptyList(), mutableListOf())
+      }
    } else {
      //Log.d("MT","Relay sent a previous Metadata Event ${oldUser.toBestDisplayName()} ${formattedDateTime(event.createdAt)} > ${formattedDateTime(oldUser.updatedAt)}")
    }
+
+    refreshObservers()
  }

  fun consume(event: ChannelMessageEvent) {
@@ -279,7 +298,12 @@ object LocalCache {

    val author = getOrCreateUser(event.pubKey)
    val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { getOrCreateNote(it) }.toMutableList())
+    val replyTo = Collections.synchronizedList(
+      event.replyTos
+        .map { channel.getOrCreateNote(it) }
+        .filter { it.event !is ChannelCreateEvent }
+        .toMutableList()
+    )

    note.channel = channel
    note.loadEvent(event, author, mentions, replyTo)
@@ -299,8 +323,6 @@ object LocalCache {
      it.addReply(note)
    }

-    UrlCachedPreviewer.preloadPreviewsFor(note)
-
    refreshObservers()
  }

@@ -313,7 +335,27 @@ object LocalCache {
  }

  fun findUsersStartingWith(username: String): List<User> {
-    return users.values.filter { it.info.anyNameStartsWith(username) }
+    return users.values.filter {
+           it.info.anyNameStartsWith(username)
+        || it.pubkeyHex.startsWith(username, true)
+        || it.pubkey.toNpub().startsWith(username, true)
+    }
+  }
+
+  fun findNotesStartingWith(text: String): List<Note> {
+    return notes.values.filter {
+      (it.event is TextNoteEvent && it.event?.content?.contains(text) ?: false)
+        || it.idHex.startsWith(text, true)
+        || it.id.toNote().startsWith(text, true)
+    }
+  }
+
+  fun findChannelsStartingWith(text: String): List<Channel> {
+    return channels.values.filter {
+      it.anyNameStartsWith(text)
+        || it.idHex.startsWith(text, true)
+        || it.id.toNote().startsWith(text, true)
+    }
  }

  // Observers line up here.
@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.model

+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -11,6 +13,7 @@ import java.util.Collections
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import nostr.postr.events.Event

@@ -40,7 +43,7 @@ class Note(val idHex: String) {
        this.mentions = mentions
        this.replyTo = replyTo

-        refreshObservers()
+        invalidateData()
    }

    fun formattedDateTime(timestamp: Long): String {
@@ -72,54 +75,63 @@ class Note(val idHex: String) {

    fun addReply(note: Note) {
        if (replies.add(note))
-            refreshObservers()
+            invalidateData()
    }

    fun addBoost(note: Note) {
        if (boosts.add(note))
-            refreshObservers()
+            invalidateData()
    }

    fun addReaction(note: Note) {
        if (reactions.add(note))
-            refreshObservers()
+            invalidateData()
    }

    fun isReactedBy(user: User): Boolean {
-        return reactions.any { it.author == user }
+        return synchronized(reactions) {
+            reactions.any { it.author == user }
+        }
    }

    fun isBoostedBy(user: User): Boolean {
-        return boosts.any { it.author == user }
+        return synchronized(boosts) {
+            boosts.any { it.author == user }
+        }
    }

    // Observers line up here.
    val live: NoteLiveData = NoteLiveData(this)

-    private fun refreshObservers() {
-        live.refresh()
+    // Refreshes observers in batches.
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
    }
 }

 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
-    val scope = CoroutineScope(Job() + Dispatchers.Main)
-
    fun refresh() {
        postValue(NoteState(note))
    }

    override fun onActive() {
        super.onActive()
-        scope.launch {
-            NostrSingleEventDataSource.add(note.idHex)
-        }
+        NostrSingleEventDataSource.add(note.idHex)
    }

    override fun onInactive() {
        super.onInactive()
-        scope.launch {
-            NostrSingleEventDataSource.remove(note.idHex)
-        }
+        NostrSingleEventDataSource.remove(note.idHex)
    }
 }

@@ -8,6 +8,10 @@ import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
 import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch

 object UrlCachedPreviewer {
  val cache = ConcurrentHashMap<String, UrlInfoItem>()
@@ -18,16 +22,19 @@ object UrlCachedPreviewer {
      return
    }

-    BahaUrlPreview(url, object : IUrlPreviewCallback {
-      override fun onComplete(urlInfo: UrlInfoItem) {
-        cache.put(url, urlInfo)
-        callback?.onComplete(urlInfo)
-      }
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      BahaUrlPreview(url, object : IUrlPreviewCallback {
+        override fun onComplete(urlInfo: UrlInfoItem) {
+          cache.put(url, urlInfo)
+          callback?.onComplete(urlInfo)
+        }

-      override fun onFailed(throwable: Throwable) {
-        callback?.onFailed(throwable)
-      }
-    }).fetchUrlPreview()
+        override fun onFailed(throwable: Throwable) {
+          callback?.onFailed(throwable)
+        }
+      }).fetchUrlPreview()
+    }
  }

  fun findUrlsInMessage(message: String): List<String> {
@@ -5,7 +5,13 @@ import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
+import nostr.postr.events.MetadataEvent

 class User(val pubkey: ByteArray) {
    val pubkeyHex = pubkey.toHexKey()
@@ -16,14 +22,14 @@ class User(val pubkey: ByteArray) {
    var updatedMetadataAt: Long = 0;
    var updatedFollowsAt: Long = 0;

-    var lastestContactList: ContactListEvent? = null
+    var latestContactList: ContactListEvent? = null
+    var latestMetadata: MetadataEvent? = null

    val notes = Collections.synchronizedSet(mutableSetOf<Note>())
    val follows = Collections.synchronizedSet(mutableSetOf<User>())
    val taggedPosts = Collections.synchronizedSet(mutableSetOf<Note>())

    val followers = Collections.synchronizedSet(mutableSetOf<User>())
-
    val messages = ConcurrentHashMap<User, MutableSet<Note>>()

    fun toBestDisplayName(): String {
@@ -46,10 +52,16 @@ class User(val pubkey: ByteArray) {
    fun follow(user: User) {
        follows.add(user)
        user.followers.add(this)
+
+        invalidateData()
+        user.invalidateData()
    }
    fun unfollow(user: User) {
        follows.remove(user)
        user.followers.remove(this)
+
+        invalidateData()
+        user.invalidateData()
    }

    @Synchronized
@@ -81,15 +93,13 @@ class User(val pubkey: ByteArray) {
        }

        updatedFollowsAt = updateAt
-
-        live.refresh()
    }

    fun updateUserInfo(newUserInfo: UserMetadata, updateAt: Long) {
        info = newUserInfo
        updatedMetadataAt = updateAt

-        live.refresh()
+        invalidateData()
    }

    fun isFollowing(user: User): Boolean {
@@ -101,8 +111,19 @@ class User(val pubkey: ByteArray) {
    // Observers line up here.
    val live: UserLiveData = UserLiveData(this)

-    private fun refreshObservers() {
-        live.refresh()
+    // Refreshes observers in batches.
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            delay(100)
+            live.refresh()
+            handlerWaiting = false
+        }
    }
 }

@@ -6,5 +6,5 @@ import nostr.postr.JsonFilter
 data class Channel (
  val id: String = UUID.randomUUID().toString().substring(0,4)
 ) {
-  var filter: JsonFilter? = null // Inactive when null
+  var filter: List<JsonFilter>? = null // Inactive when null
 }
@@ -29,31 +29,24 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
      account.userProfile().live.removeObserver(cacheListener)
  }

-  fun createAccountFilter(): JsonFilter {
+  fun createAccountContactListFilter(): JsonFilter {
    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind, ContactListEvent.kind),
+      kinds = listOf(ContactListEvent.kind),
      authors = listOf(account.userProfile().pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+      limit = 1
    )
  }

-  val accountChannel = requestNewChannel()
-
-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
+  fun createAccountMetadataFilter(): JsonFilter {
+    return JsonFilter(
+      kinds = listOf(MetadataEvent.kind),
+      authors = listOf(account.userProfile().pubkeyHex),
+      limit = 3
+    )
  }

-  fun equalAuthors(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.authors, list2.authors)
-  }
+  val accountMetadataChannel = requestNewChannel()
+  val accountContactListChannel = requestNewChannel()

  override fun feed(): List<Note> {
    val user = account.userProfile()
@@ -66,16 +59,16 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {

    return LocalCache.notes.values
      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .sortedBy { it.event!!.createdAt }
+      .sortedBy { it.event?.createdAt }
      .reversed()
  }

  override fun updateChannelFilters() {
    // gets everthing about the user logged in
-    val newAccountFilter = createAccountFilter()
+    val newAccountMetadataFilter = createAccountMetadataFilter()
+    accountMetadataChannel.filter = listOf(newAccountMetadataFilter).ifEmpty { null }

-    if (!equalAuthors(newAccountFilter, accountChannel.filter)) {
-      accountChannel.filter = newAccountFilter
-    }
+    val newAccountContactListEvent = createAccountContactListFilter()
+    accountContactListChannel.filter = listOf(newAccountContactListEvent).ifEmpty { null }
  }
 }
@@ -10,22 +10,28 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {

  fun loadMessagesBetween(channelId: String) {
    channel = LocalCache.channels[channelId]
+    resetFilters()
  }

-  fun createMessagesToChannelFilter() = JsonFilter(
-    kinds = listOf(ChannelMessageEvent.kind),
-    tags = mapOf("e" to listOf(channel?.idHex).filterNotNull()),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
-  )
+  fun createMessagesToChannelFilter(): JsonFilter? {
+    if (channel != null) {
+      return JsonFilter(
+        kinds = listOf(ChannelMessageEvent.kind),
+        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+        since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      )
+    }
+    return null
+  }

  val messagesChannel = requestNewChannel()

  // returns the last Note of each user.
  override fun feed(): List<Note> {
-    return channel?.notes?.values?.sortedBy { it.event!!.createdAt } ?: emptyList()
+    return channel?.notes?.values?.sortedBy { it.event?.createdAt } ?: emptyList()
  }

  override fun updateChannelFilters() {
-    messagesChannel.filter = createMessagesToChannelFilter()
+    messagesChannel.filter = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
  }
 }
@@ -35,11 +35,11 @@ object NostrChatRoomDataSource: NostrDataSource<Note>("ChatroomFeed") {
  override fun feed(): List<Note> {
    val messages = account.userProfile().messages[withUser]

-    return messages?.sortedBy { it.event!!.createdAt } ?: emptyList()
+    return messages?.sortedBy { it.event?.createdAt } ?: emptyList()
  }

  override fun updateChannelFilters() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
+    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
+    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
  }
 }
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -21,21 +22,35 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
    authors = listOf(account.userProfile().pubkeyHex)
  )

+  fun createChannelsCreatedbyMeFilter() = JsonFilter(
+    kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
+    authors = listOf(account.userProfile().pubkeyHex)
+  )
+
  fun createMyChannelsFilter() = JsonFilter(
    kinds = listOf(ChannelCreateEvent.kind),
    ids = account.followingChannels.toList()
  )

-  fun createMyChannelsInfoFilter() = JsonFilter(
-    kinds = listOf(ChannelMetadataEvent.kind),
-    tags = mapOf("e" to account.followingChannels.toList())
-  )
+  fun createLastChannelInfoFilter(): List<JsonFilter> {
+    return account.followingChannels.map {
+      JsonFilter(
+        kinds = listOf(ChannelMetadataEvent.kind),
+        tags = mapOf("e" to listOf(it)),
+        limit = 1
+      )
+    }
+  }

-  fun createMessagesToMyChannelsFilter() = JsonFilter(
-    kinds = listOf(ChannelMessageEvent.kind),
-    tags = mapOf("e" to account.followingChannels.toList()),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
-  )
+  fun createLastMessageOfEachChannelFilter(): List<JsonFilter> {
+    return account.followingChannels.map {
+      JsonFilter(
+        kinds = listOf(ChannelMessageEvent.kind),
+        tags = mapOf("e" to listOf(it)),
+        limit = 1
+      )
+    }
+  }

  val incomingChannel = requestNewChannel()
  val outgoingChannel = requestNewChannel()
@@ -44,6 +59,8 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
  val myChannelsInfoChannel = requestNewChannel()
  val myChannelsMessagesChannel = requestNewChannel()

+  val myChannelsCreatedbyMeChannel = requestNewChannel()
+
  // returns the last Note of each user.
  override fun feed(): List<Note> {
    val messages = account.userProfile().messages
@@ -57,14 +74,22 @@ object NostrChatroomListDataSource: NostrDataSource<Note>("MailBoxFeed") {
      it.notes.values.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
    }

+    val channelsCreatedByMe = LocalCache.channels.values.filter {
+      it.creator == account.userProfile()
+    }.map {
+      it.notes.values.sortedBy { it.event?.createdAt }.lastOrNull { it.event != null }
+    }
+
    return (privateMessages + publicChannels).filterNotNull().sortedBy { it.event?.createdAt }.reversed()
  }

  override fun updateChannelFilters() {
-    incomingChannel.filter = createMessagesToMeFilter()
-    outgoingChannel.filter = createMessagesFromMeFilter()
-    myChannelsChannel.filter = createMyChannelsFilter()
-    myChannelsInfoChannel.filter = createMyChannelsInfoFilter()
-    myChannelsMessagesChannel.filter = createMessagesToMyChannelsFilter()
+    incomingChannel.filter = listOf(createMessagesToMeFilter()).ifEmpty { null }
+    outgoingChannel.filter = listOf(createMessagesFromMeFilter()).ifEmpty { null }
+    myChannelsChannel.filter = listOf(createMyChannelsFilter()).ifEmpty { null }
+    myChannelsInfoChannel.filter = createLastChannelInfoFilter().ifEmpty { null }
+    myChannelsMessagesChannel.filter = createLastMessageOfEachChannelFilter().ifEmpty { null }
+
+    //myChannelsCreatedbyMeChannel.filter = listOf(createChannelsCreatedbyMeFilter()).ifEmpty { null }
  }
 }
@@ -1,6 +1,10 @@
 package com.vitorpamplona.amethyst.service

+import android.os.Handler
+import android.os.Looper
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -11,6 +15,13 @@ import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.Relay
 import java.util.Collections
+import kotlin.time.ExperimentalTime
+import kotlin.time.measureTimedValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import nostr.postr.events.ContactListEvent
 import nostr.postr.events.DeletionEvent
 import nostr.postr.events.Event
@@ -23,9 +34,25 @@ abstract class NostrDataSource<T>(val debugName: String) {
  private val channels = Collections.synchronizedSet(mutableSetOf<Channel>())
  private val channelIds =  Collections.synchronizedSet(mutableSetOf<String>())

+  private val eventCounter = mutableMapOf<String, Int>()
+
+  fun printCounter() {
+    eventCounter.forEach {
+      println("AAA Count ${it.key}: ${it.value}")
+    }
+  }
+
  private val clientListener = object : Client.Listener() {
    override fun onEvent(event: Event, subscriptionId: String, relay: Relay) {
      if (subscriptionId in channelIds) {
+        val key = "${debugName} ${subscriptionId} ${event.kind}"
+        if (eventCounter.contains(key)) {
+          eventCounter.put(key, eventCounter.get(key)!! + 1)
+        } else {
+          eventCounter.put(key, 1)
+        }
+
+        //println("AAA ${debugName} ${subscriptionId} ${event.kind}")
        when (event) {
          is MetadataEvent -> LocalCache.consume(event)
          is TextNoteEvent -> LocalCache.consume(event)
@@ -89,7 +116,23 @@ abstract class NostrDataSource<T>(val debugName: String) {
  }

  fun loadTop(): List<T> {
-    return feed().take(100)
+    val returningList = feed().take(100)
+
+    // prepare previews
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      loadPreviews(returningList)
+    }
+
+    return returningList
+  }
+
+  fun loadPreviews(list: List<T>) {
+    list.forEach {
+      if (it is Note) {
+        UrlCachedPreviewer.preloadPreviewsFor(it)
+      }
+    }
  }

  fun requestNewChannel(): Channel {
@@ -105,11 +148,32 @@ abstract class NostrDataSource<T>(val debugName: String) {
    channelIds.remove(channel.id)
  }

+  var handlerWaiting = false
+  @Synchronized
+  fun invalidateFilters() {
+    if (handlerWaiting) return
+
+    handlerWaiting = true
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      delay(200)
+      resetFiltersSuspend()
+      handlerWaiting = false
+    }
+  }
+
  fun resetFilters() {
+    val scope = CoroutineScope(Job() + Dispatchers.IO)
+    scope.launch {
+      resetFiltersSuspend()
+    }
+  }
+
+  fun resetFiltersSuspend() {
    // saves the channels that are currently active
    val activeChannels = channels.filter { it.filter != null }
    // saves the current content to only update if it changes
-    val currentFilter = activeChannels.associate { it.id to it.filter!!.toJson() }
+    val currentFilter = activeChannels.associate { it.id to it.filter!!.joinToString("|") { it.toJson() }  }

    updateChannelFilters()

@@ -123,12 +187,12 @@ abstract class NostrDataSource<T>(val debugName: String) {
          Client.close(channel.id)
        } else {
          // was active and is still active, check if it has changed.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
+          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
            Client.close(channel.id)
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+            Client.sendFilter(channel.id, channelsNewFilter)
          } else {
            // hasn't changed, does nothing.
-            Client.sendFilterOnlyIfDisconnected(channel.id, mutableListOf(channelsNewFilter))
+            Client.sendFilterOnlyIfDisconnected(channel.id, channelsNewFilter)
          }
        }
      } else {
@@ -136,8 +200,8 @@ abstract class NostrDataSource<T>(val debugName: String) {
          // was not active and is still not active, does nothing
        } else {
          // was not active and becomes active, sends the filter.
-          if (channelsNewFilter.toJson() != currentFilter[channel.id]) {
-            Client.sendFilter(channel.id, mutableListOf(channelsNewFilter))
+          if (channelsNewFilter.joinToString("|") { it.toJson() } != currentFilter[channel.id]) {
+            Client.sendFilter(channel.id, channelsNewFilter)
          }
        }
      }
@@ -6,43 +6,21 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent

 object NostrGlobalDataSource: NostrDataSource<Note>("GlobalFeed") {
-  val fifteenMinutes = (60*15) // 15 mins
-
  fun createGlobalFilter() = JsonFilter(
-      kinds = listOf(TextNoteEvent.kind),
-      since = System.currentTimeMillis() / 1000 - fifteenMinutes
-    )
+    kinds = listOf(TextNoteEvent.kind),
+    limit = 50
+  )

  val globalFeedChannel = requestNewChannel()

-  fun equalTime(list1:Long?, list2:Long?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return Math.abs(list1 - list2) < (4*fifteenMinutes)
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalTime(list1.since, list2.since)
-  }
-
  override fun feed() = LocalCache.notes.values
    .filter {
      it.event is TextNoteEvent && (it.event as TextNoteEvent).replyTos.isEmpty()
    }
-    .sortedBy { it.event!!.createdAt }
+    .sortedBy { it.event?.createdAt }
    .reversed()

  override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, globalFeedChannel.filter)) {
-      globalFeedChannel.filter = newFilter
-    }
+    globalFeedChannel.filter = listOf(createGlobalFilter()).ifEmpty { null }
  }
 }
@@ -28,7 +28,7 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {
      account.userProfile().live.removeObserver(cacheListener)
  }

-  fun createFollowAccountsFilter(): JsonFilter? {
+  fun createFollowAccountsFilter(): JsonFilter {
    val follows = account.userProfile().follows ?: emptySet()

    val followKeys = synchronized(follows) {
@@ -39,12 +39,10 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {

    val followSet = followKeys.plus(account.userProfile().pubkeyHex.substring(0, 6))

-    if (followSet.isEmpty()) return null
-
    return JsonFilter(
      kinds = listOf(TextNoteEvent.kind, RepostEvent.kind),
      authors = followSet,
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      limit = 200
    )
  }

@@ -78,15 +76,15 @@ object NostrHomeDataSource: NostrDataSource<Note>("HomeFeed") {

    return LocalCache.notes.values
      .filter { (it.event is TextNoteEvent || it.event is RepostEvent) && it.author?.pubkeyHex in allowSet }
-      .sortedBy { it.event!!.createdAt }
+      .sortedBy { it.event?.createdAt }
      .reversed()
  }

  override fun updateChannelFilters() {
    val newFollowAccountsFilter = createFollowAccountsFilter()

-    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter)) {
-      followAccountChannel.filter = newFollowAccountsFilter
+    if (!equalAuthors(newFollowAccountsFilter, followAccountChannel.filter?.firstOrNull())) {
+      followAccountChannel.filter = listOf(newFollowAccountsFilter).ifEmpty { null }
    }
  }
 }
@@ -4,47 +4,26 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import nostr.postr.JsonFilter

-object NostrNotificationDataSource: NostrDataSource<Note>("GlobalFeed") {
+object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
  lateinit var account: Account

-  fun createGlobalFilter() = JsonFilter(
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex).filterNotNull())
+  fun createNotificationFilter() = JsonFilter(
+    tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
+    limit = 100
  )

  val notificationChannel = requestNewChannel()

-  fun <T> equalsIgnoreOrder(list1:List<T>?, list2:List<T>?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return list1.size == list2.size && list1.toSet() == list2.toSet()
-  }
-
-  fun equalFilters(list1:JsonFilter?, list2:JsonFilter?): Boolean {
-    if (list1 == null && list2 == null) return true
-    if (list1 == null) return false
-    if (list2 == null) return false
-
-    return equalsIgnoreOrder(list1.tags?.get("p"), list2.tags?.get("p"))
-        && equalsIgnoreOrder(list1.tags?.get("e"), list2.tags?.get("e"))
-  }
-
  override fun feed(): List<Note> {
    val set = account.userProfile().taggedPosts
    val filtered = synchronized(set) {
      set.filter { it.event != null }
    }

-    return filtered.sortedBy { it.event!!.createdAt }.reversed()
+    return filtered.sortedBy { it.event?.createdAt }.reversed()
  }

  override fun updateChannelFilters() {
-    val newFilter = createGlobalFilter()
-
-    if (!equalFilters(newFilter, notificationChannel.filter)) {
-      notificationChannel.filter = newFilter
-    }
+    notificationChannel.filter = listOf(createNotificationFilter()).ifEmpty { null }
  }
 }
@@ -9,10 +9,10 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.TextNoteEvent

 object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
-  private var eventsToWatch = listOf<String>()
+  private var eventsToWatch = setOf<String>()

  private fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    val reactionsToWatch = eventsToWatch.map { it }

    if (reactionsToWatch.isEmpty()) {
      return null
@@ -38,7 +38,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {

    val interestedEvents =
      (directEventsToLoad + threadingEventsToLoad)
-      .map { it.idHex.substring(0, 8) }
+      .map { it.idHex }

    if (interestedEvents.isEmpty()) {
      return null
@@ -46,6 +46,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {

    // downloads linked events to this event.
    return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
      ids = interestedEvents
    )
  }
@@ -60,17 +61,20 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
  }

  override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    val reactions = createRepliesAndReactionsFilter()
+    val missing = createLoadEventsIfNotLoadedFilter()
+
+    repliesAndReactionsChannel.filter = listOfNotNull(reactions).ifEmpty { null }
+    loadEventsChannel.filter = listOfNotNull(missing).ifEmpty { null }
  }

  fun add(eventId: String) {
    eventsToWatch = eventsToWatch.plus(eventId)
-    resetFilters()
+    invalidateFilters()
  }

  fun remove(eventId: String) {
    eventsToWatch = eventsToWatch.minus(eventId)
-    resetFilters()
+    invalidateFilters()
  }
 }
@@ -7,15 +7,18 @@ import nostr.postr.JsonFilter
 import nostr.postr.events.MetadataEvent

 object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {
-  var usersToWatch = listOf<String>()
+  var usersToWatch = setOf<String>()

-  fun createUserFilter(): JsonFilter? {
+  fun createUserFilter(): List<JsonFilter>? {
    if (usersToWatch.isEmpty()) return null

-    return JsonFilter(
-      kinds = listOf(MetadataEvent.kind),
-      authors = usersToWatch.map { it.substring(0, 8) }
-    )
+    return usersToWatch.map {
+      JsonFilter(
+        kinds = listOf(MetadataEvent.kind),
+        authors = listOf(it.substring(0, 8)),
+        limit = 1
+      )
+    }
  }

  val userChannel = requestNewChannel()
@@ -32,11 +35,11 @@ object NostrSingleUserDataSource: NostrDataSource<Note>("SingleUserFeed") {

  fun add(userId: String) {
    usersToWatch = usersToWatch.plus(userId)
-    resetFilters()
+    invalidateFilters()
  }

  fun remove(userId: String) {
    usersToWatch = usersToWatch.minus(userId)
-    resetFilters()
+    invalidateFilters()
  }
 }
@@ -2,20 +2,24 @@ package com.vitorpamplona.amethyst.service

 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.util.Collections
 import nostr.postr.JsonFilter
+import nostr.postr.events.TextNoteEvent

 object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
  val eventsToWatch = Collections.synchronizedList(mutableListOf<String>())

  fun createRepliesAndReactionsFilter(): JsonFilter? {
-    val reactionsToWatch = eventsToWatch.map { it.substring(0, 8) }
+    val reactionsToWatch = eventsToWatch.map { it }

    if (reactionsToWatch.isEmpty()) {
      return null
    }

    return JsonFilter(
+      kinds = listOf(TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind),
      tags = mapOf("e" to reactionsToWatch)
    )
  }
@@ -46,8 +50,8 @@ object NostrThreadDataSource: NostrDataSource<Note>("SingleThreadFeed") {
  }

  override fun updateChannelFilters() {
-    repliesAndReactionsChannel.filter = createRepliesAndReactionsFilter()
-    loadEventsChannel.filter = createLoadEventsIfNotLoadedFilter()
+    repliesAndReactionsChannel.filter = listOfNotNull(createRepliesAndReactionsFilter()).ifEmpty { null }
+    loadEventsChannel.filter = listOfNotNull(createLoadEventsIfNotLoadedFilter()).ifEmpty { null }
  }

  fun loadThread(noteId: String) {
@@ -19,7 +19,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
    return JsonFilter(
      kinds = listOf(MetadataEvent.kind),
      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7)
+      limit = 1
    )
  }

@@ -27,7 +27,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
    return JsonFilter(
      kinds = listOf(TextNoteEvent.kind),
      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 4)
+      limit = 100
    )
  }

@@ -43,7 +43,7 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
  }

  override fun updateChannelFilters() {
-    userInfoChannel.filter = createUserInfoFilter()
-    notesChannel.filter = createUserPostsFilter()
+    userInfoChannel.filter = listOf(createUserInfoFilter()).ifEmpty { null }
+    notesChannel.filter = listOf(createUserPostsFilter()).ifEmpty { null }
  }
 }
@@ -15,8 +15,7 @@ object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFo

  fun createFollowersFilter() = JsonFilter(
    kinds = listOf(ContactListEvent.kind),
-    since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 7 days
-    tags = mapOf("p" to listOf(user!!.pubkeyHex).filterNotNull())
+    tags = mapOf("p" to listOf(user!!.pubkeyHex))
  )

  val followerChannel = requestNewChannel()
@@ -30,6 +29,6 @@ object NostrUserProfileFollowersDataSource: NostrDataSource<User>("UserProfileFo
  }

  override fun updateChannelFilters() {
-    followerChannel.filter = createFollowersFilter()
+    followerChannel.filter = listOf(createFollowersFilter()).ifEmpty { null }
  }
 }
@@ -17,7 +17,7 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
    return JsonFilter(
      kinds = listOf(ContactListEvent.kind),
      authors = listOf(user!!.pubkeyHex),
-      since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 7), // 4 days
+      limit = 1
    )
  }

@@ -28,6 +28,6 @@ object NostrUserProfileFollowsDataSource: NostrDataSource<User>("UserProfileFoll
  }

  override fun updateChannelFilters() {
-    followChannel.filter = createFollowFilter()
+    followChannel.filter = listOf(createFollowFilter()).ifEmpty { null }
  }
 }
@@ -30,14 +30,14 @@ class ChannelMetadataEvent (
  companion object {
    const val kind = 41

-    fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannel: ChannelCreateEvent, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
+    fun create(newChannelInfo: ChannelCreateEvent.ChannelData?, originalChannelIdHex: String, privateKey: ByteArray, createdAt: Long = Date().time / 1000): ChannelMetadataEvent {
      val content = if (newChannelInfo != null)
        gson.toJson(newChannelInfo)
      else
        ""

      val pubKey = Utils.pubkeyCreate(privateKey)
-      val tags = listOf( listOf("e", originalChannel.id.toHex(), "", "root") )
+      val tags = listOf( listOf("e", originalChannelIdHex, "", "root") )
      val id = generateId(pubKey, createdAt, kind, tags, content)
      val sig = Utils.sign(id, privateKey)
      return ChannelMetadataEvent(id, pubKey, createdAt, tags, content, sig)
@@ -1,7 +1,6 @@
 package com.vitorpamplona.amethyst.service.relays

 import com.google.gson.JsonElement
-import java.util.Collections
 import nostr.postr.events.Event
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -31,6 +30,7 @@ class Relay(
    }

    fun requestAndWatch() {
+        println("Connecting with ${url}")
        val request = Request.Builder().url(url).build()
        val listener = object : WebSocketListener() {

@@ -88,6 +88,10 @@ class Relay(
            }

            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                socket?.close(1000, "Normal close")
+                // Failures disconnect the relay. 
+                socket = null
+                //println("Relay onFailure ${url}, ${response?.message}")
                t.printStackTrace()
                listeners.forEach {
                    it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
@@ -100,6 +104,7 @@ class Relay(
    fun disconnect() {
        //httpClient.dispatcher.executorService.shutdown()
        socket?.close(1000, "Normal close")
+        socket = null
    }

    fun sendFilter(requestId: String) {
@@ -110,7 +115,7 @@ class Relay(
            if (filters.isNotEmpty()) {
                val request = """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]"""
                //println("FILTERSSENT " + """["REQ","$requestId",${filters.joinToString(",") { it.toJson() }}]""")
-                socket!!.send(request)
+                socket?.send(request)
            }
        }
    }
@@ -3,6 +3,10 @@ package com.vitorpamplona.amethyst.service.relays
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.Constants
 import java.util.Collections
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import nostr.postr.events.Event

 /**
@@ -108,7 +112,10 @@ object RelayPool: Relay.Listener {
    val live: RelayPoolLiveData = RelayPoolLiveData(this)

    private fun refreshObservers() {
-        live.refresh()
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            live.refresh()
+        }
    }
 }

@@ -16,6 +16,7 @@ import coil.decode.ImageDecoderDecoder
 import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.KeyStorage
 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
@@ -43,7 +44,9 @@ class MainActivity : ComponentActivity() {
          add(GifDecoder.Factory())
        }
        add(SvgDecoder.Factory())
-      }.build()
+      }
+        .respectCacheHeaders(false)
+        .build()
    }

    setContent {
@@ -71,6 +74,7 @@ class MainActivity : ComponentActivity() {
  override fun onPause() {
    NostrAccountDataSource.stop()
    NostrHomeDataSource.stop()
+    NostrChannelDataSource.stop()
    NostrChatroomListDataSource.stop()
    NostrUserProfileDataSource.stop()
    NostrUserProfileFollowersDataSource.stop()
@@ -0,0 +1,123 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+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
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+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.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun NewChannelView(onClose: () -> Unit, account: Account, accountStateViewModel: AccountStateViewModel, channel: Channel? = null) {
+    val postViewModel: NewChannelViewModel = viewModel()
+
+    postViewModel.load(account, channel, accountStateViewModel)
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create()
+                            onClose()
+                        },
+                        postViewModel.channelName.value.text.isNotBlank()
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Channel Name") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelName.value,
+                    onValueChange = { postViewModel.channelName.value = it },
+                    placeholder = {
+                        Text(
+                            text = "My Awesome Group",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    )
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Picture Url") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.channelPicture.value,
+                    onValueChange = { postViewModel.channelPicture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "http://mygroup.com/logo.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    }
+                )
+
+                Spacer(modifier = Modifier.height(15.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Description") },
+                    modifier = Modifier.fillMaxWidth().height(100.dp),
+                    value = postViewModel.channelDescription.value,
+                    onValueChange = { postViewModel.channelDescription.value = it },
+                    placeholder = {
+                        Text(
+                            text = "About us.. ",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    maxLines = 10
+
+                )
+            }
+        }
+    }
+
+
+
+}
@@ -0,0 +1,56 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.ViewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+class NewChannelViewModel: ViewModel() {
+    private var account: Account? = null
+    private var originalChannel: Channel? = null
+    private var accountStateViewModel: AccountStateViewModel? = null
+
+    val channelName = mutableStateOf(TextFieldValue())
+    val channelPicture = mutableStateOf(TextFieldValue())
+    val channelDescription = mutableStateOf(TextFieldValue())
+
+
+    fun load(account: Account, channel: Channel?, accountStateViewModel: AccountStateViewModel) {
+        this.accountStateViewModel = accountStateViewModel
+        this.account = account
+        if (channel != null) {
+            originalChannel = channel
+            channelName.value = TextFieldValue(channel.info.name ?: "")
+            channelPicture.value = TextFieldValue(channel.info.picture ?: "")
+            channelDescription.value = TextFieldValue(channel.info.about ?: "")
+        }
+    }
+
+    fun create() {
+        if (originalChannel == null)
+            this.account?.sendCreateNewChannel(
+                channelName.value.text,
+                channelDescription.value.text,
+                channelPicture.value.text,
+                accountStateViewModel!!
+            )
+        else
+            this.account?.sendChangeChannel(
+                channelName.value.text,
+                channelDescription.value.text,
+                channelPicture.value.text,
+                originalChannel!!
+            )
+
+        clear()
+    }
+
+    fun clear() {
+        channelName.value = TextFieldValue()
+        channelPicture.value = TextFieldValue()
+        channelDescription.value = TextFieldValue()
+    }
+}
@@ -1,24 +1,21 @@
 package com.vitorpamplona.amethyst.ui.actions

 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
 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.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
@@ -37,16 +34,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.TransformedText
-import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.components.UrlPreview
@@ -57,7 +52,7 @@ import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.ui.components.videoExtension
 import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.screen.UserLine
 import kotlinx.coroutines.delay
 import nostr.postr.events.TextNoteEvent

@@ -169,41 +164,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                        )
                    ) {
                        itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item ->
-                            Column(modifier = Modifier.fillMaxWidth().clickable(onClick = {
+                            UserLine(item) {
                                postViewModel.autocompleteWithUser(item)
-                            })) {
-                                Row(
-                                    modifier = Modifier
-                                        .padding(
-                                            start = 12.dp,
-                                            end = 12.dp,
-                                            top = 10.dp)
-                                ) {
-
-                                    AsyncImage(
-                                        model = item.profilePicture(),
-                                        contentDescription = "Profile Image",
-                                        modifier = Modifier
-                                            .width(55.dp).height(55.dp)
-                                            .clip(shape = CircleShape)
-                                    )
-
-                                    Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
-                                        Row(verticalAlignment = Alignment.CenterVertically) {
-                                            UserDisplay(item)
-                                        }
-
-                                        Text(
-                                            item.info.about?.take(100) ?: "",
-                                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-                                        )
-                                    }
-                                }
-
-                                Divider(
-                                    modifier = Modifier.padding(top = 10.dp),
-                                    thickness = 0.25.dp
-                                )
                            }
                        }
                    }
@@ -278,3 +240,46 @@ fun PostButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier =
        Text(text = "Post", color = Color.White)
    }
 }
+
+@Composable
+fun CreateButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Text(text = "Create", color = Color.White)
+    }
+}
+
+@Composable
+fun SearchButton(onPost: () -> Unit = {}, isActive: Boolean, modifier: Modifier = Modifier) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            if (isActive) {
+                onPost()
+            }
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            )
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_search),
+            null,
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}
@@ -38,7 +38,13 @@ class NewPostViewModel: ViewModel() {
        replyingTo?.let { replyNote ->
            this.replyTos = (replyNote.replyTo ?: mutableListOf()).plus(replyNote).toMutableList()
            replyNote.author?.let { replyUser ->
-                this.mentions = (replyNote.mentions ?: emptyList()).plus(replyUser)
+                val currentMentions = replyNote.mentions ?: emptyList()
+                if (currentMentions.contains(replyUser)) {
+                    this.mentions = currentMentions
+                } else {
+                    this.mentions = currentMentions.plus(replyUser)
+                }
+
            }
        }
        this.account = account
@@ -89,7 +95,7 @@ class NewPostViewModel: ViewModel() {
            }.joinToString(" ")
        }.joinToString("\n")

-        account?.sendPost(newMessage, originalNote, mentions)
+        account?.sendPost(newMessage, replyTos, mentions)
        message = TextFieldValue("")
        urlPreview = null
    }
@@ -0,0 +1,211 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.foundation.layout.Arrangement
+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
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
+    val postViewModel: NewUserMetadataViewModel = viewModel()
+
+    LaunchedEffect(Unit) {
+        postViewModel.load(account)
+    }
+
+    Dialog(
+        onDismissRequest = { onClose() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Surface(
+        ) {
+            Column(
+                modifier = Modifier.padding(10.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    CloseButton(onCancel = {
+                        postViewModel.clear()
+                        onClose()
+                    })
+
+                    PostButton(
+                        onPost = {
+                            postViewModel.create()
+                            onClose()
+                        },
+                        postViewModel.userName.value.isNotBlank()
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                Row(modifier = Modifier.fillMaxWidth(1f), verticalAlignment = Alignment.CenterVertically) {
+                    OutlinedTextField(
+                        label = { Text(text = "Display Name") },
+                        modifier =  Modifier.weight(1f),
+                        value = postViewModel.displayName.value,
+                        onValueChange = { postViewModel.displayName.value = it },
+                        placeholder = {
+                            Text(
+                                text = "My display name",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            capitalization = KeyboardCapitalization.Sentences
+                        ),
+                        singleLine = true
+                    )
+
+                    Text("@", Modifier.padding(5.dp))
+
+                    OutlinedTextField(
+                        label = { Text(text = "Username") },
+                        modifier = Modifier.weight(1f),
+                        value = postViewModel.userName.value,
+                        onValueChange = { postViewModel.userName.value = it },
+                        placeholder = {
+                            Text(
+                                text = "My username",
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                            )
+                        },
+                        singleLine = true
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "About me") },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(100.dp),
+                    value = postViewModel.about.value,
+                    onValueChange = { postViewModel.about.value = it },
+                    placeholder = {
+                        Text(
+                            text = "About me",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    maxLines = 10
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Avatar URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.picture.value,
+                    onValueChange = { postViewModel.picture.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/me.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Banner URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.banner.value,
+                    onValueChange = { postViewModel.banner.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com/mybanner.jpg",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "Website URL") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.website.value,
+                    onValueChange = { postViewModel.website.value = it },
+                    placeholder = {
+                        Text(
+                            text = "https://mywebsite.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+
+                OutlinedTextField(
+                    label = { Text(text = "NIP-05") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.nip05.value,
+                    onValueChange = { postViewModel.nip05.value = it },
+                    placeholder = {
+                        Text(
+                            text = "_@mywebsite.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+                Spacer(modifier = Modifier.height(10.dp))
+                OutlinedTextField(
+                    label = { Text(text = "LN Address") },
+                    modifier = Modifier.fillMaxWidth(),
+                    value = postViewModel.lnAddress.value,
+                    onValueChange = { postViewModel.lnAddress.value = it },
+                    placeholder = {
+                        Text(
+                            text = "me@mylightiningnode.com",
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                        )
+                    },
+                    singleLine = true
+                )
+
+            }
+        }
+    }
+}
@@ -0,0 +1,79 @@
+package com.vitorpamplona.amethyst.ui.actions
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.node.ObjectNode
+import com.vitorpamplona.amethyst.model.Account
+import java.io.ByteArrayInputStream
+import java.io.StringWriter
+
+class NewUserMetadataViewModel: ViewModel() {
+    private lateinit var account: Account
+
+    val userName = mutableStateOf("")
+    val displayName = mutableStateOf("")
+    val about = mutableStateOf("")
+
+    val picture = mutableStateOf("")
+    val banner = mutableStateOf("")
+
+    val website = mutableStateOf("")
+    val nip05 = mutableStateOf("")
+    val lnAddress = mutableStateOf("")
+
+    fun load(account: Account) {
+        this.account = account
+
+        account.userProfile().let {
+            userName.value = it.bestUsername() ?: ""
+            displayName.value = it.bestDisplayName() ?: ""
+            about.value = it.info.about ?: ""
+            picture.value = it.info.picture ?: ""
+            banner.value = it.info.banner ?: ""
+            website.value = it.info.website ?: ""
+            nip05.value = it.info.nip05 ?: ""
+            lnAddress.value = it.info.lud16 ?: ""
+        }
+    }
+
+    fun create() {
+        // Tries to not delete any existing attribute that we do not work with.
+        val latest = account.userProfile().latestMetadata
+        val currentJson = if (latest != null) {
+            ObjectMapper().readTree(
+                ByteArrayInputStream(latest.content.toByteArray(Charsets.UTF_8))
+            ) as ObjectNode
+        } else {
+            ObjectMapper().createObjectNode()
+        }
+        currentJson.put("name", userName.value)
+        currentJson.put("username", userName.value)
+        currentJson.put("display_name", displayName.value)
+        currentJson.put("displayName", displayName.value)
+        currentJson.put("picture", picture.value)
+        currentJson.put("banner", banner.value)
+        currentJson.put("website", website.value)
+        currentJson.put("about", about.value)
+        currentJson.put("nip05", nip05.value)
+        currentJson.put("lud06", lnAddress.value)
+
+        val writer = StringWriter()
+        ObjectMapper().writeValue(writer, currentJson)
+
+        account.sendNewUserMetadata(writer.buffer.toString())
+
+        clear()
+    }
+
+    fun clear() {
+        userName.value = ""
+        displayName.value = ""
+        about.value = ""
+        picture.value = ""
+        banner.value = ""
+        website.value = ""
+        nip05.value = ""
+        lnAddress.value = ""
+    }
+}
@@ -48,14 +48,14 @@ fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
                        showGallerySelect = true
                    }
                ) {
-                    Text("Add Image from Gallery")
+                    Text("Upload Image")
                }
            }
        }
    } else {
        Column {
            Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
-                Text("Add Image from Gallery")
+                Text("Upload Image")
            }
        }
    }
@@ -0,0 +1,53 @@
+package com.vitorpamplona.amethyst.buttons
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Visibility
+import androidx.compose.material.icons.outlined.VisibilityOff
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewPostView
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun NewChannelButton(account: Account, accountStateViewModel: AccountStateViewModel) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    if (wantsToPost)
+        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel)
+
+    OutlinedButton(
+        onClick = { wantsToPost = true },
+        modifier = Modifier.size(55.dp),
+        shape = CircleShape,
+        colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+        contentPadding = PaddingValues(0.dp),
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Add,
+            contentDescription = "New Channel",
+            modifier = Modifier.size(26.dp),
+            tint = Color.White
+        )
+    }
+}
@@ -0,0 +1,38 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickableEmail(email: String) {
+  val context = LocalContext.current
+
+  ClickableText(
+    text = AnnotatedString("$email "),
+    onClick = { runCatching { context.sendMail(email) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}
+
+fun Context.sendMail(to: String, subject: String? = null) {
+  try {
+    val intent = Intent(Intent.ACTION_SEND)
+    intent.type = "vnd.android.cursor.item/email" // or "message/rfc822"
+    intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
+    if (subject != null)
+      intent.putExtra(Intent.EXTRA_SUBJECT, subject)
+    startActivity(intent)
+  } catch (e: ActivityNotFoundException) {
+    // TODO: Handle case where no email app is available
+  } catch (t: Throwable) {
+    // TODO: Handle potential other type of exceptions
+  }
+}
@@ -0,0 +1,33 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.AnnotatedString
+
+@Composable
+fun ClickablePhone(phone: String) {
+  val context = LocalContext.current
+
+  ClickableText(
+    text = AnnotatedString("$phone "),
+    onClick = { runCatching { context.dial(phone) } },
+    style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
+  )
+}
+
+fun Context.dial(phone: String) {
+  try {
+    val intent = Intent(Intent.ACTION_DIAL, Uri.fromParts("tel", phone, null))
+    startActivity(intent)
+  } catch (t: Throwable) {
+    // TODO: Handle potential exceptions
+  }
+}
@@ -60,6 +60,10 @@ fun RichTextViewer(content: String, tags: List<List<String>>?, note: Note, accou
            } else {
              UrlPreview(word, word)
            }
+          } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+            ClickableEmail(word)
+          } else if (Patterns.PHONE.matcher(word).matches()) {
+            ClickablePhone(word)
          } else if (noProtocolUrlValidator.matcher(word).matches()) {
            UrlPreview("https://$word", word)
          } else if (tagIndex.matcher(word).matches() && tags != null) {
@@ -47,10 +47,25 @@ fun AppBottomBar(navController: NavHostController) {
                    selected = currentRoute == item.route,
                    onClick = {
                        if (currentRoute != item.route) {
-                            navController.navigate(item.route)
+                            navController.navigate(item.route){
+                                navController.graph.startDestinationRoute?.let { start ->
+                                    popUpTo(start)
+                                    restoreState = true
+                                }
+                                launchSingleTop = true
+                                restoreState = true
+                            }
                        } else {
                            // TODO: Make it scrool to the top
-                            navController.navigate(item.route)
+                            navController.navigate(item.route){
+                                navController.graph.startDestinationRoute?.let { start ->
+                                    popUpTo(start) { inclusive = item.route == Route.Home.route }
+                                    restoreState = true
+                                }
+
+                                launchSingleTop = true
+                                restoreState = true
+                            }
                        }
                    }
                )
@@ -4,16 +4,18 @@ import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun AppNavigation(
    navController: NavHostController,
-    accountViewModel: AccountViewModel
+    accountViewModel: AccountViewModel,
+    accountStateViewModel: AccountStateViewModel
 ) {
    NavHost(navController, startDestination = Route.Home.route) {
        Routes.forEach {
-            composable(it.route, it.arguments, content = it.buildScreen(accountViewModel, navController))
+            composable(it.route, it.arguments, content = it.buildScreen(accountViewModel, accountStateViewModel, navController))
        }
    }
 }
@@ -31,7 +31,21 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
+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.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrNotificationDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
@@ -46,7 +60,10 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac

@Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
    val accountUser = accountUserState?.user

    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
@@ -71,6 +88,25 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                            Client.allSubscriptions().map { "${it} ${Client.getSubscriptionFilters(it).joinToString { it.toJson() }}" }.forEach {
                                Log.d("CURRENT FILTERS", it)
                            }
+
+                            NostrAccountDataSource.printCounter()
+                            NostrChannelDataSource.printCounter()
+                            NostrChatRoomDataSource.printCounter()
+                            NostrChatroomListDataSource.printCounter()
+
+                            NostrGlobalDataSource.printCounter()
+                            NostrHomeDataSource.printCounter()
+                            NostrNotificationDataSource.printCounter()
+
+                            NostrSingleEventDataSource.printCounter()
+                            NostrSingleUserDataSource.printCounter()
+                            NostrThreadDataSource.printCounter()
+
+                            NostrUserProfileDataSource.printCounter()
+                            NostrUserProfileFollowersDataSource.printCounter()
+                            NostrUserProfileFollowsDataSource.printCounter()
+
+                            println("AAA: " + RelayPool.connectedRelays())
                        }
                    ) {
                        Icon(
@@ -49,7 +49,10 @@ fun DrawerContent(navController: NavHostController,
                  accountViewModel: AccountViewModel,
                  accountStateViewModel: AccountStateViewModel) {

-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
    val accountUser = accountUserState?.user

    Surface(
@@ -64,14 +67,18 @@ fun DrawerContent(navController: NavHostController,
                        model = banner,
                        contentDescription = "Profile Image",
                        contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                    )
                } else {
                    Image(
                        painter = painterResource(R.drawable.profile_banner),
                        contentDescription = "Profile Banner",
                        contentScale = ContentScale.FillWidth,
-                        modifier = Modifier.fillMaxWidth().height(150.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(150.dp)
                    )
                }

@@ -111,7 +118,8 @@ fun ProfileContent(accountUser: User?, modifier: Modifier = Modifier, scaffoldSt
            model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
            contentDescription = "Profile Image",
            modifier = Modifier
-                .width(100.dp).height(100.dp)
+                .width(100.dp)
+                .height(100.dp)
                .clip(shape = CircleShape)
                .border(3.dp, MaterialTheme.colors.background, CircleShape)
                .background(MaterialTheme.colors.background)
@@ -205,7 +213,8 @@ fun NavigationRow(navController: NavHostController, scaffoldState: ScaffoldState
        })
    ) {
        Row(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                .padding(vertical = 15.dp, horizontal = 25.dp),
            verticalAlignment = Alignment.CenterVertically
        ) {
@@ -10,6 +10,7 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.navArgument
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.ChannelScreen
 import com.vitorpamplona.amethyst.ui.screen.ChatroomListScreen
 import com.vitorpamplona.amethyst.ui.screen.ChatroomScreen
@@ -25,31 +26,31 @@ sealed class Route(
    val route: String,
    val icon: Int,
    val arguments: List<NamedNavArgument> = emptyList(),
-    val buildScreen: (AccountViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
+    val buildScreen: (AccountViewModel, AccountStateViewModel, NavController) -> @Composable (NavBackStackEntry) -> Unit
 ) {
-    object Home : Route("Home", R.drawable.ic_home, buildScreen = { acc, nav -> { _ -> HomeScreen(acc, nav) } })
-    object Search : Route("Search", R.drawable.ic_search, buildScreen = { acc, nav -> { _ -> SearchScreen(acc, nav) }})
-    object Notification : Route("Notification", R.drawable.ic_notifications,buildScreen = { acc, nav -> { _ -> NotificationScreen(acc, nav) }})
-    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, nav -> { _ -> ChatroomListScreen(acc, nav) }})
+    object Home : Route("Home", R.drawable.ic_home, buildScreen = { acc, accSt, nav -> { _ -> HomeScreen(acc, nav) } })
+    object Search : Route("Search", R.drawable.ic_search, buildScreen = { acc, accSt, nav -> { _ -> SearchScreen(acc, nav) }})
+    object Notification : Route("Notification", R.drawable.ic_notifications,buildScreen = { acc, accSt, nav -> { _ -> NotificationScreen(acc, nav) }})
+    object Message : Route("Message", R.drawable.ic_dm, buildScreen = { acc, accSt, nav -> { _ -> ChatroomListScreen(acc, nav) }})

    object Profile : Route("User/{id}", R.drawable.ic_profile,
        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ProfileScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ProfileScreen(it.arguments?.getString("id"), acc, nav) }}
    )

    object Note : Route("Note/{id}", R.drawable.ic_moments,
        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ThreadScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ThreadScreen(it.arguments?.getString("id"), acc, nav) }}
    )

    object Room : Route("Room/{id}", R.drawable.ic_moments,
        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ChatroomScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ChatroomScreen(it.arguments?.getString("id"), acc, nav) }}
    )

    object Channel : Route("Channel/{id}", R.drawable.ic_moments,
        arguments = listOf(navArgument("id") { type = NavType.StringType } ),
-        buildScreen = { acc, nav -> { ChannelScreen(it.arguments?.getString("id"), acc, nav) }}
+        buildScreen = { acc, accSt, nav -> { ChannelScreen(it.arguments?.getString("id"), acc, accSt, nav) }}
    )
 }

@@ -23,17 +23,19 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.ui.components.RichTextViewer
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import nostr.postr.events.TextNoteEvent

@Composable
 fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
    val noteState by baseNote.live.observeAsState()
    val note = noteState?.note

-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
    val accountUser = accountUserState?.user

    if (note?.event == null) {
@@ -45,18 +47,26 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
        val channelState by note.channel!!.live.observeAsState()
        val channel = channelState?.channel

-        channel?.let {
+        val description = if (note.event is ChannelCreateEvent) {
+            "Channel created"
+        } else if (note.event is ChannelMetadataEvent) {
+            "Channel Information changed to "
+        } else {
+            note.event?.content
+        }
+        channel?.let { channel ->
            ChannelName(
-                channelPicture = it.profilePicture(),
+                channelPicture = channel.profilePicture(),
                channelTitle = {
                    Text(
-                        "${it.info.name}",
-                        fontWeight = FontWeight.Bold
+                        "${channel.info.name}",
+                        fontWeight = FontWeight.Bold,
+                        modifier = it
                    )
                },
                channelLastTime = note.event?.createdAt,
-                channelLastContent = "${author?.toBestDisplayName()}: " + note.event?.content,
-                onClick = { navController.navigate("Channel/${it.idHex}") })
+                channelLastContent = "${author?.toBestDisplayName()}: " + description,
+                onClick = { navController.navigate("Channel/${channel.idHex}") })
        }

    } else {
@@ -76,22 +86,22 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr
            }
        }

-        userToComposeOn?.let {
+        userToComposeOn?.let { user ->
            ChannelName(
-                channelPicture = it.profilePicture(),
-                channelTitle = { UserDisplay(it) },
+                channelPicture = user.profilePicture(),
+                channelTitle = { UsernameDisplay(user, it) },
                channelLastTime = note.event?.createdAt,
                channelLastContent = accountViewModel.decrypt(note),
-                onClick = { navController.navigate("Room/${it.pubkeyHex}") })
+                onClick = { navController.navigate("Room/${user.pubkeyHex}") })
        }
    }

 }

@Composable
-private fun ChannelName(
+fun ChannelName(
    channelPicture: String,
-    channelTitle: @Composable () -> Unit,
+    channelTitle: @Composable (Modifier) -> Unit,
    channelLastTime: Long?,
    channelLastContent: String?,
    onClick: () -> Unit
@@ -116,12 +126,15 @@ private fun ChannelName(
                    verticalAlignment = Alignment.CenterVertically,
                    modifier = Modifier.padding(bottom = 4.dp)
                ) {
-                    channelTitle()
+                    channelTitle(Modifier.weight(1f))
+
+                    channelLastTime?.let {
+                        Text(
+                            timeAgo(channelLastTime),
+                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f)
+                        )
+                    }

-                    Text(
-                        timeAgo(channelLastTime),
-                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.52f)
-                    )
                }

                if (channelLastContent != null)
@@ -35,7 +35,11 @@ import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
+import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@@ -44,11 +48,14 @@ val ChatBubbleShapeThem = RoundedCornerShape(3.dp, 15.dp, 15.dp, 15.dp)

@OptIn(ExperimentalFoundationApi::class)
@Composable
-fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
+fun ChatroomMessageCompose(baseNote: Note, innerQuote: Boolean = false, accountViewModel: AccountViewModel, navController: NavController) {
    val noteState by baseNote.live.observeAsState()
    val note = noteState?.note

-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val accountUserState by account.userProfile().live.observeAsState()
    val accountUser = accountUserState?.user

    var popupExpanded by remember { mutableStateOf(false) }
@@ -85,7 +92,7 @@ fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, n
            ) {
                Row(
                    horizontalArrangement = alignment,
-                    modifier = Modifier.fillMaxWidth(0.85f)
+                    modifier = Modifier.fillMaxWidth(if (innerQuote) 1f else 0.85f)
                ) {

                    Surface(
@@ -101,7 +108,7 @@ fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, n
                            modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 5.dp),
                        ) {

-                            if (author != accountUser && note.event is ChannelMessageEvent) {
+                            if (innerQuote || author != accountUser && note.event is ChannelMessageEvent) {
                                Row(
                                    verticalAlignment = Alignment.CenterVertically,
                                    horizontalArrangement = alignment,
@@ -133,25 +140,53 @@ fun ChatroomMessageCompose(baseNote: Note, accountViewModel: AccountViewModel, n
                                }
                            }

-                            Row(verticalAlignment = Alignment.CenterVertically) {
-                                val eventContent = accountViewModel.decrypt(note)
+                            val replyTo = note.replyTo
+                            if (replyTo != null && replyTo.isNotEmpty()) {
+                                Row(verticalAlignment = Alignment.CenterVertically) {
+                                    replyTo.mapIndexed { index, note ->
+                                        ChatroomMessageCompose(
+                                            note,
+                                            innerQuote = true,
+                                            accountViewModel = accountViewModel,
+                                            navController = navController
+                                        )
+                                    }
+                                }
+                            }

-                                if (eventContent != null)
-                                    RichTextViewer(
-                                        eventContent,
-                                        note.event?.tags,
-                                        note,
-                                        accountViewModel,
-                                        navController
-                                    )
-                                else
-                                    RichTextViewer(
-                                        "Could Not decrypt the message",
-                                        note.event?.tags,
-                                        note,
-                                        accountViewModel,
-                                        navController
-                                    )
+                            Row(verticalAlignment = Alignment.CenterVertically) {
+                                val event = note.event
+                                if (event is ChannelCreateEvent) {
+                                    Text(text = "${note.author?.toBestDisplayName()} created " +
+                                      "${event.channelInfo.name ?: ""} with " +
+                                      "description of '${event.channelInfo.about ?: ""}', " +
+                                      "and picture '${event.channelInfo.picture ?: ""}'")
+                                } else if (event is ChannelMetadataEvent) {
+                                    Text(text = "${note.author?.toBestDisplayName()} changed " +
+                                      "chat name to '${event.channelInfo.name ?: ""}', " +
+                                      "description to '${event.channelInfo.about ?: ""}', " +
+                                      "and picture to '${event.channelInfo.picture ?: ""}'")
+                                } else {
+                                    val eventContent = accountViewModel.decrypt(note)
+
+                                    if (eventContent != null)
+                                        RichTextViewer(
+                                            eventContent,
+                                            note.event?.tags,
+                                            note,
+                                            accountViewModel,
+                                            navController
+                                        )
+                                    else
+                                        RichTextViewer(
+                                            "Could Not decrypt the message",
+                                            note.event?.tags,
+                                            note,
+                                            accountViewModel,
+                                            navController
+                                        )
+
+                                }
                            }

                            Row(
@@ -31,7 +31,7 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, modifier: Modifier = Modifier, isIn
    val noteState by likeSetCard.note.live.observeAsState()
    val note = noteState?.note

-    if (note?.event == null) {
+    if (note == null) {
        BlankNote(Modifier, isInnerNote)
    } else {
        Column(modifier = modifier) {
@@ -34,6 +34,7 @@ import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.toNote
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.components.RichTextViewer
@@ -50,14 +51,25 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
    var popupExpanded by remember { mutableStateOf(false) }

    if (note?.event == null) {
-        BlankNote(modifier, isInnerNote)
+        BlankNote(modifier.combinedClickable(
+            onClick = {  },
+            onLongClick = { popupExpanded = true },
+        ), isInnerNote)
    } else {
        val authorState by note.author!!.live.observeAsState()
        val author = authorState?.user

        Column(modifier =
            modifier.combinedClickable(
-                onClick = { navController.navigate("Note/${note.idHex}") },
+                onClick = {
+                    if (note.event !is ChannelMessageEvent) {
+                        navController.navigate("Note/${note.idHex}")
+                    } else {
+                        note.channel?.let {
+                            navController.navigate("Channel/${it.idHex}")
+                        }
+                    }
+                },
                onLongClick = { popupExpanded = true },
            )
        ) {
@@ -107,21 +119,16 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                    }
                }

-                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)
-                    .clickable(onClick = {
-                        note.let {
-                            navController.navigate("Note/${note.idHex}")
-                        }
-                    })
-                ) {
+                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
                    Row(verticalAlignment = Alignment.CenterVertically) {
                        if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author, Modifier.weight(1f))

                        if (note.event !is RepostEvent) {
                            Text(
                                timeAgo(note.event?.createdAt),
-                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                maxLines = 1
                            )
                        } else {
                            Text(
@@ -134,6 +141,10 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool

                    if (note.event is TextNoteEvent && (note.replyTo != null || note.mentions != null)) {
                        ReplyInformation(note.replyTo, note.mentions, navController)
+                    } else if (note.event is ChannelMessageEvent && (note.replyTo != null || note.mentions != null)) {
+                        note.channel?.let {
+                            ReplyInformationChannel(note.replyTo, note.mentions, it, navController)
+                        }
                    }

                    if (note.event is ReactionEvent || note.event is RepostEvent) {
@@ -161,7 +172,9 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                        if (eventContent != null)
                            RichTextViewer(eventContent, note.event?.tags, note, accountViewModel, navController)

-                        ReactionsRowState(note, accountViewModel)
+                        if (note.event !is ChannelMessageEvent) {
+                            ReactionsRowState(note, accountViewModel)
+                        }

                        Divider(
                            modifier = Modifier.padding(top = 10.dp),
@@ -184,7 +197,7 @@ fun NoteDropDownMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Unit,
        expanded = popupExpanded,
        onDismissRequest = onDismiss
    ) {
-        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.event?.content ?: "")); onDismiss() }) {
+        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(accountViewModel.decrypt(note) ?: "")); onDismiss() }) {
            Text("Copy Text")
        }
        DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(note.author?.pubkey?.toNpub() ?: "")); onDismiss() }) {
@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.note

 import androidx.compose.foundation.layout.Arrangement
 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.Icon
@@ -35,88 +36,87 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
  if (wantsToReplyTo != null)
    NewPostView({ wantsToReplyTo = null }, wantsToReplyTo, account)

-  Row(modifier = Modifier.padding(top = 8.dp)) {
-    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) wantsToReplyTo = note }
-      ) {
+  Row(
+    modifier = Modifier.padding(top = 8.dp).fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) wantsToReplyTo = note }
+    ) {
+      Icon(
+        painter = painterResource(R.drawable.ic_comment),
+        null,
+        modifier = Modifier.size(15.dp),
+        tint = grayTint,
+      )
+    }
+
+    Text(
+      "  ${showCount(note.replies?.size)}",
+      fontSize = 14.sp,
+      color = grayTint,
+      modifier = Modifier.weight(1f)
+    )
+
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) boost(note) }
+    ) {
+      if (note.isBoostedBy(account.userProfile())) {
        Icon(
-          painter = painterResource(R.drawable.ic_comment),
+          painter = painterResource(R.drawable.ic_retweeted),
          null,
-          modifier = Modifier.size(15.dp),
-          tint = grayTint,
+          modifier = Modifier.size(20.dp),
+          tint = Color.Unspecified
+        )
+      } else {
+        Icon(
+          painter = painterResource(R.drawable.ic_retweet),
+          null,
+          modifier = Modifier.size(20.dp),
+          tint = grayTint
        )
      }
-
-      Text(
-        "  ${showCount(note.replies?.size)}",
-        fontSize = 14.sp,
-        color = grayTint
-      )
    }
-    Row(
-      modifier = Modifier.padding(start = 40.dp),
-      verticalAlignment = Alignment.CenterVertically
+
+    Text(
+      "  ${showCount(note.boosts?.size)}",
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+
+    IconButton(
+      modifier = Modifier.then(Modifier.size(24.dp)),
+      onClick = { if (account.isWriteable()) reactTo(note) }
    ) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) boost(note) }
-      ) {
-        if (note.isBoostedBy(account.userProfile())) {
-          Icon(
-            painter = painterResource(R.drawable.ic_retweeted),
-            null,
-            modifier = Modifier.size(20.dp),
-            tint = Color.Unspecified
-          )
-        } else {
-          Icon(
-            painter = painterResource(R.drawable.ic_retweet),
-            null,
-            modifier = Modifier.size(20.dp),
-            tint = grayTint
-          )
-        }
+      if (note.isReactedBy(account.userProfile())) {
+        Icon(
+          painter = painterResource(R.drawable.ic_liked),
+          null,
+          modifier = Modifier.size(16.dp),
+          tint = Color.Unspecified
+        )
+      } else {
+        Icon(
+          painter = painterResource(R.drawable.ic_like),
+          null,
+          modifier = Modifier.size(16.dp),
+          tint = grayTint
+        )
      }
-
-      Text(
-        "  ${showCount(note.boosts?.size)}",
-        fontSize = 14.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
    }
-    Row(
-      modifier = Modifier.padding(start = 40.dp),
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      IconButton(
-        modifier = Modifier.then(Modifier.size(24.dp)),
-        onClick = { if (account.isWriteable()) reactTo(note) }
-      ) {
-        if (note.isReactedBy(account.userProfile())) {
-          Icon(
-            painter = painterResource(R.drawable.ic_liked),
-            null,
-            modifier = Modifier.size(16.dp),
-            tint = Color.Unspecified
-          )
-        } else {
-          Icon(
-            painter = painterResource(R.drawable.ic_like),
-            null,
-            modifier = Modifier.size(16.dp),
-            tint = grayTint
-          )
-        }
-      }

-      Text(
-        "  ${showCount(note.reactions?.size)}",
-        fontSize = 14.sp,
-        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-      )
-    }
+    Text(
+      "  ${showCount(note.reactions?.size)}",
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+
+    /*
    Row(
      modifier = Modifier.padding(start = 40.dp),
      verticalAlignment = Alignment.CenterVertically
@@ -133,6 +133,8 @@ fun ReactionsRow(note: Note, account: Account, boost: (Note) -> Unit, reactTo: (
        )
      }
    }
+
+     */
  }
 }

@@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User

@@ -40,6 +41,80 @@ fun ReplyInformation(replyTo: MutableList<Note>?, mentions: List<User>?, prefix:
          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
        )

+        mentions.toSet().forEachIndexed { idx, user ->
+          val innerUserState by user.live.observeAsState()
+          val innerUser = innerUserState?.user
+
+          innerUser?.let { myUser ->
+            ClickableText(
+              AnnotatedString("${prefix}@${myUser.toBestDisplayName()}"),
+              style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
+              onClick = { onUserTagClick(myUser) }
+            )
+
+            if (idx < mentions.size - 2) {
+              Text(
+                ", ",
+                fontSize = 13.sp,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            } else if (idx < mentions.size - 1) {
+              Text(
+                " and ",
+                fontSize = 13.sp,
+                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+              )
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+
+@Composable
+fun ReplyInformationChannel(replyTo: MutableList<Note>?, mentions: List<User>?, channel: Channel, navController: NavController) {
+  ReplyInformationChannel(replyTo, mentions, channel,
+    onUserTagClick = {
+      navController.navigate("User/${it.pubkeyHex}")
+    },
+    onChannelTagClick = {
+      navController.navigate("Channel/${it.idHex}")
+    }
+  )
+}
+
+
+@Composable
+fun ReplyInformationChannel(replyTo: MutableList<Note>?,
+                     mentions: List<User>?,
+                     channel: Channel,
+                     prefix: String = "",
+                     onUserTagClick: (User) -> Unit,
+                     onChannelTagClick: (Channel) -> Unit
+) {
+  FlowRow() {
+    if (mentions != null && mentions.isNotEmpty()) {
+      if (replyTo != null && replyTo.isNotEmpty()) {
+        Text(
+          "in channel ",
+          fontSize = 13.sp,
+          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        )
+
+        ClickableText(
+          AnnotatedString("${channel.info.name} "),
+          style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary.copy(alpha = 0.52f), fontSize = 13.sp),
+          onClick = { onChannelTagClick(channel) }
+        )
+
+        Text(
+          "replying to ",
+          fontSize = 13.sp,
+          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        )
+
        mentions.toSet().forEachIndexed { idx, user ->
          val innerUserState by user.live.observeAsState()
          val innerUser = innerUserState?.user
@@ -54,7 +54,7 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle

            Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
                Row(verticalAlignment = Alignment.CenterVertically) {
-                    UserDisplay(user)
+                    UsernameDisplay(user)
                }

                Text(
@@ -3,16 +3,21 @@ package com.vitorpamplona.amethyst.ui.note
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import com.vitorpamplona.amethyst.model.User

@Composable
-fun UserDisplay(user: User) {
+fun UsernameDisplay(user: User, weight: Modifier = Modifier) {
    if (user.bestUsername() != null || user.bestDisplayName() != null) {
      if (user.bestDisplayName().isNullOrBlank()) {
        Text(
          "@${(user.bestUsername() ?: "")}",
          fontWeight = FontWeight.Bold,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = weight
        )
      } else {
        Text(
@@ -22,12 +27,18 @@ fun UserDisplay(user: User) {
        Text(
          "@${(user.bestUsername() ?: "")}",
          color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          modifier = weight
        )
      }
    } else {
      Text(
        user.pubkeyDisplayHex,
        fontWeight = FontWeight.Bold,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        modifier = weight
      )
    }
 }
@@ -8,6 +8,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -24,7 +25,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+    val feedState by viewModel.feedContent.collectAsState()

    var isRefreshing by remember { mutableStateOf(false) }
    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen

+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -8,7 +10,11 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -21,13 +27,13 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
    private var lastNotes: List<Note>? = null

    fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
        }
    }

-    fun refreshSuspend() {
+    private fun refreshSuspended() {
        val notes = dataSource.loadTop()

        val lastNotesCopy = lastNotes
@@ -75,22 +81,32 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
    }

    fun updateFeed(notes: List<Card>) {
-        if (notes.isEmpty()) {
-            _feedContent.update { CardFeedState.Empty }
-        } else {
-            _feedContent.update { CardFeedState.Loaded(notes) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { CardFeedState.Empty }
+            } else {
+                _feedContent.update { CardFeedState.Loaded(notes) }
+            }
        }
    }

-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is CardFeedState.Loaded) {
-            _feedContent.update { CardFeedState.Loaded(state.feed) }
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
        }
    }

    private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
    }

    init {
@@ -14,6 +14,7 @@ import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -30,7 +31,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+    val feedState by viewModel.feedContent.collectAsState()

    var isRefreshing by remember { mutableStateOf(false) }
    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
@@ -39,7 +40,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo

    LaunchedEffect(isRefreshing) {
        if (isRefreshing) {
-            viewModel.refresh()
+            viewModel.hardRefresh()
            isRefreshing = false
        }
    }
@@ -5,35 +5,79 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.LocalCacheState
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

+class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
+class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
+class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource)
+class NostrGlobalFeedViewModel: FeedViewModel(NostrGlobalDataSource)
+class NostrThreadFeedViewModel: FeedViewModel(NostrThreadDataSource)
+class NostrUserProfileFeedViewModel: FeedViewModel(NostrUserProfileDataSource)

-class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
+class NostrChatroomListKnownFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
+    override fun newListFromDataSource(): List<Note> {
+        // Filter: all channels + PMs the account has replied to
+        return super.newListFromDataSource().filter {
+            val me = NostrChatroomListDataSource.account.userProfile()
+            it.channel != null || me.messages[it.author]?.firstOrNull { me == it.author } != null
+        }
+    }
+}
+class NostrChatroomListNewFeedViewModel: FeedViewModel(NostrChatroomListDataSource) {
+    override fun newListFromDataSource(): List<Note> {
+        // Filter: no channels + PMs the account has never replied to
+        return super.newListFromDataSource().filter {
+            val me = NostrChatroomListDataSource.account.userProfile()
+            it.channel == null && me.messages[it.author]?.firstOrNull { me == it.author } == null
+        }
+    }
+}
+
+abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
    private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
    val feedContent = _feedContent.asStateFlow()

-    fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
-        }
+    open fun newListFromDataSource(): List<Note> {
+        return dataSource.loadTop()
    }

-    fun refreshSuspend() {
-        val notes = dataSource.loadTop()
+    fun hardRefresh() {
+        dataSource.resetFilters()
+    }

-        val oldNotesState = feedContent.value
-        if (oldNotesState is FeedState.Loaded) {
-            if (notes != oldNotesState.feed) {
-                updateFeed(notes)
+    fun refresh() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val notes = newListFromDataSource()
+
+            val oldNotesState = feedContent.value
+            if (oldNotesState is FeedState.Loaded) {
+                if (notes != oldNotesState.feed) {
+                    withContext(Dispatchers.Main) {
+                        updateFeed(notes)
+                    }
+                }
+            } else {
+                withContext(Dispatchers.Main) {
+                    updateFeed(notes)
+                }
            }
-        } else {
-            updateFeed(notes)
        }
    }

@@ -45,15 +89,22 @@ class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
        }
    }

-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is FeedState.Loaded) {
-            _feedContent.update { FeedState.Loaded(state.feed) }
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
        }
    }

    private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
    }

    init {
@@ -40,7 +40,7 @@ import com.vitorpamplona.amethyst.ui.components.RichTextViewer
 import com.vitorpamplona.amethyst.ui.note.BlankNote
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.ReactionsRowState
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.note.timeAgoLong
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@@ -185,7 +185,7 @@ fun NoteMaster(baseNote: Note, accountViewModel: AccountViewModel, navController
                Column(modifier = Modifier.padding(start = 10.dp)) {
                    Row(verticalAlignment = Alignment.CenterVertically) {
                        if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author)
                    }

                    Row(verticalAlignment = Alignment.CenterVertically) {
@@ -8,6 +8,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -22,7 +23,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
-    val feedState by viewModel.feedContent.collectAsStateWithLifecycle()
+    val feedState by viewModel.feedContent.collectAsState()

    var isRefreshing by remember { mutableStateOf(false) }
    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
@@ -1,5 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen

+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -8,7 +10,11 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -27,13 +33,13 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
    val feedContent = _feedContent.asStateFlow()

    fun refresh() {
-        // For some reason, view Model Scope doesn't call
-        viewModelScope.launch {
-            refreshSuspend()
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            refreshSuspended()
        }
    }

-    fun refreshSuspend() {
+    private fun refreshSuspended() {
        val notes = dataSource.loadTop()

        val oldNotesState = feedContent.value
@@ -47,22 +53,32 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()
    }

    fun updateFeed(notes: List<User>) {
-        if (notes.isEmpty()) {
-            _feedContent.update { UserFeedState.Empty }
-        } else {
-            _feedContent.update { UserFeedState.Loaded(notes) }
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            if (notes.isEmpty()) {
+                _feedContent.update { UserFeedState.Empty }
+            } else {
+                _feedContent.update { UserFeedState.Loaded(notes) }
+            }
        }
    }

-    fun refreshCurrentList() {
-        val state = feedContent.value
-        if (state is UserFeedState.Loaded) {
-            _feedContent.update { UserFeedState.Loaded(state.feed) }
+    var handlerWaiting = false
+    @Synchronized
+    fun invalidateData() {
+        if (handlerWaiting) return
+
+        handlerWaiting = true
+        val scope = CoroutineScope(Job() + Dispatchers.IO)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting = false
        }
    }

    private val cacheListener: (LocalCacheState) -> Unit = {
-        refresh()
+        invalidateData()
    }

    init {
@@ -10,7 +10,6 @@ import com.vitorpamplona.amethyst.model.UserState

 class AccountViewModel(private val account: Account): ViewModel() {
  val accountLiveData: LiveData<AccountState> = Transformations.map(account.live) { it }
-  val userLiveData: LiveData<UserState> = Transformations.map(account.userProfile().live) { it }

  fun reactTo(note: Note) {
    account.reactTo(note)
@@ -1,6 +1,5 @@
 package com.vitorpamplona.amethyst.ui.screen

-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,20 +9,28 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.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.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
@@ -33,16 +40,19 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
-import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
-import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.actions.PostButton
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
-fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navController: NavController) {
+fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
    val accountState by accountViewModel.accountLiveData.observeAsState()
    val account = accountState?.account

@@ -54,23 +64,32 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navCon
        val channelState by NostrChannelDataSource.channel!!.live.observeAsState()
        val channel = channelState?.channel ?: return

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChannelDataSource ) }
+        val feedViewModel: NostrChannelFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }

        Column(Modifier.fillMaxHeight()) {
            ChannelHeader(
-                channel,
-                accountViewModel = accountViewModel,
+                channel, account,
+                accountStateViewModel = accountStateViewModel,
                navController = navController
            )

            Column(
-                modifier = Modifier.fillMaxHeight().padding(vertical = 0.dp).weight(1f, true)
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(vertical = 0.dp)
+                    .weight(1f, true)
            ) {
                ChatroomFeedView(feedViewModel, accountViewModel, navController)
            }

            //LAST ROW
-            Row(modifier = Modifier.padding(10.dp).fillMaxWidth(),
+            Row(modifier = Modifier
+                .padding(10.dp)
+                .fillMaxWidth(),
                horizontalArrangement = Arrangement.SpaceBetween,
                verticalAlignment = Alignment.CenterVertically
            ) {
@@ -80,7 +99,9 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navCon
                    keyboardOptions = KeyboardOptions.Default.copy(
                        capitalization = KeyboardCapitalization.Sentences
                    ),
-                    modifier = Modifier.weight(1f, true).padding(end = 10.dp),
+                    modifier = Modifier
+                        .weight(1f, true)
+                        .padding(end = 10.dp),
                    placeholder = {
                        Text(
                            text = "reply here.. ",
@@ -104,7 +125,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navCon
 }

@Composable
-fun ChannelHeader(baseChannel: Channel, accountViewModel: AccountViewModel, navController: NavController) {
+fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel: AccountStateViewModel, navController: NavController) {
    val channelState by baseChannel.live.observeAsState()
    val channel = channelState?.channel

@@ -116,11 +137,14 @@ fun ChannelHeader(baseChannel: Channel, accountViewModel: AccountViewModel, navC
                    model = channel?.profilePicture(),
                    contentDescription = "Profile Image",
                    modifier = Modifier
-                        .width(35.dp).height(35.dp)
+                        .width(35.dp)
+                        .height(35.dp)
                        .clip(shape = CircleShape)
                )

-                Column(modifier = Modifier.padding(start = 10.dp)) {
+                Column(modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)) {
                    Row(verticalAlignment = Alignment.CenterVertically) {
                        Text(
                            "${channel?.info?.name}",
@@ -132,12 +156,26 @@ fun ChannelHeader(baseChannel: Channel, accountViewModel: AccountViewModel, navC
                        Text(
                            "${channel?.info?.about}",
                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
-                            maxLines = 1,
+                            maxLines = 2,
                            overflow = TextOverflow.Ellipsis,
                            fontSize = 12.sp
                        )
                    }
                }
+
+                channel?.let { NoteCopyButton(it) }
+
+                channel?.let {
+                    if (channel.creator == account.userProfile()) {
+                        EditButton(account, it, accountStateViewModel)
+                    } else {
+                        if (account.followingChannels.contains(channel.idHex)) {
+                            LeaveButton(account,channel,accountStateViewModel, navController)
+                        } else {
+                            JoinButton(account,channel,accountStateViewModel, navController)
+                        }
+                    }
+                }
            }
        }

@@ -146,4 +184,82 @@ fun ChannelHeader(baseChannel: Channel, accountViewModel: AccountViewModel, navC
            thickness = 0.25.dp
        )
    }
+}
+
+
+@Composable
+private fun NoteCopyButton(
+    note: Channel
+) {
+    val clipboardManager = LocalClipboardManager.current
+
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { clipboardManager.setText(AnnotatedString(note.id.toNote())) },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            ),
+    ) {
+        Text(text = "note", color = Color.White)
+    }
+}
+
+@Composable
+private fun EditButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel) {
+    var wantsToPost by remember {
+        mutableStateOf(false)
+    }
+
+    if (wantsToPost)
+        NewChannelView({ wantsToPost = false }, account = account, accountStateViewModel, channel)
+
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = { wantsToPost = true },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Edit", color = Color.White)
+    }
+}
+
+@Composable
+private fun JoinButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+            account.joinChannel(channel.idHex, accountStateViewModel)
+            navController.navigate(Route.Message.route)
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Join", color = Color.White)
+    }
+}
+
+@Composable
+private fun LeaveButton(account: Account, channel: Channel, accountStateViewModel: AccountStateViewModel, navController: NavController) {
+    Button(
+        modifier = Modifier.padding(horizontal = 3.dp),
+        onClick = {
+            account.leaveChannel(channel.idHex, accountStateViewModel)
+            navController.navigate(Route.Message.route)
+        },
+        shape = RoundedCornerShape(20.dp),
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = MaterialTheme.colors.primary
+            )
+    ) {
+        Text(text = "Leave", color = Color.White)
+    }
 }
@@ -3,30 +3,96 @@ package com.vitorpamplona.amethyst.ui.screen
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Tab
+import androidx.compose.material.TabRow
+import androidx.compose.material.TabRowDefaults
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
-import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
+import com.google.accompanist.pager.ExperimentalPagerApi
+import com.google.accompanist.pager.HorizontalPager
+import com.google.accompanist.pager.pagerTabIndicatorOffset
+import com.google.accompanist.pager.rememberPagerState
+import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.launch

+@OptIn(ExperimentalPagerApi::class)
@Composable
 fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val account by accountViewModel.accountLiveData.observeAsState()
+    val pagerState = rememberPagerState()
+    val coroutineScope = rememberCoroutineScope()

-    if (account != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatroomListDataSource ) }
-
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            TabRow(
+                selectedTabIndex = pagerState.currentPage,
+                indicator = { tabPositions ->
+                    TabRowDefaults.Indicator(
+                        Modifier.pagerTabIndicatorOffset(pagerState, tabPositions),
+                        color = MaterialTheme.colors.primary
+                    )
+                },
            ) {
-                ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+                Tab(
+                    selected = pagerState.currentPage == 0,
+                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(0) } },
+                    text = {
+                        Text(text = "Known")
+                    }
+                )
+
+                Tab(
+                    selected = pagerState.currentPage == 1,
+                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
+                    text = {
+                        Text(text = "New Requests")
+                    }
+                )
+            }
+            HorizontalPager(count = 2, state = pagerState) {
+                when (pagerState.currentPage) {
+                    0 -> TabKnown(accountViewModel, navController)
+                    1 -> TabNew(accountViewModel, navController)
+                }
            }
        }
    }
 }

+@Composable
+fun TabKnown(accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrChatroomListKnownFeedViewModel = viewModel()
+
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}
+
+@Composable
+fun TabNew(accountViewModel: AccountViewModel, navController: NavController) {
+    val feedViewModel: NostrChatroomListNewFeedViewModel = viewModel()
+
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            ChatroomListFeedView(feedViewModel, accountViewModel, navController)
+        }
+    }
+}
@@ -13,10 +13,10 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -33,7 +33,7 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
 import com.vitorpamplona.amethyst.ui.actions.PostButton
-import com.vitorpamplona.amethyst.ui.note.UserDisplay
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
@@ -46,7 +46,11 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr

        NostrChatRoomDataSource.loadMessagesBetween(account, userId)

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatRoomDataSource ) }
+        val feedViewModel: NostrChatRoomFeedViewModel = viewModel()
+
+        LaunchedEffect(Unit) {
+            feedViewModel.refresh()
+        }

        Column(Modifier.fillMaxHeight()) {
            NostrChatRoomDataSource.withUser?.let {
@@ -121,7 +125,7 @@ fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navContro
                Column(modifier = Modifier.padding(start = 10.dp)) {
                    Row(verticalAlignment = Alignment.CenterVertically) {
                        if (author != null)
-                            UserDisplay(author)
+                            UsernameDisplay(author)
                    }
                }
            }
@@ -4,28 +4,35 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import java.lang.System.currentTimeMillis

@Composable
 fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val feedViewModel: NostrHomeFeedViewModel = viewModel()

-    if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrHomeDataSource ) }
+    LaunchedEffect(Unit) {
+        feedViewModel.refresh()
+    }

-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                FeedView(feedViewModel, accountViewModel, navController)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            FeedView(feedViewModel, accountViewModel, navController)
        }
    }
 }
@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
+import com.vitorpamplona.amethyst.buttons.NewChannelButton
 import com.vitorpamplona.amethyst.buttons.NewNoteButton
 import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
 import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
@@ -49,7 +50,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
        scaffoldState = scaffoldState
    ) {
        Column(modifier = Modifier.padding(bottom = it.calculateBottomPadding())) {
-            AppNavigation(navController, accountViewModel)
+            AppNavigation(navController, accountViewModel, accountStateViewModel)
        }
    }
 }
@@ -73,4 +74,20 @@ fun FloatingButton(navController: NavHostController, accountViewModel: AccountSt
            }
        }
    }
+
+    if (currentRoute(navController) == Route.Message.route) {
+        Crossfade(targetState = accountState) { state ->
+            when (state) {
+                is AccountState.LoggedInViewOnly -> {
+                    // Does nothing.
+                }
+                is AccountState.LoggedOff -> {
+                    // Does nothing.
+                }
+                is AccountState.LoggedIn -> {
+                    NewChannelButton(state.account, accountViewModel)
+                }
+            }
+        }
+    }
 }
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
@@ -15,18 +16,13 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val account by accountViewModel.accountLiveData.observeAsState()
+    val feedViewModel: CardFeedViewModel = viewModel { CardFeedViewModel( NostrNotificationDataSource ) }

-    if (account != null) {
-        val feedViewModel: CardFeedViewModel =
-            viewModel { CardFeedViewModel( NostrNotificationDataSource ) }
-
-        Column(Modifier.fillMaxHeight()) {
-            Column(
-                modifier = Modifier.padding(vertical = 0.dp)
-            ) {
-                CardFeedView(feedViewModel, accountViewModel = accountViewModel, navController)
-            }
+    Column(Modifier.fillMaxHeight()) {
+        Column(
+            modifier = Modifier.padding(vertical = 0.dp)
+        ) {
+            CardFeedView(feedViewModel, accountViewModel = accountViewModel, navController)
        }
    }
 }
@@ -30,7 +30,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 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
@@ -51,31 +54,29 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.pagerTabIndicatorOffset
 import com.google.accompanist.pager.rememberPagerState
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import com.vitorpamplona.amethyst.ui.actions.NewChannelView
+import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 import nostr.postr.toNpub

-data class TabRowItem(
-    val title: String,
-    val screen: @Composable () -> Unit,
-)
-
@OptIn(ExperimentalPagerApi::class)
@Composable
 fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navController: NavController) {
    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account
+    val account = accountState?.account ?: return

-    val accountUserState by accountViewModel.userLiveData.observeAsState()
+    val accountUserState by account.userProfile().live.observeAsState()
    val accountUser = accountUserState?.user

-    val clipboardManager = LocalClipboardManager.current
-
-    if (userId != null && account != null && accountUser != null) {
+    if (userId != null && accountUser != null) {
        DisposableEffect(account) {
            NostrUserProfileDataSource.loadUserProfile(userId)
            NostrUserProfileFollowersDataSource.loadUserProfile(userId)
@@ -105,14 +106,18 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                            model = banner,
                            contentDescription = "Profile Image",
                            contentScale = ContentScale.FillWidth,
-                            modifier = Modifier.fillMaxWidth().height(125.dp)
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(125.dp)
                        )
                    } else {
                        Image(
                            painter = painterResource(R.drawable.profile_banner),
                            contentDescription = "Profile Banner",
                            contentScale = ContentScale.FillWidth,
-                            modifier = Modifier.fillMaxWidth().height(125.dp)
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(125.dp)
                        )
                    }

@@ -138,12 +143,12 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro

                            MessageButton(user, navController)

-                            NPubCopyButton(clipboardManager, user)
+                            NPubCopyButton(user)

                            if (accountUser == user) {
-                                EditButton()
+                                EditButton(account)
                            } else {
-                                if (accountUser.isFollowing(user) == true) {
+                                if (accountUser.isFollowing(user)) {
                                    UnfollowButton { account.unfollow(user) }
                                } else {
                                    FollowButton { account.follow(user) }
@@ -160,7 +165,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                        Text(" @${user.bestUsername()}", color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f))
                        Text(
                            "${user.info.about}",
-                            color = Color.White,
+                            color = MaterialTheme.colors.onSurface,
                            modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
                        )

@@ -222,7 +227,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavController) {
    val accountState by accountViewModel.accountLiveData.observeAsState()
    if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrUserProfileDataSource ) }
+        val feedViewModel: NostrUserProfileFeedViewModel = viewModel()

        Column(Modifier.fillMaxHeight()) {
            Column(
@@ -262,9 +267,10 @@ fun TabFollowers(user: User, accountViewModel: AccountViewModel, navController:

@Composable
 private fun NPubCopyButton(
-    clipboardManager: ClipboardManager,
    user: User
 ) {
+    val clipboardManager = LocalClipboardManager.current
+
    Button(
        modifier = Modifier.padding(horizontal = 3.dp),
        onClick = { clipboardManager.setText(AnnotatedString(user.pubkey.toNpub())) },
@@ -293,16 +299,23 @@ private fun MessageButton(user: User, navController: NavController) {
            painter = painterResource(R.drawable.ic_dm),
            "Send a Direct Message",
            modifier = Modifier.size(20.dp),
-            tint = Color.Unspecified
+            tint = Color.White
        )
    }
 }

@Composable
-private fun EditButton() {
+private fun EditButton(account: Account) {
+    var wantsToEdit by remember {
+        mutableStateOf(false)
+    }
+
+    if (wantsToEdit)
+        NewUserMetadataView({ wantsToEdit = false }, account)
+
    Button(
        modifier = Modifier.padding(horizontal = 3.dp),
-        onClick = {},
+        onClick = { wantsToEdit = true },
        shape = RoundedCornerShape(20.dp),
        colors = ButtonDefaults
            .buttonColors(
@@ -1,25 +1,229 @@
 package com.vitorpamplona.amethyst.ui.screen

+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
-import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import coil.compose.AsyncImage
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Channel
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.ui.note.ChannelName
+import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrGlobalDataSource ) }
+    val feedViewModel: NostrGlobalFeedViewModel = viewModel()
+
+    LaunchedEffect(Unit) {
+        feedViewModel.refresh()
+    }

    Column(Modifier.fillMaxHeight()) {
        Column(
            modifier = Modifier.padding(vertical = 0.dp)
        ) {
+            SearchBar(accountViewModel, navController)
            FeedView(feedViewModel, accountViewModel, navController)
        }
    }
 }
+
+@Composable
+private fun SearchBar(accountViewModel: AccountViewModel, navController: NavController) {
+    val searchValue = remember { mutableStateOf(TextFieldValue("")) }
+    val searchResults = remember { mutableStateOf<List<User>>(emptyList()) }
+    val searchResultsNotes = remember { mutableStateOf<List<Note>>(emptyList()) }
+    val searchResultsChannels = remember { mutableStateOf<List<Channel>>(emptyList()) }
+
+    val isTrailingIconVisible by remember {
+        derivedStateOf {
+            searchValue.value.text.isNotBlank()
+        }
+    }
+
+    //LAST ROW
+    Row(
+        modifier = Modifier
+            .padding(10.dp)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        TextField(
+            value = searchValue.value,
+            onValueChange = {
+                searchValue.value = it
+                searchResults.value = LocalCache.findUsersStartingWith(it.text)
+                searchResultsNotes.value = LocalCache.findNotesStartingWith(it.text)
+                searchResultsChannels.value = LocalCache.findChannelsStartingWith(it.text)
+            },
+            keyboardOptions = KeyboardOptions.Default.copy(
+                capitalization = KeyboardCapitalization.Sentences
+            ),
+            leadingIcon = {
+                Icon(
+                    painter = painterResource(R.drawable.ic_search),
+                    contentDescription = null,
+                    modifier = Modifier.size(20.dp),
+                    tint = Color.Unspecified
+                )
+            },
+            modifier = Modifier
+                .weight(1f, true)
+                .defaultMinSize(minHeight = 20.dp),
+            placeholder = {
+                Text(
+                    text = "npub, hex, username ",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            },
+            trailingIcon = {
+                if (isTrailingIconVisible) {
+                    IconButton(
+                        onClick = {
+                            searchValue.value = TextFieldValue("")
+                            searchResults.value = emptyList()
+                            searchResultsChannels.value = emptyList()
+                            searchResultsNotes.value = emptyList()
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Clear,
+                            contentDescription = "Clear"
+                        )
+                    }
+                }
+            }
+        )
+    }
+
+    if (searchValue.value.text.isNotBlank()) {
+        LazyColumn(
+            modifier = Modifier.fillMaxHeight(),
+            contentPadding = PaddingValues(
+                top = 10.dp,
+                bottom = 10.dp
+            )
+        ) {
+            itemsIndexed(searchResults.value, key = { _, item -> item.pubkeyHex }) { index, item ->
+                UserLine(item) {
+                    navController.navigate("User/${item.pubkeyHex}")
+                }
+            }
+
+            itemsIndexed(searchResultsChannels.value, key = { _, item -> item.idHex }) { index, item ->
+                ChannelName(
+                    channelPicture = item.profilePicture(),
+                    channelTitle = {
+                        Text(
+                            "${item.info.name}",
+                            fontWeight = FontWeight.Bold
+                        )
+                    },
+                    channelLastTime = null,
+                    channelLastContent = item.info.about,
+                    onClick = { navController.navigate("Channel/${item.idHex}") })
+            }
+
+            itemsIndexed(searchResultsNotes.value, key = { _, item -> item.idHex }) { index, item ->
+                NoteCompose(item, accountViewModel = accountViewModel, navController = navController)
+            }
+        }
+    }
+}
+
+@Composable
+fun UserLine(
+    baseUser: User,
+    onClick: () -> Unit
+) {
+    val userState by baseUser.live.observeAsState()
+    val user = userState?.user ?: return
+
+    Column(modifier = Modifier
+        .fillMaxWidth()
+        .clickable(onClick = onClick)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 10.dp
+                )
+        ) {
+
+            AsyncImage(
+                model = user.profilePicture(),
+                contentDescription = "Profile Image",
+                modifier = Modifier
+                    .width(55.dp)
+                    .height(55.dp)
+                    .clip(shape = CircleShape)
+            )
+
+            Column(
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f)
+            ) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    UsernameDisplay(user)
+                }
+
+                Text(
+                    user.info.about?.take(100) ?: "",
+                    color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+                )
+            }
+        }
+
+        Divider(
+            modifier = Modifier.padding(top = 10.dp),
+            thickness = 0.25.dp
+        )
+    }
+}
@@ -27,7 +27,7 @@ fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navControl
    if (account != null && noteId != null) {
        NostrThreadDataSource.loadThread(noteId)

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrThreadDataSource ) }
+        val feedViewModel: NostrThreadFeedViewModel = viewModel()

        Column(Modifier.fillMaxHeight()) {
            Column(
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.enableR8.fullMode=true
Author	SHA1	Message	Date
Vitor Pamplona	f17936f029	Version 0.9.5	2023-01-21 13:53:48 -03:00
Vitor Pamplona	d64766516a	Removing unnecessary observables	2023-01-21 13:53:38 -03:00
Vitor Pamplona	d685219ed9	Remove blinking	2023-01-21 13:53:12 -03:00
Vitor Pamplona	bb9217466a	Hard Refresh when the button to refresh is pressed.	2023-01-21 13:37:57 -03:00
Vitor Pamplona	80f58875bb	Uses cached images instead of reloading them by default	2023-01-21 13:32:22 -03:00
Vitor Pamplona	ffe58f3d41	Fixing click home button to go to the top of the home feed.	2023-01-21 13:07:47 -03:00
Vitor Pamplona	733801fddf	fixing alignment of the reaction buttons	2023-01-21 12:48:14 -03:00
Vitor Pamplona	5cb6bca224	Fixing concurrent modification exception in reactions and boosts	2023-01-21 12:41:05 -03:00
Vitor Pamplona	790dd778bb	Fixing quote of the root image in Messages	2023-01-21 12:40:49 -03:00
Vitor Pamplona	a692ad47d6	Spam filter in new private messages	2023-01-21 12:31:23 -03:00
Vitor Pamplona	46a8f81387	Adding more logo versions and store banners	2023-01-21 10:58:54 -03:00
Vitor Pamplona	acb07352b7	Updated Screenshots	2023-01-21 10:56:24 -03:00
Vitor PamplonaandGitHub	5268da117c	Updating Privacy policy Adding Data deletion path and contact info	2023-01-21 08:54:46 -05:00
Vitor Pamplona	b6c1273ecd	v0.9.4	2023-01-21 00:55:25 -03:00
Vitor Pamplona	07f9c6e8c3	keeping other classes to make sure deserialization works.	2023-01-21 00:54:39 -03:00
Vitor Pamplona	ea53a15105	Adding a Basic Privacy Policy	2023-01-20 23:56:54 -03:00
Vitor Pamplona	716a150fc3	Changing my mind... keeping the dot in time ago	2023-01-20 23:33:43 -03:00
Vitor Pamplona	df3ae43ce7	Adjusting the message screen to correctly display the time aligned to the right.	2023-01-20 23:31:44 -03:00
Vitor Pamplona	09bbb59c61	v0.9.3	2023-01-20 23:05:56 -03:00
Vitor Pamplona	0f731117d4	Seems to solve constant crashing when reconnecting after a failure related to this issue: https://github.com/square/okhttp/issues/7381	2023-01-20 23:01:53 -03:00
Vitor Pamplona	115c1ba082	Edit Profile	2023-01-20 23:00:30 -03:00
Vitor Pamplona	135b24df6c	Fixing NPE when socket disconnects after the initial check if == null	2023-01-20 18:57:50 -03:00
Vitor PamplonaandGitHub	207f03bb06	Merge pull request #6 from KotlinGeekDev/fix-navigation-issues Fix navigation.	2023-01-20 16:48:25 -05:00
KotlinGeekDev	e78c7aba85	Fix navigation.	2023-01-20 22:31:19 +01:00
Vitor PamplonaandGitHub	41b82ec749	Merge pull request #3 from KotlinGeekDev/reduce-apk-size Make changes to reduce the release APK/app bundle size.	2023-01-20 14:44:58 -05:00
KotlinGeekDev	b915956f57	Make changes to reduce the release APK/app bundle size.	2023-01-20 20:26:46 +01:00
Vitor Pamplona	144b0a7512	v0.9.2: - Fixes bug when tagging new users on reply - Fixes bug on likes not being shown. - Fixes alignment of the time in the home feed.	2023-01-19 21:48:15 -05:00
Vitor Pamplona	359eb0b000	Downloading just the last metadata for users being displayed in the screen.	2023-01-19 21:40:24 -05:00
Vitor Pamplona	e47476129f	BugFix for the position of time in the feed.	2023-01-19 21:39:43 -05:00
Vitor Pamplona	0017845de2	Fixing the bug that wasn't showing likes	2023-01-19 21:35:57 -05:00
Vitor Pamplona	ab0bab0c16	Solving User tagging bug	2023-01-19 21:35:36 -05:00
Vitor Pamplona	b9b1da1f04	v0.9.1	2023-01-19 18:26:12 -05:00
Vitor Pamplona	0e22a25d3d	Removing double call refresh	2023-01-19 18:14:56 -05:00
Vitor Pamplona	8b61dc09d0	Showing likes for Public Chat events.	2023-01-19 18:14:42 -05:00
Vitor Pamplona	e1fa46290e	Correctly shows Chat notifications in the Notifications Tab.	2023-01-19 17:58:35 -05:00
Vitor Pamplona	ec5f510264	Shows replies in chat	2023-01-19 17:58:01 -05:00
Vitor Pamplona	2d46b17493	Block like breaks in the User Information block of the layout.	2023-01-19 17:57:43 -05:00
Vitor Pamplona	99f478d891	Fixing large usernames breaking the layout	2023-01-19 17:56:44 -05:00
Vitor Pamplona	451137e8fa	handling co-routines with viewModel Scope	2023-01-19 17:56:22 -05:00
Vitor Pamplona	fc88c2867d	Adding replying information for notes in a channel	2023-01-19 17:55:57 -05:00
Vitor Pamplona	98704bc43d	remove transformations	2023-01-19 17:55:37 -05:00
Vitor Pamplona	c5c8ffc70f	Avoid using trasnformations. They won't work in this application (base object never changes)	2023-01-19 17:55:25 -05:00
Vitor Pamplona	94a228d78a	Simplifying the name of the "Add Image from Gallery" button	2023-01-19 17:54:30 -05:00
Vitor Pamplona	625bbaf35c	Marking relays with failure as not connected	2023-01-19 17:54:07 -05:00
Vitor Pamplona	dd35e01f8a	Fixing null pointer exceptions	2023-01-19 17:53:51 -05:00
Vitor Pamplona	c1d46dcc2f	Using short-term co-routines	2023-01-19 17:52:32 -05:00
Vitor Pamplona	85c66279b2	Removing unnecessary code	2023-01-19 17:51:35 -05:00
Vitor Pamplona	a18c5b975f	Solving some of the Out of Memory errors.	2023-01-19 17:50:29 -05:00
Vitor Pamplona	4224ebe429	Version 0.9	2023-01-19 08:44:41 -05:00
Vitor Pamplona	57636607d2	Version 0.9	2023-01-19 08:42:36 -05:00
Vitor Pamplona	8771584deb	Moving away from handlers and into coroutines.	2023-01-19 08:41:48 -05:00
Vitor Pamplona	9d52180550	Join/Leave Channels, Channel search.	2023-01-19 08:03:01 -05:00
Vitor Pamplona	75219f0f2d	Add Channel	2023-01-18 22:00:32 -05:00
Vitor Pamplona	0e3b007730	Fixing Public chat's event order.	2023-01-18 18:59:18 -05:00
Vitor Pamplona	ce4e3e6589	Fixing #1 , unable to see bio in the Profile Screen	2023-01-18 17:22:01 -05:00
Vitor Pamplona	f1dd5669a1	v0.8.2	2023-01-18 17:13:08 -05:00
Vitor Pamplona	4271ae77d2	Batch updates to enhance performance.	2023-01-18 17:12:43 -05:00
Vitor Pamplona	3846ae2af5	Search Bar	2023-01-18 16:50:03 -05:00
Vitor Pamplona	a4885e643e	Add threading for the LazyColumn refresh.	2023-01-18 15:55:35 -05:00
Vitor Pamplona	3441f7987b	fix for copying the encrypted part of the message instead of the plain text.	2023-01-18 15:55:10 -05:00
Vitor Pamplona	9792733f72	New Observer/Observable performance improvements.	2023-01-18 15:30:39 -05:00
Vitor Pamplona	bf8a0f0e76	Additional Performance Improvements	2023-01-18 14:24:04 -05:00
Vitor Pamplona	381711b72e	Version 0.8.1	2023-01-18 12:21:29 -05:00
Vitor Pamplona	ff529a920e	Moving URL Preview fetcher to thread + running over a given feed list.	2023-01-18 12:21:00 -05:00
Vitor Pamplona	7d18f36e3e	Improving performance with more precise filters.	2023-01-18 11:44:31 -05:00
Vitor Pamplona	f2b913f7c8	Updating dependencies	2023-01-18 09:18:34 -05:00
Vitor Pamplona	d171552efd	Clickable Phone and Emails	2023-01-18 09:18:26 -05:00