v0.77.8

New Crowdin Translations

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,32 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

README.md

@@ -106,7 +106,7 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 
 This is a native Android app made with Kotlin and Jetpack Compose.
 The app uses a modified version of the [nostrpostrlib](https://github.com/Giszmo/NostrPostr/tree/master/nostrpostrlib) to talk to Nostr relays.
-The overall architecture consists in the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
+The overall architecture consists of the UI, which uses the usual State/ViewModel/Composition, the service layer that connects with Nostr relays,
 and the model/repository layer, which keeps all Nostr objects in memory, in a full OO graph.
 
 The repository layer stores Nostr Events as Notes and Users separately. Those classes use LiveData objects to
@@ -172,7 +172,7 @@ For the Play build:
 keytool -genkey -v -keystore <my-release-key.keystore> -alias <alias_name> -keyalg RSA -keysize 2048 -validity 10000
 openssl base64 < <my-release-key.keystore> | tr -d '\n' | tee some_signing_key.jks.base64.txt
 ```
-2. Create 4 Secret Key variables on your GitHub repository and fill in with the signing key information
+2. Create four Secret Key variables on your GitHub repository and fill in the signing key information
     - `KEY_ALIAS` <- `<alias_name>`
     - `KEY_PASSWORD` <- `<your password>`
     - `KEY_STORE_PASSWORD` <- `<your key store password>`
@@ -192,15 +192,15 @@ The relay also learns which public keys you are requesting, meaning your public
 Relays have all your data in raw text. They know your IP, your name, your location (guessed from IP), your pub key, all your contacts, and other relays, and can read every action you do (post, like, boost, quote, report, etc) with the exception of Private Zaps and Private DMs.
 
 # DM Privacy #
-While the content of direct messages (DMs) is only visible to you, and your DM nostr counterparty, everyone can see that and when you and your counterparty are DM-ing each other.
+While the content of direct messages (DMs) is only visible to you and your DM counterparty, everyone can see when you and your counterparty DM each other.
 
 # Visibility & Permanence of Your Content on nostr
 ## Information Visibility ##
 Content that you share can be shared to other relays. 
-Information that you share is publicly visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
+Information that you share publicly is visible to anyone reading from relays that have your information. Your information may also be visible to nostr users who do not share relays with you.
 
 ## Information Permanence ##
-Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee deleting or editing any content once posted. 
+Information shared on nostr should be assumed permanent for privacy purposes. There is no way to guarantee edit or deletion of any content once posted. 
 
 # Screenshots
 

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 294
-        versionName "0.76.0"
+        versionCode 305
+        versionName "0.77.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -112,7 +112,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // Zoomable images
-    implementation "net.engawapg.lib:zoomable:1.5.0"
+    implementation 'net.engawapg.lib:zoomable:1.5.1'
 
     // Biometrics
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha05"

app/src/androidTest/java/com/vitorpamplona/amethyst/RichTextParserTest.kt

@@ -3,7 +3,7 @@ package com.vitorpamplona.amethyst
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.vitorpamplona.amethyst.service.RichTextParser
 import com.vitorpamplona.amethyst.service.RichTextViewerState
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.EmptyTagList
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -666,7 +666,7 @@ class RichTextParserTest {
 
     @Test
     fun testTextToParse() {
-        val state = RichTextParser().parseText(textToParse, ImmutableListOfLists())
+        val state = RichTextParser().parseText(textToParse, EmptyTagList)
         Assert.assertEquals(
             "relay.shitforce.one, relayable.org, universe.nostrich.land, nos.lol, universe.nostrich.land?lang=zh, universe.nostrich.land?lang=en, relay.damus.io, relay.nostr.wirednet.jp, offchain.pub, nostr.rocks, relay.wellorder.net, nostr.oxtr.dev, universe.nostrich.land?lang=ja, relay.mostr.pub, nostr.bitcoiner.social, Nostr-Check.com, MR.Rabbit, Ancap.su, zapper.lol, smies.me, baller.hodl",
             state.urlSet.joinToString(", ")
@@ -3989,7 +3989,7 @@ class RichTextParserTest {
 
     @Test
     fun testShortTextToParse() {
-        val state = RichTextParser().parseText("Hi, how are you doing? ", ImmutableListOfLists())
+        val state = RichTextParser().parseText("Hi, how are you doing? ", EmptyTagList)
         Assert.assertTrue(state.urlSet.isEmpty())
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
@@ -3999,7 +3999,7 @@ class RichTextParserTest {
 
     @Test
     fun testShortNewLinesTextToParse() {
-        val state = RichTextParser().parseText("\nHi, \nhow\n\n\n are you doing? \n", ImmutableListOfLists())
+        val state = RichTextParser().parseText("\nHi, \nhow\n\n\n are you doing? \n", EmptyTagList)
         Assert.assertTrue(state.urlSet.isEmpty())
         Assert.assertTrue(state.imagesForPager.isEmpty())
         Assert.assertTrue(state.imageList.isEmpty())
@@ -4019,7 +4019,7 @@ See how it can be done here: https://lnshort.it/live-stream-embeds/
 https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg
         """.trimIndent()
 
-        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+        val state = RichTextParser().parseText(text, EmptyTagList)
         Assert.assertEquals("https://lnshort.it/live-stream-embeds/", state.urlSet.firstOrNull())
         Assert.assertEquals("https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg", state.imagesForPager.keys.firstOrNull())
         Assert.assertEquals("https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db214e8a.jpg", state.imageList.firstOrNull()?.url)
@@ -4080,7 +4080,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
     fun testNewLineAfterImage() {
         val text = "That’s it ! That’s the #note https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg "
 
-        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+        val state = RichTextParser().parseText(text, EmptyTagList)
 
         printStateForDebug(state)
 
@@ -4106,7 +4106,7 @@ https://nostr.build/i/fd53fcf5ad950fbe45127e4bcee1b59e8301d41de6beee211f45e344db
     fun testSapceAfterImage() {
         val text = "That’s it! https://cdn.nostr.build/i/1dc0726b6cb0f94a92bd66765ffb90f6c67e90c17bb957fc3d5d4782cbd73de7.jpg That’s the #note"
 
-        val state = RichTextParser().parseText(text, ImmutableListOfLists())
+        val state = RichTextParser().parseText(text, EmptyTagList)
 
         printStateForDebug(state)
 

app/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -2,7 +2,8 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import com.vitorpamplona.amethyst.AccountInfo
 
-class PushNotificationUtils {
-    fun init(accounts: List<AccountInfo>) {
+object PushNotificationUtils {
+    var hasInit: Boolean = true
+    suspend fun init(accounts: List<AccountInfo>) {
     }
 }

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
     <queries>
         <package android:name="org.torproject.android"/>
+        <package android:name="com.greenart7c3.nostrsigner"/>
+        <package android:name="com.greenart7c3.nostrsigner.debug"/>
     </queries>
 
     <!-- Doesn't require a camera -->

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

@@ -3,10 +3,13 @@ package com.vitorpamplona.amethyst
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.compose.runtime.Immutable
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.ConnectivityType
+import com.vitorpamplona.amethyst.model.DefaultReactions
+import com.vitorpamplona.amethyst.model.DefaultZapAmounts
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Nip47URI
@@ -16,10 +19,8 @@ import com.vitorpamplona.amethyst.model.Settings
 import com.vitorpamplona.amethyst.model.parseConnectivityType
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.quartz.crypto.KeyPair
-import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.hexToByteArray
 import com.vitorpamplona.quartz.encoders.toHexKey
-import com.vitorpamplona.quartz.encoders.toNpub
 import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.LnZapEvent
@@ -35,7 +36,8 @@ private const val DEBUG_PREFERENCES_NAME = "debug_prefs"
 @Immutable
 data class AccountInfo(
     val npub: String,
-    val hasPrivKey: Boolean = false
+    val hasPrivKey: Boolean,
+    val loggedInWithExternalSigner: Boolean
 )
 
 private object PrefKeys {
@@ -74,7 +76,7 @@ private object PrefKeys {
     const val THEME = "theme"
     const val PREFERRED_LANGUAGE = "preferred_Language"
     const val AUTOMATICALLY_LOAD_URL_PREVIEW = "automatically_load_url_preview"
-    val LAST_READ: (String) -> String = { route -> "last_read_route_$route" }
+    const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
 }
 
 object LocalPreferences {
@@ -82,7 +84,7 @@ object LocalPreferences {
 
     private var _currentAccount: String? = null
 
-    private fun currentAccount(): String? {
+    fun currentAccount(): String? {
         if (_currentAccount == null) {
             _currentAccount = encryptedPreferences().getString(PrefKeys.CURRENT_ACCOUNT, null)
         }
@@ -201,7 +203,11 @@ object LocalPreferences {
 
     fun allSavedAccounts(): List<AccountInfo> {
         return savedAccounts().map { npub ->
-            AccountInfo(npub = npub)
+            AccountInfo(
+                npub,
+                hasPrivKey(npub),
+                getLoggedInWithExternalSigner(npub)
+            )
         }
     }
 
@@ -245,6 +251,7 @@ object LocalPreferences {
             } else {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
+            putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, account.loginWithExternalSigner)
         }.apply()
 
         val globalPrefs = encryptedPreferences()
@@ -276,17 +283,19 @@ object LocalPreferences {
     }
 
     fun getTheme(): Int {
-        encryptedPreferences().apply {
-            return getInt(PrefKeys.THEME, 0)
-        }
+        return encryptedPreferences().getInt(PrefKeys.THEME, 0)
     }
 
     fun getPreferredLanguage(): String {
-        var language = ""
-        encryptedPreferences().apply {
-            language = getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
-        }
-        return language
+        return encryptedPreferences().getString(PrefKeys.PREFERRED_LANGUAGE, "") ?: ""
+    }
+
+    private fun getLoggedInWithExternalSigner(npub: String): Boolean {
+        return encryptedPreferences(npub).getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
+    }
+
+    private fun hasPrivKey(npub: String): Boolean {
+        return (encryptedPreferences(npub).getString(PrefKeys.NOSTR_PRIVKEY, "") ?: "").isNotBlank()
     }
 
     fun loadFromEncryptedStorage(): Account? {
@@ -316,11 +325,11 @@ object LocalPreferences {
 
             val zapAmountChoices = getString(PrefKeys.ZAP_AMOUNTS, "[]")?.let {
                 Event.mapper.readValue<List<Long>?>(it)
-            }?.ifEmpty { listOf(500L, 1000L, 5000L) } ?: listOf(500L, 1000L, 5000L)
+            }?.ifEmpty { DefaultZapAmounts } ?: DefaultZapAmounts
 
             val reactionChoices = getString(PrefKeys.REACTION_CHOICES, "[]")?.let {
                 Event.mapper.readValue<List<String>?>(it)
-            }?.ifEmpty { listOf("+") } ?: listOf("+")
+            }?.ifEmpty { DefaultReactions } ?: DefaultReactions
 
             val defaultZapType = getString(PrefKeys.DEFAULT_ZAPTYPE, "")?.let { serverName ->
                 LnZapEvent.ZapType.values().firstOrNull() { it.name == serverName }
@@ -335,16 +344,22 @@ object LocalPreferences {
                     Event.mapper.readValue<Nip47URI?>(it)
                 }
             } catch (e: Throwable) {
+                Log.w("LocalPreferences", "Error Decoding Zap Payment Request Server ${getString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, null)}", e)
                 e.printStackTrace()
                 null
             }
 
             val latestContactList = try {
                 getString(PrefKeys.LATEST_CONTACT_LIST, null)?.let {
-                    Event.fromJson(it) as ContactListEvent?
+                    println("Decoding Contact List: " + it)
+                    if (it != null) {
+                        Event.fromJson(it) as ContactListEvent?
+                    } else {
+                        null
+                    }
                 }
             } catch (e: Throwable) {
-                e.printStackTrace()
+                Log.w("LocalPreferences", "Error Decoding Contact List ${getString(PrefKeys.LATEST_CONTACT_LIST, null)}", e)
                 null
             }
 
@@ -353,6 +368,7 @@ object LocalPreferences {
                     Event.mapper.readValue<Map<String, String>?>(it)
                 } ?: mapOf()
             } catch (e: Throwable) {
+                Log.w("LocalPreferences", "Error Decoding Language Preferences ${getString(PrefKeys.LANGUAGE_PREFS, null)}", e)
                 e.printStackTrace()
                 mapOf()
             }
@@ -363,6 +379,7 @@ object LocalPreferences {
             val useProxy = getBoolean(PrefKeys.USE_PROXY, false)
             val proxyPort = getInt(PrefKeys.PROXY_PORT, 9050)
             val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
+            val loginWithExternalSigner = getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)
 
             val showSensitiveContent = if (contains(PrefKeys.SHOW_SENSITIVE_CONTENT)) {
                 getBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, false)
@@ -377,6 +394,7 @@ object LocalPreferences {
                     Event.mapper.readValue<Map<String, Long>?>(it)
                 } ?: mapOf()
             } catch (e: Throwable) {
+                Log.w("LocalPreferences", "Error Decoding Last Read per route ${getString(PrefKeys.LAST_READ_PER_ROUTE, null)}", e)
                 e.printStackTrace()
                 mapOf()
             }
@@ -431,51 +449,11 @@ object LocalPreferences {
                 warnAboutPostsWithReports = warnAboutReports,
                 filterSpamFromStrangers = filterSpam,
                 lastReadPerRoute = lastReadPerRoute,
-                settings = settings
+                settings = settings,
+                loginWithExternalSigner = loginWithExternalSigner
             )
 
             return a
         }
     }
-
-    fun migrateSingleUserPrefs() {
-        if (currentAccount() != null) return
-
-        val pubkey = encryptedPreferences().getString(PrefKeys.NOSTR_PUBKEY, null) ?: return
-        val npub = Hex.decode(pubkey).toNpub()
-
-        val stringPrefs = listOf(
-            PrefKeys.NOSTR_PRIVKEY,
-            PrefKeys.NOSTR_PUBKEY,
-            PrefKeys.RELAYS,
-            PrefKeys.LANGUAGE_PREFS,
-            PrefKeys.TRANSLATE_TO,
-            PrefKeys.ZAP_AMOUNTS,
-            PrefKeys.LATEST_CONTACT_LIST
-        )
-
-        val stringSetPrefs = listOf(
-            PrefKeys.FOLLOWING_CHANNELS,
-            PrefKeys.HIDDEN_USERS,
-            PrefKeys.DONT_TRANSLATE_FROM
-        )
-
-        encryptedPreferences().apply {
-            val appPrefs = this
-            encryptedPreferences(npub).edit().apply {
-                val userPrefs = this
-
-                stringPrefs.forEach { userPrefs.putString(it, appPrefs.getString(it, null)) }
-                stringSetPrefs.forEach { userPrefs.putStringSet(it, appPrefs.getStringSet(it, null)) }
-                userPrefs.putBoolean(
-                    PrefKeys.HIDE_DELETE_REQUEST_DIALOG,
-                    appPrefs.getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
-                )
-            }.apply()
-        }
-
-        encryptedPreferences().edit().clear().apply()
-        addAccount(npub)
-        updateCurrentAccount(npub)
-    }
 }

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

@@ -92,9 +92,7 @@ class MultiPlayerPlaybackManager(
             override fun onPlaybackStateChanged(playbackState: Int) {
                 when (playbackState) {
                     STATE_IDLE -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.add(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                     STATE_READY -> {
                         cachedPositions.get(uri)?.let { lastPosition ->
@@ -104,9 +102,7 @@ class MultiPlayerPlaybackManager(
                         }
                     }
                     else -> {
-                        if (player.currentPosition > 5 * 60) { // 5 seconds
-                            cachedPositions.add(uri, player.currentPosition)
-                        }
+                        cachedPositions.add(uri, player.currentPosition)
                     }
                 }
             }

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

@@ -12,6 +12,7 @@ import coil.disk.DiskCache
 import coil.util.DebugLogger
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -35,15 +36,21 @@ import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import java.io.File
 
 object ServiceManager {
+    var shouldPauseService: Boolean = true // to not open amber in a loop trying to use auth relays and registering for notifications
+    private var isStarted: Boolean = false // to not open amber in a loop trying to use auth relays and registering for notifications
     private var account: Account? = null
 
     fun start(account: Account, context: Context) {
         this.account = account
+        ExternalSignerUtils.account = account
         start(context)
     }
 
     @Synchronized
     fun start(context: Context) {
+        if (isStarted && account != null) {
+            return
+        }
         Log.d("ServiceManager", "Starting Relay Services")
 
         val myAccount = account
@@ -88,6 +95,7 @@ object ServiceManager {
             NostrSingleEventDataSource.start()
             NostrSingleChannelDataSource.start()
             NostrSingleUserDataSource.start()
+            isStarted = true
         }
     }
 
@@ -113,6 +121,7 @@ object ServiceManager {
         NostrVideoDataSource.stop()
 
         Client.disconnect()
+        isStarted = false
     }
 
     fun cleanObservers() {

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

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst.model
 import android.util.Log
 import androidx.compose.runtime.Stable
 import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -11,6 +13,7 @@ import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.encoders.HexValidator
 import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.encoders.bechToBytes
 import com.vitorpamplona.quartz.encoders.decodePublicKeyAsHexOrNull
 import com.vitorpamplona.quartz.encoders.toHexKey
 import com.vitorpamplona.quartz.events.*
@@ -53,6 +56,10 @@ object LocalCache {
         // checkNotInMainThread()
 
         return users[key] ?: run {
+            require(isValidHex(key = key)) {
+                "$key is not a valid hex"
+            }
+
             val newObject = User(key)
             users.putIfAbsent(key, newObject) ?: newObject
         }
@@ -98,6 +105,10 @@ object LocalCache {
         checkNotInMainThread()
 
         return notes.get(idHex) ?: run {
+            require(isValidHex(idHex)) {
+                "$idHex is not a valid hex"
+            }
+
             val newObject = Note(idHex)
             notes.putIfAbsent(idHex, newObject) ?: newObject
         }
@@ -198,6 +209,14 @@ object LocalCache {
         val user = getOrCreateUser(event.pubKey)
         if (user.latestBookmarkList == null || event.createdAt > user.latestBookmarkList!!.createdAt) {
             if (event.dTag() == "bookmark") {
+                val loggedInUser = LocalPreferences.currentAccount()
+                val hexKey = loggedInUser?.bechToBytes()
+                if (hexKey != null) {
+                    val pubKey = Hex.encode(hexKey)
+                    if (pubKey == event.pubKey) {
+                        ExternalSignerUtils.content.remove(event.id)
+                    }
+                }
                 user.updateBookmark(event)
             }
             // Log.d("MT", "New User Metadata ${oldUser.pubkeyDisplayHex} ${oldUser.toBestDisplayName()}")
@@ -807,23 +826,23 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        val zapRequest = event.zapRequest?.id?.let { getOrCreateNote(it) }
+        val zapRequest = event.zapRequest?.id?.let { getNoteIfExists(it) }
+
+        if (zapRequest == null || zapRequest.event !is LnZapRequestEvent) {
+            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
+            return
+        }
 
         val author = getOrCreateUser(event.pubKey)
         val mentions = event.zappedAuthor().mapNotNull { checkGetOrCreateUser(it) }
         val repliesTo = event.zappedPost().mapNotNull { checkGetOrCreateNote(it) } +
             event.taggedAddresses().map { getOrCreateAddressableNote(it) } +
             (
-                (zapRequest?.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
+                (zapRequest.event as? LnZapRequestEvent)?.taggedAddresses()?.map { getOrCreateAddressableNote(it) } ?: emptySet<Note>()
                 )
 
         note.loadEvent(event, author, repliesTo)
 
-        if (zapRequest == null) {
-            Log.e("ZP", "Zap Request not found. Unable to process Zap {${event.toJson()}}")
-            return
-        }
-
         // Log.d("ZP", "New ZapEvent ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
 
         repliesTo.forEach {

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

@@ -43,6 +43,10 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
 
         return minOf(publishedAt, lastCreatedAt)
     }
+
+    fun dTag(): String? {
+        return (event as? AddressableEvent)?.dTag()
+    }
 }
 
 @Stable

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

@@ -5,16 +5,15 @@ import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
-import com.vitorpamplona.quartz.encoders.Bech32
 import com.vitorpamplona.quartz.encoders.Hex
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Lud06
 import com.vitorpamplona.quartz.encoders.toNpub
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
@@ -27,9 +26,6 @@ import com.vitorpamplona.quartz.events.toImmutableListOfLists
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.Dispatchers
 import java.math.BigDecimal
-import java.util.regex.Pattern
-
-val lnurlpPattern = Pattern.compile("(?i:http|https):\\/\\/((.+)\\/)*\\.well-known\\/lnurlp\\/(.*)")
 
 @Stable
 class User(val pubkeyHex: String) {
@@ -268,19 +264,11 @@ class User(val pubkeyHex: String) {
         info?.updatedMetadataAt = latestMetadata.createdAt
         info?.tags = latestMetadata.tags.toImmutableListOfLists()
 
-        if (newUserInfo.lud16.isNullOrBlank() && newUserInfo.lud06?.lowercase()?.startsWith("lnurl") == true) {
-            try {
-                val url = String(Bech32.decodeBytes(newUserInfo.lud06!!, false).second)
-
-                val matcher = lnurlpPattern.matcher(url)
-                while (matcher.find()) {
-                    val domain = matcher.group(2)
-                    val username = matcher.group(3)
-
-                    info?.lud16 = "$username@$domain"
+        if (newUserInfo.lud16.isNullOrBlank()) {
+            info?.lud06?.let {
+                if (it.lowercase().startsWith("lnurl")) {
+                    info?.lud16 = Lud06().toLud16(it)
                 }
-            } catch (t: Throwable) {
-                // Doesn't create errors.
             }
         }
 
@@ -331,7 +319,7 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet ?: emptySet()
     }
 
-    fun cachedFollowingTagSet(): Set<HexKey> {
+    fun cachedFollowingTagSet(): Set<String> {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 

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

@@ -11,7 +11,6 @@ import com.vitorpamplona.amethyst.ui.components.ZoomableUrlImage
 import com.vitorpamplona.amethyst.ui.components.ZoomableUrlVideo
 import com.vitorpamplona.amethyst.ui.components.hashTagsPattern
 import com.vitorpamplona.amethyst.ui.components.imageExtensions
-import com.vitorpamplona.amethyst.ui.components.startsWithNIP19Scheme
 import com.vitorpamplona.amethyst.ui.components.tagIndex
 import com.vitorpamplona.amethyst.ui.components.videoExtensions
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
@@ -290,3 +289,9 @@ class SchemelessUrlSegment(segment: String, val url: String, val extras: String?
 
 @Immutable
 class RegularTextSegment(segment: String) : Segment(segment)
+
+fun startsWithNIP19Scheme(word: String): Boolean {
+    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
+
+    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
+}

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

@@ -0,0 +1,311 @@
+package com.vitorpamplona.amethyst.service
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import android.util.LruCache
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import com.vitorpamplona.amethyst.Amethyst
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.ui.MainActivity
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toNpub
+import com.vitorpamplona.quartz.events.EventInterface
+import com.vitorpamplona.quartz.events.LnZapRequestEvent
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
+enum class SignerType {
+    SIGN_EVENT,
+    NIP04_ENCRYPT,
+    NIP04_DECRYPT,
+    NIP44_ENCRYPT,
+    NIP44_DECRYPT,
+    GET_PUBLIC_KEY,
+    DECRYPT_ZAP_EVENT
+}
+
+object ExternalSignerUtils {
+    val content = LruCache<String, String>(10)
+    var isActivityRunning: Boolean = false
+    val cachedDecryptedContent = mutableMapOf<HexKey, String>()
+    lateinit var account: Account
+    private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var decryptResultLauncher: ActivityResultLauncher<Intent>
+    private lateinit var blockListResultLauncher: ActivityResultLauncher<Intent>
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun requestRejectedToast() {
+        GlobalScope.launch(Dispatchers.Main) {
+            Toast.makeText(
+                Amethyst.instance,
+                Amethyst.instance.getString(R.string.sign_request_rejected),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun default() {
+        isActivityRunning = false
+        ServiceManager.shouldPauseService = true
+        GlobalScope.launch(Dispatchers.IO) {
+            isActivityRunning = false
+            ServiceManager.shouldPauseService = true
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun start(activity: MainActivity) {
+        activityResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                }
+            }
+            default()
+        }
+
+        decryptResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    content.put(id, event)
+                    cachedDecryptedContent[id] = event
+                }
+            }
+            default()
+        }
+
+        blockListResultLauncher = activity.registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                requestRejectedToast()
+            } else {
+                val decryptedContent = it.data?.getStringExtra("signature") ?: ""
+                val id = it.data?.getStringExtra("id") ?: ""
+                if (id.isNotBlank()) {
+                    cachedDecryptedContent[id] = decryptedContent
+                    account.live.invalidateData()
+                }
+            }
+            default()
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    fun openSigner(
+        data: String,
+        type: SignerType,
+        intentResult: ActivityResultLauncher<Intent>,
+        pubKey: HexKey,
+        id: String
+    ) {
+        try {
+            ServiceManager.shouldPauseService = false
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("nostrsigner:$data"))
+            val signerType = when (type) {
+                SignerType.SIGN_EVENT -> "sign_event"
+                SignerType.NIP04_ENCRYPT -> "nip04_encrypt"
+                SignerType.NIP04_DECRYPT -> "nip04_decrypt"
+                SignerType.NIP44_ENCRYPT -> "nip44_encrypt"
+                SignerType.NIP44_DECRYPT -> "nip44_decrypt"
+                SignerType.GET_PUBLIC_KEY -> "get_public_key"
+                SignerType.DECRYPT_ZAP_EVENT -> "decrypt_zap_event"
+            }
+            intent.putExtra("type", signerType)
+            intent.putExtra("pubKey", pubKey)
+            intent.putExtra("id", id)
+            if (type !== SignerType.GET_PUBLIC_KEY) {
+                intent.putExtra("current_user", account.keyPair.pubKey.toNpub())
+            }
+            intent.`package` = "com.greenart7c3.nostrsigner"
+            intentResult.launch(intent)
+        } catch (e: Exception) {
+            Log.e("Signer", "Error opening Signer app", e)
+            GlobalScope.launch(Dispatchers.Main) {
+                Toast.makeText(
+                    Amethyst.instance,
+                    Amethyst.instance.getString(R.string.error_opening_external_signer),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+
+    fun openSigner(event: EventInterface, columnName: String = "signature") {
+        checkNotInMainThread()
+
+        val result = getDataFromResolver(SignerType.SIGN_EVENT, arrayOf(event.toJson(), event.pubKey()), columnName)
+        if (result !== null) {
+            content.put(event.id(), result)
+            return
+        }
+
+        ServiceManager.shouldPauseService = false
+        isActivityRunning = true
+        openSigner(
+            event.toJson(),
+            SignerType.SIGN_EVENT,
+            activityResultLauncher,
+            "",
+            event.id()
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptBlockList(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            blockListResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun getDataFromResolver(signerType: SignerType, data: Array<out String>, columnName: String = "signature"): String? {
+        val localData = if (signerType !== SignerType.GET_PUBLIC_KEY) {
+            data.toList().plus(account.keyPair.pubKey.toNpub()).toTypedArray()
+        } else {
+            data
+        }
+
+        Amethyst.instance.contentResolver.query(
+            Uri.parse("content://com.greenart7c3.nostrsigner.$signerType"),
+            localData,
+            null,
+            null,
+            null
+        ).use {
+            if (it !== null) {
+                if (it.moveToFirst()) {
+                    val index = it.getColumnIndex(columnName)
+                    if (index < 0) {
+                        Log.d("getDataFromResolver", "column '$columnName' not found")
+                        return null
+                    }
+                    return it.getString(index)
+                }
+            }
+        }
+        return null
+    }
+
+    fun decrypt(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            // do nothing
+        }
+    }
+
+    fun decryptDM(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun decryptBookmark(encryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_DECRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(encryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            cachedDecryptedContent[id] = result
+            return
+        }
+        openSigner(
+            encryptedContent,
+            signerType,
+            decryptResultLauncher,
+            pubKey,
+            id
+        )
+    }
+
+    fun encrypt(decryptedContent: String, pubKey: HexKey, id: String, signerType: SignerType = SignerType.NIP04_ENCRYPT) {
+        val result = getDataFromResolver(signerType, arrayOf(decryptedContent, pubKey))
+        if (result !== null) {
+            content.put(id, result)
+            return
+        }
+
+        isActivityRunning = true
+        openSigner(
+            decryptedContent,
+            signerType,
+            activityResultLauncher,
+            pubKey,
+            id
+        )
+        while (isActivityRunning) {
+            Thread.sleep(100)
+        }
+    }
+
+    fun decryptZapEvent(event: LnZapRequestEvent) {
+        val result = getDataFromResolver(SignerType.DECRYPT_ZAP_EVENT, arrayOf(event.toJson(), event.pubKey))
+        if (result !== null) {
+            content.put(event.id, result)
+            cachedDecryptedContent[event.id] = result
+            return
+        }
+        openSigner(
+            event.toJson(),
+            SignerType.DECRYPT_ZAP_EVENT,
+            decryptResultLauncher,
+            event.pubKey,
+            event.id
+        )
+    }
+}

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

@@ -16,16 +16,16 @@ class FileHeader(
     val size: Int,
     val dim: String?,
     val blurHash: String?,
-    val description: String? = null,
+    val alt: String? = null,
     val sensitiveContent: Boolean = false
 ) {
     companion object {
-        suspend fun prepare(fileUrl: String, mimeType: String?, description: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        suspend fun prepare(fileUrl: String, mimeType: String?, alt: String?, sensitiveContent: Boolean, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
             try {
                 val imageData: ByteArray? = ImageDownloader().waitAndGetImage(fileUrl)
 
                 if (imageData != null) {
-                    prepare(imageData, fileUrl, mimeType, description, sensitiveContent, onReady, onError)
+                    prepare(imageData, fileUrl, mimeType, alt, sensitiveContent, onReady, onError)
                 } else {
                     onError()
                 }
@@ -39,7 +39,7 @@ class FileHeader(
             data: ByteArray,
             fileUrl: String,
             mimeType: String?,
-            description: String?,
+            alt: String?,
             sensitiveContent: Boolean,
             onReady: (FileHeader) -> Unit,
             onError: () -> Unit
@@ -79,7 +79,7 @@ class FileHeader(
                     Pair(null, null)
                 }
 
-                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, description, sensitiveContent))
+                onReady(FileHeader(fileUrl, mimeType, hash, size, dim, blurHash, alt, sensitiveContent))
             } catch (e: Exception) {
                 Log.e("ImageDownload", "Couldn't convert image in to File Header: ${e.message}")
                 onError()

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

@@ -8,17 +8,26 @@ import com.vitorpamplona.amethyst.service.relays.EOSEAccount
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
-import com.vitorpamplona.quartz.events.*
+import com.vitorpamplona.quartz.events.AdvertisedRelayListEvent
 import com.vitorpamplona.quartz.events.BadgeAwardEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.BookmarkListEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ContactListEvent
+import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
+import com.vitorpamplona.quartz.events.Event
+import com.vitorpamplona.quartz.events.GenericRepostEvent
+import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.LnZapPaymentResponseEvent
 import com.vitorpamplona.quartz.events.MetadataEvent
+import com.vitorpamplona.quartz.events.PeopleListEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.ReactionEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.RepostEvent
+import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.events.StatusEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
 object NostrAccountDataSource : NostrDataSource("AccountData") {
@@ -136,6 +145,8 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
     }
 
     override fun consume(event: Event, relay: Relay) {
+        checkNotInMainThread()
+
         if (LocalCache.justVerify(event)) {
             if (event is GiftWrapEvent) {
                 val privateKey = account.keyPair.privKey
@@ -143,6 +154,20 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     event.cachedGift(privateKey)?.let {
                         this.consume(it, relay)
                     }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        this.consume(it, relay)
+                    }
                 }
             }
 
@@ -152,6 +177,20 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
                     event.cachedGossip(privateKey)?.let {
                         LocalCache.justConsume(it, relay)
                     }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, relay)
+                    }
                 }
 
                 // Don't store sealed gossips to avoid rebroadcasting by mistake.
@@ -181,7 +220,6 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
 
         if (this::account.isInitialized) {
             val event = account.createAuthEvent(relay, challenge)
-
             if (event != null) {
                 Client.send(
                     event,

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

@@ -44,7 +44,7 @@ class NostrLnZapPaymentResponseDataSource(
     override fun auth(relay: Relay, challenge: String) {
         super.auth(relay, challenge)
 
-        val event = RelayAuthEvent.create(relay.url, challenge, authSigningKey)
+        val event = RelayAuthEvent.create(relay.url, challenge, "", authSigningKey)
         Client.send(
             event,
             relay.url

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

@@ -0,0 +1,17 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+
+object PackageUtils {
+    private fun isPackageInstalled(context: Context, target: String): Boolean {
+        return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
+    }
+
+    fun isOrbotInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "org.torproject.android")
+    }
+
+    fun isAmberInstalled(context: Context): Boolean {
+        return isPackageInstalled(context, "com.greenart7c3.nostrsigner")
+    }
+}

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

@@ -0,0 +1,207 @@
+package com.vitorpamplona.amethyst.service
+
+import android.content.Context
+import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.quartz.events.LnZapEvent
+import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
+import com.vitorpamplona.quartz.events.ZapSplitSetup
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.math.round
+
+class ZapPaymentHandler(val account: Account) {
+
+    @Immutable
+    data class Payable(
+        val info: ZapSplitSetup,
+        val user: User?,
+        val amountMilliSats: Long,
+        val invoice: String
+    )
+
+    suspend fun zap(
+        note: Note,
+        amountMilliSats: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayViaIntent: (ImmutableList<Payable>) -> Unit,
+        zapType: LnZapEvent.ZapType
+    ) = withContext(Dispatchers.IO) {
+        val zapSplitSetup = note.event?.zapSplitSetup()
+
+        val zapsToSend = if (!zapSplitSetup.isNullOrEmpty()) {
+            zapSplitSetup
+        } else {
+            val lud16 = note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
+
+            if (lud16.isNullOrBlank()) {
+                onError(context.getString(R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats))
+                return@withContext
+            }
+
+            listOf(ZapSplitSetup(lud16, null, weight = 1.0, true))
+        }
+
+        val totalWeight = zapsToSend.sumOf { it.weight }
+
+        val invoicesToPayOnIntent = mutableListOf<Payable>()
+
+        zapsToSend.forEachIndexed { index, value ->
+            val outerProgressMin = index / zapsToSend.size.toFloat()
+            val outerProgressMax = (index + 1) / zapsToSend.size.toFloat()
+
+            val zapValue =
+                round((amountMilliSats * value.weight / totalWeight) / 1000f).toLong() * 1000
+
+            if (value.isLnAddress) {
+                innerZap(
+                    lud16 = value.lnAddressOrPubKeyHex,
+                    note = note,
+                    amount = zapValue,
+                    pollOption = pollOption,
+                    message = message,
+                    context = context,
+                    onError = onError,
+                    onProgress = {
+                        onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
+                    },
+                    zapType = zapType,
+                    onPayInvoiceThroughIntent = {
+                        invoicesToPayOnIntent.add(
+                            Payable(
+                                info = value,
+                                user = null,
+                                amountMilliSats = zapValue,
+                                invoice = it
+                            )
+                        )
+                    }
+                )
+            } else {
+                val user = LocalCache.getUserIfExists(value.lnAddressOrPubKeyHex)
+                val lud16 = user?.info?.lnAddress()
+
+                if (lud16 != null) {
+                    innerZap(
+                        lud16 = lud16,
+                        note = note,
+                        amount = zapValue,
+                        pollOption = pollOption,
+                        message = message,
+                        context = context,
+                        onError = onError,
+                        onProgress = {
+                            onProgress((it * (outerProgressMax - outerProgressMin)) + outerProgressMin)
+                        },
+                        zapType = zapType,
+                        overrideUser = user,
+                        onPayInvoiceThroughIntent = {
+                            invoicesToPayOnIntent.add(
+                                Payable(
+                                    info = value,
+                                    user = user,
+                                    amountMilliSats = zapValue,
+                                    invoice = it
+                                )
+                            )
+                        }
+                    )
+                } else {
+                    onError(
+                        context.getString(
+                            R.string.user_x_does_not_have_a_lightning_address_setup_to_receive_sats,
+                            user?.toBestDisplayName() ?: value.lnAddressOrPubKeyHex
+                        )
+                    )
+                }
+            }
+        }
+
+        if (invoicesToPayOnIntent.isNotEmpty()) {
+            onPayViaIntent(invoicesToPayOnIntent.toImmutableList())
+            onProgress(1f)
+        } else {
+            launch(Dispatchers.IO) {
+                // Awaits for the event to come back to LocalCache.
+                delay(5000)
+                onProgress(1f)
+            }
+        }
+    }
+
+    private suspend fun innerZap(
+        lud16: String,
+        note: Note,
+        amount: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayInvoiceThroughIntent: (String) -> Unit,
+        zapType: LnZapEvent.ZapType,
+        overrideUser: User? = null
+    ) {
+        var zapRequestJson = ""
+
+        if (zapType != LnZapEvent.ZapType.NONZAP) {
+            val zapRequest = account.createZapRequestFor(note, pollOption, message, zapType, overrideUser)
+            if (zapRequest != null) {
+                zapRequestJson = zapRequest.toJson()
+            }
+        }
+
+        onProgress(0.10f)
+
+        LightningAddressResolver().lnAddressInvoice(
+            lud16,
+            amount,
+            message,
+            zapRequestJson,
+            onSuccess = {
+                onProgress(0.7f)
+                if (account.hasWalletConnectSetup()) {
+                    account.sendZapPaymentRequestFor(
+                        bolt11 = it,
+                        note,
+                        onResponse = { response ->
+                            if (response is PayInvoiceErrorResponse) {
+                                onProgress(0.0f)
+                                onError(
+                                    response.error?.message
+                                        ?: response.error?.code?.toString()
+                                        ?: "Error parsing error message"
+                                )
+                            } else {
+                                onProgress(1f)
+                            }
+                        }
+                    )
+                    onProgress(0.8f)
+                } else {
+                    try {
+                        onPayInvoiceThroughIntent(it)
+                    } catch (e: Exception) {
+                        onError(context.getString(R.string.lightning_wallets_not_found2))
+                    }
+                    onProgress(0f)
+                }
+            },
+            onError = onError,
+            onProgress = onProgress
+        )
+    }
+}

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

@@ -4,16 +4,14 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.quartz.encoders.Bech32
 import com.vitorpamplona.quartz.encoders.LnInvoiceUtil
+import com.vitorpamplona.quartz.encoders.Lud06
 import com.vitorpamplona.quartz.encoders.toLnUrl
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.Request
-import okhttp3.Response
 import java.math.BigDecimal
+import java.math.RoundingMode
 import java.net.URLEncoder
 
 class LightningAddressResolver() {
@@ -27,11 +25,7 @@ class LightningAddressResolver() {
         }
 
         if (lnaddress.lowercase().startsWith("lnurl")) {
-            return try {
-                String(Bech32.decodeBytes(lnaddress, false).second)
-            } catch (e: Exception) {
-                null
-            }
+            return Lud06().toLnUrlp(lnaddress)
         }
 
         return null
@@ -66,7 +60,7 @@ class LightningAddressResolver() {
         }
     }
 
-    suspend fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
+    suspend fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: suspend (String) -> Unit, onError: (String) -> Unit) = withContext(Dispatchers.IO) {
         val encodedMessage = URLEncoder.encode(message, "utf-8")
 
         val urlBinder = if (lnCallback.contains("?")) "&" else "?"
@@ -82,22 +76,13 @@ class LightningAddressResolver() {
             .url(url)
             .build()
 
-        client.newCall(request).enqueue(object : Callback {
-            override fun onResponse(call: Call, response: Response) {
-                response.use {
-                    if (it.isSuccessful) {
-                        onSuccess(response.body.string())
-                    } else {
-                        onError("Could not fetch invoice from $lnCallback")
-                    }
-                }
+        client.newCall(request).execute().use {
+            if (it.isSuccessful) {
+                onSuccess(it.body.string())
+            } else {
+                onError("Could not fetch invoice from $lnCallback")
             }
-
-            override fun onFailure(call: Call, e: java.io.IOException) {
-                onError("Could not fetch an invoice from $lnCallback. Message ${e.message}")
-                e.printStackTrace()
-            }
-        })
+        }
     }
 
     suspend fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
@@ -115,7 +100,7 @@ class LightningAddressResolver() {
         milliSats: Long,
         message: String,
         nostrRequest: String? = null,
-        onSuccess: (String) -> Unit,
+        onSuccess: suspend (String) -> Unit,
         onError: (String) -> Unit,
         onProgress: (percent: Float) -> Unit
     ) {
@@ -159,13 +144,14 @@ class LightningAddressResolver() {
 
                             lnInvoice?.get("pr")?.asText()?.ifBlank { null }?.let { pr ->
                                 // Forces LN Invoice amount to be the requested amount.
+                                val expectedAmountInSats = BigDecimal(milliSats).divide(BigDecimal(1000), RoundingMode.HALF_UP).toLong()
                                 val invoiceAmount = LnInvoiceUtil.getAmountInSats(pr)
-                                if (invoiceAmount.multiply(BigDecimal(1000)).toLong() == BigDecimal(milliSats).toLong()) {
+                                if (invoiceAmount.toLong() == expectedAmountInSats) {
                                     onProgress(0.7f)
                                     onSuccess(pr)
                                 } else {
                                     onProgress(0.0f)
-                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
+                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from $lnaddress. It should have been $expectedAmountInSats")
                                 }
                             } ?: lnInvoice?.get("reason")?.asText()?.ifBlank { null }?.let { reason ->
                                 onProgress(0.0f)

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

@@ -7,6 +7,8 @@ import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.amethyst.service.SignerType
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendDMNotification
 import com.vitorpamplona.amethyst.service.notifications.NotificationUtils.sendZapNotification
 import com.vitorpamplona.amethyst.ui.note.showAmount
@@ -32,27 +34,56 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         // Test with all logged in accounts
         LocalPreferences.allSavedAccounts().forEach {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
-            if (acc != null && acc.keyPair.privKey != null) {
+            if (acc != null && (acc.keyPair.privKey != null || acc.loginWithExternalSigner)) {
                 consumeIfMatchesAccount(event, acc)
             }
         }
     }
 
     private suspend fun consumeIfMatchesAccount(pushWrappedEvent: GiftWrapEvent, account: Account) {
-        val key = account.keyPair.privKey ?: return
-        pushWrappedEvent.unwrap(key)?.let { notificationEvent ->
-            if (!LocalCache.justVerify(notificationEvent)) return // invalid event
-            if (LocalCache.notes[notificationEvent.id] != null) return // already processed
+        val key = account.keyPair.privKey
+        if (account.loginWithExternalSigner) {
+            var cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id]
+            if (cached == null) {
+                ExternalSignerUtils.decrypt(
+                    pushWrappedEvent.content,
+                    pushWrappedEvent.pubKey,
+                    pushWrappedEvent.id,
+                    SignerType.NIP44_DECRYPT
+                )
+                cached = ExternalSignerUtils.cachedDecryptedContent[pushWrappedEvent.id] ?: ""
+            }
+            pushWrappedEvent.unwrap(cached)?.let { notificationEvent ->
+                if (!LocalCache.justVerify(notificationEvent)) return // invalid event
+                if (LocalCache.notes[notificationEvent.id] != null) return // already processed
 
-            LocalCache.justConsume(notificationEvent, null)
+                LocalCache.justConsume(notificationEvent, null)
 
-            unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
-                if (innerEvent is PrivateDmEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is LnZapEvent) {
-                    notify(innerEvent, account)
-                } else if (innerEvent is ChatMessageEvent) {
-                    notify(innerEvent, account)
+                unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
+                    if (innerEvent is PrivateDmEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        notify(innerEvent, account)
+                    }
+                }
+            }
+        } else if (key != null) {
+            pushWrappedEvent.unwrap(key)?.let { notificationEvent ->
+                if (!LocalCache.justVerify(notificationEvent)) return // invalid event
+                if (LocalCache.notes[notificationEvent.id] != null) return // already processed
+
+                LocalCache.justConsume(notificationEvent, null)
+
+                unwrapAndConsume(notificationEvent, account)?.let { innerEvent ->
+                    if (innerEvent is PrivateDmEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        notify(innerEvent, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        notify(innerEvent, account)
+                    }
                 }
             }
         }
@@ -63,17 +94,54 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
         return when (event) {
             is GiftWrapEvent -> {
-                val key = account.keyPair.privKey ?: return null
-                event.cachedGift(key)?.let {
-                    unwrapAndConsume(it, account)
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGift(key)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGift(account.keyPair.pubKey, cached)?.let {
+                        unwrapAndConsume(it, account)
+                    }
+                } else {
+                    null
                 }
             }
             is SealedGossipEvent -> {
-                val key = account.keyPair.privKey ?: return null
-                event.cachedGossip(key)?.let {
-                    // this is not verifiable
-                    LocalCache.justConsume(it, null)
-                    it
+                val key = account.keyPair.privKey
+                if (key != null) {
+                    event.cachedGossip(key)?.let {
+                        // this is not verifiable
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else if (account.loginWithExternalSigner) {
+                    var cached = ExternalSignerUtils.cachedDecryptedContent[event.id]
+                    if (cached == null) {
+                        ExternalSignerUtils.decrypt(
+                            event.content,
+                            event.pubKey,
+                            event.id,
+                            SignerType.NIP44_DECRYPT
+                        )
+                        cached = ExternalSignerUtils.cachedDecryptedContent[event.id] ?: ""
+                    }
+                    event.cachedGossip(account.keyPair.pubKey, cached)?.let {
+                        LocalCache.justConsume(it, null)
+                        it
+                    }
+                } else {
+                    null
                 }
             }
             else -> {
@@ -154,7 +222,7 @@ class EventNotificationConsumer(private val applicationContext: Context) {
 
         if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-        if (acc != null && acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+        if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
             val amount = showAmount(event.amount)
             val senderInfo = (noteZapRequest.event as? LnZapRequestEvent)?.let {
                 val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)

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

@@ -23,7 +23,7 @@ class RegisterAccounts(
     ): List<RelayAuthEvent> {
         return accounts.mapNotNull {
             val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
-            if (acc != null) {
+            if (acc != null && acc.isWriteable()) {
                 val relayToUse = acc.activeRelays()?.firstOrNull { it.read }
                 if (relayToUse != null) {
                     acc.createAuthEvent(relayToUse, notificationToken)
@@ -36,7 +36,7 @@ class RegisterAccounts(
         }
     }
 
-    private fun postRegistrationEvent(events: List<RelayAuthEvent>) {
+    fun postRegistrationEvent(events: List<RelayAuthEvent>) {
         try {
             val jsonObject = """{
                 "events": [ ${events.joinToString(", ") { it.toJson() }} ]

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

@@ -6,6 +6,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.Request
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import java.lang.IllegalArgumentException
 
 private const val ELEMENT_TAG_META = "meta"
 private const val ATTRIBUTE_VALUE_PROPERTY = "property"
@@ -64,7 +65,11 @@ suspend fun getDocument(url: String, timeOut: Int = 30000): Document =
     withContext(Dispatchers.IO) {
         val request: Request = Request.Builder().url(url).get().build()
         val html = HttpClient.getHttpClient().newCall(request).execute().use {
-            it.body.string()
+            if (it.isSuccessful) {
+                it.body.string()
+            } else {
+                throw IllegalArgumentException("Website returned: " + it.code)
+            }
         }
 
         Jsoup.parse(html)

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

@@ -23,6 +23,7 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
 import com.vitorpamplona.amethyst.ui.components.DefaultMutedSetting
@@ -51,9 +52,10 @@ import java.nio.charset.StandardCharsets
 class MainActivity : AppCompatActivity() {
     @RequiresApi(Build.VERSION_CODES.R)
     override fun onCreate(savedInstanceState: Bundle?) {
+        ExternalSignerUtils.start(this)
+
         super.onCreate(savedInstanceState)
 
-        LocalPreferences.migrateSingleUserPrefs()
         val language = LocalPreferences.getPreferredLanguage()
         if (language.isNotBlank()) {
             val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(language)
@@ -99,11 +101,13 @@ class MainActivity : AppCompatActivity() {
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {
-            ServiceManager.start(this@MainActivity)
+            if (ServiceManager.shouldPauseService) {
+                ServiceManager.start(this@MainActivity)
+            }
         }
 
         GlobalScope.launch(Dispatchers.IO) {
-            PushNotificationUtils().init(LocalPreferences.allSavedAccounts())
+            PushNotificationUtils.init(LocalPreferences.allSavedAccounts())
         }
     }
 
@@ -113,7 +117,9 @@ class MainActivity : AppCompatActivity() {
         debugState(this)
         // }
 
-        ServiceManager.pause()
+        if (ServiceManager.shouldPauseService) {
+            ServiceManager.pause()
+        }
         super.onPause()
     }
 
@@ -145,8 +151,10 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onAvailable: Disconnecting and connecting again")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
-                ServiceManager.start(this@MainActivity)
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                    ServiceManager.start(this@MainActivity)
+                }
             }
         }
 
@@ -176,7 +184,9 @@ class MainActivity : AppCompatActivity() {
             Log.d("NETWORKCALLBACK", "onLost: Disconnecting and pausing relay's connection")
             // Only starts after login
             GlobalScope.launch(Dispatchers.IO) {
-                ServiceManager.pause()
+                if (ServiceManager.shouldPauseService) {
+                    ServiceManager.pause()
+                }
             }
         }
     }

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

@@ -194,7 +194,7 @@ private fun RenderSearch(
         }
     }
 
-    DisposableEffect(Unit) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Join Start")

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

@@ -26,7 +26,7 @@ open class NewMediaModel : ViewModel() {
     var mediaType by mutableStateOf<String?>(null)
 
     var selectedServer by mutableStateOf<ServersAvailable?>(null)
-    var description by mutableStateOf("")
+    var alt by mutableStateOf("")
     var sensitiveContent by mutableStateOf(false)
 
     // Images and Videos
@@ -79,7 +79,7 @@ open class NewMediaModel : ViewModel() {
                         uploadingPercentage.value = 0.2f
                         uploadingDescription.value = "Loading"
                         contentResolver.openInputStream(fileUri)?.use {
-                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
+                            createNIP95Record(it.readBytes(), contentType, alt, sensitiveContent, relayList = relayList)
                         }
                             ?: run {
                                 viewModelScope.launch {
@@ -92,24 +92,32 @@ open class NewMediaModel : ViewModel() {
                     } else {
                         uploadingPercentage.value = 0.2f
                         uploadingDescription.value = "Uploading"
-                        ImageUploader.uploadImage(
-                            uri = fileUri,
-                            contentType = contentType,
-                            size = size,
-                            server = serverToUse,
-                            contentResolver = contentResolver,
-                            onSuccess = { imageUrl, mimeType ->
-                                createNIP94Record(imageUrl, mimeType, description, sensitiveContent, relayList = relayList)
-                            },
-                            onError = {
-                                isUploadingImage = false
-                                uploadingPercentage.value = 0.00f
-                                uploadingDescription.value = null
-                                viewModelScope.launch {
-                                    imageUploadingError.emit("Failed to upload the image / video")
+                        viewModelScope.launch(Dispatchers.IO) {
+                            ImageUploader.uploadImage(
+                                uri = fileUri,
+                                contentType = contentType,
+                                size = size,
+                                server = serverToUse,
+                                contentResolver = contentResolver,
+                                onSuccess = { imageUrl, mimeType ->
+                                    createNIP94Record(
+                                        imageUrl,
+                                        mimeType,
+                                        alt,
+                                        sensitiveContent,
+                                        relayList = relayList
+                                    )
+                                },
+                                onError = {
+                                    isUploadingImage = false
+                                    uploadingPercentage.value = 0.00f
+                                    uploadingDescription.value = null
+                                    viewModelScope.launch {
+                                        imageUploadingError.emit("Failed to upload the image / video")
+                                    }
                                 }
-                            }
-                        )
+                            )
+                        }
                     }
                 },
                 onError = {
@@ -131,7 +139,7 @@ open class NewMediaModel : ViewModel() {
         uploadingDescription.value = null
         uploadingPercentage.value = 0.0f
 
-        description = ""
+        alt = ""
         selectedServer = account?.defaultFileServer
     }
 
@@ -139,7 +147,7 @@ open class NewMediaModel : ViewModel() {
         return !isUploadingImage && galleryUri != null && selectedServer != null
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
+    fun createNIP94Record(imageUrl: String, mimeType: String?, alt: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         uploadingPercentage.value = 0.40f
         viewModelScope.launch(Dispatchers.IO) {
             uploadingDescription.value = "Server Processing"
@@ -158,7 +166,7 @@ open class NewMediaModel : ViewModel() {
                     imageData,
                     imageUrl,
                     mimeType,
-                    description,
+                    alt,
                     sensitiveContent,
                     onReady = {
                         uploadingPercentage.value = 0.90f
@@ -192,7 +200,7 @@ open class NewMediaModel : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, alt: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         uploadingPercentage.value = 0.30f
         uploadingDescription.value = "Hashing"
 
@@ -201,7 +209,7 @@ open class NewMediaModel : ViewModel() {
                 bytes,
                 "",
                 mimeType,
-                description,
+                alt,
                 sensitiveContent,
                 onReady = {
                     uploadingDescription.value = "Signing"

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

@@ -50,6 +50,7 @@ import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.ui.components.VideoView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
@@ -186,8 +187,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
-    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
+    val fileServerOptions = remember { fileServers.map { TitleExplainer(it.second, it.third) }.toImmutableList() }
     val resolver = LocalContext.current.contentResolver
 
     Row(
@@ -252,7 +252,6 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
             label = stringResource(id = R.string.file_server),
             placeholder = fileServers.firstOrNull { it.first == accountViewModel.account.defaultFileServer }?.second ?: fileServers[0].second,
             options = fileServerOptions,
-            explainers = fileServerExplainers,
             onSelect = {
                 postViewModel.selectedServer = fileServers[it].first
             },
@@ -288,8 +287,8 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
                 modifier = Modifier
                     .fillMaxWidth()
                     .windowInsetsPadding(WindowInsets(0.dp, 0.dp, 0.dp, 0.dp)),
-                value = postViewModel.description,
-                onValueChange = { postViewModel.description = it },
+                value = postViewModel.alt,
+                onValueChange = { postViewModel.alt = it },
                 placeholder = {
                     Text(
                         text = stringResource(R.string.content_description_example),

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

@@ -1,6 +1,6 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import com.vitorpamplona.amethyst.model.LocalCache
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.quartz.crypto.KeyPair
@@ -13,7 +13,8 @@ class NewMessageTagger(
     var message: String,
     var mentions: List<User>? = null,
     var replyTos: List<Note>? = null,
-    var channelHex: String? = null
+    var channelHex: String? = null,
+    var dao: Dao
 ) {
 
     val directMentions = mutableSetOf<HexKey>()
@@ -40,20 +41,20 @@ class NewMessageTagger(
         return (if (channelHex != null) 1 else 0) + (replyTos?.indexOf(note) ?: 0)
     }
 
-    fun run() {
+    suspend fun run() {
         // adds all references to mentions and reply tos
         message.split('\n').forEach { paragraph: String ->
             paragraph.split(' ').forEach { word: String ->
                 val results = parseDirtyWordForKey(word)
 
                 if (results?.key?.type == Nip19.Type.USER) {
-                    addUserToMentions(LocalCache.getOrCreateUser(results.key.hex))
+                    addUserToMentions(dao.getOrCreateUser(results.key.hex))
                 } else if (results?.key?.type == Nip19.Type.NOTE) {
-                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
+                    addNoteToReplyTos(dao.getOrCreateNote(results.key.hex))
                 } else if (results?.key?.type == Nip19.Type.EVENT) {
-                    addNoteToReplyTos(LocalCache.getOrCreateNote(results.key.hex))
+                    addNoteToReplyTos(dao.getOrCreateNote(results.key.hex))
                 } else if (results?.key?.type == Nip19.Type.ADDRESS) {
-                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    val note = dao.checkGetOrCreateAddressableNote(results.key.hex)
                     if (note != null) {
                         addNoteToReplyTos(note)
                     }
@@ -66,19 +67,19 @@ class NewMessageTagger(
             paragraph.split(' ').map { word: String ->
                 val results = parseDirtyWordForKey(word)
                 if (results?.key?.type == Nip19.Type.USER) {
-                    val user = LocalCache.getOrCreateUser(results.key.hex)
+                    val user = dao.getOrCreateUser(results.key.hex)
 
                     "nostr:${user.pubkeyNpub()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.NOTE) {
-                    val note = LocalCache.getOrCreateNote(results.key.hex)
+                    val note = dao.getOrCreateNote(results.key.hex)
 
                     "nostr:${note.toNEvent()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.EVENT) {
-                    val note = LocalCache.getOrCreateNote(results.key.hex)
+                    val note = dao.getOrCreateNote(results.key.hex)
 
                     "nostr:${note.toNEvent()}${results.restOfWord}"
                 } else if (results?.key?.type == Nip19.Type.ADDRESS) {
-                    val note = LocalCache.checkGetOrCreateAddressableNote(results.key.hex)
+                    val note = dao.checkGetOrCreateAddressableNote(results.key.hex)
                     if (note != null) {
                         "nostr:${note.idNote()}${results.restOfWord}"
                     } else {
@@ -91,6 +92,7 @@ class NewMessageTagger(
         }.joinToString("\n")
     }
 
+    @Immutable
     data class DirtyKeyInfo(val key: Nip19.Return, val restOfWord: String)
 
     fun parseDirtyWordForKey(mightBeAKey: String): DirtyKeyInfo? {
@@ -101,37 +103,50 @@ class NewMessageTagger(
 
         key = key.removePrefix("@")
 
-        if (key.length < 63) {
-            return null
-        }
-
         try {
-            val keyB32 = key.substring(0, 63)
-            val restOfWord = key.substring(63)
-
             if (key.startsWith("nsec1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
                 // Converts to npub
                 val pubkey = Nip19.uriToRoute(KeyPair(privKey = keyB32.bechToBytes()).pubKey.toNpub()) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord)
             } else if (key.startsWith("npub1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
+
                 val pubkey = Nip19.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(pubkey, restOfWord)
             } else if (key.startsWith("note1", true)) {
+                if (key.length < 63) {
+                    return null
+                }
+
+                val keyB32 = key.substring(0, 63)
+                val restOfWord = key.substring(63)
+
                 val noteId = Nip19.uriToRoute(keyB32) ?: return null
 
                 return DirtyKeyInfo(noteId, restOfWord)
             } else if (key.startsWith("nprofile", true)) {
-                val pubkeyRelay = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val pubkeyRelay = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(pubkeyRelay, pubkeyRelay.additionalChars)
             } else if (key.startsWith("nevent1", true)) {
-                val noteRelayId = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val noteRelayId = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(noteRelayId, noteRelayId.additionalChars)
             } else if (key.startsWith("naddr1", true)) {
-                val address = Nip19.uriToRoute(keyB32 + restOfWord) ?: return null
+                val address = Nip19.uriToRoute(key) ?: return null
 
                 return DirtyKeyInfo(address, address.additionalChars) // no way to know when they address ends and dirt begins
             }
@@ -142,3 +157,9 @@ class NewMessageTagger(
         return null
     }
 }
+
+interface Dao {
+    suspend fun getOrCreateUser(hex: String): User
+    suspend fun getOrCreateNote(hex: String): Note
+    suspend fun checkGetOrCreateAddressableNote(hex: String): Note?
+}

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

@@ -9,6 +9,7 @@ import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -81,21 +82,27 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.ReverseGeoLocationUtil
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
+import com.vitorpamplona.amethyst.service.startsWithNIP19Scheme
 import com.vitorpamplona.amethyst.ui.components.*
+import com.vitorpamplona.amethyst.ui.note.BaseUserPicture
 import com.vitorpamplona.amethyst.ui.note.CancelIcon
 import com.vitorpamplona.amethyst.ui.note.CloseIcon
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.PollIcon
 import com.vitorpamplona.amethyst.ui.note.RegularPostIcon
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.MyTextField
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.UserLine
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
@@ -111,6 +118,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.lang.Math.round
 
 @Composable
 fun NewPostView(
@@ -136,7 +144,7 @@ fun NewPostView(
     var relayList = account.activeWriteRelays()
 
     LaunchedEffect(Unit) {
-        postViewModel.load(account, baseReplyTo, quote)
+        postViewModel.load(accountViewModel, baseReplyTo, quote)
 
         launch(Dispatchers.IO) {
             postViewModel.imageUploadingError.collect { error ->
@@ -205,10 +213,8 @@ fun NewPostView(
                             }
                             PostButton(
                                 onPost = {
-                                    scope.launch(Dispatchers.IO) {
-                                        postViewModel.sendPost(relayList = relayList)
-                                        onClose()
-                                    }
+                                    postViewModel.sendPost(relayList = relayList)
+                                    onClose()
                                 },
                                 isActive = postViewModel.canPost()
                             )
@@ -321,9 +327,9 @@ fun NewPostView(
                                 if (postViewModel.wantsForwardZapTo) {
                                     Row(
                                         verticalAlignment = Alignment.CenterVertically,
-                                        modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp)
+                                        modifier = Modifier.padding(top = Size5dp, bottom = Size5dp, start = Size10dp)
                                     ) {
-                                        FowardZapTo(postViewModel)
+                                        FowardZapTo(postViewModel, accountViewModel)
                                     }
                                 }
 
@@ -333,8 +339,8 @@ fun NewPostView(
                                         ImageVideoDescription(
                                             url,
                                             account.defaultFileServer,
-                                            onAdd = { description, server, sensitiveContent ->
-                                                postViewModel.upload(url, description, sensitiveContent, server, context, relayList)
+                                            onAdd = { alt, server, sensitiveContent ->
+                                                postViewModel.upload(url, alt, sensitiveContent, server, context, relayList)
                                                 account.changeDefaultFileServer(server)
                                             },
                                             onCancel = {
@@ -721,7 +727,7 @@ fun SendDirectMessageTo(postViewModel: NewPostViewModel) {
 }
 
 @Composable
-fun FowardZapTo(postViewModel: NewPostViewModel) {
+fun FowardZapTo(postViewModel: NewPostViewModel, accountViewModel: AccountViewModel) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -755,7 +761,7 @@ fun FowardZapTo(postViewModel: NewPostViewModel) {
             }
 
             Text(
-                text = stringResource(R.string.zap_forward_title),
+                text = stringResource(R.string.zap_split_title),
                 fontSize = 20.sp,
                 fontWeight = FontWeight.W500,
                 modifier = Modifier.padding(start = 10.dp)
@@ -765,22 +771,52 @@ fun FowardZapTo(postViewModel: NewPostViewModel) {
         Divider()
 
         Text(
-            text = stringResource(R.string.zap_forward_explainer),
+            text = stringResource(R.string.zap_split_explainer),
             color = MaterialTheme.colors.placeholderText,
             modifier = Modifier.padding(vertical = 10.dp)
         )
 
+        postViewModel.forwardZapTo.items.forEachIndexed { index, splitItem ->
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size10dp)) {
+                BaseUserPicture(splitItem.key, Size55dp, accountViewModel = accountViewModel)
+
+                Spacer(modifier = DoubleHorzSpacer)
+
+                Column(modifier = Modifier.weight(1f)) {
+                    UsernameDisplay(splitItem.key, showPlayButton = false)
+                    Text(
+                        text = String.format("%.0f%%", splitItem.percentage * 100),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 18.sp
+                    )
+                }
+
+                Spacer(modifier = DoubleHorzSpacer)
+
+                Slider(
+                    value = splitItem.percentage,
+                    onValueChange = { sliderValue ->
+                        val rounded = (round(sliderValue * 20)) / 20.0f
+                        postViewModel.updateZapPercentage(index, rounded)
+                    },
+                    modifier = Modifier
+                        .weight(1.5f)
+                )
+            }
+        }
+
         OutlinedTextField(
             value = postViewModel.forwardZapToEditting,
             onValueChange = {
                 postViewModel.updateZapForwardTo(it)
             },
-
-            label = { Text(text = stringResource(R.string.zap_forward_lnAddress)) },
+            label = { Text(text = stringResource(R.string.zap_split_serarch_and_add_user)) },
             modifier = Modifier.fillMaxWidth(),
             placeholder = {
                 Text(
-                    text = stringResource(R.string.zap_forward_lnAddress),
+                    text = stringResource(R.string.zap_split_serarch_and_add_user_placeholder),
                     color = MaterialTheme.colors.placeholderText
                 )
             },
@@ -1284,8 +1320,7 @@ fun ImageVideoDescription(
         Triple(ServersAvailable.NIP95, stringResource(id = R.string.upload_server_relays_nip95), stringResource(id = R.string.upload_server_relays_nip95_explainer))
     )
 
-    val fileServerOptions = remember { fileServers.map { it.second }.toImmutableList() }
-    val fileServerExplainers = remember { fileServers.map { it.third }.toImmutableList() }
+    val fileServerOptions = remember { fileServers.map { TitleExplainer(it.second, it.third) }.toImmutableList() }
 
     var selectedServer by remember { mutableStateOf(defaultServer) }
     var message by remember { mutableStateOf("") }
@@ -1399,7 +1434,6 @@ fun ImageVideoDescription(
                     label = stringResource(id = R.string.file_server),
                     placeholder = fileServers.filter { it.first == defaultServer }.firstOrNull()?.second ?: fileServers[0].second,
                     options = fileServerOptions,
-                    explainers = fileServerExplainers,
                     onSelect = {
                         selectedServer = fileServers[it].first
                     },

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

@@ -21,7 +21,9 @@ import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.noProtocolUrlValidator
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.MediaCompressor
+import com.vitorpamplona.amethyst.ui.components.Split
 import com.vitorpamplona.amethyst.ui.components.isValidURL
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.quartz.encoders.HexKey
 import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.BaseTextNoteEvent
@@ -29,6 +31,7 @@ import com.vitorpamplona.quartz.events.ChatMessageEvent
 import com.vitorpamplona.quartz.events.CommunityDefinitionEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
+import com.vitorpamplona.quartz.events.ZapSplitSetup
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -43,6 +46,7 @@ enum class UserSuggestionAnchor {
 
 @Stable
 open class NewPostViewModel() : ViewModel() {
+    var accountViewModel: AccountViewModel? = null
     var account: Account? = null
     var requiresNIP24: Boolean = false
 
@@ -88,9 +92,13 @@ open class NewPostViewModel() : ViewModel() {
     var canAddInvoice by mutableStateOf(false)
     var wantsInvoice by mutableStateOf(false)
 
+    data class ForwardZapSetup(val user: User) {
+        var percentage by mutableStateOf(100)
+    }
+
     // Forward Zap to
     var wantsForwardZapTo by mutableStateOf(false)
-    var forwardZapTo by mutableStateOf<User?>(null)
+    var forwardZapTo by mutableStateOf<Split<User>>(Split())
     var forwardZapToEditting by mutableStateOf(TextFieldValue(""))
 
     // NSFW, Sensitive
@@ -109,7 +117,7 @@ open class NewPostViewModel() : ViewModel() {
     // NIP24 Wrapped DMs / Group messages
     var nip24 by mutableStateOf(false)
 
-    open fun load(account: Account, replyingTo: Note?, quote: Note?) {
+    open fun load(accountViewModel: AccountViewModel, replyingTo: Note?, quote: Note?) {
         originalNote = replyingTo
         replyingTo?.let { replyNote ->
             if (replyNote.event is BaseTextNoteEvent) {
@@ -141,8 +149,8 @@ open class NewPostViewModel() : ViewModel() {
             urlPreview = findUrlInMessage()
         }
 
-        canAddInvoice = account.userProfile().info?.lnAddress() != null
-        canAddZapRaiser = account.userProfile().info?.lnAddress() != null
+        canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
+        canAddZapRaiser = accountViewModel.userProfile().info?.lnAddress() != null
         canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
         contentToAddUrl = null
 
@@ -151,25 +159,40 @@ open class NewPostViewModel() : ViewModel() {
         wantsToAddGeoHash = false
         wantsZapraiser = false
         zapRaiserAmount = null
-        forwardZapTo = null
+        forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
-        this.account = account
+        this.accountViewModel = accountViewModel
+        this.account = accountViewModel.account
     }
 
     fun sendPost(relayList: List<Relay>? = null) {
-        val tagger = NewMessageTagger(message.text, mentions, replyTos, originalNote?.channelHex())
+        viewModelScope.launch(Dispatchers.IO) {
+            innerSendPost(relayList)
+        }
+    }
+
+    suspend fun innerSendPost(relayList: List<Relay>? = null) {
+        if (accountViewModel == null) {
+            cancel()
+            return
+        }
+
+        val tagger = NewMessageTagger(message.text, mentions, replyTos, originalNote?.channelHex(), accountViewModel!!)
         tagger.run()
 
-        val toUsersTagger = NewMessageTagger(toUsers.text, null, null, null)
+        val toUsersTagger = NewMessageTagger(toUsers.text, null, null, null, accountViewModel!!)
         toUsersTagger.run()
         val dmUsers = toUsersTagger.mentions
 
         val zapReceiver = if (wantsForwardZapTo) {
-            if (forwardZapTo != null) {
-                forwardZapTo?.info?.lud16 ?: forwardZapTo?.info?.lud06
-            } else {
-                forwardZapToEditting.text
+            forwardZapTo?.items?.map {
+                ZapSplitSetup(
+                    lnAddressOrPubKeyHex = it.key.pubkeyHex,
+                    relay = it.key.relaysBeingUsed.keys.firstOrNull(),
+                    weight = it.percentage.toDouble(),
+                    isLnAddress = false
+                )
             }
         } else {
             null
@@ -276,7 +299,7 @@ open class NewPostViewModel() : ViewModel() {
         cancel()
     }
 
-    fun upload(galleryUri: Uri, description: String, sensitiveContent: Boolean, server: ServersAvailable, context: Context, relayList: List<Relay>? = null) {
+    fun upload(galleryUri: Uri, alt: String, sensitiveContent: Boolean, server: ServersAvailable, context: Context, relayList: List<Relay>? = null) {
         isUploadingImage = true
         contentToAddUrl = null
 
@@ -291,7 +314,7 @@ open class NewPostViewModel() : ViewModel() {
                 onReady = { fileUri, contentType, size ->
                     if (server == ServersAvailable.NIP95) {
                         contentResolver.openInputStream(fileUri)?.use {
-                            createNIP95Record(it.readBytes(), contentType, description, sensitiveContent, relayList = relayList)
+                            createNIP95Record(it.readBytes(), contentType, alt, sensitiveContent, relayList = relayList)
                         }
                     } else {
                         ImageUploader.uploadImage(
@@ -302,7 +325,7 @@ open class NewPostViewModel() : ViewModel() {
                             contentResolver = contentResolver,
                             onSuccess = { imageUrl, mimeType ->
                                 if (isNIP94Server(server)) {
-                                    createNIP94Record(imageUrl, mimeType, description, sensitiveContent)
+                                    createNIP94Record(imageUrl, mimeType, alt, sensitiveContent)
                                 } else {
                                     isUploadingImage = false
                                     message = TextFieldValue(message.text + "\n\n" + imageUrl)
@@ -355,7 +378,7 @@ open class NewPostViewModel() : ViewModel() {
         wantsForwardZapTo = false
         wantsToMarkAsSensitive = false
         wantsToAddGeoHash = false
-        forwardZapTo = null
+        forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
         userSuggestions = emptyList()
@@ -427,10 +450,10 @@ open class NewPostViewModel() : ViewModel() {
     open fun updateZapForwardTo(it: TextFieldValue) {
         forwardZapToEditting = it
         if (it.selection.collapsed) {
-            val lastWord = it.text.substring(0, it.selection.end).substringAfterLast("\n").substringAfterLast(" ")
+            val lastWord = it.text
             userSuggestionAnchor = it.selection
             userSuggestionsMainMessage = UserSuggestionAnchor.FORWARD_ZAPS
-            if (lastWord.startsWith("@") && lastWord.length > 2) {
+            if (lastWord.length > 2) {
                 NostrSearchEventOrUserDataSource.search(lastWord.removePrefix("@"))
                 viewModelScope.launch(Dispatchers.IO) {
                     userSuggestions = LocalCache.findUsersStartingWith(lastWord.removePrefix("@"))
@@ -460,6 +483,9 @@ open class NewPostViewModel() : ViewModel() {
                     TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
                 )
             } else if (userSuggestionsMainMessage == UserSuggestionAnchor.FORWARD_ZAPS) {
+                forwardZapTo?.addItem(item)
+                forwardZapToEditting = TextFieldValue("")
+                /*
                 val lastWord = forwardZapToEditting.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
                 val lastWordStart = it.end - lastWord.length
                 val wordToInsert = "@${item.pubkeyNpub()}"
@@ -468,7 +494,7 @@ open class NewPostViewModel() : ViewModel() {
                 forwardZapToEditting = TextFieldValue(
                     forwardZapToEditting.text.replaceRange(lastWordStart, it.end, wordToInsert),
                     TextRange(lastWordStart + wordToInsert.length, lastWordStart + wordToInsert.length)
-                )
+                )*/
             } else if (userSuggestionsMainMessage == UserSuggestionAnchor.TO_USERS) {
                 val lastWord = toUsers.text.substring(0, it.end).substringAfterLast("\n").substringAfterLast(" ")
                 val lastWordStart = it.end - lastWord.length
@@ -511,13 +537,13 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
+    fun createNIP94Record(imageUrl: String, mimeType: String?, alt: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             // Images don't seem to be ready immediately after upload
             FileHeader.prepare(
                 imageUrl,
                 mimeType,
-                description,
+                alt,
                 sensitiveContent,
                 onReady = {
                     val note = account?.sendHeader(it, relayList = relayList)
@@ -542,13 +568,13 @@ open class NewPostViewModel() : ViewModel() {
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, alt: String, sensitiveContent: Boolean, relayList: List<Relay>? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             FileHeader.prepare(
                 bytes,
                 "",
                 mimeType,
-                description,
+                alt,
                 sensitiveContent,
                 onReady = {
                     val nip95 = account?.createNip95(bytes, headerInfo = it)
@@ -656,6 +682,10 @@ open class NewPostViewModel() : ViewModel() {
             isValidvalueMaximum.value = true
         }
     }
+
+    fun updateZapPercentage(index: Int, sliderValue: Float) {
+        forwardZapTo?.updatePercentage(index, sliderValue)
+    }
 }
 
 enum class GeohashPrecision(val digits: Int) {

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

@@ -17,6 +17,7 @@ import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -37,6 +38,7 @@ import kotlinx.coroutines.withContext
 fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     val postViewModel: NewUserMetadataViewModel = viewModel()
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         postViewModel.load(account)
@@ -82,7 +84,9 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
                 }
 
                 Column(
-                    modifier = Modifier.padding(10.dp).verticalScroll(rememberScrollState())
+                    modifier = Modifier
+                        .padding(10.dp)
+                        .verticalScroll(rememberScrollState())
                 ) {
                     Row(
                         modifier = Modifier.fillMaxWidth(1f),

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

@@ -124,7 +124,6 @@ class NewUserMetadataViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             account.sendNewUserMetadata(writer.buffer.toString(), newClaims)
         }
-
         clear()
     }
 
@@ -183,23 +182,25 @@ class NewUserMetadataViewModel : ViewModel() {
             contentResolver.getType(galleryUri),
             context.applicationContext,
             onReady = { fileUri, contentType, size ->
-                ImageUploader.uploadImage(
-                    uri = fileUri,
-                    contentType = contentType,
-                    size = size,
-                    server = account.defaultFileServer,
-                    contentResolver = contentResolver,
-                    onSuccess = { imageUrl, mimeType ->
-                        onUploading(false)
-                        onUploaded(imageUrl)
-                    },
-                    onError = {
-                        onUploading(false)
-                        viewModelScope.launch {
-                            imageUploadingError.emit("Failed to upload the image / video")
+                viewModelScope.launch(Dispatchers.IO) {
+                    ImageUploader.uploadImage(
+                        uri = fileUri,
+                        contentType = contentType,
+                        size = size,
+                        server = account.defaultFileServer,
+                        contentResolver = contentResolver,
+                        onSuccess = { imageUrl, mimeType ->
+                            onUploading(false)
+                            onUploaded(imageUrl)
+                        },
+                        onError = {
+                            onUploading(false)
+                            viewModelScope.launch {
+                                imageUploadingError.emit("Failed to upload the image / video")
+                            }
                         }
-                    }
-                )
+                    )
+                }
             },
             onError = {
                 onUploading(false)

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

@@ -248,7 +248,7 @@ private fun DisplayOwnerInformation(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadUser(baseUserHex = userHex) {
+    LoadUser(baseUserHex = userHex, accountViewModel) {
         Crossfade(it) {
             if (it != null) {
                 UserCompose(baseUser = it, accountViewModel = accountViewModel, showDiviser = false, nav = nav)

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

@@ -24,7 +24,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 
 @Composable
 fun NewCommunityNoteButton(communityIdHex: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    LoadNote(baseNoteHex = communityIdHex) {
+    LoadNote(baseNoteHex = communityIdHex, accountViewModel) {
         it?.let {
             NewCommunityNoteButton(it, accountViewModel, nav)
         }

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

@@ -40,12 +40,12 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NIP30Parser
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.quartz.encoders.Nip19
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
@@ -61,20 +61,21 @@ import kotlinx.coroutines.launch
 @Composable
 fun ClickableRoute(
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     when (nip19.type) {
         Nip19.Type.USER -> {
-            DisplayUser(nip19, nav)
+            DisplayUser(nip19, accountViewModel, nav)
         }
         Nip19.Type.ADDRESS -> {
-            DisplayAddress(nip19, nav)
+            DisplayAddress(nip19, accountViewModel, nav)
         }
         Nip19.Type.NOTE -> {
-            DisplayNote(nip19, nav)
+            DisplayNote(nip19, accountViewModel, nav)
         }
         Nip19.Type.EVENT -> {
-            DisplayEvent(nip19, nav)
+            DisplayEvent(nip19, accountViewModel, nav)
         }
         else -> {
             Text(
@@ -86,34 +87,15 @@ fun ClickableRoute(
     }
 }
 
-@Composable
-private fun LoadNote(
-    hex: String,
-    content: @Composable (Note) -> Unit
-) {
-    var noteBase by remember(hex) { mutableStateOf(LocalCache.getNoteIfExists(hex)) }
-
-    if (noteBase == null) {
-        LaunchedEffect(key1 = hex) {
-            launch(Dispatchers.IO) {
-                noteBase = LocalCache.checkGetOrCreateNote(hex)
-            }
-        }
-    }
-
-    noteBase?.let {
-        content(it)
-    }
-}
-
 @Composable
 private fun DisplayEvent(
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadNote(nip19.hex) {
+    LoadNote(nip19.hex, accountViewModel) {
         if (it != null) {
-            DisplayNoteLink(it, nip19, nav)
+            DisplayNoteLink(it, nip19, accountViewModel, nav)
         } else {
             CreateClickableText(
                 clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
@@ -128,11 +110,12 @@ private fun DisplayEvent(
 @Composable
 private fun DisplayNote(
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadNote(nip19.hex) {
+    LoadNote(nip19.hex, accountViewModel = accountViewModel) {
         if (it != null) {
-            DisplayNoteLink(it, nip19, nav)
+            DisplayNoteLink(it, nip19, accountViewModel, nav)
         } else {
             CreateClickableText(
                 clickablePart = remember(nip19) { "@${nip19.hex.toShortenHex()}" },
@@ -148,6 +131,7 @@ private fun DisplayNote(
 private fun DisplayNoteLink(
     it: Note,
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     val noteState by it.live().metadata.observeAsState()
@@ -177,7 +161,7 @@ private fun DisplayNoteLink(
             nav = nav
         )
     } else if (channelHex != null) {
-        LoadChannel(baseChannelHex = channelHex) { baseChannel ->
+        LoadChannel(baseChannelHex = channelHex, accountViewModel) { baseChannel ->
             val channelState by baseChannel.live.observeAsState()
             val channelDisplayName by remember(channelState) {
                 derivedStateOf {
@@ -205,14 +189,15 @@ private fun DisplayNoteLink(
 @Composable
 private fun DisplayAddress(
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    var noteBase by remember(nip19) { mutableStateOf(LocalCache.getNoteIfExists(nip19.hex)) }
+    var noteBase by remember(nip19) { mutableStateOf(accountViewModel.getNoteIfExists(nip19.hex)) }
 
     if (noteBase == null) {
         LaunchedEffect(key1 = nip19.hex) {
-            launch(Dispatchers.IO) {
-                noteBase = LocalCache.checkGetOrCreateAddressableNote(nip19.hex)
+            accountViewModel.checkGetOrCreateAddressableNote(nip19.hex) {
+                noteBase = it
             }
         }
     }
@@ -244,14 +229,19 @@ private fun DisplayAddress(
 @Composable
 private fun DisplayUser(
     nip19: Nip19.Return,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    var userBase by remember(nip19) { mutableStateOf(LocalCache.getUserIfExists(nip19.hex)) }
+    var userBase by remember(nip19) {
+        mutableStateOf(
+            accountViewModel.getUserIfExists(nip19.hex)
+        )
+    }
 
     if (userBase == null) {
         LaunchedEffect(key1 = nip19.hex) {
-            launch(Dispatchers.IO) {
-                userBase = LocalCache.checkGetOrCreateUser(nip19.hex)
+            accountViewModel.checkGetOrCreateUser(nip19.hex) {
+                userBase = it
             }
         }
     }
@@ -687,7 +677,7 @@ fun InLineIconRenderer(
                         contentDescription = null,
                         modifier = Modifier
                             .fillMaxSize()
-                            .padding(horizontal = 1.dp)
+                            .padding(horizontal = 0.dp)
                     )
                 }
             )

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

@@ -31,6 +31,7 @@ import com.vitorpamplona.amethyst.ui.theme.secondaryButtonBackground
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 const val SHORT_TEXT_LENGTH = 350
+const val SHORTEN_AFTER_LINES = 10
 
 @Composable
 fun ExpandableRichTextViewer(
@@ -45,11 +46,25 @@ fun ExpandableRichTextViewer(
     var showFullText by remember { mutableStateOf(false) }
 
     val whereToCut = remember(content) {
-        // Cuts the text in the first space after 350
+        // Cuts the text in the first space or new line after SHORT_TEXT_LENGTH characters
         val firstSpaceAfterCut = content.indexOf(' ', SHORT_TEXT_LENGTH).let { if (it < 0) content.length else it }
         val firstNewLineAfterCut = content.indexOf('\n', SHORT_TEXT_LENGTH).let { if (it < 0) content.length else it }
 
-        minOf(firstSpaceAfterCut, firstNewLineAfterCut)
+        // or after SHORTEN_AFTER_LINES lines
+        val numberOfLines = content.count { it == '\n' }
+
+        var charactersInLines = minOf(firstSpaceAfterCut, firstNewLineAfterCut)
+
+        if (numberOfLines > SHORTEN_AFTER_LINES) {
+            val shortContent = content.lines().take(SHORTEN_AFTER_LINES)
+            charactersInLines = 0
+            for (line in shortContent) {
+                // +1 because new line character is omitted from .lines
+                charactersInLines += (line.length + 1)
+            }
+        }
+
+        minOf(firstSpaceAfterCut, firstNewLineAfterCut, charactersInLines)
     }
 
     val text by remember(content) {

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

@@ -0,0 +1,154 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import android.util.Log
+import android.util.Patterns
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.startsWithNIP19Scheme
+import com.vitorpamplona.quartz.encoders.Nip19
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
+
+class MarkdownParser {
+    private fun getDisplayNameAndNIP19FromTag(tag: String, tags: ImmutableListOfLists<String>): Pair<String, String>? {
+        val matcher = tagIndex.matcher(tag)
+        val (index, suffix) = try {
+            matcher.find()
+            Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
+        } catch (e: Exception) {
+            Log.w("Tag Parser", "Couldn't link tag $tag", e)
+            Pair(null, null)
+        }
+
+        if (index != null && index >= 0 && index < tags.lists.size) {
+            val tag = tags.lists[index]
+
+            if (tag.size > 1) {
+                if (tag[0] == "p") {
+                    LocalCache.checkGetOrCreateUser(tag[1])?.let {
+                        return Pair(it.toBestDisplayName(), it.pubkeyNpub())
+                    }
+                } else if (tag[0] == "e" || tag[0] == "a") {
+                    LocalCache.checkGetOrCreateNote(tag[1])?.let {
+                        return Pair(it.idDisplayNote(), it.toNEvent())
+                    }
+                }
+            }
+        }
+
+        return null
+    }
+
+    private fun getDisplayNameFromNip19(nip19: Nip19.Return): Pair<String, String>? {
+        if (nip19.type == Nip19.Type.USER) {
+            LocalCache.users[nip19.hex]?.let {
+                return Pair(it.toBestDisplayName(), it.pubkeyNpub())
+            }
+        } else if (nip19.type == Nip19.Type.NOTE) {
+            LocalCache.notes[nip19.hex]?.let {
+                return Pair(it.idDisplayNote(), it.toNEvent())
+            }
+        } else if (nip19.type == Nip19.Type.ADDRESS) {
+            LocalCache.addressables[nip19.hex]?.let {
+                return Pair(it.idDisplayNote(), it.toNEvent())
+            }
+        } else if (nip19.type == Nip19.Type.EVENT) {
+            LocalCache.notes[nip19.hex]?.let {
+                return Pair(it.idDisplayNote(), it.toNEvent())
+            }
+        }
+
+        return null
+    }
+
+    fun returnNIP19References(content: String, tags: ImmutableListOfLists<String>?): List<Nip19.Return> {
+        checkNotInMainThread()
+
+        val listOfReferences = mutableListOf<Nip19.Return>()
+        content.split('\n').forEach { paragraph ->
+            paragraph.split(' ').forEach { word: String ->
+                if (startsWithNIP19Scheme(word)) {
+                    val parsedNip19 = Nip19.uriToRoute(word)
+                    parsedNip19?.let {
+                        listOfReferences.add(it)
+                    }
+                }
+            }
+        }
+
+        tags?.lists?.forEach {
+            if (it[0] == "p" && it.size > 1) {
+                listOfReferences.add(Nip19.Return(Nip19.Type.USER, it[1], null, null, null, ""))
+            } else if (it[0] == "e" && it.size > 1) {
+                listOfReferences.add(Nip19.Return(Nip19.Type.NOTE, it[1], null, null, null, ""))
+            } else if (it[0] == "a" && it.size > 1) {
+                listOfReferences.add(Nip19.Return(Nip19.Type.ADDRESS, it[1], null, null, null, ""))
+            }
+        }
+
+        return listOfReferences
+    }
+
+    fun returnMarkdownWithSpecialContent(content: String, tags: ImmutableListOfLists<String>?): String {
+        var returnContent = ""
+        content.split('\n').forEach { paragraph ->
+            paragraph.split(' ').forEach { word: String ->
+                if (isValidURL(word)) {
+                    val removedParamsFromUrl = word.split("?")[0].lowercase()
+                    if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
+                        returnContent += "![]($word) "
+                    } else {
+                        returnContent += "[$word]($word) "
+                    }
+                } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
+                    returnContent += "[$word](mailto:$word) "
+                } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
+                    returnContent += "[$word](tel:$word) "
+                } else if (startsWithNIP19Scheme(word)) {
+                    val parsedNip19 = Nip19.uriToRoute(word)
+                    returnContent += if (parsedNip19 !== null) {
+                        val pair = getDisplayNameFromNip19(parsedNip19)
+                        if (pair != null) {
+                            val (displayName, nip19) = pair
+                            "[$displayName](nostr:$nip19) "
+                        } else {
+                            "$word "
+                        }
+                    } else {
+                        "$word "
+                    }
+                } else if (word.startsWith("#")) {
+                    if (tagIndex.matcher(word).matches() && tags != null) {
+                        val pair = getDisplayNameAndNIP19FromTag(word, tags)
+                        if (pair != null) {
+                            returnContent += "[${pair.first}](nostr:${pair.second}) "
+                        } else {
+                            returnContent += "$word "
+                        }
+                    } else if (hashTagsPattern.matcher(word).matches()) {
+                        val hashtagMatcher = hashTagsPattern.matcher(word)
+
+                        val (myTag, mySuffix) = try {
+                            hashtagMatcher.find()
+                            Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
+                        } catch (e: Exception) {
+                            Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
+                            Pair(null, null)
+                        }
+
+                        if (myTag != null) {
+                            returnContent += "[#$myTag](nostr:Hashtag?id=$myTag)$mySuffix "
+                        } else {
+                            returnContent += "$word "
+                        }
+                    } else {
+                        returnContent += "$word "
+                    }
+                } else {
+                    returnContent += "$word "
+                }
+            }
+            returnContent += "\n"
+        }
+        return returnContent
+    }
+}

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

@@ -1,7 +1,5 @@
 package com.vitorpamplona.amethyst.ui.components
 
-import android.util.Log
-import android.util.Patterns
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.BasicText
@@ -113,7 +111,7 @@ fun RichTextViewer(
 ) {
     Column(modifier = modifier) {
         if (remember(content) { isMarkdown(content) }) {
-            RenderContentAsMarkdown(content, tags, nav)
+            RenderContentAsMarkdown(content, tags, accountViewModel, nav)
         } else {
             RenderRegular(content, tags, canPreview, backgroundColor, accountViewModel, nav)
         }
@@ -243,7 +241,7 @@ private fun RenderWordWithoutPreview(
         is PhoneSegment -> ClickablePhone(word.segmentText)
         is BechSegment -> BechLink(word.segmentText, false, backgroundColor, accountViewModel, nav)
         is HashTagSegment -> HashTag(word, nav)
-        is HashIndexUserSegment -> TagLink(word, nav)
+        is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
         is HashIndexEventSegment -> TagLink(word, false, backgroundColor, accountViewModel, nav)
         is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
         is RegularTextSegment -> NormalWord(word.segmentText, style)
@@ -270,7 +268,7 @@ private fun RenderWordWithPreview(
         is PhoneSegment -> ClickablePhone(word.segmentText)
         is BechSegment -> BechLink(word.segmentText, true, backgroundColor, accountViewModel, nav)
         is HashTagSegment -> HashTag(word, nav)
-        is HashIndexUserSegment -> TagLink(word, nav)
+        is HashIndexUserSegment -> TagLink(word, accountViewModel, nav)
         is HashIndexEventSegment -> TagLink(word, true, backgroundColor, accountViewModel, nav)
         is SchemelessUrlSegment -> NoProtocolUrlRenderer(word)
         is RegularTextSegment -> NormalWord(word.segmentText, style)
@@ -320,7 +318,7 @@ fun RenderCustomEmoji(word: String, state: RichTextViewerState) {
 }
 
 @Composable
-private fun RenderContentAsMarkdown(content: String, tags: ImmutableListOfLists<String>?, nav: (String) -> Unit) {
+private fun RenderContentAsMarkdown(content: String, tags: ImmutableListOfLists<String>?, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val uri = LocalUriHandler.current
     val onClick = remember {
         { link: String ->
@@ -338,7 +336,7 @@ private fun RenderContentAsMarkdown(content: String, tags: ImmutableListOfLists<
         MaterialRichText(
             style = MaterialTheme.colors.markdownStyle
         ) {
-            RefreshableContent(content, tags) {
+            RefreshableContent(content, tags, accountViewModel) {
                 Markdown(
                     content = it,
                     markdownParseOptions = MarkdownParseOptions.Default,
@@ -350,13 +348,14 @@ private fun RenderContentAsMarkdown(content: String, tags: ImmutableListOfLists<
 }
 
 @Composable
-private fun RefreshableContent(content: String, tags: ImmutableListOfLists<String>?, onCompose: @Composable (String) -> Unit) {
+private fun RefreshableContent(content: String, tags: ImmutableListOfLists<String>?, accountViewModel: AccountViewModel, onCompose: @Composable (String) -> Unit) {
     var markdownWithSpecialContent by remember(content) { mutableStateOf<String?>(content) }
 
-    ObserverAllNIP19References(content, tags) {
-        val newMarkdownWithSpecialContent = returnMarkdownWithSpecialContent(content, tags)
-        if (markdownWithSpecialContent != newMarkdownWithSpecialContent) {
-            markdownWithSpecialContent = newMarkdownWithSpecialContent
+    ObserverAllNIP19References(content, tags, accountViewModel) {
+        accountViewModel.returnMarkdownWithSpecialContent(content, tags) { newMarkdownWithSpecialContent ->
+            if (markdownWithSpecialContent != newMarkdownWithSpecialContent) {
+                markdownWithSpecialContent = newMarkdownWithSpecialContent
+            }
         }
     }
 
@@ -366,47 +365,47 @@ private fun RefreshableContent(content: String, tags: ImmutableListOfLists<Strin
 }
 
 @Composable
-fun ObserverAllNIP19References(content: String, tags: ImmutableListOfLists<String>?, onRefresh: () -> Unit) {
+fun ObserverAllNIP19References(content: String, tags: ImmutableListOfLists<String>?, accountViewModel: AccountViewModel, onRefresh: () -> Unit) {
     var nip19References by remember(content) { mutableStateOf<List<Nip19.Return>>(emptyList()) }
 
     LaunchedEffect(key1 = content) {
-        launch(Dispatchers.IO) {
-            nip19References = returnNIP19References(content, tags)
+        accountViewModel.returnNIP19References(content, tags) {
+            nip19References = it
             onRefresh()
         }
     }
 
     nip19References.forEach {
-        ObserveNIP19(it, onRefresh)
+        ObserveNIP19(it, accountViewModel, onRefresh)
     }
 }
 
 @Composable
 fun ObserveNIP19(
     it: Nip19.Return,
+    accountViewModel: AccountViewModel,
     onRefresh: () -> Unit
 ) {
     if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
-        ObserveNIP19Event(it, onRefresh)
+        ObserveNIP19Event(it, accountViewModel, onRefresh)
     } else if (it.type == Nip19.Type.USER) {
-        ObserveNIP19User(it, onRefresh)
+        ObserveNIP19User(it, accountViewModel, onRefresh)
     }
 }
 
 @Composable
 private fun ObserveNIP19Event(
     it: Nip19.Return,
+    accountViewModel: AccountViewModel,
     onRefresh: () -> Unit
 ) {
-    var baseNote by remember(it) { mutableStateOf<Note?>(LocalCache.getNoteIfExists(it.hex)) }
+    var baseNote by remember(it) { mutableStateOf<Note?>(accountViewModel.getNoteIfExists(it.hex)) }
 
     if (baseNote == null) {
         LaunchedEffect(key1 = it.hex) {
-            launch(Dispatchers.IO) {
-                if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
-                    LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
-                        launch(Dispatchers.Main) { baseNote = note }
-                    }
+            if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
+                accountViewModel.checkGetOrCreateNote(it.hex)?.let { note ->
+                    launch(Dispatchers.Main) { baseNote = note }
                 }
             }
         }
@@ -423,9 +422,7 @@ fun ObserveNote(note: Note, onRefresh: () -> Unit) {
 
     LaunchedEffect(key1 = loadedNoteId) {
         if (loadedNoteId != null) {
-            launch(Dispatchers.IO) {
-                onRefresh()
-            }
+            onRefresh()
         }
     }
 }
@@ -433,17 +430,16 @@ fun ObserveNote(note: Note, onRefresh: () -> Unit) {
 @Composable
 private fun ObserveNIP19User(
     it: Nip19.Return,
+    accountViewModel: AccountViewModel,
     onRefresh: () -> Unit
 ) {
-    var baseUser by remember(it) { mutableStateOf<User?>(LocalCache.getUserIfExists(it.hex)) }
+    var baseUser by remember(it) { mutableStateOf<User?>(accountViewModel.getUserIfExists(it.hex)) }
 
     if (baseUser == null) {
         LaunchedEffect(key1 = it.hex) {
-            launch(Dispatchers.IO) {
-                if (it.type == Nip19.Type.USER) {
-                    LocalCache.checkGetOrCreateUser(it.hex)?.let { user ->
-                        launch(Dispatchers.Main) { baseUser = user }
-                    }
+            if (it.type == Nip19.Type.USER) {
+                accountViewModel.checkGetOrCreateUser(it.hex)?.let { user ->
+                    launch(Dispatchers.Main) { baseUser = user }
                 }
             }
         }
@@ -460,160 +456,11 @@ private fun ObserveUser(user: User, onRefresh: () -> Unit) {
 
     LaunchedEffect(key1 = loadedUserMetaId) {
         if (loadedUserMetaId != null) {
-            launch(Dispatchers.IO) {
-                onRefresh()
-            }
+            onRefresh()
         }
     }
 }
 
-private fun getDisplayNameAndNIP19FromTag(tag: String, tags: ImmutableListOfLists<String>): Pair<String, String>? {
-    val matcher = tagIndex.matcher(tag)
-    val (index, suffix) = try {
-        matcher.find()
-        Pair(matcher.group(1)?.toInt(), matcher.group(2) ?: "")
-    } catch (e: Exception) {
-        Log.w("Tag Parser", "Couldn't link tag $tag", e)
-        Pair(null, null)
-    }
-
-    if (index != null && index >= 0 && index < tags.lists.size) {
-        val tag = tags.lists[index]
-
-        if (tag.size > 1) {
-            if (tag[0] == "p") {
-                LocalCache.checkGetOrCreateUser(tag[1])?.let {
-                    return Pair(it.toBestDisplayName(), it.pubkeyNpub())
-                }
-            } else if (tag[0] == "e" || tag[0] == "a") {
-                LocalCache.checkGetOrCreateNote(tag[1])?.let {
-                    return Pair(it.idDisplayNote(), it.toNEvent())
-                }
-            }
-        }
-    }
-
-    return null
-}
-
-private fun getDisplayNameFromNip19(nip19: Nip19.Return): Pair<String, String>? {
-    if (nip19.type == Nip19.Type.USER) {
-        LocalCache.users[nip19.hex]?.let {
-            return Pair(it.toBestDisplayName(), it.pubkeyNpub())
-        }
-    } else if (nip19.type == Nip19.Type.NOTE) {
-        LocalCache.notes[nip19.hex]?.let {
-            return Pair(it.idDisplayNote(), it.toNEvent())
-        }
-    } else if (nip19.type == Nip19.Type.ADDRESS) {
-        LocalCache.addressables[nip19.hex]?.let {
-            return Pair(it.idDisplayNote(), it.toNEvent())
-        }
-    } else if (nip19.type == Nip19.Type.EVENT) {
-        LocalCache.notes[nip19.hex]?.let {
-            return Pair(it.idDisplayNote(), it.toNEvent())
-        }
-    }
-
-    return null
-}
-
-private fun returnNIP19References(content: String, tags: ImmutableListOfLists<String>?): List<Nip19.Return> {
-    val listOfReferences = mutableListOf<Nip19.Return>()
-    content.split('\n').forEach { paragraph ->
-        paragraph.split(' ').forEach { word: String ->
-            if (startsWithNIP19Scheme(word)) {
-                val parsedNip19 = Nip19.uriToRoute(word)
-                parsedNip19?.let {
-                    listOfReferences.add(it)
-                }
-            }
-        }
-    }
-
-    tags?.lists?.forEach {
-        if (it[0] == "p" && it.size > 1) {
-            listOfReferences.add(Nip19.Return(Nip19.Type.USER, it[1], null, null, null, ""))
-        } else if (it[0] == "e" && it.size > 1) {
-            listOfReferences.add(Nip19.Return(Nip19.Type.NOTE, it[1], null, null, null, ""))
-        } else if (it[0] == "a" && it.size > 1) {
-            listOfReferences.add(Nip19.Return(Nip19.Type.ADDRESS, it[1], null, null, null, ""))
-        }
-    }
-
-    return listOfReferences
-}
-
-private fun returnMarkdownWithSpecialContent(content: String, tags: ImmutableListOfLists<String>?): String {
-    var returnContent = ""
-    content.split('\n').forEach { paragraph ->
-        paragraph.split(' ').forEach { word: String ->
-            if (isValidURL(word)) {
-                val removedParamsFromUrl = word.split("?")[0].lowercase()
-                if (imageExtensions.any { removedParamsFromUrl.endsWith(it) }) {
-                    returnContent += "![]($word) "
-                } else {
-                    returnContent += "[$word]($word) "
-                }
-            } else if (Patterns.EMAIL_ADDRESS.matcher(word).matches()) {
-                returnContent += "[$word](mailto:$word) "
-            } else if (Patterns.PHONE.matcher(word).matches() && word.length > 6) {
-                returnContent += "[$word](tel:$word) "
-            } else if (startsWithNIP19Scheme(word)) {
-                val parsedNip19 = Nip19.uriToRoute(word)
-                returnContent += if (parsedNip19 !== null) {
-                    val pair = getDisplayNameFromNip19(parsedNip19)
-                    if (pair != null) {
-                        val (displayName, nip19) = pair
-                        "[$displayName](nostr:$nip19) "
-                    } else {
-                        "$word "
-                    }
-                } else {
-                    "$word "
-                }
-            } else if (word.startsWith("#")) {
-                if (tagIndex.matcher(word).matches() && tags != null) {
-                    val pair = getDisplayNameAndNIP19FromTag(word, tags)
-                    if (pair != null) {
-                        returnContent += "[${pair.first}](nostr:${pair.second}) "
-                    } else {
-                        returnContent += "$word "
-                    }
-                } else if (hashTagsPattern.matcher(word).matches()) {
-                    val hashtagMatcher = hashTagsPattern.matcher(word)
-
-                    val (myTag, mySuffix) = try {
-                        hashtagMatcher.find()
-                        Pair(hashtagMatcher.group(1), hashtagMatcher.group(2))
-                    } catch (e: Exception) {
-                        Log.e("Hashtag Parser", "Couldn't link hashtag $word", e)
-                        Pair(null, null)
-                    }
-
-                    if (myTag != null) {
-                        returnContent += "[#$myTag](nostr:Hashtag?id=$myTag)$mySuffix "
-                    } else {
-                        returnContent += "$word "
-                    }
-                } else {
-                    returnContent += "$word "
-                }
-            } else {
-                returnContent += "$word "
-            }
-        }
-        returnContent += "\n"
-    }
-    return returnContent
-}
-
-fun startsWithNIP19Scheme(word: String): Boolean {
-    val cleaned = word.lowercase().removePrefix("@").removePrefix("nostr:").removePrefix("@")
-
-    return listOf("npub1", "naddr1", "note1", "nprofile1", "nevent1").any { cleaned.startsWith(it) }
-}
-
 @Immutable
 data class LoadedBechLink(val baseNote: Note?, val nip19: Nip19.Return)
 
@@ -654,7 +501,7 @@ fun BechLink(word: String, canPreview: Boolean, backgroundColor: MutableState<Co
         }
     } else if (loadedLink?.nip19 != null) {
         Row() {
-            ClickableRoute(loadedLink?.nip19!!, nav)
+            ClickableRoute(loadedLink?.nip19!!, accountViewModel, nav)
         }
     } else {
         val text = remember {
@@ -763,8 +610,8 @@ private fun InlineIcon(hashtagIcon: HashtagIcon) =
     }
 
 @Composable
-fun TagLink(word: HashIndexUserSegment, nav: (String) -> Unit) {
-    LoadUser(baseUserHex = word.hex) {
+fun TagLink(word: HashIndexUserSegment, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    LoadUser(baseUserHex = word.hex, accountViewModel) {
         if (it == null) {
             Text(text = word.segmentText)
         } else {
@@ -776,15 +623,15 @@ fun TagLink(word: HashIndexUserSegment, nav: (String) -> Unit) {
 }
 
 @Composable
-fun LoadNote(baseNoteHex: String, content: @Composable (Note?) -> Unit) {
+fun LoadNote(baseNoteHex: String, accountViewModel: AccountViewModel, content: @Composable (Note?) -> Unit) {
     var note by remember(baseNoteHex) {
-        mutableStateOf<Note?>(LocalCache.getNoteIfExists(baseNoteHex))
+        mutableStateOf<Note?>(accountViewModel.getNoteIfExists(baseNoteHex))
     }
 
     if (note == null) {
         LaunchedEffect(key1 = baseNoteHex) {
-            launch(Dispatchers.IO) {
-                note = LocalCache.checkGetOrCreateNote(baseNoteHex)
+            accountViewModel.checkGetOrCreateNote(baseNoteHex) {
+                note = it
             }
         }
     }
@@ -794,7 +641,7 @@ fun LoadNote(baseNoteHex: String, content: @Composable (Note?) -> Unit) {
 
 @Composable
 fun TagLink(word: HashIndexEventSegment, canPreview: Boolean, backgroundColor: MutableState<Color>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    LoadNote(baseNoteHex = word.hex) {
+    LoadNote(baseNoteHex = word.hex, accountViewModel) {
         if (it == null) {
             Text(text = remember { word.segmentText.toShortenHex() })
         } else {

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

@@ -0,0 +1,99 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import kotlin.math.abs
+
+class SplitItem<T>(val key: T) {
+    var percentage by mutableStateOf(0f)
+}
+
+class Split<T>() {
+    var items: List<SplitItem<T>> by mutableStateOf(emptyList())
+
+    fun addItem(key: T): Int {
+        val wasEqualSplit = isEqualSplit()
+        val newItem = SplitItem(key)
+        items = items.plus(newItem)
+
+        if (wasEqualSplit) {
+            forceEqualSplit()
+        } else {
+            updatePercentage(items.lastIndex, equalSplit())
+        }
+
+        return items.lastIndex
+    }
+
+    fun equalSplit() = 1f / items.size
+
+    fun isEqualSplit(): Boolean {
+        val expectedPercentage = equalSplit()
+        return items.all { (it.percentage - expectedPercentage) < 0.01 }
+    }
+
+    fun forceEqualSplit() {
+        val correctPercentage = equalSplit()
+        items.forEach {
+            it.percentage = correctPercentage
+        }
+    }
+
+    fun updatePercentage(index: Int, percentage: Float) {
+        if (items.isEmpty()) return
+
+        val splitItem = items.getOrNull(index) ?: return
+
+        if (items.size == 1) {
+            splitItem.percentage = 1f
+        } else {
+            splitItem.percentage = percentage
+
+            println("Update ${items[index].key} to $percentage")
+
+            val othersMustShare = 1.0f - splitItem.percentage
+
+            val othersHave = items.sumOf {
+                if (it == splitItem) 0.0 else it.percentage.toDouble()
+            }.toFloat()
+
+            if (abs(othersHave - othersMustShare) < 0.01) return // nothing to do
+
+            println("Others Must Share $othersMustShare but have $othersHave")
+
+            bottomUpAdjustment(othersMustShare, othersHave, index)
+        }
+    }
+
+    private fun bottomUpAdjustment(othersMustShare: Float, othersHave: Float, exceptForIndex: Int) {
+        var needToRemove = othersHave - othersMustShare
+        if (needToRemove > 0) {
+            for (i in items.indices.reversed()) {
+                if (i == exceptForIndex) continue // do not update the current item
+
+                if (needToRemove < items[i].percentage) {
+                    val oldValue = items[i].percentage
+                    items[i].percentage -= needToRemove
+                    needToRemove = 0f
+                    println("- Updating ${items[i].key} from $oldValue to ${items[i].percentage - needToRemove}. $needToRemove left")
+                } else {
+                    val oldValue = items[i].percentage
+                    needToRemove -= items[i].percentage
+                    items[i].percentage = 0f
+                    println("- Updating ${items[i].key} from $oldValue to ${0}. $needToRemove left")
+                }
+
+                if (needToRemove < 0.01) {
+                    break
+                }
+            }
+        } else if (needToRemove < 0) {
+            if (items.lastIndex == exceptForIndex) {
+                items[items.lastIndex - 1].percentage += -needToRemove
+            } else {
+                items.last().percentage += -needToRemove
+            }
+        }
+    }
+}

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

@@ -20,6 +20,7 @@ import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -37,8 +38,7 @@ import kotlinx.collections.immutable.ImmutableList
 fun TextSpinner(
     label: String?,
     placeholder: String,
-    options: ImmutableList<String>,
-    explainers: ImmutableList<String>? = null,
+    options: ImmutableList<TitleExplainer>,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -74,8 +74,8 @@ fun TextSpinner(
 
     if (optionsShowing) {
         options.isNotEmpty().also {
-            SpinnerSelectionDialog(options = options, explainers = explainers, onDismiss = { optionsShowing = false }) {
-                currentText = options[it]
+            SpinnerSelectionDialog(options = options, onDismiss = { optionsShowing = false }) {
+                currentText = options[it].title
                 optionsShowing = false
                 onSelect(it)
             }
@@ -85,10 +85,40 @@ fun TextSpinner(
 
 @Composable
 fun SpinnerSelectionDialog(
-    options: ImmutableList<String>,
-    explainers: ImmutableList<String>?,
+    options: ImmutableList<TitleExplainer>,
     onDismiss: () -> Unit,
     onSelect: (Int) -> Unit
+) {
+    SpinnerSelectionDialog(
+        options = options,
+        onSelect = onSelect,
+        onDismiss = onDismiss
+    ) { item ->
+        Row(
+            horizontalArrangement = Arrangement.Center,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(text = item.title, color = MaterialTheme.colors.onSurface)
+        }
+        item.explainer?.let {
+            Spacer(modifier = Modifier.height(5.dp))
+            Row(
+                horizontalArrangement = Arrangement.Start,
+                modifier = Modifier
+                    .fillMaxWidth()
+            ) {
+                Text(text = it, color = Color.Gray, fontSize = Font14SP)
+            }
+        }
+    }
+}
+
+@Composable
+fun <T> SpinnerSelectionDialog(
+    options: ImmutableList<T>,
+    onSelect: (Int) -> Unit,
+    onDismiss: () -> Unit,
+    onRenderItem: @Composable (T) -> Unit
 ) {
     Dialog(onDismissRequest = onDismiss) {
         Surface(
@@ -106,23 +136,7 @@ fun SpinnerSelectionDialog(
                             }
                     ) {
                         Column() {
-                            Row(
-                                horizontalArrangement = Arrangement.Center,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                            ) {
-                                Text(text = item, color = MaterialTheme.colors.onSurface)
-                            }
-                            explainers?.getOrNull(index)?.let {
-                                Spacer(modifier = Modifier.height(5.dp))
-                                Row(
-                                    horizontalArrangement = Arrangement.Start,
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                ) {
-                                    Text(text = it, color = Color.Gray, fontSize = Font14SP)
-                                }
-                            }
+                            onRenderItem(item)
                         }
                     }
                     if (index < options.lastIndex) {
@@ -133,3 +147,6 @@ fun SpinnerSelectionDialog(
         }
     }
 }
+
+@Immutable
+data class TitleExplainer(val title: String, val explainer: String? = null)

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

@@ -0,0 +1,11 @@
+package com.vitorpamplona.amethyst.ui.components
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class TranslationConfig(
+    val result: String?,
+    val sourceLang: String?,
+    val targetLang: String?,
+    val showOriginal: Boolean
+)

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

@@ -62,7 +62,7 @@ fun UrlPreviewCard(
                     style = MaterialTheme.typography.caption,
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(start = 10.dp, end = 10.dp, top = 10.dp),
+                        .padding(start = 10.dp, end = 10.dp, top = 5.dp),
                     color = Color.Gray,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis

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

@@ -29,9 +29,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 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
@@ -205,34 +205,34 @@ fun VideoViewInner(
         )
     }
 
+    val mediaItem = remember(videoUri) {
+        MediaItem.Builder()
+            .setMediaId(videoUri)
+            .setUri(videoUri)
+            .setMediaMetadata(
+                MediaMetadata.Builder()
+                    .setArtist(authorName?.ifBlank { null })
+                    .setTitle(title?.ifBlank { null } ?: videoUri)
+                    .setArtworkUri(
+                        try {
+                            if (artworkUri != null) {
+                                Uri.parse(artworkUri)
+                            } else {
+                                null
+                            }
+                        } catch (e: Exception) {
+                            null
+                        }
+                    )
+                    .build()
+            )
+            .build()
+    }
+
     if (!automaticallyStartPlayback.value) {
         ImageUrlWithDownloadButton(url = videoUri, showImage = automaticallyStartPlayback)
     } else {
         VideoPlayerActiveMutex(videoUri) { activeOnScreen ->
-            val mediaItem = remember(videoUri) {
-                MediaItem.Builder()
-                    .setMediaId(videoUri)
-                    .setUri(videoUri)
-                    .setMediaMetadata(
-                        MediaMetadata.Builder()
-                            .setArtist(authorName?.ifBlank { null })
-                            .setTitle(title?.ifBlank { null } ?: videoUri)
-                            .setArtworkUri(
-                                try {
-                                    if (artworkUri != null) {
-                                        Uri.parse(artworkUri)
-                                    } else {
-                                        null
-                                    }
-                                } catch (e: Exception) {
-                                    null
-                                }
-                            )
-                            .build()
-                    )
-                    .build()
-            }
-
             GetVideoController(
                 mediaItem = mediaItem,
                 videoUri = videoUri,
@@ -282,53 +282,51 @@ fun GetVideoController(
     }
 
     // Prepares a VideoPlayer from the foreground service.
-    LaunchedEffect(key1 = videoUri) {
+    DisposableEffect(key1 = videoUri) {
         // If it is not null, the user might have come back from a playing video, like clicking on
         // the notification of the video player.
         if (controller.value == null) {
-            launch(Dispatchers.IO) {
-                PlaybackClientController.prepareController(
-                    uid,
-                    videoUri,
-                    nostrUriCallback,
-                    context
-                ) {
-                    // checks again because of race conditions.
-                    if (controller.value == null) { // still prone to race conditions.
-                        controller.value = it
+            PlaybackClientController.prepareController(
+                uid,
+                videoUri,
+                nostrUriCallback,
+                context
+            ) {
+                // checks again because of race conditions.
+                if (controller.value == null) { // still prone to race conditions.
+                    controller.value = it
 
-                        if (!it.isPlaying) {
-                            if (keepPlayingMutex?.isPlaying == true) {
+                    if (!it.isPlaying) {
+                        if (keepPlayingMutex?.isPlaying == true) {
+                            // There is a video playing, start this one on mute.
+                            controller.value?.volume = 0f
+                        } else {
+                            // There is no other video playing. Use the default mute state to
+                            // decide if sound is on or not.
+                            controller.value?.volume = if (defaultToStart) 0f else 1f
+                        }
+                    }
+
+                    controller.value?.setMediaItem(mediaItem)
+                    controller.value?.prepare()
+                } else if (controller.value != it) {
+                    // discards the new controller because there is an existing one
+                    it.stop()
+                    it.release()
+
+                    controller.value?.let {
+                        if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
+                            if (it.isPlaying) {
                                 // There is a video playing, start this one on mute.
-                                controller.value?.volume = 0f
+                                it.volume = 0f
                             } else {
                                 // There is no other video playing. Use the default mute state to
                                 // decide if sound is on or not.
-                                controller.value?.volume = if (defaultToStart) 0f else 1f
+                                it.volume = if (defaultToStart) 0f else 1f
                             }
-                        }
 
-                        controller.value?.setMediaItem(mediaItem)
-                        controller.value?.prepare()
-                    } else if (controller.value != it) {
-                        // discards the new controller because there is an existing one
-                        it.stop()
-                        it.release()
-
-                        controller.value?.let {
-                            if (it.playbackState == Player.STATE_IDLE || it.playbackState == Player.STATE_ENDED) {
-                                if (it.isPlaying) {
-                                    // There is a video playing, start this one on mute.
-                                    it.volume = 0f
-                                } else {
-                                    // There is no other video playing. Use the default mute state to
-                                    // decide if sound is on or not.
-                                    it.volume = if (defaultToStart) 0f else 1f
-                                }
-
-                                it.setMediaItem(mediaItem)
-                                it.prepare()
-                            }
+                            it.setMediaItem(mediaItem)
+                            it.prepare()
                         }
                     }
                 }
@@ -350,46 +348,52 @@ fun GetVideoController(
                 }
             }
         }
+
+        onDispose {
+            if (!keepPlaying.value) {
+                // Stops and releases the media.
+                controller.value?.stop()
+                controller.value?.release()
+                controller.value = null
+            }
+        }
     }
 
     // User pauses and resumes the app. What to do with videos?
-    val scope = rememberCoroutineScope()
     val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(key1 = videoUri) {
+    DisposableEffect(key1 = lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 // if the controller is null, restarts the controller with a new one
                 // if the controller is not null, just continue playing what the controller was playing
                 if (controller.value == null) {
-                    scope.launch(Dispatchers.IO) {
-                        PlaybackClientController.prepareController(
-                            UUID.randomUUID().toString(),
-                            videoUri,
-                            nostrUriCallback,
-                            context
-                        ) {
-                            // checks again to make sure no other thread has created a controller.
-                            if (controller.value == null) {
-                                controller.value = it
+                    PlaybackClientController.prepareController(
+                        uid,
+                        videoUri,
+                        nostrUriCallback,
+                        context
+                    ) {
+                        // checks again to make sure no other thread has created a controller.
+                        if (controller.value == null) {
+                            controller.value = it
 
-                                if (!it.isPlaying) {
-                                    if (keepPlayingMutex?.isPlaying == true) {
-                                        // There is a video playing, start this one on mute.
-                                        controller.value?.volume = 0f
-                                    } else {
-                                        // There is no other video playing. Use the default mute state to
-                                        // decide if sound is on or not.
-                                        controller.value?.volume = if (defaultToStart) 0f else 1f
-                                    }
+                            if (!it.isPlaying) {
+                                if (keepPlayingMutex?.isPlaying == true) {
+                                    // There is a video playing, start this one on mute.
+                                    controller.value?.volume = 0f
+                                } else {
+                                    // There is no other video playing. Use the default mute state to
+                                    // decide if sound is on or not.
+                                    controller.value?.volume = if (defaultToStart) 0f else 1f
                                 }
-
-                                controller.value?.setMediaItem(mediaItem)
-                                controller.value?.prepare()
-                            } else if (controller.value != it) {
-                                // discards the new controller because there is an existing one
-                                it.stop()
-                                it.release()
                             }
+
+                            controller.value?.setMediaItem(mediaItem)
+                            controller.value?.prepare()
+                        } else if (controller.value != it) {
+                            // discards the new controller because there is an existing one
+                            it.stop()
+                            it.release()
                         }
                     }
                 }
@@ -407,13 +411,6 @@ fun GetVideoController(
         lifeCycleOwner.lifecycle.addObserver(observer)
         onDispose {
             lifeCycleOwner.lifecycle.removeObserver(observer)
-
-            if (!keepPlaying.value) {
-                // Stops and releases the media.
-                controller.value?.stop()
-                controller.value?.release()
-                controller.value = null
-            }
         }
     }
 
@@ -612,7 +609,7 @@ fun Waveform(
     DrawWaveform(waveform, waveformProgress, modifier)
 
     val restartFlow = remember {
-        mutableStateOf(0)
+        mutableIntStateOf(0)
     }
 
     // Keeps the screen on while playing and viewing videos.
@@ -693,7 +690,7 @@ fun ControlWhenPlayerIsActive(
     val view = LocalView.current
 
     // Keeps the screen on while playing and viewing videos.
-    DisposableEffect(key1 = controller) {
+    DisposableEffect(key1 = controller, key2 = view) {
         val listener = object : Player.Listener {
             override fun onIsPlayingChanged(isPlaying: Boolean) {
                 // doesn't consider the mutex because the screen can turn off if the video

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

@@ -477,14 +477,16 @@ private fun AddedImageFeatures(
                 if (content.blurhash != null) {
                     DisplayBlurHash(content.blurhash, content.description, contentScale, myModifier)
                 } else {
-                    FlowRow() {
+                    FlowRow(Modifier.fillMaxWidth()) {
                         DisplayUrlWithLoadingSymbol(content)
                     }
                 }
             }
 
             is AsyncImagePainter.State.Error -> {
-                ClickableUrl(urlText = "${content.url} ", url = content.url)
+                FlowRow(Modifier.fillMaxWidth()) {
+                    ClickableUrl(urlText = "${content.url} ", url = content.url)
+                }
             }
 
             is AsyncImagePainter.State.Success -> {
@@ -612,7 +614,7 @@ fun ZoomableImageDialog(
 ) {
     val view = LocalView.current
 
-    DisposableEffect(key1 = Unit) {
+    DisposableEffect(key1 = view) {
         if (Build.VERSION.SDK_INT >= 30) {
             view.windowInsetsController?.hide(
                 android.view.WindowInsets.Type.systemBars()

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

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst.ui.dal
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.quartz.encoders.toHexKey
 
 object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     lateinit var account: Account
@@ -12,18 +14,44 @@ object BookmarkPrivateFeedFilter : FeedFilter<Note>() {
     }
 
     override fun feed(): List<Note> {
-        val privKey = account.keyPair.privKey ?: return emptyList()
-
         val bookmarks = account.userProfile().latestBookmarkList
 
-        val notes = bookmarks?.privateTaggedEvents(privKey)
-            ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+        if (account.loginWithExternalSigner) {
+            val id = bookmarks?.id
+            if (id != null) {
+                val decryptedContent = ExternalSignerUtils.cachedDecryptedContent[id]
+                if (decryptedContent == null) {
+                    ExternalSignerUtils.decryptBookmark(
+                        bookmarks.content,
+                        account.keyPair.pubKey.toHexKey(),
+                        id
+                    )
+                } else {
+                    bookmarks.decryptedContent = decryptedContent
+                }
+            }
+            val decryptedContent = ExternalSignerUtils.cachedDecryptedContent[id] ?: ""
 
-        val addresses = bookmarks?.privateTaggedAddresses(privKey)
-            ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
+            val notes = bookmarks?.privateTaggedEvents(decryptedContent)
+                ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+            val addresses = bookmarks?.privateTaggedAddresses(decryptedContent)
+                ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
 
-        return notes.plus(addresses).toSet()
-            .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-            .reversed()
+            return notes.plus(addresses).toSet()
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                .reversed()
+        } else {
+            val privKey = account.keyPair.privKey ?: return emptyList()
+
+            val notes = bookmarks?.privateTaggedEvents(privKey)
+                ?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+
+            val addresses = bookmarks?.privateTaggedAddresses(privKey)
+                ?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
+
+            return notes.plus(addresses).toSet()
+                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
+                .reversed()
+        }
     }
 }

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

@@ -14,7 +14,18 @@ class HiddenAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
     }
 
     override fun feed(): List<User> {
-        return account.getBlockList()
+        val blockList = account.getBlockList()
+        val decryptedContent = blockList?.decryptedContent ?: ""
+        if (account.loginWithExternalSigner) {
+            if (decryptedContent.isEmpty()) return emptyList()
+
+            return blockList
+                ?.publicAndPrivateUsers(decryptedContent)
+                ?.map { LocalCache.getOrCreateUser(it) }
+                ?: emptyList()
+        }
+
+        return blockList
             ?.publicAndPrivateUsers(account.keyPair.privKey)
             ?.map { LocalCache.getOrCreateUser(it) }
             ?: emptyList()

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

@@ -284,7 +284,7 @@ fun AppNavigation(
         actionableNextPage = null
     }
 
-    DisposableEffect(navController) {
+    DisposableEffect(activity) {
         val consumer = Consumer<Intent> { intent ->
             val uri = intent?.data?.toString()
             val newPage = uriToRoute(uri)

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

@@ -33,6 +33,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
@@ -54,14 +55,15 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavBackStackEntry
 import coil.Coil
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
-import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -88,6 +90,7 @@ import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.LoadCityName
 import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.LongCommunityHeader
 import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
@@ -106,7 +109,6 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.LongChannelHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LongRoomHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.RoomNameOnlyDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ShortChannelHeader
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.ShowVideoStreaming
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
 import com.vitorpamplona.amethyst.ui.theme.BottomTopHeight
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
@@ -117,6 +119,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size34dp
 import com.vitorpamplona.amethyst.ui.theme.Size40dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.ContactListEvent
 import com.vitorpamplona.quartz.events.PeopleListEvent
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -227,7 +230,7 @@ private fun CommunityTopBar(
     nav: (String) -> Unit,
     navPopBack: () -> Unit
 ) {
-    LoadAddressableNote(aTagHex = id) { baseNote ->
+    LoadAddressableNote(aTagHex = id, accountViewModel) { baseNote ->
         if (baseNote != null) {
             FlexibleTopBarWithBackButton(
                 title = {
@@ -288,7 +291,7 @@ private fun RenderRoomTopBar(
     if (room.users.size == 1) {
         FlexibleTopBarWithBackButton(
             title = {
-                LoadUser(baseUserHex = room.users.first()) { baseUser ->
+                LoadUser(baseUserHex = room.users.first(), accountViewModel) { baseUser ->
                     if (baseUser != null) {
                         ClickableUserPicture(
                             baseUser = baseUser,
@@ -303,7 +306,7 @@ private fun RenderRoomTopBar(
                 }
             },
             extendableRow = {
-                LoadUser(baseUserHex = room.users.first()) {
+                LoadUser(baseUserHex = room.users.first(), accountViewModel) {
                     if (it != null) {
                         UserCompose(
                             baseUser = it,
@@ -348,13 +351,8 @@ private fun ChannelTopBar(
     nav: (String) -> Unit,
     navPopBack: () -> Unit
 ) {
-    LoadChannel(baseChannelHex = id) { baseChannel ->
+    LoadChannel(baseChannelHex = id, accountViewModel) { baseChannel ->
         FlexibleTopBarWithBackButton(
-            prefixRow = {
-                if (baseChannel is LiveActivitiesChannel) {
-                    ShowVideoStreaming(baseChannel, accountViewModel)
-                }
-            },
             title = {
                 ShortChannelHeader(
                     baseChannel = baseChannel,
@@ -382,11 +380,12 @@ fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState
         val list by accountViewModel.storiesListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
-            followLists,
-            list,
-            true
+            followListsModel = followLists,
+            listName = list,
+            withGlobal = true,
+            withRoutes = false
         ) { listName ->
-            accountViewModel.account.changeDefaultStoriesFollowList(listName)
+            accountViewModel.account.changeDefaultStoriesFollowList(listName.code)
         }
     }
 }
@@ -397,11 +396,16 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
         val list by accountViewModel.homeListLiveData.observeAsState(KIND3_FOLLOWS)
 
         FollowList(
-            followLists,
-            list,
-            true
+            followListsModel = followLists,
+            listName = list,
+            withGlobal = true,
+            withRoutes = true
         ) { listName ->
-            accountViewModel.account.changeDefaultHomeFollowList(listName)
+            if (listName.type == CodeNameType.ROUTE) {
+                nav(listName.code)
+            } else {
+                accountViewModel.account.changeDefaultHomeFollowList(listName.code)
+            }
         }
     }
 }
@@ -412,11 +416,12 @@ fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: Scaffold
         val list by accountViewModel.notificationListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
-            followLists,
-            list,
-            true
+            followListsModel = followLists,
+            listName = list,
+            withGlobal = true,
+            withRoutes = false
         ) { listName ->
-            accountViewModel.account.changeDefaultNotificationFollowList(listName)
+            accountViewModel.account.changeDefaultNotificationFollowList(listName.code)
         }
     }
 }
@@ -427,11 +432,12 @@ fun DiscoveryTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldSta
         val list by accountViewModel.discoveryListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
-            followLists,
-            list,
-            true
+            followListsModel = followLists,
+            listName = list,
+            withGlobal = true,
+            withRoutes = false
         ) { listName ->
-            accountViewModel.account.changeDefaultDiscoveryFollowList(listName)
+            accountViewModel.account.changeDefaultDiscoveryFollowList(listName.code)
         }
     }
 }
@@ -523,37 +529,81 @@ private fun LoggedInUserPictureDrawer(
 }
 
 @Composable
-fun FollowList(followListsModel: FollowListViewModel, listName: String, withGlobal: Boolean, onChange: (String) -> Unit) {
-    val kind3Follow = Pair(KIND3_FOLLOWS, stringResource(id = R.string.follow_list_kind3follows))
-    val globalFollow = Pair(GLOBAL_FOLLOWS, stringResource(id = R.string.follow_list_global))
+fun FollowList(
+    followListsModel: FollowListViewModel,
+    listName: String,
+    withGlobal: Boolean,
+    withRoutes: Boolean,
+    onChange: (CodeName) -> Unit
+) {
+    val context = LocalContext.current
+
+    val kind3Follow = CodeName(KIND3_FOLLOWS, ResourceName(R.string.follow_list_kind3follows, context), CodeNameType.HARDCODED)
+    val globalFollow = CodeName(GLOBAL_FOLLOWS, ResourceName(R.string.follow_list_global, context), CodeNameType.HARDCODED)
 
     val defaultOptions = if (withGlobal) listOf(kind3Follow, globalFollow) else listOf(kind3Follow)
 
-    val followLists by followListsModel.followLists.collectAsState()
+    val followLists by followListsModel.peopleLists.collectAsState()
+    val routeList by followListsModel.routes.collectAsState()
 
     val allLists = remember(followLists) {
-        (defaultOptions + followLists)
+        if (withRoutes) {
+            (defaultOptions + followLists + routeList)
+        } else {
+            (defaultOptions + followLists)
+        }
     }
 
     val followNames by remember(followLists) {
         derivedStateOf {
-            allLists.map { it.second }.toImmutableList()
+            allLists.map { it.name }.toImmutableList()
         }
     }
 
     SimpleTextSpinner(
-        placeholder = allLists.firstOrNull { it.first == listName }?.second ?: "Select an Option",
+        placeholder = allLists.firstOrNull { it.code == listName }?.name?.name() ?: "Select an Option",
         options = followNames,
         onSelect = {
-            onChange(allLists.getOrNull(it)?.first ?: KIND3_FOLLOWS)
+            onChange(allLists.getOrNull(it) ?: kind3Follow)
         }
     )
 }
 
+enum class CodeNameType {
+    HARDCODED, PEOPLE_LIST, ROUTE
+}
+
+abstract class Name {
+    abstract fun name(): String
+}
+
+class GeoHashName(val geoHashTag: String) : Name() {
+    override fun name() = "/g/$geoHashTag"
+}
+class HashtagName(val hashTag: String) : Name() {
+    override fun name() = "#$hashTag"
+}
+class ResourceName(val resourceId: Int, val context: Context) : Name() {
+    override fun name() = context.getString(resourceId)
+}
+
+class PeopleListName(val note: AddressableNote) : Name() {
+    override fun name() = note.dTag() ?: ""
+}
+class CommunityName(val note: AddressableNote) : Name() {
+    override fun name() = "/n/${(note.dTag() ?: "")}"
+}
+
+@Immutable
+data class CodeName(val code: String, val name: Name, val type: CodeNameType)
+
 @Stable
 class FollowListViewModel(val account: Account) : ViewModel() {
-    private var _followLists = MutableStateFlow<ImmutableList<Pair<String, String>>>(emptyList<Pair<String, String>>().toPersistentList())
-    val followLists = _followLists.asStateFlow()
+    private var _peopleLists = MutableStateFlow<ImmutableList<CodeName>>(emptyList<CodeName>().toPersistentList())
+    val peopleLists = _peopleLists.asStateFlow()
+
+    private var _routes = MutableStateFlow<ImmutableList<CodeName>>(emptyList<CodeName>().toPersistentList())
+    val routes = _routes.asStateFlow()
 
     fun refresh() {
         viewModelScope.launch(Dispatchers.Default) {
@@ -571,14 +621,34 @@ class FollowListViewModel(val account: Account) : ViewModel() {
                 event.pubKey == account.userProfile().pubkeyHex &&
                 (event.tags.size > 1 || event.content.length > 50)
             ) {
-                Pair(event.dTag(), event.dTag())
+                CodeName(event.address().toTag(), PeopleListName(it.value), CodeNameType.PEOPLE_LIST)
             } else {
                 null
             }
-        }.sortedBy { it.second }.toImmutableList()
+        }.sortedBy { it.name.name() }.toImmutableList()
 
-        if (!equalImmutableLists(_followLists.value, newFollowLists)) {
-            _followLists.emit(newFollowLists)
+        if (!equalImmutableLists(_peopleLists.value, newFollowLists)) {
+            _peopleLists.emit(newFollowLists)
+        }
+
+        val communities = account.userProfile().cachedFollowingCommunitiesSet().mapNotNull {
+            LocalCache.checkGetOrCreateAddressableNote(it)?.let { communityNote ->
+                CodeName("Community/${communityNote.idHex}", CommunityName(communityNote), CodeNameType.ROUTE)
+            }
+        }
+
+        val hashtags = account.userProfile().cachedFollowingTagSet().map {
+            CodeName("Hashtag/$it", HashtagName(it), CodeNameType.ROUTE)
+        }
+
+        val geotags = account.userProfile().cachedFollowingGeohashSet().map {
+            CodeName("Geohash/$it", GeoHashName(it), CodeNameType.ROUTE)
+        }
+
+        val routeList = (communities + hashtags + geotags).sortedBy { it.name.name() }.toImmutableList()
+
+        if (!equalImmutableLists(_routes.value, routeList)) {
+            _routes.emit(routeList)
         }
     }
 
@@ -590,7 +660,10 @@ class FollowListViewModel(val account: Account) : ViewModel() {
         collectorJob = viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect { newNotes ->
                 checkNotInMainThread()
-                if (newNotes.any { it.event is PeopleListEvent }) {
+                if (newNotes.any {
+                    it.event?.pubKey() == account.userProfile().pubkeyHex && (it.event is PeopleListEvent || it.event is ContactListEvent)
+                }
+                ) {
                     refresh()
                 }
             }
@@ -612,8 +685,7 @@ class FollowListViewModel(val account: Account) : ViewModel() {
 @Composable
 fun SimpleTextSpinner(
     placeholder: String,
-    options: ImmutableList<String>,
-    explainers: ImmutableList<String>? = null,
+    options: ImmutableList<Name>,
     onSelect: (Int) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -649,10 +721,68 @@ fun SimpleTextSpinner(
 
     if (optionsShowing) {
         options.isNotEmpty().also {
-            SpinnerSelectionDialog(options = options, explainers = explainers, onDismiss = { optionsShowing = false }) {
-                currentText = options[it]
-                optionsShowing = false
-                onSelect(it)
+            SpinnerSelectionDialog(
+                options = options,
+                onDismiss = { optionsShowing = false },
+                onSelect = {
+                    currentText = options[it].name()
+                    optionsShowing = false
+                    onSelect(it)
+                }
+            ) {
+                RenderOption(it)
+            }
+        }
+    }
+}
+
+@Composable
+fun RenderOption(it: Name) {
+    when (it) {
+        is GeoHashName -> {
+            LoadCityName(it.geoHashTag) {
+                Row(
+                    horizontalArrangement = Arrangement.Center,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Text(text = "/g/$it", color = MaterialTheme.colors.onSurface)
+                }
+            }
+        }
+        is HashtagName -> {
+            Row(
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text(text = it.name(), color = MaterialTheme.colors.onSurface)
+            }
+        }
+        is ResourceName -> {
+            Row(
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text(text = stringResource(id = it.resourceId), color = MaterialTheme.colors.onSurface)
+            }
+        }
+        is PeopleListName -> {
+            Row(
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text(text = it.name(), color = MaterialTheme.colors.onSurface)
+            }
+        }
+        is CommunityName -> {
+            Row(
+                horizontalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                val name by it.note.live().metadata.map {
+                    "/n/" + (it.note as? AddressableNote)?.dTag()
+                }.observeAsState()
+
+                Text(text = name ?: "", color = MaterialTheme.colors.onSurface)
             }
         }
     }

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

@@ -257,7 +257,7 @@ private fun EditStatusBox(baseAccountUser: User, accountViewModel: AccountViewMo
     val scope = rememberCoroutineScope()
     val focusManager = LocalFocusManager.current
 
-    LoadStatuses(user = baseAccountUser) { statuses ->
+    LoadStatuses(user = baseAccountUser, accountViewModel) { statuses ->
         if (statuses.isEmpty()) {
             val currentStatus = remember {
                 mutableStateOf("")

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

@@ -150,6 +150,14 @@ sealed class Route(
         route = "Settings",
         icon = R.drawable.ic_settings
     )
+
+    companion object {
+        val InvertedLayouts = setOf(
+            Channel.route,
+            Room.route,
+            RoomByAuthor.route
+        )
+    }
 }
 
 // **

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

@@ -17,6 +17,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -36,6 +37,8 @@ import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.actions.PostButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
 class AddBountyAmountViewModel : ViewModel() {
     private var account: Account? = null
@@ -80,6 +83,7 @@ class AddBountyAmountViewModel : ViewModel() {
 fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onClose: () -> Unit) {
     val postViewModel: AddBountyAmountViewModel = viewModel()
     postViewModel.load(accountViewModel.account, bounty)
+    val scope = rememberCoroutineScope()
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -89,7 +93,11 @@ fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onCl
         )
     ) {
         Surface() {
-            Column(modifier = Modifier.padding(10.dp).width(IntrinsicSize.Min)) {
+            Column(
+                modifier = Modifier
+                    .padding(10.dp)
+                    .width(IntrinsicSize.Min)
+            ) {
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,
                     verticalAlignment = Alignment.CenterVertically,
@@ -102,8 +110,10 @@ fun AddBountyAmountDialog(bounty: Note, accountViewModel: AccountViewModel, onCl
 
                     PostButton(
                         onPost = {
-                            postViewModel.sendPost()
-                            onClose()
+                            scope.launch(Dispatchers.IO) {
+                                postViewModel.sendPost()
+                                onClose()
+                            }
                         },
                         isActive = postViewModel.hasChanged()
                     )

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

@@ -646,7 +646,7 @@ fun RenderCommunitiesThumb(baseNote: Note, accountViewModel: AccountViewModel, n
 fun RenderChannelThumb(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val noteEvent = baseNote.event as? ChannelCreateEvent ?: return
 
-    LoadChannel(baseChannelHex = baseNote.idHex) {
+    LoadChannel(baseChannelHex = baseNote.idHex, accountViewModel) {
         RenderChannelThumb(baseNote = baseNote, channel = it, accountViewModel, nav)
     }
 }

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

@@ -47,7 +47,6 @@ import androidx.lifecycle.map
 import com.patrykandpatrick.vico.core.extension.forEachIndexedExtended
 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.components.CreateTextWithEmoji
@@ -99,7 +98,7 @@ fun ChatroomComposeChannelOrUser(
     }
 
     if (channelHex != null) {
-        ChatroomChannel(channelHex, baseNote, accountViewModel, nav)
+        ChatroomChannel(channelHex!!, baseNote, accountViewModel, nav)
     } else {
         ChatroomPrivateMessages(baseNote, accountViewModel, nav)
     }
@@ -134,12 +133,12 @@ private fun ChatroomPrivateMessages(
 
 @Composable
 private fun ChatroomChannel(
-    channelHex: HexKey?,
+    channelHex: HexKey,
     baseNote: Note,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadChannel(baseChannelHex = channelHex!!) { channel ->
+    LoadChannel(baseChannelHex = channelHex, accountViewModel) { channel ->
         ChannelRoomCompose(baseNote, channel, accountViewModel, nav)
     }
 }
@@ -256,11 +255,10 @@ private fun UserRoomCompose(
             note.createdAt()
         }
     }
-
     val content by remember(note) {
-        derivedStateOf {
+        mutableStateOf(
             accountViewModel.decrypt(note)
-        }
+        )
     }
 
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
@@ -278,7 +276,7 @@ private fun UserRoomCompose(
             )
         },
         channelTitle = {
-            RoomNameDisplay(room, it, accountViewModel.userProfile())
+            RoomNameDisplay(room, it, accountViewModel)
         },
         channelLastTime = createAt,
         channelLastContent = content,
@@ -288,20 +286,20 @@ private fun UserRoomCompose(
 }
 
 @Composable
-fun RoomNameDisplay(room: ChatroomKey, modifier: Modifier, loggedInUser: User) {
-    val roomSubject by loggedInUser.live().messages.map {
+fun RoomNameDisplay(room: ChatroomKey, modifier: Modifier, accountViewModel: AccountViewModel) {
+    val roomSubject by accountViewModel.userProfile().live().messages.map {
         it.user.privateChatrooms[room]?.subject
-    }.distinctUntilChanged().observeAsState(loggedInUser.privateChatrooms[room]?.subject)
+    }.distinctUntilChanged().observeAsState(accountViewModel.userProfile().privateChatrooms[room]?.subject)
 
     Crossfade(targetState = roomSubject, modifier) {
         if (it != null && it.isNotBlank()) {
             if (room.users.size > 1) {
                 DisplayRoomSubject(it)
             } else {
-                DisplayUserAndSubject(room.users.first(), it)
+                DisplayUserAndSubject(room.users.first(), it, accountViewModel)
             }
         } else {
-            DisplayUserSetAsSubject(room)
+            DisplayUserSetAsSubject(room, accountViewModel)
         }
     }
 }
@@ -309,7 +307,8 @@ fun RoomNameDisplay(room: ChatroomKey, modifier: Modifier, loggedInUser: User) {
 @Composable
 private fun DisplayUserAndSubject(
     user: HexKey,
-    subject: String
+    subject: String,
+    accountViewModel: AccountViewModel
 ) {
     Row() {
         Text(
@@ -323,7 +322,7 @@ private fun DisplayUserAndSubject(
             fontWeight = FontWeight.Bold,
             maxLines = 1
         )
-        LoadUser(baseUserHex = user) {
+        LoadUser(baseUserHex = user, accountViewModel = accountViewModel) {
             it?.let {
                 UsernameDisplay(it, Modifier.weight(1f))
             }
@@ -334,6 +333,7 @@ private fun DisplayUserAndSubject(
 @Composable
 fun DisplayUserSetAsSubject(
     room: ChatroomKey,
+    accountViewModel: AccountViewModel,
     fontWeight: FontWeight = FontWeight.Bold
 ) {
     val userList = remember(room) {
@@ -343,7 +343,7 @@ fun DisplayUserSetAsSubject(
     if (userList.size == 1) {
         // Regular Design
         Row() {
-            LoadUser(baseUserHex = userList[0]) {
+            LoadUser(baseUserHex = userList[0], accountViewModel) {
                 it?.let {
                     UsernameDisplay(it, Modifier.weight(1f), fontWeight = fontWeight)
                 }
@@ -352,7 +352,7 @@ fun DisplayUserSetAsSubject(
     } else {
         Row() {
             userList.take(4).forEachIndexedExtended { index, isFirst, isLast, value ->
-                LoadUser(baseUserHex = value) {
+                LoadUser(baseUserHex = value, accountViewModel) {
                     it?.let {
                         ShortUsernameDisplay(baseUser = it, fontWeight = fontWeight)
                     }
@@ -417,15 +417,14 @@ private fun WatchNotificationChanges(
 }
 
 @Composable
-fun LoadUser(baseUserHex: String, content: @Composable (User?) -> Unit) {
+fun LoadUser(baseUserHex: String, accountViewModel: AccountViewModel, content: @Composable (User?) -> Unit) {
     var user by remember(baseUserHex) {
-        mutableStateOf(LocalCache.getUserIfExists(baseUserHex))
+        mutableStateOf(accountViewModel.getUserIfExists(baseUserHex))
     }
 
     if (user == null) {
         LaunchedEffect(key1 = baseUserHex) {
-            launch(Dispatchers.IO) {
-                val newUser = LocalCache.checkGetOrCreateUser(baseUserHex)
+            accountViewModel.checkGetOrCreateUser(baseUserHex) { newUser ->
                 if (user != newUser) {
                     user = newUser
                 }

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

@@ -25,6 +25,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -66,6 +67,7 @@ import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 import com.vitorpamplona.quartz.events.ChatMessageEvent
+import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
@@ -285,7 +287,7 @@ fun NormalChatNote(
             modifier = modif,
             horizontalArrangement = alignment
         ) {
-            val availableBubbleSize = remember { mutableStateOf(0) }
+            val availableBubbleSize = remember { mutableIntStateOf(0) }
             var popupExpanded by remember { mutableStateOf(false) }
 
             val modif2 = remember {
@@ -355,7 +357,7 @@ private fun RenderBubble(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val bubbleSize = remember { mutableStateOf(0) }
+    val bubbleSize = remember { mutableIntStateOf(0) }
 
     val bubbleModifier = remember {
         Modifier
@@ -626,8 +628,8 @@ private fun RenderRegularTextNote(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val tags = remember(note.event) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
-    val eventContent = remember { accountViewModel.decrypt(note) }
+    val tags = remember(note.event) { note.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
+    val eventContent by remember { mutableStateOf(accountViewModel.decrypt(note)) }
     val modifier = remember { Modifier.padding(top = 5.dp) }
 
     if (eventContent != null) {
@@ -636,7 +638,7 @@ private fun RenderRegularTextNote(
             accountViewModel = accountViewModel
         ) {
             TranslatableRichTextViewer(
-                content = eventContent,
+                content = eventContent!!,
                 canPreview = canPreview,
                 modifier = modifier,
                 tags = tags,

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

@@ -30,6 +30,7 @@ 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
@@ -67,8 +68,9 @@ import com.vitorpamplona.amethyst.ui.theme.bitcoinColor
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import com.vitorpamplona.amethyst.ui.theme.overPictureBackground
 import com.vitorpamplona.amethyst.ui.theme.profile35dpModifier
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.EmptyTagList
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -169,7 +171,6 @@ private fun Galeries(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val zapEvents by remember { derivedStateOf { multiSetCard.zapEvents } }
     val boostEvents by remember { derivedStateOf { multiSetCard.boostEvents } }
     val likeEvents by remember { derivedStateOf { multiSetCard.likeEventsByType } }
 
@@ -178,6 +179,16 @@ private fun Galeries(
     val hasLikeEvents by remember { derivedStateOf { multiSetCard.likeEvents.isNotEmpty() } }
 
     if (hasZapEvents) {
+        var zapEvents by remember(multiSetCard.zapEvents) {
+            mutableStateOf<ImmutableList<ZapAmountCommentNotification>>(persistentListOf())
+        }
+
+        LaunchedEffect(key1 = Unit) {
+            accountViewModel.decryptAmountMessageInGroup(multiSetCard.zapEvents) {
+                zapEvents = it
+            }
+        }
+
         val (value, elapsed) = measureTimedValue {
             RenderZapGallery(zapEvents, backgroundColor, nav, accountViewModel)
         }
@@ -247,7 +258,7 @@ fun RenderLikeGallery(
 
 @Composable
 fun RenderZapGallery(
-    zapEvents: ImmutableList<CombinedZap>,
+    zapEvents: ImmutableList<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
@@ -294,10 +305,29 @@ fun RenderBoostGallery(
     }
 }
 
+@Composable
+fun MapZaps(
+    zaps: ImmutableList<CombinedZap>,
+    accountViewModel: AccountViewModel,
+    content: @Composable (ImmutableList<ZapAmountCommentNotification>) -> Unit
+) {
+    var zapEvents by remember(zaps) {
+        mutableStateOf<ImmutableList<ZapAmountCommentNotification>>(persistentListOf())
+    }
+
+    LaunchedEffect(key1 = Unit) {
+        accountViewModel.decryptAmountMessageInGroup(zaps) {
+            zapEvents = it
+        }
+    }
+
+    content(zapEvents)
+}
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun AuthorGalleryZaps(
-    authorNotes: ImmutableList<CombinedZap>,
+    authorNotes: ImmutableList<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
@@ -305,24 +335,12 @@ fun AuthorGalleryZaps(
     Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach {
-                ParseAuthorCommentAndAmount(it, backgroundColor, nav, accountViewModel)
+                RenderState(it, backgroundColor, accountViewModel, nav)
             }
         }
     }
 }
 
-@Composable
-private fun ParseAuthorCommentAndAmount(
-    zap: CombinedZap,
-    backgroundColor: MutableState<Color>,
-    nav: (String) -> Unit,
-    accountViewModel: AccountViewModel
-) {
-    ParseAuthorCommentAndAmount(zap.request, zap.response, accountViewModel) { state ->
-        RenderState(state, backgroundColor, accountViewModel, nav)
-    }
-}
-
 @Immutable
 data class ZapAmountCommentNotification(
     val user: User?,
@@ -358,19 +376,21 @@ private fun ParseAuthorCommentAndAmount(
     onReady(content)
 }
 
+fun click(content: ZapAmountCommentNotification, nav: (String) -> Unit) {
+    content.user?.let {
+        nav(routeFor(it))
+    }
+}
+
 @Composable
 private fun RenderState(
-    content: MutableState<ZapAmountCommentNotification>,
+    content: ZapAmountCommentNotification,
     backgroundColor: MutableState<Color>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     Row(
-        modifier = Modifier.clickable {
-            content.value.user?.let {
-                nav(routeFor(it))
-            }
-        },
+        modifier = Modifier.clickable { click(content, nav) },
         verticalAlignment = Alignment.CenterVertically
     ) {
         DisplayAuthorCommentAndAmount(
@@ -396,76 +416,65 @@ val commentTextSize = 12.sp
 
 @Composable
 private fun DisplayAuthorCommentAndAmount(
-    authorComment: MutableState<ZapAmountCommentNotification>,
+    authorComment: ZapAmountCommentNotification,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
     Box(modifier = Size35Modifier, contentAlignment = Alignment.BottomCenter) {
-        CrossfadeToDisplayPicture(authorComment, accountViewModel)
-        CrossfadeToDisplayAmount(authorComment)
+        WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(authorComment.user, accountViewModel)
+        authorComment.amount?.let {
+            CrossfadeToDisplayAmount(it)
+        }
     }
 
-    CrossfadeToDisplayComment(authorComment, backgroundColor, nav, accountViewModel)
-}
-
-@Composable
-fun CrossfadeToDisplayPicture(authorComment: MutableState<ZapAmountCommentNotification>, accountViewModel: AccountViewModel) {
-    Crossfade(authorComment.value) {
-        WatchUserMetadataAndFollowsAndRenderUserProfilePictureOrDefaultAuthor(it.user, accountViewModel)
+    authorComment.comment?.let {
+        CrossfadeToDisplayComment(it, backgroundColor, nav, accountViewModel)
     }
 }
 
 @Composable
-fun CrossfadeToDisplayAmount(authorComment: MutableState<ZapAmountCommentNotification>) {
-    Crossfade(authorComment.value, modifier = amountBoxModifier) {
-        it.amount?.let {
-            Box(
-                modifier = amountBoxModifier,
-                contentAlignment = Alignment.BottomCenter
-            ) {
-                val backgroundColor = MaterialTheme.colors.overPictureBackground
-                Box(
-                    modifier = remember {
-                        Modifier
-                            .width(Size35dp)
-                            .background(backgroundColor)
-                    },
-                    contentAlignment = Alignment.BottomCenter
-                ) {
-                    Text(
-                        text = it,
-                        fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colors.bitcoinColor,
-                        fontSize = commentTextSize,
-                        modifier = bottomPadding1dp
-                    )
-                }
-            }
+fun CrossfadeToDisplayAmount(amount: String) {
+    Box(
+        modifier = amountBoxModifier,
+        contentAlignment = Alignment.BottomCenter
+    ) {
+        val backgroundColor = MaterialTheme.colors.overPictureBackground
+        Box(
+            modifier = remember {
+                Modifier
+                    .width(Size35dp)
+                    .background(backgroundColor)
+            },
+            contentAlignment = Alignment.BottomCenter
+        ) {
+            Text(
+                text = amount,
+                fontWeight = FontWeight.Bold,
+                color = MaterialTheme.colors.bitcoinColor,
+                fontSize = commentTextSize,
+                modifier = bottomPadding1dp
+            )
         }
     }
 }
 
 @Composable
 fun CrossfadeToDisplayComment(
-    authorComment: MutableState<ZapAmountCommentNotification>,
+    comment: String,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Crossfade(authorComment.value) {
-        it.comment?.let {
-            TranslatableRichTextViewer(
-                content = it,
-                canPreview = true,
-                tags = remember { ImmutableListOfLists() },
-                modifier = textBoxModifier,
-                backgroundColor = backgroundColor,
-                accountViewModel = accountViewModel,
-                nav = nav
-            )
-        }
-    }
+    TranslatableRichTextViewer(
+        content = comment,
+        canPreview = true,
+        tags = EmptyTagList,
+        modifier = textBoxModifier,
+        backgroundColor = backgroundColor,
+        accountViewModel = accountViewModel,
+        nav = nav
+    )
 }
 
 @OptIn(ExperimentalLayoutApi::class)
@@ -517,25 +526,25 @@ fun WatchUserMetadataAndFollowsAndRenderUserProfilePicture(
     accountViewModel: AccountViewModel
 ) {
     WatchUserMetadata(author) { baseUserPicture ->
-        Crossfade(targetState = baseUserPicture) { userPicture ->
-            RobohashAsyncImageProxy(
-                robot = author.pubkeyHex,
-                model = userPicture,
-                contentDescription = stringResource(id = R.string.profile_image),
-                modifier = MaterialTheme.colors.profile35dpModifier,
-                contentScale = ContentScale.Crop
-            )
-        }
+        // Crossfade(targetState = baseUserPicture) { userPicture ->
+        RobohashAsyncImageProxy(
+            robot = author.pubkeyHex,
+            model = baseUserPicture,
+            contentDescription = stringResource(id = R.string.profile_image),
+            modifier = MaterialTheme.colors.profile35dpModifier,
+            contentScale = ContentScale.Crop
+        )
+        // }
     }
 
     WatchUserFollows(author.pubkeyHex, accountViewModel) { isFollowing ->
-        Crossfade(targetState = isFollowing) {
-            if (it) {
-                Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
-                    FollowingIcon(Size10dp)
-                }
+        // Crossfade(targetState = isFollowing) {
+        if (isFollowing) {
+            Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
+                FollowingIcon(Size10dp)
             }
         }
+        // }
     }
 }
 

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

@@ -106,7 +106,7 @@ fun ObserveDisplayNip05Status(
 ) {
     val nip05 by baseUser.live().nip05Changes.observeAsState(baseUser.nip05())
 
-    LoadStatuses(baseUser) { statuses ->
+    LoadStatuses(baseUser, accountViewModel) { statuses ->
         Crossfade(targetState = nip05, modifier = columnModifier, label = "ObserveDisplayNip05StatusCrossfade") {
             VerifyAndDisplayNIP05OrStatusLine(it, statuses, baseUser, columnModifier, accountViewModel, nav)
         }
@@ -233,7 +233,7 @@ fun DisplayStatus(
             )
         }
     } else if (nostrATag != null) {
-        LoadAddressableNote(nostrATag) { note ->
+        LoadAddressableNote(nostrATag, accountViewModel) { note ->
             if (note != null) {
                 Spacer(modifier = StdHorzSpacer)
                 IconButton(
@@ -255,7 +255,7 @@ fun DisplayStatus(
             }
         }
     } else if (nostrHexID != null) {
-        LoadNote(baseNoteHex = nostrHexID) {
+        LoadNote(baseNoteHex = nostrHexID, accountViewModel) {
             if (it != null) {
                 Spacer(modifier = StdHorzSpacer)
                 IconButton(

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

@@ -31,11 +31,15 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.darkColors
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowForwardIos
+import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -50,6 +54,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.CenterVertically
+import androidx.compose.ui.Alignment.Companion.TopStart
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Brush
@@ -80,7 +85,6 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.ConnectivityType
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.User
@@ -117,11 +121,13 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.LeaveCommunityButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LiveFlag
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.NormalTimeAgo
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ScheduledFlag
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
+import com.vitorpamplona.amethyst.ui.theme.HalfDoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.HalfPadding
 import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
 import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
@@ -129,11 +135,12 @@ import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size24Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
-import com.vitorpamplona.amethyst.ui.theme.Size30dp
+import com.vitorpamplona.amethyst.ui.theme.Size34dp
 import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
@@ -146,13 +153,13 @@ import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.UserNameMaxRowHeight
 import com.vitorpamplona.amethyst.ui.theme.UserNameRowHeight
 import com.vitorpamplona.amethyst.ui.theme.WidthAuthorPictureModifier
+import com.vitorpamplona.amethyst.ui.theme.grayText
 import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.replyBackground
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
-import com.vitorpamplona.amethyst.ui.theme.repostProfileBorder
 import com.vitorpamplona.amethyst.ui.theme.subtleBorder
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.toNpub
@@ -173,11 +180,12 @@ import com.vitorpamplona.quartz.events.CommunityPostApprovalEvent
 import com.vitorpamplona.quartz.events.EmojiPackEvent
 import com.vitorpamplona.quartz.events.EmojiPackSelectionEvent
 import com.vitorpamplona.quartz.events.EmojiUrl
+import com.vitorpamplona.quartz.events.EmptyTagList
+import com.vitorpamplona.quartz.events.EventInterface
 import com.vitorpamplona.quartz.events.FileHeaderEvent
 import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
 import com.vitorpamplona.quartz.events.GenericRepostEvent
 import com.vitorpamplona.quartz.events.HighlightEvent
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.LiveActivitiesChatMessageEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
@@ -624,7 +632,7 @@ fun LongCommunityHeader(
                 TranslatableRichTextViewer(
                     content = summary ?: stringResource(id = R.string.community_no_descriptor),
                     canPreview = false,
-                    tags = remember { ImmutableListOfLists(emptyList()) },
+                    tags = EmptyTagList,
                     backgroundColor = background,
                     accountViewModel = accountViewModel,
                     nav = nav
@@ -666,14 +674,13 @@ fun LongCommunityHeader(
     }
 
     LaunchedEffect(key1 = noteState) {
-        launch(Dispatchers.IO) {
-            val noteEvent = (noteState?.note?.event as? CommunityDefinitionEvent)
-            val newParticipantUsers = noteEvent?.moderators()?.mapNotNull { part ->
-                LocalCache.checkGetOrCreateUser(part.key)?.let { Pair(part, it) }
-            }?.toImmutableList()
+        val participants = (noteState?.note?.event as? CommunityDefinitionEvent)?.moderators()
 
-            if (newParticipantUsers != null && !equalImmutableLists(newParticipantUsers, participantUsers)) {
-                participantUsers = newParticipantUsers
+        if (participants != null) {
+            accountViewModel.loadParticipants(participants) { newParticipantUsers ->
+                if (newParticipantUsers != null && !equalImmutableLists(newParticipantUsers, participantUsers)) {
+                    participantUsers = newParticipantUsers
+                }
             }
         }
     }
@@ -1035,7 +1042,9 @@ private fun NoteBody(
         )
     }
 
-    Spacer(modifier = Modifier.height(3.dp))
+    if (baseNote.event !is RepostEvent && baseNote.event !is GenericRepostEvent) {
+        Spacer(modifier = Modifier.height(3.dp))
+    }
 
     if (!makeItShort) {
         ReplyRow(
@@ -1055,6 +1064,62 @@ private fun NoteBody(
         accountViewModel,
         nav
     )
+
+    val noteEvent = baseNote.event
+    val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetup() ?: false }
+    if (zapSplits && noteEvent != null) {
+        Spacer(modifier = HalfDoubleVertSpacer)
+        DisplayZapSplits(noteEvent, accountViewModel, nav)
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun DisplayZapSplits(noteEvent: EventInterface, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+    val list = remember(noteEvent) { noteEvent.zapSplitSetup() }
+
+    if (list.isEmpty()) return
+
+    Row(verticalAlignment = CenterVertically) {
+        Box(
+            Modifier
+                .height(20.dp)
+                .width(25.dp)
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Bolt,
+                contentDescription = stringResource(id = R.string.zaps),
+                modifier = Modifier
+                    .size(20.dp)
+                    .align(Alignment.CenterStart),
+                tint = BitcoinOrange
+            )
+            Icon(
+                imageVector = Icons.Outlined.ArrowForwardIos,
+                contentDescription = stringResource(id = R.string.zaps),
+                modifier = Modifier
+                    .size(13.dp)
+                    .align(Alignment.CenterEnd),
+                tint = BitcoinOrange
+            )
+        }
+
+        Spacer(modifier = StdHorzSpacer)
+
+        FlowRow {
+            list.forEach {
+                if (it.isLnAddress) {
+                    ClickableText(
+                        text = AnnotatedString(it.lnAddressOrPubKeyHex),
+                        onClick = { },
+                        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)
+                    )
+                } else {
+                    UserPicture(userHex = it.lnAddressOrPubKeyHex, size = 25.dp, accountViewModel = accountViewModel, nav = nav)
+                }
+            }
+        }
+    }
 }
 
 @Composable
@@ -1279,7 +1344,7 @@ fun RenderTextEvent(
                 accountViewModel = accountViewModel
             ) {
                 val modifier = remember(note) { Modifier.fillMaxWidth() }
-                val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
+                val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
 
                 TranslatableRichTextViewer(
                     content = eventContent,
@@ -1318,7 +1383,7 @@ fun RenderPoll(
             overflow = TextOverflow.Ellipsis
         )
     } else {
-        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
+        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
 
         SensitivityWarning(
             note = note,
@@ -1493,7 +1558,7 @@ fun RenderAppDefinition(
                     Row(
                         modifier = Modifier.padding(top = 5.dp, bottom = 5.dp)
                     ) {
-                        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
+                        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
                         val bgColor = MaterialTheme.colors.background
                         val backgroundColor = remember {
                             mutableStateOf(bgColor)
@@ -1560,20 +1625,18 @@ private fun RenderPrivateMessage(
     val noteEvent = note.event as? PrivateDmEvent ?: return
 
     val withMe = remember { noteEvent.with(accountViewModel.userProfile().pubkeyHex) }
-
     if (withMe) {
-        val eventContent = remember { accountViewModel.decrypt(note) }
-
+        val eventContent by remember { mutableStateOf(accountViewModel.decrypt(note)) }
         val hashtags = remember(note.event?.id()) { note.event?.hashtags()?.toImmutableList() ?: persistentListOf() }
         val modifier = remember(note.event?.id()) { Modifier.fillMaxWidth() }
         val isAuthorTheLoggedUser = remember(note.event?.id()) { accountViewModel.isLoggedUser(note.author) }
 
-        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
+        val tags = remember(note) { note.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
 
         if (eventContent != null) {
             if (makeItShort && isAuthorTheLoggedUser) {
                 Text(
-                    text = eventContent,
+                    text = eventContent!!,
                     color = MaterialTheme.colors.placeholderText,
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis
@@ -1584,7 +1647,7 @@ private fun RenderPrivateMessage(
                     accountViewModel = accountViewModel
                 ) {
                     TranslatableRichTextViewer(
-                        content = eventContent,
+                        content = eventContent!!,
                         canPreview = canPreview && !makeItShort,
                         modifier = modifier,
                         tags = tags,
@@ -1594,7 +1657,7 @@ private fun RenderPrivateMessage(
                     )
                 }
 
-                DisplayUncitedHashtags(hashtags, eventContent, nav)
+                DisplayUncitedHashtags(hashtags, eventContent!!, nav)
             }
         }
     } else {
@@ -1608,7 +1671,7 @@ private fun RenderPrivateMessage(
             ),
             canPreview = !makeItShort,
             Modifier.fillMaxWidth(),
-            ImmutableListOfLists(),
+            EmptyTagList,
             backgroundColor,
             accountViewModel,
             nav
@@ -1753,9 +1816,8 @@ fun DisplayPeopleList(
 ) {
     val noteEvent = baseNote.event as? PeopleListEvent ?: return
 
-    var members by remember { mutableStateOf<List<User>>(listOf()) }
+    var members by remember { mutableStateOf<ImmutableList<User>>(persistentListOf()) }
 
-    val account = accountViewModel.userProfile()
     var expanded by remember {
         mutableStateOf(false)
     }
@@ -1784,10 +1846,8 @@ fun DisplayPeopleList(
     )
 
     LaunchedEffect(Unit) {
-        launch(Dispatchers.IO) {
-            members = noteEvent.bookmarkedPeople().mapNotNull { hex ->
-                LocalCache.checkGetOrCreateUser(hex)
-            }.sortedBy { account.isFollowing(it) }.reversed()
+        accountViewModel.loadUsers(noteEvent.bookmarkedPeople()) {
+            members = it
         }
     }
 
@@ -1835,15 +1895,11 @@ private fun RenderBadgeAward(
     val noteEvent = note.event as? BadgeAwardEvent ?: return
     var awardees by remember { mutableStateOf<List<User>>(listOf()) }
 
-    val account = accountViewModel.userProfile()
-
     Text(text = stringResource(R.string.award_granted_to))
 
     LaunchedEffect(key1 = note) {
-        launch(Dispatchers.IO) {
-            awardees = noteEvent.awardees().mapNotNull { hex ->
-                LocalCache.checkGetOrCreateUser(hex)
-            }.sortedBy { account.isFollowing(it) }.reversed()
+        accountViewModel.loadUsers(noteEvent.awardees()) {
+            awardees = it
         }
     }
 
@@ -1952,7 +2008,7 @@ fun RenderPostApproval(
 
     Column(Modifier.fillMaxWidth()) {
         noteEvent.communities().forEach {
-            LoadAddressableNote(it) {
+            LoadAddressableNote(it, accountViewModel) {
                 it?.let {
                     NoteCompose(
                         it,
@@ -1991,15 +2047,14 @@ fun RenderPostApproval(
 }
 
 @Composable
-fun LoadAddressableNote(aTagHex: String, content: @Composable (AddressableNote?) -> Unit) {
+fun LoadAddressableNote(aTagHex: String, accountViewModel: AccountViewModel, content: @Composable (AddressableNote?) -> Unit) {
     var note by remember(aTagHex) {
-        mutableStateOf<AddressableNote?>(LocalCache.getAddressableNoteIfExists(aTagHex))
+        mutableStateOf<AddressableNote?>(accountViewModel.getAddressableNoteIfExists(aTagHex))
     }
 
     if (note == null) {
         LaunchedEffect(key1 = aTagHex) {
-            launch(Dispatchers.IO) {
-                val newNote = LocalCache.checkGetOrCreateAddressableNote(aTagHex)
+            accountViewModel.checkGetOrCreateAddressableNote(aTagHex) { newNote ->
                 if (newNote != note) {
                     note = newNote
                 }
@@ -2011,15 +2066,14 @@ fun LoadAddressableNote(aTagHex: String, content: @Composable (AddressableNote?)
 }
 
 @Composable
-fun LoadAddressableNote(aTag: ATag, content: @Composable (AddressableNote?) -> Unit) {
+fun LoadAddressableNote(aTag: ATag, accountViewModel: AccountViewModel, content: @Composable (AddressableNote?) -> Unit) {
     var note by remember(aTag) {
-        mutableStateOf<AddressableNote?>(LocalCache.getAddressableNoteIfExists(aTag.toTag()))
+        mutableStateOf<AddressableNote?>(accountViewModel.getAddressableNoteIfExists(aTag.toTag()))
     }
 
     if (note == null) {
         LaunchedEffect(key1 = aTag) {
-            launch(Dispatchers.IO) {
-                val newNote = LocalCache.getOrCreateAddressableNote(aTag)
+            accountViewModel.getOrCreateAddressableNote(aTag) { newNote ->
                 if (newNote != note) {
                     note = newNote
                 }
@@ -2151,7 +2205,8 @@ private fun EmojiListOptions(
             accountViewModel.userProfile().pubkeyHex,
             "",
             null
-        )
+        ),
+        accountViewModel
     ) {
         it?.let { usersEmojiList ->
             val hasAddedThis by usersEmojiList.live().metadata.map {
@@ -2254,7 +2309,7 @@ fun RenderPinListEvent(
                     TranslatableRichTextViewer(
                         content = pin,
                         canPreview = true,
-                        tags = remember { ImmutableListOfLists() },
+                        tags = EmptyTagList,
                         backgroundColor = backgroundColor,
                         accountViewModel = accountViewModel,
                         nav = nav
@@ -2353,8 +2408,8 @@ private fun RenderReport(
     TranslatableRichTextViewer(
         content = content,
         canPreview = true,
-        modifier = remember { Modifier },
-        tags = remember { ImmutableListOfLists() },
+        modifier = Modifier,
+        tags = EmptyTagList,
         backgroundColor = backgroundColor,
         accountViewModel = accountViewModel,
         nav = nav
@@ -2503,6 +2558,7 @@ fun SecondUserInfoRow(
 @Composable
 fun LoadStatuses(
     user: User,
+    accountViewModel: AccountViewModel,
     content: @Composable (ImmutableList<AddressableNote>) -> Unit
 ) {
     var statuses: ImmutableList<AddressableNote> by remember {
@@ -2512,9 +2568,7 @@ fun LoadStatuses(
     val userStatus by user.live().statuses.observeAsState()
 
     LaunchedEffect(key1 = userStatus) {
-        launch(Dispatchers.IO) {
-            val myUser = userStatus?.user ?: return@launch
-            val newStatuses = LocalCache.findStatusesForUser(myUser)
+        accountViewModel.findStatusesForUser(userStatus?.user ?: user) { newStatuses ->
             if (!equalImmutableLists(statuses, newStatuses)) {
                 statuses = newStatuses
             }
@@ -2525,7 +2579,7 @@ fun LoadStatuses(
 }
 
 @Composable
-fun DisplayLocation(geohash: String, nav: (String) -> Unit) {
+fun LoadCityName(geohash: String, content: @Composable (String) -> Unit) {
     val context = LocalContext.current
     var cityName by remember(geohash) {
         mutableStateOf<String>(geohash)
@@ -2540,18 +2594,25 @@ fun DisplayLocation(geohash: String, nav: (String) -> Unit) {
         }
     }
 
-    ClickableText(
-        text = AnnotatedString(cityName),
-        onClick = { nav("Geohash/$geohash") },
-        style = LocalTextStyle.current.copy(
-            color = MaterialTheme.colors.primary.copy(
-                alpha = 0.52f
+    content(cityName)
+}
+
+@Composable
+fun DisplayLocation(geohash: String, nav: (String) -> Unit) {
+    LoadCityName(geohash) { cityName ->
+        ClickableText(
+            text = AnnotatedString(cityName),
+            onClick = { nav("Geohash/$geohash") },
+            style = LocalTextStyle.current.copy(
+                color = MaterialTheme.colors.primary.copy(
+                    alpha = 0.52f
+                ),
+                fontSize = Font14SP,
+                fontWeight = FontWeight.Bold
             ),
-            fontSize = Font14SP,
-            fontWeight = FontWeight.Bold
-        ),
-        maxLines = 1
-    )
+            maxLines = 1
+        )
+    }
 }
 
 @Composable
@@ -2574,12 +2635,14 @@ fun FirstUserInfoRow(
             }
         }
 
+        val textColor = if (isRepost) MaterialTheme.colors.grayText else Color.Unspecified
+
         if (showAuthorPicture) {
             NoteAuthorPicture(baseNote, nav, accountViewModel, Size25dp)
             Spacer(HalfPadding)
-            NoteUsernameDisplay(baseNote, remember { Modifier.weight(1f) })
+            NoteUsernameDisplay(baseNote, remember { Modifier.weight(1f) }, textColor = textColor)
         } else {
-            NoteUsernameDisplay(baseNote, remember { Modifier.weight(1f) })
+            NoteUsernameDisplay(baseNote, remember { Modifier.weight(1f) }, textColor = textColor)
         }
 
         if (isRepost) {
@@ -2691,12 +2754,18 @@ private fun RenderAuthorImages(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    NoteAuthorPicture(baseNote, nav, accountViewModel, Size55dp)
+    val baseRepost by remember {
+        derivedStateOf {
+            baseNote.replyTo?.lastOrNull()
+        }
+    }
 
     val isRepost = baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent
 
-    if (isRepost) {
-        RepostNoteAuthorPicture(baseNote, accountViewModel, nav)
+    if (isRepost && baseRepost != null) {
+        RepostNoteAuthorPicture(baseNote, baseRepost!!, accountViewModel, nav)
+    } else {
+        NoteAuthorPicture(baseNote, nav, accountViewModel, Size55dp)
     }
 
     val isChannel = baseNote.event is ChannelMessageEvent && baseNote.channelHex() != null
@@ -2704,7 +2773,7 @@ private fun RenderAuthorImages(
     if (isChannel) {
         val baseChannelHex = remember { baseNote.channelHex() }
         if (baseChannelHex != null) {
-            LoadChannel(baseChannelHex) { channel ->
+            LoadChannel(baseChannelHex, accountViewModel) { channel ->
                 ChannelNotePicture(channel)
             }
         }
@@ -2712,15 +2781,14 @@ private fun RenderAuthorImages(
 }
 
 @Composable
-fun LoadChannel(baseChannelHex: String, content: @Composable (Channel) -> Unit) {
+fun LoadChannel(baseChannelHex: String, accountViewModel: AccountViewModel, content: @Composable (Channel) -> Unit) {
     var channel by remember(baseChannelHex) {
-        mutableStateOf<Channel?>(LocalCache.getChannelIfExists(baseChannelHex))
+        mutableStateOf<Channel?>(accountViewModel.getChannelIfExists(baseChannelHex))
     }
 
     if (channel == null) {
         LaunchedEffect(key1 = baseChannelHex) {
-            launch(Dispatchers.IO) {
-                val newChannel = LocalCache.checkGetOrCreateChannel(baseChannelHex)
+            accountViewModel.checkGetOrCreateChannel(baseChannelHex) { newChannel ->
                 launch(Dispatchers.Main) {
                     channel = newChannel
                 }
@@ -2767,23 +2835,30 @@ private fun ChannelNotePicture(baseChannel: Channel) {
 @Composable
 private fun RepostNoteAuthorPicture(
     baseNote: Note,
+    baseRepost: Note,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val baseRepost by remember {
-        derivedStateOf {
-            baseNote.replyTo?.lastOrNull()
-        }
-    }
-
-    baseRepost?.let {
-        Box(Size30Modifier) {
+    Box(modifier = Size55Modifier) {
+        Box(Size35Modifier.align(Alignment.TopStart)) {
             NoteAuthorPicture(
-                baseNote = it,
+                baseNote = baseNote,
                 nav = nav,
                 accountViewModel = accountViewModel,
-                size = Size30dp,
-                pictureModifier = MaterialTheme.colors.repostProfileBorder
+                size = Size34dp
+            )
+        }
+
+        Box(Size18Modifier.align(Alignment.BottomStart).padding(1.dp)) {
+            RepostedIcon(modifier = Size18Modifier, MaterialTheme.colors.placeholderText)
+        }
+
+        Box(Size35Modifier.align(Alignment.BottomEnd)) {
+            NoteAuthorPicture(
+                baseNote = baseRepost,
+                nav = nav,
+                accountViewModel = accountViewModel,
+                size = Size34dp
             )
         }
     }
@@ -2813,7 +2888,7 @@ fun DisplayHighlight(
         quote,
         canPreview = canPreview && !makeItShort,
         remember { Modifier.fillMaxWidth() },
-        remember { ImmutableListOfLists<String>(emptyList()) },
+        EmptyTagList,
         backgroundColor,
         accountViewModel,
         nav
@@ -2830,15 +2905,12 @@ private fun DisplayQuoteAuthor(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    var userBase by remember { mutableStateOf<User?>(LocalCache.getUserIfExists(authorHex)) }
+    var userBase by remember { mutableStateOf<User?>(accountViewModel.getUserIfExists(authorHex)) }
 
-    LaunchedEffect(Unit) {
-        if (userBase == null) {
-            launch(Dispatchers.IO) {
-                val newUserBase = LocalCache.checkGetOrCreateUser(authorHex)
-                launch(Dispatchers.Main) {
-                    userBase = newUserBase
-                }
+    if (userBase == null) {
+        LaunchedEffect(Unit) {
+            accountViewModel.checkGetOrCreateUser(authorHex) { newUserBase ->
+                userBase = newUserBase
             }
         }
     }
@@ -2862,7 +2934,7 @@ private fun DisplayQuoteAuthor(
 
 @Composable
 private fun LoadAndDisplayPost(postAddress: ATag, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    LoadAddressableNote(aTag = postAddress) {
+    LoadAddressableNote(aTag = postAddress, accountViewModel) {
         it?.let { note ->
             val noteEvent by note.live().metadata.map {
                 it.note.event
@@ -3029,26 +3101,28 @@ fun DisplayUncitedHashtags(
     eventContent: String,
     nav: (String) -> Unit
 ) {
-    val hasHashtags = remember {
+    val hasHashtags = remember(eventContent) {
         hashtags.isNotEmpty()
     }
 
     if (hasHashtags) {
+        val unusedHashtags = remember(eventContent) {
+            hashtags.filter { !eventContent.contains(it, true) }
+        }
+
         FlowRow(
             modifier = remember { Modifier.padding(top = 5.dp) }
         ) {
-            hashtags.forEach { hashtag ->
-                if (!eventContent.contains(hashtag, true)) {
-                    ClickableText(
-                        text = AnnotatedString("#$hashtag "),
-                        onClick = { nav("Hashtag/$hashtag") },
-                        style = LocalTextStyle.current.copy(
-                            color = MaterialTheme.colors.primary.copy(
-                                alpha = 0.52f
-                            )
+            unusedHashtags.forEach { hashtag ->
+                ClickableText(
+                    text = remember { AnnotatedString("#$hashtag ") },
+                    onClick = { nav("Hashtag/$hashtag") },
+                    style = LocalTextStyle.current.copy(
+                        color = MaterialTheme.colors.primary.copy(
+                            alpha = 0.52f
                         )
                     )
-                }
+                )
             }
         }
     }
@@ -3271,7 +3345,7 @@ fun FileHeaderDisplay(note: Note, roundedCorner: Boolean, accountViewModel: Acco
         val blurHash = event.blurhash()
         val hash = event.hash()
         val dimensions = event.dimensions()
-        val description = event.content
+        val description = event.alt() ?: event.content
         val isImage = imageExtensions.any { fullUrl.split("?")[0].lowercase().endsWith(it) }
         val uri = note.toNostrUri()
 
@@ -3308,7 +3382,7 @@ fun FileStorageHeaderDisplay(baseNote: Note, roundedCorner: Boolean, accountView
     val eventHeader = (baseNote.event as? FileStorageHeaderEvent) ?: return
     val dataEventId = eventHeader.dataEventId() ?: return
 
-    LoadNote(baseNoteHex = dataEventId) { contentNote ->
+    LoadNote(baseNoteHex = dataEventId, accountViewModel) { contentNote ->
         if (contentNote != null) {
             ObserverAndRenderNIP95(baseNote, contentNote, roundedCorner, accountViewModel)
         }
@@ -3335,7 +3409,7 @@ private fun ObserverAndRenderNIP95(
         val localDir = note?.idHex?.let { File(File(appContext.cacheDir, "NIP95"), it) }
         val blurHash = eventHeader.blurhash()
         val dimensions = eventHeader.dimensions()
-        val description = eventHeader.content
+        val description = eventHeader.alt() ?: eventHeader.content
         val mimeType = eventHeader.mimeType()
 
         val newContent = if (mimeType?.startsWith("image") == true) {
@@ -3383,8 +3457,8 @@ fun AudioTrackHeader(noteEvent: AudioTrackEvent, note: Note, accountViewModel: A
     var participantUsers by remember { mutableStateOf<List<Pair<Participant, User>>>(emptyList()) }
 
     LaunchedEffect(key1 = participants) {
-        launch(Dispatchers.IO) {
-            participantUsers = participants.mapNotNull { part -> LocalCache.checkGetOrCreateUser(part.key)?.let { Pair(part, it) } }
+        accountViewModel.loadParticipants(participants) {
+            participantUsers = it
         }
     }
 
@@ -3463,7 +3537,7 @@ fun AudioHeader(noteEvent: AudioHeaderEvent, note: Note, accountViewModel: Accou
 
     val defaultBackground = MaterialTheme.colors.background
     val background = remember { mutableStateOf(defaultBackground) }
-    val tags = remember(noteEvent) { noteEvent?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists() }
+    val tags = remember(noteEvent) { noteEvent?.tags()?.toImmutableListOfLists() ?: EmptyTagList }
 
     val eventContent = remember(note.event) {
         val subject = (note.event as? TextNoteEvent)?.subject()?.ifEmpty { null }
@@ -3593,11 +3667,7 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
     }
 
     LaunchedEffect(key1 = eventUpdates) {
-        launch(Dispatchers.IO) {
-            val newParticipantUsers = participants.mapNotNull { part ->
-                LocalCache.checkGetOrCreateUser(part.key)?.let { Pair(part, it) }
-            }.toImmutableList()
-
+        accountViewModel.loadParticipants(participants) { newParticipantUsers ->
             if (!equalImmutableLists(newParticipantUsers, participantUsers)) {
                 participantUsers = newParticipantUsers
             }
@@ -3678,7 +3748,7 @@ fun RenderLiveActivityEventInner(baseNote: Note, accountViewModel: AccountViewMo
 private fun LongFormHeader(noteEvent: LongTextNoteEvent, note: Note, accountViewModel: AccountViewModel) {
     val image = remember(noteEvent) { noteEvent.image() }
     val title = remember(noteEvent) { noteEvent.title() }
-    val summary = remember(noteEvent) { noteEvent.summary() ?: noteEvent.content.take(200).ifBlank { null } }
+    val summary = remember(noteEvent) { noteEvent.summary()?.ifBlank { null } ?: noteEvent.content.take(200).ifBlank { null } }
 
     Row(
         modifier = Modifier

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

@@ -24,6 +24,7 @@ import androidx.compose.ui.window.Popup
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ZapPaymentHandler
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
@@ -32,9 +33,12 @@ import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.*
@@ -113,7 +117,7 @@ private fun OptionNote(
     nav: (String) -> Unit
 ) {
     val tags = remember(baseNote) {
-        baseNote.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists()
+        baseNote.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList
     }
 
     Row(
@@ -283,6 +287,12 @@ fun ZapVote(
     }
 
     var wantsToZap by remember { mutableStateOf(false) }
+    var wantsToPay by remember {
+        mutableStateOf<ImmutableList<ZapPaymentHandler.Payable>>(
+            persistentListOf()
+        )
+    }
+
     var zappingProgress by remember { mutableStateOf(0f) }
     var showErrorMessageDialog by remember { mutableStateOf<String?>(null) }
 
@@ -298,7 +308,7 @@ fun ZapVote(
             // interactionSource = remember { MutableInteractionSource() },
             // indication = rememberRipple(bounded = false, radius = 24.dp),
             onClick = {
-                if (!accountViewModel.isWriteable()) {
+                if (!accountViewModel.isWriteable() && !accountViewModel.loggedInWithExternalSigner()) {
                     scope.launch {
                         Toast
                             .makeText(
@@ -362,6 +372,8 @@ fun ZapVote(
                                 zappingProgress = it
                             }
                         },
+                        onPayViaIntent = {
+                        },
                         zapType = accountViewModel.account.defaultZapType
                     )
                 } else {
@@ -393,6 +405,26 @@ fun ZapVote(
                     scope.launch(Dispatchers.Main) {
                         zappingProgress = it
                     }
+                },
+                onPayViaIntent = {
+                    wantsToPay = it
+                }
+            )
+        }
+
+        if (wantsToPay.isNotEmpty()) {
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
+                    wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
                 }
             )
         }
@@ -463,7 +495,8 @@ fun FilteredZapAmountChoicePopup(
     onDismiss: () -> Unit,
     onChangeAmount: () -> Unit,
     onError: (text: String) -> Unit,
-    onProgress: (percent: Float) -> Unit
+    onProgress: (percent: Float) -> Unit,
+    onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit
 ) {
     val context = LocalContext.current
 
@@ -502,6 +535,7 @@ fun FilteredZapAmountChoicePopup(
                             context,
                             onError,
                             onProgress,
+                            onPayViaIntent,
                             defaultZapType
                         )
                         onDismiss()
@@ -526,6 +560,7 @@ fun FilteredZapAmountChoicePopup(
                                     context,
                                     onError,
                                     onProgress,
+                                    onPayViaIntent,
                                     defaultZapType
                                 )
                                 onDismiss()

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

@@ -33,9 +33,12 @@ class PollNoteViewModel : ViewModel() {
 
     private var pollEvent: PollNoteEvent? = null
     private var pollOptions: Map<Int, String>? = null
-    private var valueMaximum: Int? = null
-    private var valueMinimum: Int? = null
-    private var closedAt: Int? = null
+    private var valueMaximum: Long? = null
+    private var valueMinimum: Long? = null
+    private var valueMaximumBD: BigDecimal? = null
+    private var valueMinimumBD: BigDecimal? = null
+
+    private var closedAt: Long? = null
     private var consensusThreshold: BigDecimal? = null
 
     private var totalZapped: BigDecimal = BigDecimal.ZERO
@@ -49,10 +52,12 @@ class PollNoteViewModel : ViewModel() {
         pollNote = note
         pollEvent = pollNote?.event as PollNoteEvent
         pollOptions = pollEvent?.pollOptions()
-        valueMaximum = pollEvent?.getTagInt(VALUE_MAXIMUM)
-        valueMinimum = pollEvent?.getTagInt(VALUE_MINIMUM)
-        consensusThreshold = pollEvent?.getTagInt(CONSENSUS_THRESHOLD)?.toFloat()?.div(100)?.toBigDecimal()
-        closedAt = pollEvent?.getTagInt(CLOSED_AT)
+        valueMaximum = pollEvent?.getTagLong(VALUE_MAXIMUM)
+        valueMinimum = pollEvent?.getTagLong(VALUE_MINIMUM)
+        valueMinimumBD = valueMinimum?.let { BigDecimal(it) }
+        valueMaximumBD = valueMaximum?.let { BigDecimal(it) }
+        consensusThreshold = pollEvent?.getTagLong(CONSENSUS_THRESHOLD)?.toFloat()?.div(100)?.toBigDecimal()
+        closedAt = pollEvent?.getTagLong(CLOSED_AT)
     }
 
     fun refreshTallies() {
@@ -110,6 +115,29 @@ class PollNoteViewModel : ViewModel() {
         } catch (e: Exception) { null }
     }
 
+    fun isValidInputVoteAmount(amount: BigDecimal?): Boolean {
+        if (amount == null) {
+            return false
+        } else if (valueMinimum == null && valueMaximum == null) {
+            if (amount > BigDecimal.ZERO) {
+                return true
+            }
+        } else if (valueMinimum == null) {
+            if (amount > BigDecimal.ZERO && amount <= valueMaximumBD!!) {
+                return true
+            }
+        } else if (valueMaximum == null) {
+            if (amount >= valueMinimumBD!!) {
+                return true
+            }
+        } else {
+            if ((valueMinimumBD!! <= amount) && (amount <= valueMaximumBD!!)) {
+                return true
+            }
+        }
+        return false
+    }
+
     fun isValidInputVoteAmount(amount: Long?): Boolean {
         if (amount == null) {
             return false
@@ -145,24 +173,29 @@ class PollNoteViewModel : ViewModel() {
     private fun zappedPollOptionAmount(option: Int): BigDecimal {
         return pollNote?.zaps?.values?.sumOf {
             val event = it?.event as? LnZapEvent
-            if (event?.zappedPollOption() == option) {
-                event.amount ?: BigDecimal(0)
+            val zapAmount = event?.amount ?: BigDecimal.ZERO
+            val isValidAmount = isValidInputVoteAmount(event?.amount)
+
+            if (isValidAmount && event?.zappedPollOption() == option) {
+                zapAmount
             } else {
-                BigDecimal(0)
+                BigDecimal.ZERO
             }
-        } ?: BigDecimal(0)
+        } ?: BigDecimal.ZERO
     }
 
     private fun totalZapped(): BigDecimal {
         return pollNote?.zaps?.values?.sumOf {
             val zapEvent = (it?.event as? LnZapEvent)
+            val zapAmount = zapEvent?.amount ?: BigDecimal.ZERO
+            val isValidAmount = isValidInputVoteAmount(zapEvent?.amount)
 
-            if (zapEvent?.zappedPollOption() != null) {
-                zapEvent.amount ?: BigDecimal(0)
+            if (isValidAmount && zapEvent?.zappedPollOption() != null) {
+                zapAmount
             } else {
-                BigDecimal(0)
+                BigDecimal.ZERO
             }
-        } ?: BigDecimal(0)
+        } ?: BigDecimal.ZERO
     }
 
     fun createZapOptionsThatMatchThePollingParameters(): List<Long> {
@@ -176,8 +209,8 @@ class PollNoteViewModel : ViewModel() {
                 }
             }
         }
-        valueMinimum?.let { options.add(it.toLong()) }
-        valueMaximum?.let { options.add(it.toLong()) }
+        valueMinimum?.let { options.add(it) }
+        valueMaximum?.let { options.add(it) }
 
         return options.toSet().sorted()
     }

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

@@ -78,18 +78,17 @@ import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ZapPaymentHandler
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.components.ImageUrlType
 import com.vitorpamplona.amethyst.ui.components.InLineIconRenderer
 import com.vitorpamplona.amethyst.ui.components.TextType
-import com.vitorpamplona.amethyst.ui.screen.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.DarkerGreen
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.HalfDoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.HalfStartPadding
-import com.vitorpamplona.amethyst.ui.theme.Height4dpModifier
 import com.vitorpamplona.amethyst.ui.theme.ModifierWidth3dp
 import com.vitorpamplona.amethyst.ui.theme.NoSoTinyBorders
 import com.vitorpamplona.amethyst.ui.theme.ReactionRowExpandButton
@@ -107,6 +106,8 @@ import com.vitorpamplona.amethyst.ui.theme.TinyBorders
 import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.placeholderTextColorFilter
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineScope
@@ -133,13 +134,14 @@ fun ReactionsRow(
 
     InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, accountViewModel, nav)
 
+    Spacer(modifier = HalfDoubleVertSpacer)
+
     LoadAndDisplayZapraiser(baseNote, showReactionDetail, wantsToSeeReactions, accountViewModel)
 
     if (showReactionDetail && wantsToSeeReactions.value) {
         ReactionDetailGallery(baseNote, nav, accountViewModel)
+        Spacer(modifier = HalfDoubleVertSpacer)
     }
-
-    Spacer(modifier = HalfDoubleVertSpacer)
 }
 
 @Composable
@@ -249,7 +251,6 @@ private fun LoadAndDisplayZapraiser(
     }
 
     if (zapraiserAmount > 0) {
-        Spacer(modifier = Height4dpModifier)
         Box(
             modifier = remember {
                 ReactionRowZapraiserSize
@@ -457,8 +458,15 @@ private fun WatchZapAndRenderGallery(
     accountViewModel: AccountViewModel
 ) {
     val zapsState by baseNote.live().zaps.observeAsState()
-    val zapEvents by remember(zapsState) {
-        derivedStateOf { baseNote.zaps.mapNotNull { it.value?.let { zapEvent -> CombinedZap(it.key, zapEvent) } }.toImmutableList() }
+
+    var zapEvents by remember(zapsState) {
+        mutableStateOf<ImmutableList<ZapAmountCommentNotification>>(persistentListOf())
+    }
+
+    LaunchedEffect(key1 = zapsState) {
+        accountViewModel.decryptAmountMessageInGroup(baseNote) {
+            zapEvents = it
+        }
     }
 
     if (zapEvents.isNotEmpty()) {
@@ -543,12 +551,16 @@ fun ReplyReaction(
             if (accountViewModel.isWriteable()) {
                 onPress()
             } else {
-                scope.launch {
-                    Toast.makeText(
-                        context,
-                        context.getString(R.string.login_with_a_private_key_to_be_able_to_reply),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    onPress()
+                } else {
+                    scope.launch {
+                        Toast.makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_reply),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
                 }
             }
         }
@@ -652,12 +664,22 @@ fun BoostReaction(
                     wantsToBoost = true
                 }
             } else {
-                scope.launch {
-                    Toast.makeText(
-                        context,
-                        context.getString(R.string.login_with_a_private_key_to_be_able_to_boost_posts),
-                        Toast.LENGTH_SHORT
-                    ).show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    if (accountViewModel.hasBoosted(baseNote)) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.deleteBoostsTo(baseNote)
+                        }
+                    } else {
+                        wantsToBoost = true
+                    }
+                } else {
+                    scope.launch {
+                        Toast.makeText(
+                            context,
+                            context.getString(R.string.login_with_a_private_key_to_be_able_to_boost_posts),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
                 }
             }
         }
@@ -675,6 +697,11 @@ fun BoostReaction(
                 onQuote = {
                     wantsToBoost = false
                     onQuotePress()
+                },
+                onRepost = {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.boost(baseNote)
+                    }
                 }
             )
         }
@@ -738,6 +765,20 @@ fun LikeReaction(
                     context,
                     onMultipleChoices = {
                         wantsToReact = true
+                    },
+                    onWantsToSignReaction = {
+                        if (accountViewModel.account.reactionChoices.size == 1) {
+                            scope.launch(Dispatchers.IO) {
+                                val reaction = accountViewModel.account.reactionChoices.first()
+                                if (accountViewModel.hasReactedTo(baseNote, reaction)) {
+                                    accountViewModel.deleteReactionTo(baseNote, reaction)
+                                } else {
+                                    accountViewModel.reactTo(baseNote, reaction)
+                                }
+                            }
+                        } else if (accountViewModel.account.reactionChoices.size > 1) {
+                            wantsToReact = true
+                        }
                     }
                 )
             },
@@ -857,7 +898,8 @@ private fun likeClick(
     accountViewModel: AccountViewModel,
     scope: CoroutineScope,
     context: Context,
-    onMultipleChoices: () -> Unit
+    onMultipleChoices: () -> Unit,
+    onWantsToSignReaction: () -> Unit
 ) {
     if (accountViewModel.account.reactionChoices.isEmpty()) {
         scope.launch {
@@ -870,14 +912,18 @@ private fun likeClick(
                 .show()
         }
     } else if (!accountViewModel.isWriteable()) {
-        scope.launch {
-            Toast
-                .makeText(
-                    context,
-                    context.getString(R.string.login_with_a_private_key_to_like_posts),
-                    Toast.LENGTH_SHORT
-                )
-                .show()
+        if (accountViewModel.loggedInWithExternalSigner()) {
+            onWantsToSignReaction()
+        } else {
+            scope.launch {
+                Toast
+                    .makeText(
+                        context,
+                        context.getString(R.string.login_with_a_private_key_to_like_posts),
+                        Toast.LENGTH_SHORT
+                    )
+                    .show()
+            }
         }
     } else if (accountViewModel.account.reactionChoices.size == 1) {
         scope.launch(Dispatchers.IO) {
@@ -907,6 +953,11 @@ fun ZapReaction(
     var wantsToChangeZapAmount by remember { mutableStateOf(false) }
     var wantsToSetCustomZap by remember { mutableStateOf(false) }
     var showErrorMessageDialog by remember { mutableStateOf<String?>(null) }
+    var wantsToPay by remember(baseNote) {
+        mutableStateOf<ImmutableList<ZapPaymentHandler.Payable>>(
+            persistentListOf()
+        )
+    }
 
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -938,6 +989,9 @@ fun ZapReaction(
                                 zappingProgress = 0f
                                 showErrorMessageDialog = it
                             }
+                        },
+                        onPayViaIntent = {
+                            wantsToPay = it
                         }
                     )
                 },
@@ -971,6 +1025,9 @@ fun ZapReaction(
                     scope.launch(Dispatchers.Main) {
                         zappingProgress = it
                     }
+                },
+                onPayViaIntent = {
+                    wantsToPay = it
                 }
             )
         }
@@ -981,7 +1038,10 @@ fun ZapReaction(
                 textContent = showErrorMessageDialog ?: "",
                 onClickStartMessage = {
                     baseNote.author?.let {
-                        nav(routeToMessage(it, showErrorMessageDialog, accountViewModel))
+                        scope.launch(Dispatchers.IO) {
+                            val route = routeToMessage(it, showErrorMessageDialog, accountViewModel)
+                            nav(route)
+                        }
                     }
                 },
                 onDismiss = { showErrorMessageDialog = null }
@@ -995,6 +1055,23 @@ fun ZapReaction(
             )
         }
 
+        if (wantsToPay.isNotEmpty()) {
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
+                    wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                }
+            )
+        }
+
         if (wantsToSetCustomZap) {
             ZapCustomDialog(
                 onClose = { wantsToSetCustomZap = false },
@@ -1009,6 +1086,9 @@ fun ZapReaction(
                         zappingProgress = it
                     }
                 },
+                onPayViaIntent = {
+                    wantsToPay = it
+                },
                 accountViewModel = accountViewModel,
                 baseNote = baseNote
             )
@@ -1045,7 +1125,8 @@ private fun zapClick(
     context: Context,
     onZappingProgress: (Float) -> Unit,
     onMultipleChoices: () -> Unit,
-    onError: (String) -> Unit
+    onError: (String) -> Unit,
+    onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit
 ) {
     if (accountViewModel.account.zapAmountChoices.isEmpty()) {
         scope.launch {
@@ -1057,7 +1138,7 @@ private fun zapClick(
                 )
                 .show()
         }
-    } else if (!accountViewModel.isWriteable()) {
+    } else if (!accountViewModel.isWriteable() && !accountViewModel.loggedInWithExternalSigner()) {
         scope.launch {
             Toast
                 .makeText(
@@ -1080,7 +1161,8 @@ private fun zapClick(
                     onZappingProgress(it)
                 }
             },
-            zapType = accountViewModel.account.defaultZapType
+            zapType = accountViewModel.account.defaultZapType,
+            onPayViaIntent = onPayViaIntent
         )
     } else if (accountViewModel.account.zapAmountChoices.size > 1) {
         onMultipleChoices()
@@ -1196,7 +1278,7 @@ private fun DrawViewCount(
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit) {
+private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel: AccountViewModel, onDismiss: () -> Unit, onQuote: () -> Unit, onRepost: () -> Unit) {
     val iconSizePx = with(LocalDensity.current) {
         -iconSize.toPx().toInt()
     }
@@ -1211,8 +1293,13 @@ private fun BoostTypeChoicePopup(baseNote: Note, iconSize: Dp, accountViewModel:
             Button(
                 modifier = Modifier.padding(horizontal = 3.dp),
                 onClick = {
-                    scope.launch(Dispatchers.IO) {
-                        accountViewModel.boost(baseNote)
+                    if (accountViewModel.isWriteable()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.boost(baseNote)
+                            onDismiss()
+                        }
+                    } else {
+                        onRepost()
                         onDismiss()
                     }
                 },
@@ -1290,18 +1377,14 @@ private fun ActionableReactionButton(
     onChangeAmount: () -> Unit,
     toRemove: Set<String>
 ) {
-    val scope = rememberCoroutineScope()
-
     Button(
         modifier = Modifier.padding(horizontal = 3.dp),
         onClick = {
-            scope.launch(Dispatchers.IO) {
-                accountViewModel.reactToOrDelete(
-                    baseNote,
-                    reactionType
-                )
-                onDismiss()
-            }
+            accountViewModel.reactToOrDelete(
+                baseNote,
+                reactionType
+            )
+            onDismiss()
         },
         shape = ButtonBorder,
         colors = ButtonDefaults
@@ -1312,13 +1395,11 @@ private fun ActionableReactionButton(
         val thisModifier = remember(reactionType) {
             Modifier.combinedClickable(
                 onClick = {
-                    scope.launch(Dispatchers.IO) {
-                        accountViewModel.reactToOrDelete(
-                            baseNote,
-                            reactionType
-                        )
-                        onDismiss()
-                    }
+                    accountViewModel.reactToOrDelete(
+                        baseNote,
+                        reactionType
+                    )
+                    onDismiss()
                 },
                 onLongClick = {
                     onChangeAmount()
@@ -1391,10 +1472,11 @@ fun ZapAmountChoicePopup(
     onDismiss: () -> Unit,
     onChangeAmount: () -> Unit,
     onError: (text: String) -> Unit,
-    onProgress: (percent: Float) -> Unit
+    onProgress: (percent: Float) -> Unit,
+    onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit
 ) {
     val context = LocalContext.current
-
+    val scope = rememberCoroutineScope()
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account ?: return
     val zapMessage = ""
@@ -1417,6 +1499,7 @@ fun ZapAmountChoicePopup(
                             context,
                             onError,
                             onProgress,
+                            onPayViaIntent,
                             account.defaultZapType
                         )
                         onDismiss()
@@ -1441,6 +1524,7 @@ fun ZapAmountChoicePopup(
                                     context,
                                     onError,
                                     onProgress,
+                                    onPayViaIntent,
                                     account.defaultZapType
                                 )
                                 onDismiss()

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

@@ -314,7 +314,8 @@ private fun EmojiSelector(accountViewModel: AccountViewModel, nav: (String) -> U
             accountViewModel.userProfile().pubkeyHex,
             "",
             null
-        )
+        ),
+        accountViewModel
     ) { emptyNote ->
         emptyNote?.let { usersEmojiList ->
             val collections by usersEmojiList.live().metadata.map {
@@ -339,7 +340,7 @@ fun EmojiCollectionGallery(emojiCollections: List<ATag>, accountViewModel: Accou
         state = listState
     ) {
         itemsIndexed(emojiCollections, key = { _, item -> item.toTag() }) { _, item ->
-            LoadAddressableNote(aTag = item) {
+            LoadAddressableNote(aTag = item, accountViewModel) {
                 it?.let {
                     WatchAndRenderNote(it, bgColor, accountViewModel, nav, onClick)
                 }

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

@@ -73,6 +73,7 @@ import com.vitorpamplona.amethyst.ui.actions.SaveButton
 import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.getFragmentActivity
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
@@ -219,8 +220,7 @@ fun UpdateZapAmountDialog(
         Triple(LnZapEvent.ZapType.NONZAP, stringResource(id = R.string.zap_type_nonzap), stringResource(id = R.string.zap_type_nonzap_explainer))
     )
 
-    val zapOptions = remember { zapTypes.map { it.second }.toImmutableList() }
-    val zapOptionExplainers = remember { zapTypes.map { it.third }.toImmutableList() }
+    val zapOptions = remember { zapTypes.map { TitleExplainer(it.second, it.third) }.toImmutableList() }
 
     LaunchedEffect(accountViewModel, nip47uri) {
         postViewModel.load()
@@ -361,7 +361,6 @@ fun UpdateZapAmountDialog(
                                 placeholder = zapTypes.filter { it.first == accountViewModel.defaultZapType() }
                                     .first().second,
                                 options = zapOptions,
-                                explainers = zapOptionExplainers,
                                 onSelect = {
                                     postViewModel.selectedZapType = zapTypes[it].first
                                 },
@@ -387,6 +386,19 @@ fun UpdateZapAmountDialog(
                                 Modifier.weight(1f)
                             )
 
+                            /* TODO: Find a way to open this in the PWA
+                            IconButton(onClick = {
+                                onClose()
+                                runCatching { uri.openUri("https://app.mutinywallet.com/settings/connections?callbackUri=nostr+walletconnect&name=Amethyst") }
+                            }) {
+                                Icon(
+                                    painter = painterResource(R.mipmap.mutiny),
+                                    null,
+                                    modifier = Modifier.size(24.dp),
+                                    tint = Color.Unspecified
+                                )
+                            }*/
+
                             IconButton(onClick = {
                                 onClose()
                                 runCatching { uri.openUri("https://nwc.getalby.com/apps/new?c=Amethyst") }

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

@@ -43,11 +43,13 @@ import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ReportNoteDialog
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.toHexKey
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -102,6 +104,32 @@ fun DisplayBlankAuthor(size: Dp, modifier: Modifier = Modifier) {
     )
 }
 
+@Composable
+fun UserPicture(
+    userHex: String,
+    size: Dp,
+    pictureModifier: Modifier = remember { Modifier },
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    LoadUser(baseUserHex = userHex, accountViewModel) {
+        if (it != null) {
+            UserPicture(
+                user = it,
+                size = size,
+                pictureModifier = pictureModifier,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
+        } else {
+            DisplayBlankAuthor(
+                size,
+                pictureModifier
+            )
+        }
+    }
+}
+
 @Composable
 fun UserPicture(
     user: User,
@@ -188,57 +216,57 @@ fun NonClickableUserPictures(
 
         when (userList.size) {
             0 -> {}
-            1 -> LoadUser(baseUserHex = userList[0]) {
+            1 -> LoadUser(baseUserHex = userList[0], accountViewModel) {
                 it?.let {
                     BaseUserPicture(it, size, accountViewModel, outerModifier = Modifier)
                 }
             }
             2 -> {
-                LoadUser(baseUserHex = userList[0]) {
+                LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(1.5f), accountViewModel, outerModifier = Modifier.align(Alignment.CenterStart))
                     }
                 }
-                LoadUser(baseUserHex = userList[1]) {
+                LoadUser(baseUserHex = userList[1], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(1.5f), accountViewModel, outerModifier = Modifier.align(Alignment.CenterEnd))
                     }
                 }
             }
             3 -> {
-                LoadUser(baseUserHex = userList[0]) {
+                LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(1.8f), accountViewModel, outerModifier = Modifier.align(Alignment.BottomStart))
                     }
                 }
-                LoadUser(baseUserHex = userList[1]) {
+                LoadUser(baseUserHex = userList[1], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(1.8f), accountViewModel, outerModifier = Modifier.align(Alignment.TopCenter))
                     }
                 }
-                LoadUser(baseUserHex = userList[2]) {
+                LoadUser(baseUserHex = userList[2], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(1.8f), accountViewModel, outerModifier = Modifier.align(Alignment.BottomEnd))
                     }
                 }
             }
             else -> {
-                LoadUser(baseUserHex = userList[0]) {
+                LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(2f), accountViewModel, outerModifier = Modifier.align(Alignment.BottomStart))
                     }
                 }
-                LoadUser(baseUserHex = userList[1]) {
+                LoadUser(baseUserHex = userList[1], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(2f), accountViewModel, outerModifier = Modifier.align(Alignment.TopStart))
                     }
                 }
-                LoadUser(baseUserHex = userList[2]) {
+                LoadUser(baseUserHex = userList[2], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(2f), accountViewModel, outerModifier = Modifier.align(Alignment.BottomEnd))
                     }
                 }
-                LoadUser(baseUserHex = userList[3]) {
+                LoadUser(baseUserHex = userList[3], accountViewModel) {
                     it?.let {
                         BaseUserPicture(it, size.div(2f), accountViewModel, outerModifier = Modifier.align(Alignment.TopEnd))
                     }
@@ -383,11 +411,15 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, accountVi
         val scope = rememberCoroutineScope()
 
         if (!state.isFollowingAuthor) {
-            DropdownMenuItem(onClick = {
-                accountViewModel.follow(
-                    note.author ?: return@DropdownMenuItem
-                ); onDismiss()
-            }) {
+            DropdownMenuItem(
+                onClick = {
+                    val author = note.author ?: return@DropdownMenuItem
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.follow(author)
+                        onDismiss()
+                    }
+                }
+            ) {
                 Text(stringResource(R.string.follow))
             }
             Divider()
@@ -438,36 +470,104 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, accountVi
             Text(stringResource(R.string.quick_action_share))
         }
         Divider()
-        if (state.isPrivateBookmarkNote) {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.removePrivateBookmark(note); onDismiss() } }) {
-                Text(stringResource(R.string.remove_from_private_bookmarks))
-            }
-        } else {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.addPrivateBookmark(note); onDismiss() } }) {
-                Text(stringResource(R.string.add_to_private_bookmarks))
-            }
-        }
-        if (state.isPublicBookmarkNote) {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.removePublicBookmark(note); onDismiss() } }) {
-                Text(stringResource(R.string.remove_from_public_bookmarks))
-            }
-        } else {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.addPublicBookmark(note); onDismiss() } }) {
-                Text(stringResource(R.string.add_to_public_bookmarks))
-            }
-        }
-        Divider()
         DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.broadcast(note); onDismiss() } }) {
             Text(stringResource(R.string.broadcast))
         }
         Divider()
-        if (state.isLoggedUser) {
-            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.delete(note); onDismiss() } }) {
-                Text(stringResource(R.string.request_deletion))
+        if (state.isPrivateBookmarkNote) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.removePrivateBookmark(note, bookmarks?.decryptedContent ?: "")
+                        } else {
+                            accountViewModel.removePrivateBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
+                Text(stringResource(R.string.remove_from_private_bookmarks))
             }
         } else {
-            DropdownMenuItem(onClick = { reportDialogShowing = true }) {
-                Text(stringResource(R.string.block_report))
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.addPrivateBookmark(note, bookmarks?.decryptedContent ?: "")
+                        } else {
+                            accountViewModel.addPrivateBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
+                Text(stringResource(R.string.add_to_private_bookmarks))
+            }
+        }
+        if (state.isPublicBookmarkNote) {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.removePublicBookmark(
+                                note,
+                                bookmarks?.decryptedContent ?: ""
+                            )
+                        } else {
+                            accountViewModel.removePublicBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
+                Text(stringResource(R.string.remove_from_public_bookmarks))
+            }
+        } else {
+            DropdownMenuItem(
+                onClick = {
+                    scope.launch(Dispatchers.IO) {
+                        if (accountViewModel.loggedInWithExternalSigner()) {
+                            val bookmarks = accountViewModel.userProfile().latestBookmarkList
+                            ExternalSignerUtils.decrypt(
+                                bookmarks?.content ?: "",
+                                accountViewModel.account.keyPair.pubKey.toHexKey(),
+                                bookmarks?.id ?: ""
+                            )
+                            bookmarks?.decryptedContent = ExternalSignerUtils.cachedDecryptedContent[bookmarks?.id ?: ""] ?: ""
+                            accountViewModel.addPublicBookmark(
+                                note,
+                                bookmarks?.decryptedContent ?: ""
+                            )
+                        } else {
+                            accountViewModel.addPublicBookmark(note)
+                            onDismiss()
+                        }
+                    }
+                }
+            ) {
+                Text(stringResource(R.string.add_to_public_bookmarks))
             }
         }
         Divider()
@@ -486,6 +586,16 @@ fun NoteDropDownMenu(note: Note, popupExpanded: MutableState<Boolean>, accountVi
                 Text(stringResource(R.string.content_warning_see_warnings))
             }
         }
+        Divider()
+        if (state.isLoggedUser) {
+            DropdownMenuItem(onClick = { scope.launch(Dispatchers.IO) { accountViewModel.delete(note); onDismiss() } }) {
+                Text(stringResource(R.string.request_deletion))
+            }
+        } else {
+            DropdownMenuItem(onClick = { reportDialogShowing = true }) {
+                Text(stringResource(R.string.block_report))
+            }
+        }
     }
 
     if (reportDialogShowing) {

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

@@ -15,6 +15,7 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.text.font.FontWeight
@@ -31,20 +32,20 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.ImmutableListOfLists
 
 @Composable
-fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier, showPlayButton: Boolean = true) {
+fun NoteUsernameDisplay(baseNote: Note, weight: Modifier = Modifier, showPlayButton: Boolean = true, textColor: Color = Color.Unspecified) {
     val authorState by baseNote.live().metadata.map {
         it.note.author
     }.observeAsState(baseNote.author)
 
     Crossfade(targetState = authorState, modifier = weight) {
         it?.let {
-            UsernameDisplay(it, weight, showPlayButton)
+            UsernameDisplay(it, weight, showPlayButton, textColor = textColor)
         }
     }
 }
 
 @Composable
-fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier, showPlayButton: Boolean = true, fontWeight: FontWeight = FontWeight.Bold) {
+fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier, showPlayButton: Boolean = true, fontWeight: FontWeight = FontWeight.Bold, textColor: Color = Color.Unspecified) {
     val npubDisplay by remember {
         derivedStateOf {
             baseUser.pubkeyDisplayHex()
@@ -57,9 +58,9 @@ fun UsernameDisplay(baseUser: User, weight: Modifier = Modifier, showPlayButton:
 
     Crossfade(targetState = userMetadata, modifier = weight) {
         if (it != null) {
-            UserNameDisplay(it.bestUsername(), it.bestDisplayName(), npubDisplay, it.tags, weight, showPlayButton, fontWeight)
+            UserNameDisplay(it.bestUsername(), it.bestDisplayName(), npubDisplay, it.tags, weight, showPlayButton, fontWeight, textColor)
         } else {
-            NPubDisplay(npubDisplay, weight, fontWeight)
+            NPubDisplay(npubDisplay, weight, fontWeight, textColor)
         }
     }
 }
@@ -72,27 +73,29 @@ private fun UserNameDisplay(
     tags: ImmutableListOfLists<String>?,
     modifier: Modifier,
     showPlayButton: Boolean = true,
-    fontWeight: FontWeight = FontWeight.Bold
+    fontWeight: FontWeight = FontWeight.Bold,
+    textColor: Color = Color.Unspecified
 ) {
     if (bestUserName != null && bestDisplayName != null && bestDisplayName != bestUserName) {
-        UserAndUsernameDisplay(bestDisplayName.trim(), tags, bestUserName.trim(), modifier, showPlayButton, fontWeight)
+        UserAndUsernameDisplay(bestDisplayName.trim(), tags, bestUserName.trim(), modifier, showPlayButton, fontWeight, textColor)
     } else if (bestDisplayName != null) {
-        UserDisplay(bestDisplayName.trim(), tags, modifier, showPlayButton, fontWeight)
+        UserDisplay(bestDisplayName.trim(), tags, modifier, showPlayButton, fontWeight, textColor)
     } else if (bestUserName != null) {
-        UserDisplay(bestUserName.trim(), tags, modifier, showPlayButton, fontWeight)
+        UserDisplay(bestUserName.trim(), tags, modifier, showPlayButton, fontWeight, textColor)
     } else {
-        NPubDisplay(npubDisplay, modifier, fontWeight)
+        NPubDisplay(npubDisplay, modifier, fontWeight, textColor)
     }
 }
 
 @Composable
-fun NPubDisplay(npubDisplay: String, modifier: Modifier, fontWeight: FontWeight = FontWeight.Bold) {
+fun NPubDisplay(npubDisplay: String, modifier: Modifier, fontWeight: FontWeight = FontWeight.Bold, textColor: Color = Color.Unspecified) {
     Text(
         text = npubDisplay,
         fontWeight = fontWeight,
         modifier = modifier,
         maxLines = 1,
-        overflow = TextOverflow.Ellipsis
+        overflow = TextOverflow.Ellipsis,
+        color = textColor
     )
 }
 
@@ -102,7 +105,8 @@ private fun UserDisplay(
     tags: ImmutableListOfLists<String>?,
     modifier: Modifier,
     showPlayButton: Boolean = true,
-    fontWeight: FontWeight = FontWeight.Bold
+    fontWeight: FontWeight = FontWeight.Bold,
+    textColor: Color = Color.Unspecified
 ) {
     Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
         CreateTextWithEmoji(
@@ -111,7 +115,8 @@ private fun UserDisplay(
             fontWeight = fontWeight,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
-            modifier = modifier
+            modifier = modifier,
+            color = textColor
         )
         if (showPlayButton) {
             Spacer(StdHorzSpacer)
@@ -127,7 +132,8 @@ private fun UserAndUsernameDisplay(
     bestUserName: String,
     modifier: Modifier,
     showPlayButton: Boolean = true,
-    fontWeight: FontWeight = FontWeight.Bold
+    fontWeight: FontWeight = FontWeight.Bold,
+    textColor: Color = Color.Unspecified
 ) {
     Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) {
         CreateTextWithEmoji(
@@ -135,7 +141,8 @@ private fun UserAndUsernameDisplay(
             tags = tags,
             fontWeight = fontWeight,
             maxLines = 1,
-            modifier = modifier
+            modifier = modifier,
+            color = textColor
         )
         /*
         CreateTextWithEmoji(

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

@@ -1,34 +1,63 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.*
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonColors
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Done
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+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.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.ZapPaymentHandler
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.TitleExplainer
 import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.LnZapEvent
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 class ZapOptionstViewModel : ViewModel() {
@@ -62,6 +91,7 @@ fun ZapCustomDialog(
     onClose: () -> Unit,
     onError: (text: String) -> Unit,
     onProgress: (percent: Float) -> Unit,
+    onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit,
     accountViewModel: AccountViewModel,
     baseNote: Note
 ) {
@@ -79,8 +109,7 @@ fun ZapCustomDialog(
         Triple(LnZapEvent.ZapType.NONZAP, stringResource(id = R.string.zap_type_nonzap), stringResource(id = R.string.zap_type_nonzap_explainer))
     )
 
-    val zapOptions = remember { zapTypes.map { it.second }.toImmutableList() }
-    val zapOptionExplainers = remember { zapTypes.map { it.third }.toImmutableList() }
+    val zapOptions = remember { zapTypes.map { TitleExplainer(it.second, it.third) }.toImmutableList() }
     var selectedZapType by remember(accountViewModel) { mutableStateOf(accountViewModel.account.defaultZapType) }
 
     Dialog(
@@ -113,6 +142,7 @@ fun ZapCustomDialog(
                             context,
                             onError = onError,
                             onProgress = onProgress,
+                            onPayViaIntent = onPayViaIntent,
                             zapType = selectedZapType
                         )
                         onClose()
@@ -153,7 +183,6 @@ fun ZapCustomDialog(
                         label = stringResource(id = R.string.zap_type),
                         placeholder = zapTypes.filter { it.first == accountViewModel.account.defaultZapType }.first().second,
                         options = zapOptions,
-                        explainers = zapOptionExplainers,
                         onSelect = {
                             selectedZapType = zapTypes[it].first
                         },
@@ -266,3 +295,130 @@ fun ErrorMessageDialog(
         }
     )
 }
+
+@Composable
+fun PayViaIntentDialog(
+    payingInvoices: ImmutableList<ZapPaymentHandler.Payable>,
+    accountViewModel: AccountViewModel,
+    onClose: () -> Unit,
+    onError: (String) -> Unit
+) {
+    val context = LocalContext.current
+
+    if (payingInvoices.size == 1) {
+        payViaIntent(payingInvoices.first().invoice, context, onError)
+    } else {
+        Dialog(
+            onDismissRequest = onClose,
+            properties = DialogProperties(
+                dismissOnClickOutside = false,
+                usePlatformDefaultWidth = false
+            )
+        ) {
+            Surface() {
+                Column(modifier = Modifier.padding(10.dp)) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        CloseButton(onPress = onClose)
+                    }
+
+                    Spacer(modifier = DoubleVertSpacer)
+
+                    payingInvoices.forEachIndexed { index, it ->
+                        val paid = remember {
+                            mutableStateOf(false)
+                        }
+
+                        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(vertical = Size10dp)) {
+                            if (it.user != null) {
+                                BaseUserPicture(it.user, Size55dp, accountViewModel = accountViewModel)
+                            } else {
+                                DisplayBlankAuthor(size = Size55dp)
+                            }
+
+                            Spacer(modifier = DoubleHorzSpacer)
+
+                            Column(modifier = Modifier.weight(1f)) {
+                                if (it.user != null) {
+                                    UsernameDisplay(it.user, showPlayButton = false)
+                                } else {
+                                    Text(
+                                        text = stringResource(id = R.string.wallet_number, index + 1),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                }
+                                Row() {
+                                    Text(
+                                        text = showAmount((it.amountMilliSats / 1000.0f).toBigDecimal()),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                    Spacer(modifier = StdHorzSpacer)
+                                    Text(
+                                        text = stringResource(id = R.string.sats),
+                                        maxLines = 1,
+                                        overflow = TextOverflow.Ellipsis,
+                                        fontWeight = FontWeight.Bold,
+                                        fontSize = 18.sp
+                                    )
+                                }
+                            }
+
+                            Spacer(modifier = DoubleHorzSpacer)
+
+                            PayButton(isActive = !paid.value) {
+                                paid.value = true
+
+                                payViaIntent(it.invoice, context, onError)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+fun payViaIntent(invoice: String, context: Context, onError: (String) -> Unit) {
+    try {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$invoice"))
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+
+        ContextCompat.startActivity(context, intent, null)
+    } catch (e: Exception) {
+        if (e.message != null) {
+            onError(context.getString(R.string.no_wallet_found_with_error, e.message!!))
+        } else {
+            onError(context.getString(R.string.no_wallet_found))
+        }
+    }
+}
+
+@Composable
+fun PayButton(isActive: Boolean, modifier: Modifier = Modifier, onPost: () -> Unit = {}) {
+    Button(
+        modifier = modifier,
+        onClick = {
+            onPost()
+        },
+        shape = ButtonBorder,
+        colors = ButtonDefaults
+            .buttonColors(
+                backgroundColor = if (isActive) MaterialTheme.colors.primary else Color.Gray
+            ),
+        contentPadding = PaddingValues(0.dp)
+    ) {
+        if (isActive) {
+            Text(text = stringResource(R.string.pay), color = Color.White)
+        } else {
+            Text(text = stringResource(R.string.paid), color = Color.White)
+        }
+    }
+}

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

@@ -26,7 +26,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.screen.ZapReqResponse
@@ -40,7 +39,6 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -53,16 +51,9 @@ fun ZapNoteCompose(baseReqResponse: ZapReqResponse, accountViewModel: AccountVie
     }
 
     LaunchedEffect(baseNoteRequest) {
-        launch(Dispatchers.Default) {
-            (baseNoteRequest?.note?.event as? LnZapRequestEvent)?.let {
-                baseNoteRequest?.note?.let {
-                    val decryptedContent = accountViewModel.decryptZap(it)
-                    if (decryptedContent != null) {
-                        baseAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                    } else {
-                        baseAuthor = it.author
-                    }
-                }
+        baseNoteRequest?.note?.let {
+            accountViewModel.decryptAmountMessage(it, baseReqResponse.zapEvent) {
+                baseAuthor = it?.user
             }
         }
     }
@@ -173,6 +164,8 @@ fun UserActionOptions(
     baseAuthor: User,
     accountViewModel: AccountViewModel
 ) {
+    val scope = rememberCoroutineScope()
+
     WatchIsHiddenUser(baseAuthor, accountViewModel) { isHidden ->
         if (isHidden) {
             ShowUserButton {
@@ -209,14 +202,20 @@ fun ShowFollowingOrUnfollowingButton(
     if (isFollowing) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.unfollow(baseAuthor)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -227,14 +226,20 @@ fun ShowFollowingOrUnfollowingButton(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.follow(baseAuthor)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -5,13 +5,14 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -24,8 +25,10 @@ import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.ui.screen.ZapUserSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.Size25dp
 import com.vitorpamplona.amethyst.ui.theme.Size55Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -84,11 +87,33 @@ fun ZapUserSetCompose(zapSetCard: ZapUserSetCard, isInnerNote: Boolean = false,
                 }
             }
 
-            Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
-                val zapEvents by remember { derivedStateOf { zapSetCard.zapEvents } }
-                AuthorGalleryZaps(zapEvents, backgroundColor, nav, accountViewModel)
+            Column(modifier = Modifier) {
+                Row(Modifier.fillMaxWidth()) {
+                    MapZaps(zapSetCard.zapEvents, accountViewModel) {
+                        AuthorGalleryZaps(it, backgroundColor, nav, accountViewModel)
+                    }
+                }
 
-                UserCompose(baseUser = zapSetCard.user, accountViewModel = accountViewModel, nav = nav)
+                Spacer(DoubleVertSpacer)
+
+                Row(Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp).fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                    UserPicture(
+                        zapSetCard.user,
+                        Size55dp,
+                        accountViewModel = accountViewModel,
+                        nav = nav
+                    )
+
+                    Column(modifier = remember { Modifier.padding(start = 10.dp).weight(1f) }) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            UsernameDisplay(zapSetCard.user)
+                        }
+
+                        AboutDisplay(zapSetCard.user)
+                    }
+                }
+
+                Spacer(DoubleVertSpacer)
             }
         }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/QrCodeScanner.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import com.google.zxing.client.android.Intents
 import com.journeyapps.barcodescanner.ScanContract
@@ -40,8 +39,6 @@ fun NIP19QrCodeScanner(onScan: (String?) -> Unit) {
 
 @Composable
 fun SimpleQrCodeScanner(onScan: (String?) -> Unit) {
-    val lifecycleOwner = LocalLifecycleOwner.current
-
     val qrLauncher =
         rememberLauncherForActivityResult(ScanContract()) {
             if (it.contents != null) {
@@ -59,7 +56,7 @@ fun SimpleQrCodeScanner(onScan: (String?) -> Unit) {
         addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN)
     }
 
-    DisposableEffect(lifecycleOwner) {
+    DisposableEffect(Unit) {
         qrLauncher.launch(scanOptions)
         onDispose { }
     }

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

@@ -45,21 +45,21 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
         }
     }
 
-    fun startUI(key: String, useProxy: Boolean, proxyPort: Int) {
+    fun startUI(key: String, useProxy: Boolean, proxyPort: Int, loginWithExternalSigner: Boolean = false) {
         val parsed = Nip19.uriToRoute(key)
         val pubKeyParsed = parsed?.hex?.hexToByteArray()
         val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
 
         val account =
             if (key.startsWith("nsec")) {
-                Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else if (pubKeyParsed != null) {
-                Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else if (EMAIL_PATTERN.matcher(key).matches()) {
                 // Evaluate NIP-5
-                Account(KeyPair(), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             } else {
-                Account(KeyPair(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort)
+                Account(KeyPair(Hex.decode(key)), proxy = proxy, proxyPort = proxyPort, loginWithExternalSigner = loginWithExternalSigner)
             }
 
         LocalPreferences.updatePrefsForLogin(account)

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

@@ -34,6 +34,9 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import kotlin.time.measureTimedValue
 
 @Stable
@@ -173,6 +176,8 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
                 }
             }
 
+        val sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd") // SimpleDateFormat()
+
         val allBaseNotes = zapsPerEvent.keys + boostsPerEvent.keys + reactionsPerEvent.keys
         val multiCards = allBaseNotes.map { baseNote ->
             val boostsInCard = boostsPerEvent[baseNote] ?: emptyList()
@@ -180,26 +185,47 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
             val zapsInCard = zapsPerEvent[baseNote] ?: emptyList()
 
             val singleList = (boostsInCard + zapsInCard.map { it.response } + reactionsInCard)
-                .sortedWith(compareBy({ it.createdAt() }, { it.idHex }))
-                .reversed()
+                .groupBy {
+                    sdf.format(
+                        Instant.ofEpochSecond(it.createdAt() ?: 0)
+                            .atZone(ZoneId.systemDefault())
+                            .toLocalDateTime()
+                    )
+                }
 
-            singleList.chunked(30).map { chunk ->
-                MultiSetCard(
-                    baseNote,
-                    boostsInCard.filter { it in chunk }.toImmutableList(),
-                    reactionsInCard.filter { it in chunk }.toImmutableList(),
-                    zapsInCard.filter { it.response in chunk }.toImmutableList()
+            val days = singleList.keys.sortedBy { it }
+
+            days.mapNotNull {
+                val sortedList = singleList.get(it)?.sortedWith(compareBy({ it.createdAt() }, { it.idHex }))?.reversed()
+
+                sortedList?.chunked(30)?.map { chunk ->
+                    MultiSetCard(
+                        baseNote,
+                        boostsInCard.filter { it in chunk }.toImmutableList(),
+                        reactionsInCard.filter { it in chunk }.toImmutableList(),
+                        zapsInCard.filter { it.response in chunk }.toImmutableList()
+                    )
+                }
+            }.flatten()
+        }.flatten()
+
+        val userZaps = zapsPerUser.map { user ->
+            val byDay = user.value.groupBy {
+                sdf.format(
+                    Instant.ofEpochSecond(it.createdAt() ?: 0)
+                        .atZone(ZoneId.systemDefault())
+                        .toLocalDateTime()
+                )
+            }
+
+            byDay.values.map {
+                ZapUserSetCard(
+                    user.key,
+                    it.sortedWith(compareBy({ it.createdAt() }, { it.idHex() })).reversed().toImmutableList()
                 )
             }
         }.flatten()
 
-        val userZaps = zapsPerUser.map {
-            ZapUserSetCard(
-                it.key,
-                it.value.toImmutableList()
-            )
-        }
-
         val textNoteCards = notes.filter { it.event !is ReactionEvent && it.event !is RepostEvent && it.event !is GenericRepostEvent && it.event !is LnZapEvent }.map {
             if (it.event is PrivateDmEvent || it.event is ChatMessageEvent) {
                 MessageSetCard(it)

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

@@ -87,6 +87,8 @@ open class LnZapFeedViewModel(val dataSource: FeedFilter<ZapReqResponse>) : View
             checkNotInMainThread()
 
             LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                 invalidateData()
             }
         }

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

@@ -70,16 +70,20 @@ class RelayFeedViewModel : ViewModel() {
     }
 
     fun subscribeTo(user: User) {
-        currentUser = user
-        user.live().relays.observeForever(listener)
-        user.live().relayInfo.observeForever(listener)
-        invalidateData()
+        if (currentUser != user) {
+            currentUser = user
+            user.live().relays.observeForever(listener)
+            user.live().relayInfo.observeForever(listener)
+            invalidateData()
+        }
     }
 
     fun unsubscribeTo(user: User) {
-        user.live().relays.removeObserver(listener)
-        user.live().relayInfo.removeObserver(listener)
-        currentUser = null
+        if (currentUser == user) {
+            user.live().relays.removeObserver(listener)
+            user.live().relayInfo.removeObserver(listener)
+            currentUser = null
+        }
     }
 
     private val bundler = BundledUpdate(250, Dispatchers.IO)

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

@@ -47,7 +47,7 @@ fun rememberForeverLazyListState(
             savedOffset.roundToInt()
         )
     }
-    DisposableEffect(Unit) {
+    DisposableEffect(scrollState) {
         onDispose {
             val lastIndex = scrollState.firstVisibleItemIndex
             val lastOffset = scrollState.firstVisibleItemScrollOffset

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

@@ -61,6 +61,7 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
 import com.vitorpamplona.amethyst.ui.note.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader
+import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.SmallBorder
 import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -146,7 +147,7 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
                         ) {
                             itemsIndexed(state.feed.value, key = { _, item -> item.idHex }) { index, item ->
                                 if (index == 0) {
-                                    ProvideTextStyle(TextStyle(fontSize = 16.sp, lineHeight = 1.20.em)) {
+                                    ProvideTextStyle(TextStyle(fontSize = 18.sp, lineHeight = 1.20.em)) {
                                         NoteMaster(
                                             item,
                                             modifier = Modifier.drawReplyLevel(
@@ -463,6 +464,13 @@ fun NoteMaster(
                 }
             }
 
+            val noteEvent = baseNote.event
+            val zapSplits = remember(noteEvent) { noteEvent?.hasZapSplitSetup() ?: false }
+            if (zapSplits && noteEvent != null) {
+                Spacer(modifier = DoubleVertSpacer)
+                DisplayZapSplits(noteEvent, accountViewModel, nav)
+            }
+
             ReactionsRow(note, true, accountViewModel, nav)
 
             Divider(
@@ -589,20 +597,20 @@ private fun RenderLongFormHeaderForThread(noteEvent: LongTextNoteEvent) {
                     contentScale = ContentScale.FillWidth,
                     modifier = Modifier.fillMaxWidth()
                 )
-                Spacer(modifier = Modifier.height(10.dp))
             }
 
             noteEvent.title()?.let {
+                Spacer(modifier = DoubleVertSpacer)
                 Text(
                     text = it,
                     fontSize = 28.sp,
                     fontWeight = FontWeight.Light,
                     modifier = Modifier.fillMaxWidth()
                 )
-                Spacer(modifier = Modifier.height(10.dp))
             }
 
-            noteEvent.summary()?.let {
+            noteEvent.summary()?.ifBlank { null }?.let {
+                Spacer(modifier = DoubleVertSpacer)
                 Text(
                     text = it,
                     modifier = Modifier.fillMaxWidth(),

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

@@ -101,10 +101,12 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>) : ViewModel(), In
     private val bundler = BundledUpdate(250, Dispatchers.IO)
 
     override fun invalidateData(ignoreIfDoing: Boolean) {
-        bundler.invalidate(ignoreIfDoing) {
-            // adds the time to perform the refresh into this delay
-            // holding off new updates in case of heavy refresh routines.
-            refreshSuspended()
+        viewModelScope.launch(Dispatchers.IO) {
+            bundler.invalidate(ignoreIfDoing) {
+                // adds the time to perform the refresh into this delay
+                // holding off new updates in case of heavy refresh routines.
+                refreshSuspended()
+            }
         }
     }
 
@@ -116,6 +118,8 @@ open class UserFeedViewModel(val dataSource: FeedFilter<User>) : ViewModel(), In
             checkNotInMainThread()
 
             LocalCache.live.newEventBundles.collect { newNotes ->
+                checkNotInMainThread()
+
                 invalidateData()
             }
         }

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

@@ -1,21 +1,18 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.distinctUntilChanged
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
-import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountState
 import com.vitorpamplona.amethyst.model.AddressableNote
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
@@ -27,32 +24,40 @@ import com.vitorpamplona.amethyst.service.Nip05Verifier
 import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.service.OnlineChecker
-import com.vitorpamplona.amethyst.service.lnurl.LightningAddressResolver
+import com.vitorpamplona.amethyst.service.ZapPaymentHandler
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.ui.actions.Dao
+import com.vitorpamplona.amethyst.ui.components.MarkdownParser
 import com.vitorpamplona.amethyst.ui.components.UrlPreviewState
 import com.vitorpamplona.amethyst.ui.note.ZapAmountCommentNotification
 import com.vitorpamplona.amethyst.ui.note.ZapraiserStatus
 import com.vitorpamplona.amethyst.ui.note.showAmount
+import com.vitorpamplona.amethyst.ui.screen.CombinedZap
+import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.encoders.Nip19
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.GiftWrapEvent
+import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
-import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
+import com.vitorpamplona.quartz.events.Participant
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
 import com.vitorpamplona.quartz.events.UserMetadata
 import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import java.util.Locale
 
 @Stable
-class AccountViewModel(val account: Account) : ViewModel() {
+class AccountViewModel(val account: Account) : ViewModel(), Dao {
     val accountLiveData: LiveData<AccountState> = account.live.map { it }
     val accountLanguagesLiveData: LiveData<AccountState> = account.liveLanguages.map { it }
     val accountLastReadLiveData: LiveData<AccountState> = account.liveLastRead.map { it }
@@ -102,6 +107,10 @@ class AccountViewModel(val account: Account) : ViewModel() {
         return account.isWriteable()
     }
 
+    fun loggedInWithExternalSigner(): Boolean {
+        return account.loginWithExternalSigner
+    }
+
     fun userProfile(): User {
         return account.userProfile()
     }
@@ -111,11 +120,13 @@ class AccountViewModel(val account: Account) : ViewModel() {
     }
 
     fun reactToOrDelete(note: Note, reaction: String) {
-        val currentReactions = account.reactionTo(note, reaction)
-        if (currentReactions.isNotEmpty()) {
-            account.delete(currentReactions)
-        } else {
-            account.reactTo(note, reaction)
+        viewModelScope.launch(Dispatchers.IO) {
+            val currentReactions = account.reactionTo(note, reaction)
+            if (currentReactions.isNotEmpty()) {
+                account.delete(currentReactions)
+            } else {
+                account.reactTo(note, reaction)
+            }
         }
     }
 
@@ -176,6 +187,38 @@ class AccountViewModel(val account: Account) : ViewModel() {
         }
     }
 
+    fun decryptAmountMessageInGroup(
+        zaps: ImmutableList<CombinedZap>,
+        onNewState: (ImmutableList<ZapAmountCommentNotification>) -> Unit
+    ) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val list = ArrayList<ZapAmountCommentNotification>(zaps.size)
+            zaps.forEach {
+                innerDecryptAmountMessage(it.request, it.response)?.let {
+                    list.add(it)
+                }
+            }
+
+            onNewState(list.toImmutableList())
+        }
+    }
+
+    fun decryptAmountMessageInGroup(
+        baseNote: Note,
+        onNewState: (ImmutableList<ZapAmountCommentNotification>) -> Unit
+    ) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val list = ArrayList<ZapAmountCommentNotification>(baseNote.zaps.size)
+            baseNote.zaps.forEach {
+                innerDecryptAmountMessage(it.key, it.value)?.let {
+                    list.add(it)
+                }
+            }
+
+            onNewState(list.toImmutableList())
+        }
+    }
+
     fun decryptAmountMessage(
         zapRequest: Note,
         zapEvent: Note?,
@@ -190,6 +233,8 @@ class AccountViewModel(val account: Account) : ViewModel() {
         zapRequest: Note,
         zapEvent: Note?
     ): ZapAmountCommentNotification? {
+        checkNotInMainThread()
+
         (zapRequest.event as? LnZapRequestEvent)?.let {
             val decryptedContent = decryptZap(zapRequest)
             val amount = (zapEvent?.event as? LnZapEvent)?.amount
@@ -213,78 +258,22 @@ class AccountViewModel(val account: Account) : ViewModel() {
         return null
     }
 
-    fun zap(note: Note, amount: Long, pollOption: Int?, message: String, context: Context, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit, zapType: LnZapEvent.ZapType) {
+    fun zap(
+        note: Note,
+        amount: Long,
+        pollOption: Int?,
+        message: String,
+        context: Context,
+        onError: (String) -> Unit,
+        onProgress: (percent: Float) -> Unit,
+        onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit,
+        zapType: LnZapEvent.ZapType
+    ) {
         viewModelScope.launch(Dispatchers.IO) {
-            innerZap(note, amount, pollOption, message, context, onError, onProgress, zapType)
+            ZapPaymentHandler(account).zap(note, amount, pollOption, message, context, onError, onProgress, onPayViaIntent, zapType)
         }
     }
 
-    private suspend fun innerZap(note: Note, amount: Long, pollOption: Int?, message: String, context: Context, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit, zapType: LnZapEvent.ZapType) {
-        val lud16 = note.event?.zapAddress() ?: note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
-
-        if (lud16.isNullOrBlank()) {
-            onError(context.getString(R.string.user_does_not_have_a_lightning_address_setup_to_receive_sats))
-            return
-        }
-
-        var zapRequestJson = ""
-
-        if (zapType != LnZapEvent.ZapType.NONZAP) {
-            val zapRequest = account.createZapRequestFor(note, pollOption, message, zapType)
-            if (zapRequest != null) {
-                zapRequestJson = zapRequest.toJson()
-            }
-        }
-
-        onProgress(0.10f)
-
-        LightningAddressResolver().lnAddressInvoice(
-            lud16,
-            amount,
-            message,
-            zapRequestJson,
-            onSuccess = {
-                onProgress(0.7f)
-                if (account.hasWalletConnectSetup()) {
-                    account.sendZapPaymentRequestFor(
-                        bolt11 = it,
-                        note,
-                        onResponse = { response ->
-                            if (response is PayInvoiceErrorResponse) {
-                                onProgress(0.0f)
-                                onError(
-                                    response.error?.message
-                                        ?: response.error?.code?.toString()
-                                        ?: "Error parsing error message"
-                                )
-                            } else {
-                                onProgress(1f)
-                            }
-                        }
-                    )
-                    onProgress(0.8f)
-
-                    // Awaits for the event to come back to LocalCache.
-                    viewModelScope.launch(Dispatchers.IO) {
-                        delay(5000)
-                        onProgress(0f)
-                    }
-                } else {
-                    try {
-                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
-                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                        ContextCompat.startActivity(context, intent, null)
-                    } catch (e: Exception) {
-                        onError(context.getString(R.string.lightning_wallets_not_found))
-                    }
-                    onProgress(0f)
-                }
-            },
-            onError = onError,
-            onProgress = onProgress
-        )
-    }
-
     fun report(note: Note, type: ReportEvent.ReportType, content: String = "") {
         account.report(note, type, content)
     }
@@ -312,10 +301,26 @@ class AccountViewModel(val account: Account) : ViewModel() {
         account.addPrivateBookmark(note)
     }
 
+    fun addPrivateBookmark(note: Note, decryptedContent: String) {
+        account.addPrivateBookmark(note, decryptedContent)
+    }
+
+    fun addPublicBookmark(note: Note, decryptedContent: String) {
+        account.addPublicBookmark(note, decryptedContent)
+    }
+
+    fun removePublicBookmark(note: Note, decryptedContent: String) {
+        account.removePublicBookmark(note, decryptedContent)
+    }
+
     fun addPublicBookmark(note: Note) {
         account.addPublicBookmark(note)
     }
 
+    fun removePrivateBookmark(note: Note, decryptedContent: String) {
+        account.removePrivateBookmark(note, decryptedContent)
+    }
+
     fun removePrivateBookmark(note: Note) {
         account.removePrivateBookmark(note)
     }
@@ -427,7 +432,7 @@ class AccountViewModel(val account: Account) : ViewModel() {
     )
 
     fun isNoteAcceptable(note: Note, onReady: (NoteComposeReportState) -> Unit) {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             val isFromLoggedIn = note.author?.pubkeyHex == userProfile().pubkeyHex
             val isFromLoggedInFollow = note.author?.let { userProfile().isFollowingCached(it) } ?: true
 
@@ -564,6 +569,129 @@ class AccountViewModel(val account: Account) : ViewModel() {
         }
     }
 
+    fun runOnIO(runOnIO: () -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            runOnIO()
+        }
+    }
+
+    suspend fun checkGetOrCreateUser(key: HexKey): User? {
+        return LocalCache.checkGetOrCreateUser(key)
+    }
+
+    override suspend fun getOrCreateUser(key: HexKey): User {
+        return LocalCache.getOrCreateUser(key)
+    }
+
+    fun checkGetOrCreateUser(key: HexKey, onResult: (User?) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(checkGetOrCreateUser(key))
+        }
+    }
+
+    fun getUserIfExists(hex: HexKey): User? {
+        return LocalCache.getUserIfExists(hex)
+    }
+
+    suspend fun checkGetOrCreateNote(key: HexKey): Note? {
+        return LocalCache.checkGetOrCreateNote(key)
+    }
+
+    override suspend fun getOrCreateNote(key: HexKey): Note {
+        return LocalCache.getOrCreateNote(key)
+    }
+
+    fun checkGetOrCreateNote(key: HexKey, onResult: (Note?) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(checkGetOrCreateNote(key))
+        }
+    }
+
+    fun getNoteIfExists(hex: HexKey): Note? {
+        return LocalCache.getNoteIfExists(hex)
+    }
+
+    override suspend fun checkGetOrCreateAddressableNote(key: HexKey): AddressableNote? {
+        return LocalCache.checkGetOrCreateAddressableNote(key)
+    }
+
+    fun checkGetOrCreateAddressableNote(key: HexKey, onResult: (AddressableNote?) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(checkGetOrCreateAddressableNote(key))
+        }
+    }
+
+    suspend fun getOrCreateAddressableNote(key: ATag): AddressableNote? {
+        return LocalCache.getOrCreateAddressableNote(key)
+    }
+
+    fun getOrCreateAddressableNote(key: ATag, onResult: (AddressableNote?) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(getOrCreateAddressableNote(key))
+        }
+    }
+
+    fun getAddressableNoteIfExists(key: String): AddressableNote? {
+        return LocalCache.addressables[key]
+    }
+
+    fun findStatusesForUser(myUser: User, onResult: (ImmutableList<AddressableNote>) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(LocalCache.findStatusesForUser(myUser))
+        }
+    }
+
+    suspend fun checkGetOrCreateChannel(key: HexKey): Channel? {
+        return LocalCache.checkGetOrCreateChannel(key)
+    }
+
+    fun checkGetOrCreateChannel(key: HexKey, onResult: (Channel?) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onResult(checkGetOrCreateChannel(key))
+        }
+    }
+
+    fun getChannelIfExists(hex: HexKey): Channel? {
+        return LocalCache.getChannelIfExists(hex)
+    }
+
+    fun loadParticipants(participants: List<Participant>, onReady: (ImmutableList<Pair<Participant, User>>) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val participantUsers = participants.mapNotNull { part ->
+                checkGetOrCreateUser(part.key)?.let {
+                    Pair(
+                        part,
+                        it
+                    )
+                }
+            }.toImmutableList()
+
+            onReady(participantUsers)
+        }
+    }
+
+    fun loadUsers(hexList: List<String>, onReady: (ImmutableList<User>) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onReady(
+                hexList.mapNotNull { hex ->
+                    checkGetOrCreateUser(hex)
+                }.sortedBy { account.isFollowing(it) }.reversed().toImmutableList()
+            )
+        }
+    }
+
+    fun returnNIP19References(content: String, tags: ImmutableListOfLists<String>?, onNewReferences: (List<Nip19.Return>) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onNewReferences(MarkdownParser().returnNIP19References(content, tags))
+        }
+    }
+
+    fun returnMarkdownWithSpecialContent(content: String, tags: ImmutableListOfLists<String>?, onNewContent: (String) -> Unit) {
+        viewModelScope.launch(Dispatchers.IO) {
+            onNewContent(MarkdownParser().returnMarkdownWithSpecialContent(content, tags))
+        }
+    }
+
     class Factory(val account: Account) : ViewModelProvider.Factory {
         override fun <AccountViewModel : ViewModel> create(modelClass: Class<AccountViewModel>): AccountViewModel {
             return AccountViewModel(account) as AccountViewModel

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

@@ -129,7 +129,7 @@ import com.vitorpamplona.amethyst.ui.theme.SmallBorder
 import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.StdPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
+import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
 import com.vitorpamplona.quartz.events.Participant
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
@@ -149,7 +149,7 @@ fun ChannelScreen(
 ) {
     if (channelId == null) return
 
-    LoadChannel(channelId) {
+    LoadChannel(channelId, accountViewModel) {
         PrepareChannelViewModels(
             baseChannel = it,
             accountViewModel = accountViewModel,
@@ -169,6 +169,7 @@ fun PrepareChannelViewModels(baseChannel: Channel, accountViewModel: AccountView
     )
 
     val channelScreenModel: NewPostViewModel = viewModel()
+    channelScreenModel.accountViewModel = accountViewModel
     channelScreenModel.account = accountViewModel.account
 
     ChannelScreen(
@@ -195,9 +196,6 @@ fun ChannelScreen(
     val lifeCycleOwner = LocalLifecycleOwner.current
 
     LaunchedEffect(Unit) {
-        NostrChannelDataSource.start()
-        feedViewModel.invalidateData(true)
-
         launch(Dispatchers.IO) {
             newPostModel.imageUploadingError.collect { error ->
                 withContext(Dispatchers.Main) {
@@ -208,6 +206,17 @@ fun ChannelScreen(
     }
 
     DisposableEffect(accountViewModel) {
+        NostrChannelDataSource.loadMessagesBetween(accountViewModel.account, channel)
+        NostrChannelDataSource.start()
+        feedViewModel.invalidateData(true)
+
+        onDispose {
+            NostrChannelDataSource.clear()
+            NostrChannelDataSource.stop()
+        }
+    }
+
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Channel Start")
@@ -239,6 +248,9 @@ fun ChannelScreen(
                     .weight(1f, true)
             }
         ) {
+            if (channel is LiveActivitiesChannel) {
+                ShowVideoStreaming(channel, accountViewModel)
+            }
             RefreshingChatroomFeedView(
                 viewModel = feedViewModel,
                 accountViewModel = accountViewModel,
@@ -267,7 +279,8 @@ fun ChannelScreen(
                     message = newPostModel.message.text,
                     mentions = listOfNotNull(replyTo.value?.author),
                     replyTos = listOfNotNull(replyTo.value),
-                    channelHex = channel.idHex
+                    channelHex = channel.idHex,
+                    dao = accountViewModel
                 )
                 tagger.run()
                 if (channel is PublicChatChannel) {
@@ -530,7 +543,7 @@ fun ChannelHeader(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadChannel(channelHex) {
+    LoadChannel(channelHex, accountViewModel) {
         ChannelHeader(
             it,
             showVideo,
@@ -749,9 +762,9 @@ fun LongChannelHeader(
 
                 val tags = remember(channelState) {
                     if (baseChannel is LiveActivitiesChannel) {
-                        baseChannel.info?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists()
+                        baseChannel.info?.tags()?.toImmutableListOfLists() ?: EmptyTagList
                     } else {
-                        ImmutableListOfLists()
+                        EmptyTagList
                     }
                 }
 
@@ -783,7 +796,7 @@ fun LongChannelHeader(
         }
     }
 
-    LoadNote(baseNoteHex = channel.idHex) { loadingNote ->
+    LoadNote(baseNoteHex = channel.idHex, accountViewModel) { loadingNote ->
         loadingNote?.let { note ->
             Row(
                 lineModifier,
@@ -886,7 +899,7 @@ private fun ShortChannelActionOptions(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    LoadNote(baseNoteHex = channel.idHex) {
+    LoadNote(baseNoteHex = channel.idHex, accountViewModel) {
         it?.let {
             var popupExpanded by remember { mutableStateOf(false) }
 

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

@@ -67,7 +67,7 @@ fun ChatroomListScreen(
     WatchAccountForListScreen(knownFeedViewModel, newFeedViewModel, accountViewModel)
 
     val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 NostrChatroomListDataSource.start()

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

@@ -185,6 +185,7 @@ fun PrepareChatroomViewModels(
     )
 
     val newPostModel: NewPostViewModel = viewModel()
+    newPostModel.accountViewModel = accountViewModel
     newPostModel.account = accountViewModel.account
     newPostModel.requiresNIP24 = room.users.size > 1
     if (newPostModel.requiresNIP24) {
@@ -233,9 +234,6 @@ fun ChatroomScreen(
 
     LaunchedEffect(room, accountViewModel) {
         launch(Dispatchers.IO) {
-            NostrChatroomDataSource.start()
-            feedViewModel.invalidateData()
-
             newPostModel.imageUploadingError.collect { error ->
                 withContext(Dispatchers.Main) {
                     Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
@@ -245,6 +243,16 @@ fun ChatroomScreen(
     }
 
     DisposableEffect(room, accountViewModel) {
+        NostrChatroomDataSource.loadMessagesBetween(accountViewModel.account, room)
+        NostrChatroomDataSource.start()
+        feedViewModel.invalidateData()
+
+        onDispose {
+            NostrChatroomDataSource.stop()
+        }
+    }
+
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Private Message Start")
@@ -482,7 +490,7 @@ fun ChatroomHeader(
     nav: (String) -> Unit
 ) {
     if (room.users.size == 1) {
-        LoadUser(baseUserHex = room.users.first()) { baseUser ->
+        LoadUser(baseUserHex = room.users.first(), accountViewModel) { baseUser ->
             if (baseUser != null) {
                 ChatroomHeader(baseUser = baseUser, modifier = modifier, accountViewModel = accountViewModel, nav = nav)
             }
@@ -559,7 +567,7 @@ fun GroupChatroomHeader(
 
                 Column(modifier = Modifier.padding(start = 10.dp)) {
                     RoomNameOnlyDisplay(room, Modifier, FontWeight.Bold, accountViewModel.userProfile())
-                    DisplayUserSetAsSubject(room, FontWeight.Normal)
+                    DisplayUserSetAsSubject(room, accountViewModel, FontWeight.Normal)
                 }
             }
 
@@ -733,7 +741,7 @@ fun LongRoomHeader(
         state = rememberLazyListState()
     ) {
         itemsIndexed(list, key = { _, item -> item }) { _, item ->
-            LoadUser(baseUserHex = item) {
+            LoadUser(baseUserHex = item, accountViewModel) {
                 if (it != null) {
                     UserCompose(
                         baseUser = it,

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

@@ -22,7 +22,7 @@ import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
 fun CommunityScreen(aTagHex: String?, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     if (aTagHex == null) return
 
-    LoadAddressableNote(aTagHex = aTagHex) {
+    LoadAddressableNote(aTagHex = aTagHex, accountViewModel) {
         it?.let {
             PrepareViewModelsCommunityScreen(
                 note = it,
@@ -56,7 +56,7 @@ fun CommunityScreen(note: AddressableNote, feedViewModel: NostrCommunityFeedView
         feedViewModel.invalidateData()
     }
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Community Start")

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

@@ -88,7 +88,7 @@ fun DiscoverScreen(
         accountViewModel = accountViewModel
     )
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Discovery Start")

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

@@ -65,12 +65,16 @@ fun GeoHashScreen(tag: String, feedViewModel: NostrGeoHashFeedViewModel, account
 
     NostrGeohashDataSource.loadHashtag(tag)
 
-    LaunchedEffect(tag) {
+    DisposableEffect(tag) {
         NostrGeohashDataSource.start()
         feedViewModel.invalidateData()
+        onDispose {
+            NostrGeohashDataSource.loadHashtag(null)
+            NostrGeohashDataSource.stop()
+        }
     }
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Hashtag Start")
@@ -88,8 +92,6 @@ fun GeoHashScreen(tag: String, feedViewModel: NostrGeoHashFeedViewModel, account
         lifeCycleOwner.lifecycle.addObserver(observer)
         onDispose {
             lifeCycleOwner.lifecycle.removeObserver(observer)
-            NostrGeohashDataSource.loadHashtag(null)
-            NostrGeohashDataSource.stop()
         }
     }
 
@@ -171,14 +173,20 @@ fun GeoHashActionOptions(
     if (isFollowingTag) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollowGeohash(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -189,14 +197,20 @@ fun GeoHashActionOptions(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.followGeohash(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -12,7 +12,6 @@ import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -61,12 +60,17 @@ fun HashtagScreen(tag: String, feedViewModel: NostrHashtagFeedViewModel, account
 
     NostrHashtagDataSource.loadHashtag(tag)
 
-    LaunchedEffect(tag) {
+    DisposableEffect(tag) {
         NostrHashtagDataSource.start()
         feedViewModel.invalidateData()
+
+        onDispose {
+            NostrHashtagDataSource.loadHashtag(null)
+            NostrHashtagDataSource.stop()
+        }
     }
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Hashtag Start")
@@ -84,8 +88,6 @@ fun HashtagScreen(tag: String, feedViewModel: NostrHashtagFeedViewModel, account
         lifeCycleOwner.lifecycle.addObserver(observer)
         onDispose {
             lifeCycleOwner.lifecycle.removeObserver(observer)
-            NostrHashtagDataSource.loadHashtag(null)
-            NostrHashtagDataSource.stop()
         }
     }
 
@@ -147,14 +149,20 @@ fun HashtagActionOptions(
     if (isFollowingTag) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollowHashtag(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -165,14 +173,20 @@ fun HashtagActionOptions(
     } else {
         FollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.followHashtag(tag)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {

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

@@ -61,7 +61,7 @@ fun HiddenUsersScreen(
 ) {
     val lifeCycleOwner = LocalLifecycleOwner.current
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Hidden Users Start")

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

@@ -63,7 +63,7 @@ fun HomeScreen(
     }
 
     val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 NostrHomeDataSource.invalidateFilters()

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

@@ -2,32 +2,42 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn
 
 import android.content.res.Configuration
 import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.Crossfade
+import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.with
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material.*
-import androidx.compose.material.DrawerValue
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ModalBottomSheetLayout
-import androidx.compose.material.ModalBottomSheetValue
-import androidx.compose.material.Scaffold
-import androidx.compose.material.rememberDrawerState
-import androidx.compose.material.rememberModalBottomSheetState
-import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.NestedScrollSource
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -37,12 +47,7 @@ import com.vitorpamplona.amethyst.ui.buttons.NewCommunityNoteButton
 import com.vitorpamplona.amethyst.ui.buttons.NewImageButton
 import com.vitorpamplona.amethyst.ui.buttons.NewNoteButton
 import com.vitorpamplona.amethyst.ui.navigation.*
-import com.vitorpamplona.amethyst.ui.navigation.AccountSwitchBottomSheet
-import com.vitorpamplona.amethyst.ui.navigation.AppBottomBar
-import com.vitorpamplona.amethyst.ui.navigation.AppNavigation
-import com.vitorpamplona.amethyst.ui.navigation.AppTopBar
-import com.vitorpamplona.amethyst.ui.navigation.DrawerContent
-import com.vitorpamplona.amethyst.ui.navigation.Route
+import com.vitorpamplona.amethyst.ui.navigation.Route.Companion.InvertedLayouts
 import com.vitorpamplona.amethyst.ui.note.UserReactionsViewModel
 import com.vitorpamplona.amethyst.ui.screen.AccountState
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
@@ -57,8 +62,9 @@ import com.vitorpamplona.amethyst.ui.screen.NostrVideoFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
 import com.vitorpamplona.amethyst.ui.screen.ThemeViewModel
 import kotlinx.coroutines.launch
+import kotlin.math.abs
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalAnimationApi::class)
 @Composable
 fun MainScreen(
     accountViewModel: AccountViewModel,
@@ -194,6 +200,36 @@ fun MainScreen(
         }
     }
 
+    val bottomBarHeightPx = with(LocalDensity.current) { 50.dp.roundToPx().toFloat() }
+    val bottomBarOffsetHeightPx = remember { mutableStateOf(0f) }
+
+    val nestedScrollConnection = remember {
+        object : NestedScrollConnection {
+            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
+                val delta = available.y
+                val newOffset = bottomBarOffsetHeightPx.value + delta
+
+                val currentRoute = navState.value?.destination?.route
+
+                bottomBarOffsetHeightPx.value = if (currentRoute !in InvertedLayouts) {
+                    newOffset.coerceIn(-bottomBarHeightPx, 0f)
+                } else {
+                    newOffset.coerceIn(0f, bottomBarHeightPx)
+                }
+
+                return Offset.Zero
+            }
+        }
+    }
+
+    val shouldShow = remember {
+        derivedStateOf {
+            abs(bottomBarOffsetHeightPx.value) < bottomBarHeightPx / 2.0f
+        }
+    }
+
+    WatchNavStateToUpdateBarVisibility(navState, bottomBarOffsetHeightPx)
+
     ModalBottomSheetLayout(
         sheetState = sheetState,
         sheetContent = {
@@ -203,12 +239,40 @@ fun MainScreen(
         Scaffold(
             modifier = Modifier
                 .background(MaterialTheme.colors.primaryVariant)
-                .statusBarsPadding(),
+                .statusBarsPadding()
+                .nestedScroll(nestedScrollConnection),
             bottomBar = {
-                AppBottomBar(accountViewModel, navState, navBottomRow)
+                AnimatedContent(
+                    targetState = shouldShow.value,
+                    transitionSpec = {
+                        slideInVertically { height -> height } togetherWith
+                            slideOutVertically { height -> height }
+                    }
+                ) { isVisible ->
+                    if (isVisible) {
+                        AppBottomBar(accountViewModel, navState, navBottomRow)
+                    }
+                }
             },
             topBar = {
-                AppTopBar(followLists, navState, scaffoldState, accountViewModel, nav = nav, navPopBack)
+                AnimatedContent(
+                    targetState = shouldShow.value,
+                    transitionSpec = {
+                        slideInVertically { height -> 0 } togetherWith
+                            slideOutVertically { height -> 0 }
+                    }
+                ) { isVisible ->
+                    if (isVisible) {
+                        AppTopBar(
+                            followLists,
+                            navState,
+                            scaffoldState,
+                            accountViewModel,
+                            nav = nav,
+                            navPopBack
+                        )
+                    }
+                }
             },
             drawerContent = {
                 DrawerContent(nav, scaffoldState, sheetState, accountViewModel)
@@ -217,11 +281,27 @@ fun MainScreen(
                 }
             },
             floatingActionButton = {
-                FloatingButtons(navState, accountViewModel, accountStateViewModel, nav, navBottomRow)
+                Crossfade(
+                    targetState = shouldShow.value,
+                    animationSpec = tween(durationMillis = 100)
+                ) { state ->
+                    if (state) {
+                        FloatingButtons(
+                            navState,
+                            accountViewModel,
+                            accountStateViewModel,
+                            nav,
+                            navBottomRow
+                        )
+                    }
+                }
             },
             scaffoldState = scaffoldState
         ) {
-            Column(modifier = Modifier.padding(bottom = it.calculateBottomPadding())) {
+            Column(
+                modifier = Modifier
+                    .padding(bottom = it.calculateBottomPadding())
+            ) {
                 AppNavigation(
                     homeFeedViewModel = homeFeedViewModel,
                     repliesFeedViewModel = repliesFeedViewModel,
@@ -242,6 +322,27 @@ fun MainScreen(
     }
 }
 
+@Composable
+fun WatchNavStateToUpdateBarVisibility(navState: State<NavBackStackEntry?>, bottomBarOffsetHeightPx: MutableState<Float>) {
+    LaunchedEffect(key1 = navState.value) {
+        bottomBarOffsetHeightPx.value = 0f
+    }
+
+    val lifeCycleOwner = LocalLifecycleOwner.current
+    DisposableEffect(lifeCycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                bottomBarOffsetHeightPx.value = 0f
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+}
+
 @Composable
 fun FloatingButtons(
     navEntryState: State<NavBackStackEntry?>,
@@ -251,11 +352,14 @@ fun FloatingButtons(
     navScrollToTop: (Route, Boolean) -> Unit
 ) {
     val accountState by accountStateViewModel.accountContent.collectAsState()
+    val context = LocalContext.current
 
     Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
         when (state) {
             is AccountState.LoggedInViewOnly -> {
-                // Does nothing.
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    WritePermissionButtons(navEntryState, accountViewModel, nav, navScrollToTop)
+                }
             }
             is AccountState.LoggedOff -> {
                 // Does nothing.

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

@@ -75,7 +75,7 @@ fun NotificationScreen(
     CheckifItNeedsToRequestNotificationPermission()
 
     val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 NostrAccountDataSource.invalidateFilters()

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

@@ -54,6 +54,7 @@ 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.AddressableNote
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -97,9 +98,9 @@ import com.vitorpamplona.quartz.events.AppDefinitionEvent
 import com.vitorpamplona.quartz.events.BadgeDefinitionEvent
 import com.vitorpamplona.quartz.events.BadgeProfilesEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
+import com.vitorpamplona.quartz.events.EmptyTagList
 import com.vitorpamplona.quartz.events.GitHubIdentity
 import com.vitorpamplona.quartz.events.IdentityClaim
-import com.vitorpamplona.quartz.events.ImmutableListOfLists
 import com.vitorpamplona.quartz.events.MastodonIdentity
 import com.vitorpamplona.quartz.events.PayInvoiceErrorResponse
 import com.vitorpamplona.quartz.events.PayInvoiceSuccessResponse
@@ -118,7 +119,7 @@ import java.math.BigDecimal
 fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     if (userId == null) return
 
-    var userBase by remember { mutableStateOf<User?>(LocalCache.getUserIfExists(userId)) }
+    var userBase by remember { mutableStateOf(LocalCache.getUserIfExists(userId)) }
 
     if (userBase == null) {
         LaunchedEffect(userId) {
@@ -237,11 +238,15 @@ fun ProfileScreen(
 
     val lifeCycleOwner = LocalLifecycleOwner.current
 
-    LaunchedEffect(Unit) {
+    DisposableEffect(accountViewModel) {
         NostrUserProfileDataSource.start()
+        onDispose {
+            NostrUserProfileDataSource.loadUserProfile(null)
+            NostrUserProfileDataSource.stop()
+        }
     }
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Profidle Start")
@@ -258,9 +263,6 @@ fun ProfileScreen(
         lifeCycleOwner.lifecycle.addObserver(observer)
         onDispose {
             lifeCycleOwner.lifecycle.removeObserver(observer)
-            println("Profile Dispose")
-            NostrUserProfileDataSource.loadUserProfile(null)
-            NostrUserProfileDataSource.stop()
         }
     }
 
@@ -280,7 +282,6 @@ fun ProfileScreen(
 }
 
 @Composable
-@OptIn(ExperimentalFoundationApi::class)
 private fun RenderSurface(
     baseUser: User,
     threadsViewModel: NostrUserProfileNewThreadsFeedViewModel,
@@ -383,7 +384,7 @@ private fun RenderScreen(
 ) {
     val pagerState = rememberPagerState { 9 }
 
-    Column() {
+    Column {
         ProfileHeader(baseUser, appRecommendations, nav, accountViewModel)
         ScrollableTabRow(
             backgroundColor = MaterialTheme.colors.background,
@@ -449,7 +450,7 @@ private fun CreateAndRenderTabs(
 ) {
     val coroutineScope = rememberCoroutineScope()
 
-    val tabs = listOf<@Composable() (() -> Unit)?>(
+    val tabs = listOf<@Composable (() -> Unit)?>(
         { Text(text = stringResource(R.string.notes)) },
         { Text(text = stringResource(R.string.replies)) },
         { FollowTabHeader(baseUser) },
@@ -486,7 +487,7 @@ private fun RelaysTabHeader(baseUser: User) {
 @Composable
 private fun ReportsTabHeader(baseUser: User) {
     val userState by baseUser.live().reports.observeAsState()
-    var userReports by remember { mutableStateOf(0) }
+    var userReports by remember { mutableIntStateOf(0) }
 
     LaunchedEffect(key1 = userState) {
         launch(Dispatchers.IO) {
@@ -503,11 +504,11 @@ private fun ReportsTabHeader(baseUser: User) {
 
 @Composable
 private fun FollowedTagsTabHeader(baseUser: User) {
-    var usertags by remember { mutableStateOf(0) }
+    var usertags by remember { mutableIntStateOf(0) }
 
     LaunchedEffect(key1 = baseUser) {
         launch(Dispatchers.IO) {
-            val contactList = baseUser?.latestContactList
+            val contactList = baseUser.latestContactList
 
             val newTags = (contactList?.verifiedFollowTagSet?.count() ?: 0)
 
@@ -524,7 +525,7 @@ private fun FollowedTagsTabHeader(baseUser: User) {
 private fun BookmarkTabHeader(baseUser: User) {
     val userState by baseUser.live().bookmarks.observeAsState()
 
-    var userBookmarks by remember { mutableStateOf(0) }
+    var userBookmarks by remember { mutableIntStateOf(0) }
 
     LaunchedEffect(key1 = userState) {
         launch(Dispatchers.IO) {
@@ -621,7 +622,9 @@ private fun ProfileHeader(
                 modifier = Modifier
                     .size(30.dp)
                     .align(Alignment.Center),
-                onClick = { popupExpanded = true },
+                onClick = {
+                    popupExpanded = true
+                },
                 shape = ButtonBorder,
                 colors = ButtonDefaults
                     .buttonColors(
@@ -744,14 +747,20 @@ private fun DisplayFollowUnfollowButton(
     if (isLoggedInFollowingUser) {
         UnfollowButton {
             if (!accountViewModel.isWriteable()) {
-                scope.launch {
-                    Toast
-                        .makeText(
-                            context,
-                            context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
-                            Toast.LENGTH_SHORT
-                        )
-                        .show()
+                if (accountViewModel.loggedInWithExternalSigner()) {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.account.unfollow(baseUser)
+                    }
+                } else {
+                    scope.launch {
+                        Toast
+                            .makeText(
+                                context,
+                                context.getString(R.string.login_with_a_private_key_to_be_able_to_unfollow),
+                                Toast.LENGTH_SHORT
+                            )
+                            .show()
+                    }
                 }
             } else {
                 scope.launch(Dispatchers.IO) {
@@ -763,14 +772,20 @@ private fun DisplayFollowUnfollowButton(
         if (isUserFollowingLoggedIn) {
             FollowButton(R.string.follow_back) {
                 if (!accountViewModel.isWriteable()) {
-                    scope.launch {
-                        Toast
-                            .makeText(
-                                context,
-                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                                Toast.LENGTH_SHORT
-                            )
-                            .show()
+                    if (accountViewModel.loggedInWithExternalSigner()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.account.follow(baseUser)
+                        }
+                    } else {
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                    Toast.LENGTH_SHORT
+                                )
+                                .show()
+                        }
                     }
                 } else {
                     scope.launch(Dispatchers.IO) {
@@ -781,14 +796,20 @@ private fun DisplayFollowUnfollowButton(
         } else {
             FollowButton(R.string.follow) {
                 if (!accountViewModel.isWriteable()) {
-                    scope.launch {
-                        Toast
-                            .makeText(
-                                context,
-                                context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
-                                Toast.LENGTH_SHORT
-                            )
-                            .show()
+                    if (accountViewModel.loggedInWithExternalSigner()) {
+                        scope.launch(Dispatchers.IO) {
+                            accountViewModel.account.follow(baseUser)
+                        }
+                    } else {
+                        scope.launch {
+                            Toast
+                                .makeText(
+                                    context,
+                                    context.getString(R.string.login_with_a_private_key_to_be_able_to_follow),
+                                    Toast.LENGTH_SHORT
+                                )
+                                .show()
+                        }
                     }
                 } else {
                     scope.launch(Dispatchers.IO) {
@@ -918,7 +939,7 @@ private fun DrawAdditionalInfo(
         }
     }
 
-    DisplayBadges(baseUser, nav)
+    DisplayBadges(baseUser, accountViewModel, nav)
 
     DisplayNip05ProfileStatus(user, accountViewModel)
 
@@ -934,7 +955,17 @@ private fun DrawAdditionalInfo(
 
             ClickableText(
                 text = AnnotatedString(website.removePrefix("https://")),
-                onClick = { website.let { runCatching { uri.openUri(it) } } },
+                onClick = {
+                    website.let {
+                        runCatching {
+                            if (it.contains("://")) {
+                                uri.openUri(it)
+                            } else {
+                                uri.openUri("http://$it")
+                            }
+                        }
+                    }
+                },
                 style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary),
                 modifier = Modifier.padding(top = 1.dp, bottom = 1.dp, start = 5.dp)
             )
@@ -980,7 +1011,7 @@ private fun DrawAdditionalInfo(
             TranslatableRichTextViewer(
                 content = it,
                 canPreview = false,
-                tags = remember { ImmutableListOfLists<String>(emptyList()) },
+                tags = EmptyTagList,
                 backgroundColor = background,
                 accountViewModel = accountViewModel,
                 nav = nav
@@ -1092,7 +1123,7 @@ private fun DisplayAppRecommendations(
     ) { state ->
         when (state) {
             is FeedState.Loaded -> {
-                Column() {
+                Column {
                     Text(stringResource(id = R.string.recommended_apps))
 
                     FlowRow(
@@ -1115,7 +1146,7 @@ private fun DisplayAppRecommendations(
 private fun WatchApp(baseApp: Note, nav: (String) -> Unit) {
     val appState by baseApp.live().metadata.observeAsState()
 
-    var appLogo by remember { mutableStateOf<String?>(null) }
+    var appLogo by remember(baseApp) { mutableStateOf<String?>(null) }
 
     LaunchedEffect(key1 = appState) {
         launch(Dispatchers.Default) {
@@ -1152,6 +1183,7 @@ private fun WatchApp(baseApp: Note, nav: (String) -> Unit) {
 @Composable
 private fun DisplayBadges(
     baseUser: User,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     LoadAddressableNote(
@@ -1160,20 +1192,29 @@ private fun DisplayBadges(
             baseUser.pubkeyHex,
             BadgeProfilesEvent.standardDTAg,
             null
-        )
-    ) {
-        if (it != null) {
-            val badgeList by it.live().metadata.map {
-                (it.note.event as? BadgeProfilesEvent)?.badgeAwardEvents()?.toImmutableList()
-            }.distinctUntilChanged().observeAsState()
-
-            badgeList?.let { list ->
-                RenderBadgeList(list, nav)
-            }
+        ),
+        accountViewModel
+    ) { note ->
+        if (note != null) {
+            WatchAndRenderBadgeList(note, nav)
         }
     }
 }
 
+@Composable
+private fun WatchAndRenderBadgeList(
+    note: AddressableNote,
+    nav: (String) -> Unit
+) {
+    val badgeList by note.live().metadata.map {
+        (it.note.event as? BadgeProfilesEvent)?.badgeAwardEvents()?.toImmutableList()
+    }.distinctUntilChanged().observeAsState()
+
+    badgeList?.let { list ->
+        RenderBadgeList(list, nav)
+    }
+}
+
 @Composable
 @OptIn(ExperimentalLayoutApi::class)
 private fun RenderBadgeList(
@@ -1193,7 +1234,7 @@ private fun RenderBadgeList(
 @Composable
 private fun LoadAndRenderBadge(badgeAwardEventHex: String, nav: (String) -> Unit) {
     var baseNote by remember {
-        mutableStateOf<Note?>(LocalCache.getNoteIfExists(badgeAwardEventHex))
+        mutableStateOf(LocalCache.getNoteIfExists(badgeAwardEventHex))
     }
 
     LaunchedEffect(key1 = badgeAwardEventHex) {
@@ -1438,7 +1479,7 @@ fun TabFollows(baseUser: User, feedViewModel: UserFeedViewModel, accountViewMode
     WatchFollowChanges(baseUser, feedViewModel)
 
     Column(Modifier.fillMaxHeight()) {
-        Column() {
+        Column {
             RefreshingFeedUserFeedView(feedViewModel, accountViewModel, nav, enablePullRefresh = false)
         }
     }
@@ -1449,7 +1490,7 @@ fun TabFollowers(baseUser: User, feedViewModel: UserFeedViewModel, accountViewMo
     WatchFollowerChanges(baseUser, feedViewModel)
 
     Column(Modifier.fillMaxHeight()) {
-        Column() {
+        Column {
             RefreshingFeedUserFeedView(feedViewModel, accountViewModel, nav, enablePullRefresh = false)
         }
     }
@@ -1484,7 +1525,7 @@ fun TabReceivedZaps(baseUser: User, zapFeedViewModel: NostrUserProfileZapsFeedVi
     WatchZapsAndUpdateFeed(baseUser, zapFeedViewModel)
 
     Column(Modifier.fillMaxHeight()) {
-        Column() {
+        Column {
             LnZapFeedView(zapFeedViewModel, accountViewModel, nav)
         }
     }
@@ -1507,7 +1548,7 @@ fun TabReports(baseUser: User, feedViewModel: NostrUserProfileReportFeedViewMode
     WatchReportsAndUpdateFeed(baseUser, feedViewModel)
 
     Column(Modifier.fillMaxHeight()) {
-        Column() {
+        Column {
             RefresheableFeedView(
                 feedViewModel,
                 null,
@@ -1537,6 +1578,13 @@ fun TabRelays(user: User, accountViewModel: AccountViewModel, nav: (String) -> U
     val lifeCycleOwner = LocalLifecycleOwner.current
 
     DisposableEffect(user) {
+        feedViewModel.subscribeTo(user)
+        onDispose {
+            feedViewModel.unsubscribeTo(user)
+        }
+    }
+
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Profile Relay Start")
@@ -1679,7 +1727,6 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
         onDismissRequest = onDismiss
     ) {
         val clipboardManager = LocalClipboardManager.current
-        val scope = rememberCoroutineScope()
 
         DropdownMenuItem(onClick = { clipboardManager.setText(AnnotatedString(user.pubkeyNpub())); onDismiss() }) {
             Text(stringResource(R.string.copy_user_id))
@@ -1688,17 +1735,21 @@ fun UserProfileDropDownMenu(user: User, popupExpanded: Boolean, onDismiss: () ->
         if (accountViewModel.userProfile() != user) {
             Divider()
             if (accountViewModel.account.isHidden(user)) {
-                DropdownMenuItem(onClick = {
-                    accountViewModel.show(user)
-                    onDismiss()
-                }) {
+                DropdownMenuItem(
+                    onClick = {
+                        accountViewModel.show(user)
+                        onDismiss()
+                    }
+                ) {
                     Text(stringResource(R.string.unblock_user))
                 }
             } else {
-                DropdownMenuItem(onClick = {
-                    accountViewModel.hide(user)
-                    onDismiss()
-                }) {
+                DropdownMenuItem(
+                    onClick = {
+                        accountViewModel.hide(user)
+                        onDismiss()
+                    }
+                ) {
                     Text(stringResource(id = R.string.block_hide_user))
                 }
             }

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

@@ -56,7 +56,7 @@ fun ReportNoteDialog(note: Note, accountViewModel: AccountViewModel, onDismiss:
         Pair(ReportEvent.ReportType.ILLEGAL, stringResource(R.string.report_dialog_illegal))
     )
 
-    val reasonOptions = remember { reportTypes.map { it.second }.toImmutableList() }
+    val reasonOptions = remember { reportTypes.map { TitleExplainer(it.second) }.toImmutableList() }
     var additionalReason by remember { mutableStateOf("") }
     var selectedReason by remember { mutableStateOf(-1) }
 

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

@@ -104,7 +104,7 @@ fun SearchScreen(
 
     WatchAccountForSearchScreen(accountViewModel)
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Search Start")

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

@@ -111,15 +111,15 @@ fun SettingsScreen(
 ) {
     val scope = rememberCoroutineScope()
     val selectedItens = persistentListOf(
-        stringResource(ConnectivityType.ALWAYS.reourceId),
-        stringResource(ConnectivityType.WIFI_ONLY.reourceId),
-        stringResource(ConnectivityType.NEVER.reourceId)
+        TitleExplainer(stringResource(ConnectivityType.ALWAYS.reourceId)),
+        TitleExplainer(stringResource(ConnectivityType.WIFI_ONLY.reourceId)),
+        TitleExplainer(stringResource(ConnectivityType.NEVER.reourceId))
     )
 
     val themeItens = persistentListOf(
-        stringResource(R.string.system),
-        stringResource(R.string.light),
-        stringResource(R.string.dark)
+        TitleExplainer(stringResource(R.string.system)),
+        TitleExplainer(stringResource(R.string.light)),
+        TitleExplainer(stringResource(R.string.dark))
     )
 
     val settings = accountViewModel.account.settings
@@ -132,7 +132,7 @@ fun SettingsScreen(
     val context = LocalContext.current
 
     val languageEntries = context.getLangPreferenceDropdownEntries()
-    val languageList = languageEntries.keys.toImmutableList()
+    val languageList = languageEntries.keys.map { TitleExplainer(it) }.toImmutableList()
     val languageIndex = getLanguageIndex(languageEntries)
 
     Column(
@@ -149,12 +149,12 @@ fun SettingsScreen(
         ) {
             GlobalScope.launch(Dispatchers.Main) {
                 val job = scope.launch(Dispatchers.IO) {
-                    val locale = languageEntries[languageList[it]]
+                    val locale = languageEntries[languageList[it].title]
                     accountViewModel.account.settings.preferredLanguage = locale
                     LocalPreferences.saveToEncryptedStorage(accountViewModel.account)
                 }
                 job.join()
-                val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(languageEntries[languageList[it]])
+                val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(languageEntries[languageList[it].title])
                 AppCompatDelegate.setApplicationLocales(appLocale)
             }
         }
@@ -227,7 +227,7 @@ fun SettingsScreen(
 fun SettingsRow(
     name: Int,
     description: Int,
-    selectedItens: ImmutableList<String>,
+    selectedItens: ImmutableList<TitleExplainer>,
     selectedIndex: Int,
     onSelect: (Int) -> Unit
 ) {
@@ -255,7 +255,7 @@ fun SettingsRow(
 
         TextSpinner(
             label = "",
-            placeholder = selectedItens[selectedIndex],
+            placeholder = selectedItens[selectedIndex].title,
             options = selectedItens,
             onSelect = onSelect,
             modifier = Modifier

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

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
@@ -28,11 +27,15 @@ fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, nav: (Stri
 
     NostrThreadDataSource.loadThread(noteId)
 
-    LaunchedEffect(noteId) {
+    DisposableEffect(noteId) {
         feedViewModel.invalidateData(true)
+        onDispose {
+            NostrThreadDataSource.loadThread(null)
+            NostrThreadDataSource.stop()
+        }
     }
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Thread Start")

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

@@ -89,7 +89,7 @@ fun VideoScreen(
 
     WatchAccountForVideoScreen(videoFeedView = videoFeedView, accountViewModel = accountViewModel)
 
-    DisposableEffect(accountViewModel) {
+    DisposableEffect(lifeCycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 println("Video Start")
@@ -127,7 +127,6 @@ fun WatchAccountForVideoScreen(videoFeedView: NostrVideoFeedViewModel, accountVi
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun SaveableFeedState(
     videoFeedView: NostrVideoFeedViewModel,
@@ -446,14 +445,11 @@ fun ReactionsColumn(baseNote: Note, accountViewModel: AccountViewModel, nav: (St
     Spacer(modifier = Modifier.height(8.dp))
 
     Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = 75.dp, end = 20.dp)) {
-        val scope = rememberCoroutineScope()
         ReplyReaction(baseNote, grayTint = MaterialTheme.colors.onBackground, accountViewModel, iconSize = 40.dp) {
-            scope.launch {
-                routeFor(
-                    baseNote,
-                    accountViewModel.userProfile()
-                )?.let { nav(it) }
-            }
+            routeFor(
+                baseNote,
+                accountViewModel.userProfile()
+            )?.let { nav(it) }
         }
         BoostReaction(baseNote, grayTint = MaterialTheme.colors.onBackground, accountViewModel, iconSize = 40.dp) {
             wantsToQuote = baseNote

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt

@@ -1,7 +1,10 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedOff
 
-import android.content.Context
+import android.app.Activity
 import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -21,7 +24,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.autofill.AutofillNode
 import androidx.compose.ui.autofill.AutofillType
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
@@ -36,13 +38,20 @@ import androidx.compose.ui.text.input.*
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ServiceManager
+import com.vitorpamplona.amethyst.service.ExternalSignerUtils
+import com.vitorpamplona.amethyst.service.PackageUtils
+import com.vitorpamplona.amethyst.service.SignerType
 import com.vitorpamplona.amethyst.ui.qrcode.SimpleQrCodeScanner
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.Size35dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.util.*
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -63,6 +72,58 @@ fun LoginPage(
     val useProxy = remember { mutableStateOf(false) }
     val proxyPort = remember { mutableStateOf("9050") }
     var connectOrbotDialogOpen by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
+    var loginWithExternalSigner by remember { mutableStateOf(false) }
+    val activity = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.StartActivityForResult(),
+        onResult = {
+            loginWithExternalSigner = false
+            ExternalSignerUtils.isActivityRunning = false
+            ServiceManager.shouldPauseService = true
+            if (it.resultCode != Activity.RESULT_OK) {
+                scope.launch(Dispatchers.Main) {
+                    Toast.makeText(
+                        Amethyst.instance,
+                        "Sign request rejected",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+                return@rememberLauncherForActivityResult
+            } else {
+                val event = it.data?.getStringExtra("signature") ?: ""
+                key.value = TextFieldValue(event)
+                if (!acceptedTerms.value) {
+                    termsAcceptanceIsRequired =
+                        context.getString(R.string.acceptance_of_terms_is_required)
+                }
+
+                if (key.value.text.isBlank()) {
+                    errorMessage = context.getString(R.string.key_is_required)
+                }
+
+                if (acceptedTerms.value && key.value.text.isNotBlank()) {
+                    try {
+                        accountViewModel.startUI(key.value.text, useProxy.value, proxyPort.value.toInt(), true)
+                    } catch (e: Exception) {
+                        Log.e("Login", "Could not sign in", e)
+                        errorMessage = context.getString(R.string.invalid_key)
+                    }
+                }
+            }
+        }
+    )
+
+    LaunchedEffect(loginWithExternalSigner) {
+        if (loginWithExternalSigner) {
+            ExternalSignerUtils.openSigner(
+                "",
+                SignerType.GET_PUBLIC_KEY,
+                activity,
+                "",
+                ""
+            )
+        }
+    }
 
     Column(
         modifier = Modifier
@@ -229,7 +290,7 @@ fun LoginPage(
                 }
             }
 
-            if (isPackageInstalled(context, "org.torproject.android")) {
+            if (PackageUtils.isOrbotInstalled(context)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Checkbox(
                         checked = useProxy.value,
@@ -259,10 +320,10 @@ fun LoginPage(
 
             Box(modifier = Modifier.padding(40.dp, 0.dp, 40.dp, 0.dp)) {
                 Button(
+                    enabled = acceptedTerms.value,
                     onClick = {
                         if (!acceptedTerms.value) {
-                            termsAcceptanceIsRequired =
-                                context.getString(R.string.acceptance_of_terms_is_required)
+                            termsAcceptanceIsRequired = context.getString(R.string.acceptance_of_terms_is_required)
                         }
 
                         if (key.value.text.isBlank()) {
@@ -281,15 +342,57 @@ fun LoginPage(
                     shape = RoundedCornerShape(Size35dp),
                     modifier = Modifier
                         .fillMaxWidth()
-                        .height(50.dp),
-                    colors = ButtonDefaults
-                        .buttonColors(
-                            backgroundColor = if (acceptedTerms.value) MaterialTheme.colors.primary else Color.Gray
-                        )
+                        .height(50.dp)
                 ) {
                     Text(text = stringResource(R.string.login))
                 }
             }
+
+            if (PackageUtils.isAmberInstalled(context)) {
+                Box(modifier = Modifier.padding(40.dp, 40.dp, 40.dp, 0.dp)) {
+                    Button(
+                        enabled = acceptedTerms.value,
+                        onClick = {
+                            if (!acceptedTerms.value) {
+                                termsAcceptanceIsRequired = context.getString(R.string.acceptance_of_terms_is_required)
+                                return@Button
+                            }
+
+                            val result = ExternalSignerUtils.getDataFromResolver(SignerType.GET_PUBLIC_KEY, arrayOf("login"))
+                            if (result == null) {
+                                loginWithExternalSigner = true
+                                return@Button
+                            } else {
+                                key.value = TextFieldValue(result)
+                                if (key.value.text.isBlank()) {
+                                    errorMessage = context.getString(R.string.key_is_required)
+                                    return@Button
+                                }
+
+                                if (acceptedTerms.value && key.value.text.isNotBlank()) {
+                                    try {
+                                        accountViewModel.startUI(
+                                            key.value.text,
+                                            useProxy.value,
+                                            proxyPort.value.toInt(),
+                                            true
+                                        )
+                                    } catch (e: Exception) {
+                                        Log.e("Login", "Could not sign in", e)
+                                        errorMessage = context.getString(R.string.invalid_key)
+                                    }
+                                }
+                            }
+                        },
+                        shape = RoundedCornerShape(Size35dp),
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(50.dp)
+                    ) {
+                        Text(text = stringResource(R.string.login_with_external_signer))
+                    }
+                }
+            }
         }
 
         // The last child is glued to the bottom.
@@ -315,7 +418,3 @@ fun LoginPage(
         )
     }
 }
-
-fun isPackageInstalled(context: Context, target: String): Boolean {
-    return context.packageManager.getInstalledApplications(0).find { info -> info.packageName == target } != null
-}

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt

@@ -26,6 +26,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
+import androidx.core.view.WindowCompat
 import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.resolveDefaults
 import com.patrykandpatrick.vico.compose.style.ChartStyle
@@ -347,11 +348,14 @@ fun AmethystTheme(themeViewModel: ThemeViewModel, content: @Composable () -> Uni
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
+            val insetsController = WindowCompat.getInsetsController(window, view)
             if (darkTheme) {
                 window.statusBarColor = colors.background.toArgb()
             } else {
                 window.statusBarColor = colors.primary.toArgb()
             }
+            window.navigationBarColor = colors.background.toArgb()
+            insetsController.isAppearanceLightNavigationBars = !darkTheme
         }
     }
 }