v0.78.0

New Crowdin Translations

.github/workflows/create-release.yml

@@ -112,6 +112,28 @@ jobs:
           asset_name: amethyst-googleplay-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload Play APK arm64-v8a Asset
+        id: upload-release-asset-play-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload Play APK armeabi-v7a Asset
+        id: upload-release-asset-play-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk
+          asset_name: amethyst-googleplay-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
       # F-Droid APK
       - name: Upload F-Droid APK Universal Asset
         id: upload-release-asset-fdroid-universal-apk
@@ -146,6 +168,28 @@ jobs:
           asset_name: amethyst-fdroid-x86_64-${{ github.ref_name }}.apk
           asset_content_type: application/zip
 
+      - name: Upload F-Droid APK arm64-v8a Asset
+        id: upload-release-asset-fdroid-arm64-v8a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-arm64-v8a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
+      - name: Upload F-Droid APK armeabi-v7a Asset
+        id: upload-release-asset-fdroid-armeabi-v7a-apk
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned-signed.apk
+          asset_name: amethyst-fdroid-armeabi-v7a-${{ github.ref_name }}.apk
+          asset_content_type: application/zip
+
 
 
       # Google Play AAB

.github/workflows/crowdin.yml

@@ -0,0 +1,30 @@
+name: Crowdin Action
+
+on:
+  push:
+    # paths: ["app/src/main/res/**/strings.xml"] // removes filter to allow downloads at any moment.
+    branches: [ main ]
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: crowdin action
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: l10n_crowdin_translations
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.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

@@ -82,13 +82,14 @@ height="80">](https://github.com/vitorpamplona/amethyst/releases)
 - [x] Private Messages and Small Groups (NIP-24)
 - [x] Gift Wraps & Seals (NIP-59)
 - [x] Versioned Encrypted Payloads (NIP-44)
+- [x] Expiration Support (NIP-40)
+- [x] Status Event (NIP-38)
 - [ ] Marketplace (NIP-15)
 - [ ] Image/Video Capture in the app
 - [ ] Local Database
 - [ ] Bookmarks, Pinned Posts, Muted Events (NIP-51)
 - [ ] Proof of Work in the Phone (NIP-13, NIP-20)
 - [ ] Workspaces
-- [ ] Expiration Support (NIP-40)
 - [ ] Infinity Scroll
 - [ ] Relay List Metadata (NIP-65)
 - [ ] Signing Requests (NIP-46)
@@ -105,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
@@ -171,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>`
@@ -191,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,14 +13,14 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 34
-        versionCode 279
-        versionName "0.75.0"
+        versionCode 306
+        versionName "0.78.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary true
         }
-        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'ja', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'th', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW']
+        resourceConfigurations += ['ar', 'cs', 'de', 'eo', 'es', 'fa', 'fr', 'hu', 'in', 'ja', 'night', 'nl', 'pt-rBR', 'ru', 'sv-rSE', 'ta', 'th', 'tr', 'uk', 'zh', 'sh-rHK', 'zh-rTW']
     }
 
     buildTypes {
@@ -54,7 +54,7 @@ android {
         abi {
             enable true
             reset()
-            include "x86", "x86_64"
+            include "x86", "x86_64", "arm64-v8a", "armeabi-v7a"
             universalApk true
         }
     }
@@ -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"
@@ -171,7 +171,7 @@ dependencies {
     playImplementation 'com.google.mlkit:translate:17.0.1'
 
     // PushNotifications
-    playImplementation platform('com.google.firebase:firebase-bom:32.2.2')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
     playImplementation 'com.google.firebase:firebase-messaging-ktx'
 
     // Charts

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/androidTest/java/com/vitorpamplona/amethyst/ThreadAssemblerTest.kt

@@ -1,8 +1,10 @@
 package com.vitorpamplona.amethyst
 
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.ui.dal.ThreadFeedFilter
+import com.vitorpamplona.quartz.crypto.KeyPair
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.events.Event
 import junit.framework.TestCase
@@ -95,7 +97,7 @@ class ThreadAssemblerTest {
 
         val naddr = ATag(30023, "6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93", "1680612926599", null)
 
-        val filter = ThreadFeedFilter(naddr.toTag())
+        val filter = ThreadFeedFilter(Account(KeyPair()), naddr.toTag())
         val calculatedFeed = filter.feed()
 
         val expecteedOrder = listOf(
@@ -126,14 +128,14 @@ class ThreadAssemblerTest {
             "6a58f8315af5badb1bdaeb5489417b94621a4d8e192ae2fedcca0c5dcf0c9cd4",
             "6e9bb03c7c40d67fec0d0bb872548ec207ba0ac4533efa137d7bcaca9fb4b191",
             "e2ae784b239cac4bad38136e4bd758b87dd261b659ef460450064bf9073edcb3",
-            "45d4fc726f2cc5b524be862c14fdadc1a24b25b8c6c011eedf2d2909589263e7",
-            "7a4a2419824669f07081abe2132f8cc0027efbce066ccdf187c897bb7ffa5dc3",
             "674c62f84afdc045bc3623ea132d90afdfe4b64249807f65302231115af5406d",
             "d54761f672669ea4f4b7592f3b0a30ee28de340b0a7e46b91af94e66905171c9",
             "00813a18ac9084cd0948c27027a980e34039a3011f30279a8b52ad87da5a3031",
             "87a5bd25aa084cefb3357fc9c2a5b327254fab35fdd7b2d4bd0acddc63d0abe8",
             "512962dbada5fd5015fc727a107d5c3f569662de67eab8e5da5a8065012cf11e",
             "ce6e32e3e17b6901d2cc70b60f3743e24f885bb6e9da6d88cff516079eac1883",
+            "7a4a2419824669f07081abe2132f8cc0027efbce066ccdf187c897bb7ffa5dc3",
+            "45d4fc726f2cc5b524be862c14fdadc1a24b25b8c6c011eedf2d2909589263e7",
             "d4a0b4f08d98d82a04292654ec132723cc2cf3fa24ffb6c0833426cb9372f4d5",
             "8cdc4676aca93bbafcfbe6784f9b2df54e8ca20fbe69ba55fda487736bfdb7f6",
             "7a18dda355525d468b31bba4fa947cba98cc19048d4a3099d5e9ba045d878c26"

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 -->
@@ -60,7 +62,7 @@
         android:usesCleartextTraffic="true"
         android:hardwareAccelerated="true"
         android:localeConfig="@xml/locales_config"
-        tools:targetApi="33">
+        tools:targetApi="34">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"

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

@@ -3,23 +3,26 @@ 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.BooleanType
 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
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
 import com.vitorpamplona.amethyst.model.ServersAvailable
 import com.vitorpamplona.amethyst.model.Settings
+import com.vitorpamplona.amethyst.model.parseBooleanType
 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 +38,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 +78,8 @@ 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 AUTOMATICALLY_HIDE_NAV_BARS = "automatically_hide_nav_bars"
+    const val LOGIN_WITH_EXTERNAL_SIGNER = "login_with_external_signer"
 }
 
 object LocalPreferences {
@@ -82,7 +87,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 +206,11 @@ object LocalPreferences {
 
     fun allSavedAccounts(): List<AccountInfo> {
         return savedAccounts().map { npub ->
-            AccountInfo(npub = npub)
+            AccountInfo(
+                npub,
+                hasPrivKey(npub),
+                getLoggedInWithExternalSigner(npub)
+            )
         }
     }
 
@@ -245,6 +254,7 @@ object LocalPreferences {
             } else {
                 putBoolean(PrefKeys.SHOW_SENSITIVE_CONTENT, account.showSensitiveContent!!)
             }
+            putBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, account.loginWithExternalSigner)
         }.apply()
 
         val globalPrefs = encryptedPreferences()
@@ -265,6 +275,11 @@ object LocalPreferences {
             } else {
                 putBoolean(PrefKeys.AUTOMATICALLY_LOAD_URL_PREVIEW, account.settings.automaticallyShowUrlPreview.prefCode!!)
             }
+            if (account.settings.automaticallyHideNavigationBars.prefCode == null) {
+                remove(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS)
+            } else {
+                putBoolean(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS, account.settings.automaticallyHideNavigationBars.prefCode!!)
+            }
             putString(PrefKeys.PREFERRED_LANGUAGE, account.settings.preferredLanguage ?: "")
         }.apply()
     }
@@ -276,17 +291,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 +333,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 +352,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 +376,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 +387,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 +402,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()
             }
@@ -399,6 +425,11 @@ object LocalPreferences {
                 } else {
                     ConnectivityType.ALWAYS
                 }
+                settings.automaticallyHideNavigationBars = if (contains(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS)) {
+                    parseBooleanType(getBoolean(PrefKeys.AUTOMATICALLY_HIDE_NAV_BARS, false))
+                } else {
+                    BooleanType.ALWAYS
+                }
 
                 settings.preferredLanguage = getString(PrefKeys.PREFERRED_LANGUAGE, "")
             }
@@ -431,51 +462,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,9 +121,14 @@ object ServiceManager {
         NostrVideoDataSource.stop()
 
         Client.disconnect()
+        isStarted = false
     }
 
-    fun cleanUp() {
+    fun cleanObservers() {
+        LocalCache.cleanObservers()
+    }
+
+    fun trimMemory() {
         LocalCache.cleanObservers()
 
         val accounts = LocalPreferences.allLocalAccountNPubs().mapNotNull { decodePublicKeyAsHexOrNull(it) }.toSet()
@@ -126,6 +139,14 @@ object ServiceManager {
             LocalCache.pruneContactLists(accounts)
             LocalCache.pruneRepliesAndReactions(accounts)
             LocalCache.prunePastVersionsOfReplaceables()
+            LocalCache.pruneExpiredEvents()
+        }
+    }
+
+    fun restartIfDifferentAccount(account: Account, context: Context) {
+        if (this.account != account) {
+            pause()
+            start(account, context)
         }
     }
 }

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

@@ -164,20 +164,12 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
 
     override fun onActive() {
         super.onActive()
-        if (channel is PublicChatChannel) {
-            NostrSingleChannelDataSource.add(channel.idHex)
-        } else {
-            NostrSingleChannelDataSource.add(channel.idHex)
-        }
+        NostrSingleChannelDataSource.add(channel)
     }
 
     override fun onInactive() {
         super.onInactive()
-        if (channel is PublicChatChannel) {
-            NostrSingleChannelDataSource.remove(channel.idHex)
-        } else {
-            NostrSingleChannelDataSource.remove(channel.idHex)
-        }
+        NostrSingleChannelDataSource.remove(channel)
     }
 }
 

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

@@ -0,0 +1,63 @@
+package com.vitorpamplona.amethyst.model
+
+import androidx.compose.runtime.Stable
+import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.quartz.encoders.HexKey
+import com.vitorpamplona.quartz.utils.TimeUtils
+
+@Stable
+class Chatroom() {
+    var roomMessages: Set<Note> = setOf()
+    var subject: String? = null
+    var subjectCreatedAt: Long? = null
+
+    @Synchronized
+    fun addMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+
+            val newSubject = msg.event?.subject()
+
+            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
+                subject = newSubject
+                subjectCreatedAt = msg.createdAt()
+            }
+        }
+    }
+
+    @Synchronized
+    fun removeMessageSync(msg: Note) {
+        checkNotInMainThread()
+
+        if (msg !in roomMessages) {
+            roomMessages = roomMessages + msg
+
+            roomMessages.filter { it.event?.subject() != null }.sortedBy { it.createdAt() }.lastOrNull()?.let {
+                subject = it.event?.subject()
+                subjectCreatedAt = it.createdAt()
+            }
+        }
+    }
+
+    fun senderIntersects(keySet: Set<HexKey>): Boolean {
+        return roomMessages.any { it.author?.pubkeyHex in keySet }
+    }
+
+    fun pruneMessagesToTheLatestOnly(): Set<Note> {
+        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
+
+        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
+            // Recent messages, keep last 100
+            sorted.take(100).toSet()
+        } else {
+            // Old messages, keep the last one.
+            sorted.take(1).toSet()
+        } + sorted.filter { it.liveSet?.isInUse() ?: false }
+
+        val toRemove = roomMessages.minus(toKeep)
+        roomMessages = toKeep
+        return toRemove
+    }
+}

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,10 +13,13 @@ 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.*
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -51,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
         }
@@ -96,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
         }
@@ -196,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()}")
@@ -342,6 +363,27 @@ object LocalCache {
     private fun consume(event: PinListEvent) { consumeBaseReplaceable(event) }
     private fun consume(event: RelaySetEvent) { consumeBaseReplaceable(event) }
     private fun consume(event: AudioTrackEvent) { consumeBaseReplaceable(event) }
+    fun consume(event: StatusEvent, relay: Relay?) {
+        val version = getOrCreateNote(event.id)
+        val note = getOrCreateAddressableNote(event.address())
+        val author = getOrCreateUser(event.pubKey)
+
+        if (version.event == null) {
+            version.loadEvent(event, author, emptyList())
+            version.moveAllReferencesTo(note)
+        }
+
+        // Already processed this event.
+        if (note.event?.id() == event.id()) return
+
+        if (event.createdAt > (note.createdAt() ?: 0)) {
+            note.loadEvent(event, author, emptyList())
+
+            author.liveSet?.innerStatuses?.invalidateData()
+
+            refreshObservers(note)
+        }
+    }
 
     fun consume(event: BadgeDefinitionEvent) { consumeBaseReplaceable(event) }
 
@@ -627,7 +669,7 @@ object LocalCache {
 
             mentions.forEach {
                 // doesn't add to reports, but triggers recounts
-                it.liveSet?.reports?.invalidateData()
+                it.liveSet?.innerReports?.invalidateData()
             }
         }
 
@@ -784,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 {
@@ -1125,6 +1167,18 @@ object LocalCache {
         }
     }
 
+    suspend fun findStatusesForUser(user: User): ImmutableList<AddressableNote> {
+        checkNotInMainThread()
+
+        return addressables.filter {
+            val noteEvent = it.value.event
+            (noteEvent is StatusEvent && noteEvent.pubKey == user.pubkeyHex && !noteEvent.isExpired() && noteEvent.content.isNotBlank())
+        }.values
+            .sortedWith(compareBy({ it.event?.expiration() ?: it.event?.createdAt() }, { it.idHex }))
+            .reversed()
+            .toImmutableList()
+    }
+
     fun cleanObservers() {
         notes.forEach {
             it.value.clearLive()
@@ -1148,13 +1202,7 @@ object LocalCache {
             val childrenToBeRemoved = mutableListOf<Note>()
 
             toBeRemoved.forEach {
-                notes.remove(it.idHex)
-                // Doesn't need to clean up the replies and mentions.. Too small to matter.
-
-                // Counts the replies
-                it.replyTo?.forEach { parent ->
-                    parent.removeReply(it)
-                }
+                removeFromCache(it)
 
                 childrenToBeRemoved.addAll(it.removeAllChildNotes())
             }
@@ -1173,12 +1221,7 @@ object LocalCache {
                 val childrenToBeRemoved = mutableListOf<Note>()
 
                 toBeRemoved.forEach {
-                    notes.remove(it.idHex)
-
-                    // Counts the replies
-                    it.replyTo?.forEach { parent ->
-                        parent.removeReply(it)
-                    }
+                    removeFromCache(it)
 
                     childrenToBeRemoved.addAll(it.removeAllChildNotes())
                 }
@@ -1205,21 +1248,12 @@ object LocalCache {
         val childrenToBeRemoved = mutableListOf<Note>()
 
         toBeRemoved.forEach {
-            notes.remove(it.idHex)
-
             val newerVersion = addressables[(it.event as? AddressableEvent)?.address()?.toTag()]
             if (newerVersion != null) {
                 it.moveAllReferencesTo(newerVersion)
             }
 
-            it.replyTo?.forEach { masterNote ->
-                masterNote.removeReply(it)
-                masterNote.removeBoost(it)
-                masterNote.removeReaction(it)
-                masterNote.removeZap(it)
-                masterNote.clearEOSE() // allows reloading of these events
-            }
-
+            removeFromCache(it)
             childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
@@ -1239,6 +1273,7 @@ object LocalCache {
                     it.value.event is ReactionEvent || it.value.event is LnZapEvent || it.value.event is LnZapRequestEvent ||
                     it.value.event is ReportEvent || it.value.event is GenericRepostEvent
                 ) &&
+                it.value.replyTo?.any { it.liveSet?.isInUse() == true } != true &&
                 it.value.liveSet?.isInUse() != true && // don't delete if observing.
                 it.value.author?.pubkeyHex !in accounts && // don't delete if it is the logged in account
                 it.value.event?.isTaggedUsers(accounts) != true // don't delete if it's a notification to the logged in user
@@ -1247,17 +1282,99 @@ object LocalCache {
         val childrenToBeRemoved = mutableListOf<Note>()
 
         toBeRemoved.forEach {
-            notes.remove(it.idHex)
+            removeFromCache(it)
+            childrenToBeRemoved.addAll(it.removeAllChildNotes())
+        }
 
+        removeChildrenOf(childrenToBeRemoved)
+
+        toBeRemoved.forEach {
             it.replyTo?.forEach { masterNote ->
-                masterNote.removeReply(it)
-                masterNote.removeBoost(it)
-                masterNote.removeReaction(it)
-                masterNote.removeZap(it)
-                masterNote.removeReport(it)
                 masterNote.clearEOSE() // allows reloading of these events
             }
+        }
 
+        if (toBeRemoved.size > 1) {
+            println("PRUNE: ${toBeRemoved.size} thread replies removed.")
+        }
+    }
+
+    private fun removeFromCache(note: Note) {
+        note.replyTo?.forEach { masterNote ->
+            masterNote.removeReply(note)
+            masterNote.removeBoost(note)
+            masterNote.removeReaction(note)
+            masterNote.removeZap(note)
+            masterNote.removeReport(note)
+            masterNote.clearEOSE() // allows reloading of these events if needed
+        }
+
+        if (note.event is LnZapEvent) {
+            (note.event as LnZapEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is LnZapRequestEvent) {
+            (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is ReportEvent) {
+            (note.event as ReportEvent).reportedAuthor().mapNotNull {
+                val author = getUserIfExists(it.key)
+                author?.removeReport(note)
+                author?.clearEOSE()
+            }
+        }
+
+        notes.remove(note.idHex)
+    }
+
+    fun removeAuthorLinkTo(note: Note) {
+        if (note.event is LnZapEvent) {
+            (note.event as LnZapEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is LnZapRequestEvent) {
+            (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull {
+                val author = getUserIfExists(it)
+                author?.removeZap(note)
+                author?.clearEOSE()
+            }
+        }
+        if (note.event is ReportEvent) {
+            (note.event as ReportEvent).reportedAuthor().mapNotNull {
+                val author = getUserIfExists(it.key)
+                author?.removeReport(note)
+                author?.clearEOSE()
+            }
+        }
+    }
+
+    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
+        nextToBeRemoved.forEach { note ->
+            removeFromCache(note)
+        }
+    }
+
+    fun pruneExpiredEvents() {
+        checkNotInMainThread()
+
+        val toBeRemoved = notes.filter {
+            it.value.event?.isExpired() == true
+        }.values
+
+        val childrenToBeRemoved = mutableListOf<Note>()
+
+        toBeRemoved.forEach {
+            removeFromCache(it)
             childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
@@ -1284,17 +1401,7 @@ object LocalCache {
         }.flatten()
 
         toBeRemoved.forEach {
-            // Counts the replies
-            it.replyTo?.forEach { masterNote ->
-                masterNote.removeReply(it)
-                masterNote.removeBoost(it)
-                masterNote.removeReaction(it)
-                masterNote.removeZap(it)
-                masterNote.removeReport(it)
-            }
-
-            notes.remove(it.idHex)
-
+            removeFromCache(it)
             childrenToBeRemoved.addAll(it.removeAllChildNotes())
         }
 
@@ -1303,21 +1410,6 @@ object LocalCache {
         println("PRUNE: ${toBeRemoved.size} messages removed because they were Hidden")
     }
 
-    fun removeChildrenOf(nextToBeRemoved: List<Note>) {
-        nextToBeRemoved.forEach { note ->
-            if (note.event is LnZapEvent) {
-                (note.event as LnZapEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
-            }
-            if (note.event is LnZapRequestEvent) {
-                (note.event as LnZapRequestEvent).zappedAuthor().mapNotNull { getUserIfExists(it)?.removeZap(note) }
-            }
-            if (note.event is ReportEvent) {
-                (note.event as ReportEvent).reportedAuthor().mapNotNull { getUserIfExists(it.key)?.removeZap(note) }
-            }
-            notes.remove(note.idHex)
-        }
-    }
-
     fun pruneContactLists(loggedIn: Set<HexKey>) {
         checkNotInMainThread()
 
@@ -1410,9 +1502,10 @@ object LocalCache {
                 is LiveActivitiesChatMessageEvent -> consume(event, relay)
                 is LnZapEvent -> {
                     event.zapRequest?.let {
+                        // must have a valid request
                         verifyAndConsume(it, relay)
+                        consume(event)
                     }
-                    consume(event)
                 }
                 is LnZapRequestEvent -> consume(event)
                 is LnZapPaymentRequestEvent -> consume(event)
@@ -1423,6 +1516,7 @@ object LocalCache {
                 is PrivateDmEvent -> consume(event, relay)
                 is PinListEvent -> consume(event)
                 is PeopleListEvent -> consume(event)
+                is PollNoteEvent -> consume(event, relay)
                 is ReactionEvent -> consume(event)
                 is RecommendRelayEvent -> consume(event)
                 is RelaySetEvent -> consume(event)
@@ -1439,8 +1533,9 @@ object LocalCache {
                     }
                     consume(event)
                 }
+                is StatusEvent -> consume(event, relay)
                 is TextNoteEvent -> consume(event, relay)
-                is PollNoteEvent -> consume(event, relay)
+
                 else -> {
                     Log.w("Event Not Supported", event.toJson())
                 }

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

@@ -3,6 +3,8 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.distinctUntilChanged
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.firstFullCharOrEmoji
@@ -10,6 +12,7 @@ import com.vitorpamplona.amethyst.service.relays.EOSETime
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.amethyst.ui.components.BundledUpdate
+import com.vitorpamplona.amethyst.ui.note.combineWith
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.quartz.encoders.ATag
 import com.vitorpamplona.quartz.encoders.Hex
@@ -19,6 +22,7 @@ import com.vitorpamplona.quartz.encoders.Nip19
 import com.vitorpamplona.quartz.encoders.toNote
 import com.vitorpamplona.quartz.events.*
 import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import java.math.BigDecimal
 import java.time.Instant
@@ -39,6 +43,10 @@ class AddressableNote(val address: ATag) : Note(address.toTag()) {
 
         return minOf(publishedAt, lastCreatedAt)
     }
+
+    fun dTag(): String? {
+        return (event as? AddressableEvent)?.dTag()
+    }
 }
 
 @Stable
@@ -123,7 +131,7 @@ open class Note(val idHex: String) {
             this.author = author
             this.replyTo = replyTo
 
-            liveSet?.metadata?.invalidateData()
+            liveSet?.innerMetadata?.invalidateData()
         }
     }
 
@@ -132,26 +140,60 @@ open class Note(val idHex: String) {
             .format(DateTimeFormatter.ofPattern("uuuu-MM-dd-HH:mm:ss"))
     }
 
+    data class LevelSignature(val signature: String, val createdAt: Long?, val author: User?)
+
     /**
      * This method caches signatures during each execution to avoid recalculation in longer threads
      */
     fun replyLevelSignature(
-        eventsToConsider: Set<Note>,
-        cachedSignatures: MutableMap<Note, String>
-    ): String {
+        eventsToConsider: Set<HexKey>,
+        cachedSignatures: MutableMap<Note, LevelSignature>,
+        account: User,
+        accountFollowingSet: Set<String>,
+        now: Long
+    ): LevelSignature {
         val replyTo = replyTo
         if (event is RepostEvent || event is GenericRepostEvent || replyTo == null || replyTo.isEmpty()) {
-            return "/" + formattedDateTime(createdAt() ?: 0) + ";"
+            return LevelSignature(
+                signature = "/" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) + ";",
+                createdAt = createdAt(),
+                author = author
+            )
         }
 
-        val mySignature = (
+        val parent = (
             replyTo
-                .filter { it in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
+                .filter { it.idHex in eventsToConsider } // This forces the signature to be based on a branch, avoiding two roots
                 .map {
-                    cachedSignatures[it] ?: it.replyLevelSignature(eventsToConsider, cachedSignatures).apply { cachedSignatures.put(it, this) }
+                    cachedSignatures[it] ?: it.replyLevelSignature(
+                        eventsToConsider,
+                        cachedSignatures,
+                        account,
+                        accountFollowingSet,
+                        now
+                    ).apply { cachedSignatures.put(it, this) }
                 }
-                .maxByOrNull { it.length }?.removeSuffix(";") ?: ""
-            ) + "/" + formattedDateTime(createdAt() ?: 0) + ";"
+                .maxByOrNull { it.signature.length }
+            )
+
+        val parentSignature = parent?.signature?.removeSuffix(";") ?: ""
+
+        val threadOrder = if (parent?.author == author && createdAt() != null) {
+            // author of the thread first, in **ascending** order
+            "9" + formattedDateTime((parent?.createdAt ?: 0) + (now - (createdAt() ?: 0))) + idHex.substring(0, 8)
+        } else if (author?.pubkeyHex == account.pubkeyHex) {
+            "8" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my replies
+        } else if (author?.pubkeyHex in accountFollowingSet) {
+            "7" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // my follows replies.
+        } else {
+            "0" + formattedDateTime(createdAt() ?: 0) + idHex.substring(0, 8) // everyone else.
+        }
+
+        val mySignature = LevelSignature(
+            signature = parentSignature + "/" + threadOrder + ";",
+            createdAt = createdAt(),
+            author = author
+        )
 
         cachedSignatures[this] = mySignature
         return mySignature
@@ -171,21 +213,21 @@ open class Note(val idHex: String) {
     fun addReply(note: Note) {
         if (note !in replies) {
             replies = replies + note
-            liveSet?.replies?.invalidateData()
+            liveSet?.innerReplies?.invalidateData()
         }
     }
 
     fun removeReply(note: Note) {
         if (note in replies) {
             replies = replies - note
-            liveSet?.replies?.invalidateData()
+            liveSet?.innerReplies?.invalidateData()
         }
     }
 
     fun removeBoost(note: Note) {
         if (note in boosts) {
             boosts = boosts - note
-            liveSet?.boosts?.invalidateData()
+            liveSet?.innerBoosts?.invalidateData()
         }
     }
 
@@ -208,11 +250,11 @@ open class Note(val idHex: String) {
         relays = listOf<String>()
         lastReactionsDownloadTime = emptyMap()
 
-        liveSet?.replies?.invalidateData()
-        liveSet?.reactions?.invalidateData()
-        liveSet?.boosts?.invalidateData()
-        liveSet?.reports?.invalidateData()
-        liveSet?.zaps?.invalidateData()
+        liveSet?.innerReplies?.invalidateData()
+        liveSet?.innerReactions?.invalidateData()
+        liveSet?.innerBoosts?.invalidateData()
+        liveSet?.innerReports?.invalidateData()
+        liveSet?.innerZaps?.invalidateData()
 
         return toBeRemoved
     }
@@ -231,7 +273,7 @@ open class Note(val idHex: String) {
                         reactions = reactions + Pair(reaction, newList)
                     }
 
-                    liveSet?.reactions?.invalidateData()
+                    liveSet?.innerReactions?.invalidateData()
                 }
             }
         }
@@ -243,7 +285,7 @@ open class Note(val idHex: String) {
         if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.reports?.invalidateData()
+                liveSet?.innerReports?.invalidateData()
             }
         }
     }
@@ -251,28 +293,28 @@ open class Note(val idHex: String) {
     fun removeZap(note: Note) {
         if (zaps[note] != null) {
             zaps = zaps.minus(note)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zaps.containsValue(note)) {
             zaps = zaps.filterValues { it != note }
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun removeZapPayment(note: Note) {
         if (zapPayments[note] != null) {
             zapPayments = zapPayments.minus(note)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapPayments.containsValue(note)) {
             val toRemove = zapPayments.filterValues { it == note }
             zapPayments = zapPayments.minus(toRemove.keys)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
-            liveSet?.boosts?.invalidateData()
+            liveSet?.innerBoosts?.invalidateData()
         }
     }
 
@@ -294,12 +336,12 @@ open class Note(val idHex: String) {
         if (zapRequest !in zaps.keys) {
             val inserted = innerAddZap(zapRequest, zap)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         } else if (zaps[zapRequest] == null) {
             val inserted = innerAddZap(zapRequest, zap)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         }
     }
@@ -322,12 +364,12 @@ open class Note(val idHex: String) {
         if (zapPaymentRequest !in zapPayments.keys) {
             val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         } else if (zapPayments[zapPaymentRequest] == null) {
             val inserted = innerAddZapPayment(zapPaymentRequest, zapPayment)
             if (inserted) {
-                liveSet?.zaps?.invalidateData()
+                liveSet?.innerZaps?.invalidateData()
             }
         }
     }
@@ -338,10 +380,10 @@ open class Note(val idHex: String) {
 
         if (reaction !in reactions.keys) {
             reactions = reactions + Pair(reaction, listOf(note))
-            liveSet?.reactions?.invalidateData()
+            liveSet?.innerReactions?.invalidateData()
         } else if (reactions[reaction]?.contains(note) == false) {
             reactions = reactions + Pair(reaction, (reactions[reaction] ?: emptySet()) + note)
-            liveSet?.reactions?.invalidateData()
+            liveSet?.innerReactions?.invalidateData()
         }
     }
 
@@ -350,17 +392,17 @@ open class Note(val idHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, listOf(note))
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         }
     }
 
     fun addRelay(relay: Relay) {
         if (relay.url !in relays) {
             relays = relays + relay.url
-            liveSet?.relays?.invalidateData()
+            liveSet?.innerRelays?.invalidateData()
         }
     }
 
@@ -460,10 +502,6 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
-    fun countReactions(): Int {
-        return reactions.values.sumOf { it.size }
-    }
-
     fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
         // Regular Zap Receipts
         val completedZaps = zaps.asSequence()
@@ -635,32 +673,84 @@ open class Note(val idHex: String) {
     }
 
     fun isHiddenFor(accountChoices: Account.LiveHiddenUsers): Boolean {
-        if (event == null) return false
+        val thisEvent = event ?: return false
 
-        val isBoostedNoteHidden = if (event is GenericRepostEvent || event is RepostEvent || event is CommunityPostApprovalEvent) {
+        val isBoostedNoteHidden = if (thisEvent is GenericRepostEvent || thisEvent is RepostEvent || thisEvent is CommunityPostApprovalEvent) {
             replyTo?.lastOrNull()?.isHiddenFor(accountChoices) ?: false
         } else {
             false
         }
 
-        val isSensitive = event?.isSensitive() ?: false
-        return isBoostedNoteHidden ||
+        val isHiddenByWord = if (thisEvent is BaseTextNoteEvent) {
+            accountChoices.hiddenWords.any {
+                thisEvent.content.contains(it, true)
+            }
+        } else {
+            false
+        }
+
+        val isSensitive = thisEvent.isSensitive()
+        return isBoostedNoteHidden || isHiddenByWord ||
             accountChoices.hiddenUsers.contains(author?.pubkeyHex) ||
             accountChoices.spammers.contains(author?.pubkeyHex) ||
             (isSensitive && accountChoices.showSensitiveContent == false)
     }
 }
 
+@Stable
 class NoteLiveSet(u: Note) {
     // Observers line up here.
-    val metadata: NoteLiveData = NoteLiveData(u)
+    val innerMetadata = NoteBundledRefresherLiveData(u)
+    val innerReactions = NoteBundledRefresherLiveData(u)
+    val innerBoosts = NoteBundledRefresherLiveData(u)
+    val innerReplies = NoteBundledRefresherLiveData(u)
+    val innerReports = NoteBundledRefresherLiveData(u)
+    val innerRelays = NoteBundledRefresherLiveData(u)
+    val innerZaps = NoteBundledRefresherLiveData(u)
 
-    val reactions: NoteLiveData = NoteLiveData(u)
-    val boosts: NoteLiveData = NoteLiveData(u)
-    val replies: NoteLiveData = NoteLiveData(u)
-    val reports: NoteLiveData = NoteLiveData(u)
-    val relays: NoteLiveData = NoteLiveData(u)
-    val zaps: NoteLiveData = NoteLiveData(u)
+    val metadata = innerMetadata.map { it }
+    val reactions = innerReactions.map { it }
+    val boosts = innerBoosts.map { it }
+    val replies = innerReplies.map { it }
+    val reports = innerReports.map { it }
+    val relays = innerRelays.map { it }
+    val zaps = innerZaps.map { it }
+
+    val authorChanges = innerMetadata.map {
+        it.note.author
+    }
+
+    val hasEvent = innerMetadata.map {
+        it.note.event != null
+    }.distinctUntilChanged()
+
+    val hasReactions = innerZaps.combineWith(innerBoosts, innerReactions) { zapState, boostState, reactionState ->
+        zapState?.note?.zaps?.isNotEmpty() ?: false ||
+            boostState?.note?.boosts?.isNotEmpty() ?: false ||
+            reactionState?.note?.reactions?.isNotEmpty() ?: false
+    }.distinctUntilChanged()
+
+    val replyCount = innerReplies.map {
+        it.note.replies.size
+    }.distinctUntilChanged()
+
+    val reactionCount = innerReactions.map {
+        it.note.reactions.values.sumOf { it.size }
+    }.distinctUntilChanged()
+
+    val boostCount = innerBoosts.map {
+        it.note.boosts.size
+    }.distinctUntilChanged()
+
+    val boostList = innerBoosts.map {
+        it.note.boosts.toImmutableList()
+    }.distinctUntilChanged()
+
+    val relayInfo = innerRelays.map {
+        it.note.relays.map {
+            RelayBriefInfo(it)
+        }.toImmutableList()
+    }
 
     fun isInUse(): Boolean {
         return metadata.hasObservers() ||
@@ -669,21 +759,28 @@ class NoteLiveSet(u: Note) {
             replies.hasObservers() ||
             reports.hasObservers() ||
             relays.hasObservers() ||
-            zaps.hasObservers()
+            zaps.hasObservers() ||
+            authorChanges.hasObservers() ||
+            hasEvent.hasObservers() ||
+            hasReactions.hasObservers() ||
+            replyCount.hasObservers() ||
+            reactionCount.hasObservers() ||
+            boostCount.hasObservers() ||
+            boostList.hasObservers()
     }
 
     fun destroy() {
-        metadata.destroy()
-        reactions.destroy()
-        boosts.destroy()
-        replies.destroy()
-        reports.destroy()
-        relays.destroy()
-        zaps.destroy()
+        innerMetadata.destroy()
+        innerReactions.destroy()
+        innerBoosts.destroy()
+        innerReplies.destroy()
+        innerReports.destroy()
+        innerRelays.destroy()
+        innerZaps.destroy()
     }
 }
 
-class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
+class NoteBundledRefresherLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
@@ -692,19 +789,26 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     }
 
     fun invalidateData() {
-        if (!hasObservers()) return
-
         checkNotInMainThread()
 
         bundler.invalidate() {
             checkNotInMainThread()
 
-            if (hasActiveObservers()) {
-                postValue(NoteState(note))
-            }
+            postValue(NoteState(note))
         }
     }
 
+    fun <Y> map(
+        transform: (NoteState) -> Y
+    ): NoteLoadingLiveData<Y> {
+        val initialValue = this.value?.let { transform(it) }
+        val result = NoteLoadingLiveData(note, initialValue)
+        result.addSource(this) { x -> result.value = transform(x) }
+        return result
+    }
+}
+
+class NoteLoadingLiveData<Y>(val note: Note, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
     override fun onActive() {
         super.onActive()
         if (note is AddressableNote) {
@@ -726,3 +830,10 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
 
 @Immutable
 class NoteState(val note: Note)
+
+@Immutable
+data class RelayBriefInfo(
+    val url: String,
+    val displayUrl: String = url.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/").intern(),
+    val favIcon: String = "https://$displayUrl/favicon.ico".intern()
+)

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

@@ -14,4 +14,6 @@ data class RelaySetupInfo(
     val spamCount: Int = 0,
     val feedTypes: Set<FeedType>,
     val paidRelay: Boolean = false
-)
+) {
+    val briefInfo: RelayBriefInfo = RelayBriefInfo(url)
+}

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

@@ -8,7 +8,8 @@ class Settings(
     var preferredLanguage: String? = null,
     var automaticallyShowImages: ConnectivityType = ConnectivityType.ALWAYS,
     var automaticallyStartPlayback: ConnectivityType = ConnectivityType.ALWAYS,
-    var automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS
+    var automaticallyShowUrlPreview: ConnectivityType = ConnectivityType.ALWAYS,
+    var automaticallyHideNavigationBars: BooleanType = BooleanType.ALWAYS
 )
 
 enum class ConnectivityType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
@@ -38,3 +39,28 @@ fun parseConnectivityType(screenCode: Int): ConnectivityType {
         }
     }
 }
+
+enum class BooleanType(val prefCode: Boolean?, val screenCode: Int, val reourceId: Int) {
+    ALWAYS(null, 0, R.string.connectivity_type_always),
+    NEVER(false, 1, R.string.connectivity_type_never)
+}
+
+fun parseBooleanType(code: Boolean?): BooleanType {
+    return when (code) {
+        BooleanType.ALWAYS.prefCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.prefCode -> BooleanType.NEVER
+        else -> {
+            BooleanType.ALWAYS
+        }
+    }
+}
+
+fun parseBooleanType(screenCode: Int): BooleanType {
+    return when (screenCode) {
+        BooleanType.ALWAYS.screenCode -> BooleanType.ALWAYS
+        BooleanType.NEVER.screenCode -> BooleanType.NEVER
+        else -> {
+            BooleanType.ALWAYS
+        }
+    }
+}

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

@@ -3,15 +3,17 @@ package com.vitorpamplona.amethyst.model
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.distinctUntilChanged
 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
@@ -21,13 +23,9 @@ import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.ReportEvent
 import com.vitorpamplona.quartz.events.UserMetadata
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
-import com.vitorpamplona.quartz.utils.TimeUtils
 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) {
@@ -99,7 +97,11 @@ class User(val pubkeyHex: String) {
         if (event.id == latestBookmarkList?.id) return
 
         latestBookmarkList = event
-        liveSet?.bookmarks?.invalidateData()
+        liveSet?.innerBookmarks?.invalidateData()
+    }
+
+    fun clearEOSE() {
+        latestEOSEs = emptyMap()
     }
 
     fun updateContactList(event: ContactListEvent) {
@@ -109,18 +111,18 @@ class User(val pubkeyHex: String) {
         latestContactList = event
 
         // Update following of the current user
-        liveSet?.follows?.invalidateData()
+        liveSet?.innerFollows?.invalidateData()
 
         // Update Followers of the past user list
         // Update Followers of the new contact list
         (oldContactListEvent)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
+            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
         }
         (latestContactList)?.unverifiedFollowKeySet()?.forEach {
-            LocalCache.users[it]?.liveSet?.followers?.invalidateData()
+            LocalCache.users[it]?.liveSet?.innerFollowers?.invalidateData()
         }
 
-        liveSet?.relays?.invalidateData()
+        liveSet?.innerRelays?.invalidateData()
     }
 
     fun addReport(note: Note) {
@@ -128,10 +130,10 @@ class User(val pubkeyHex: String) {
 
         if (author !in reports.keys) {
             reports = reports + Pair(author, setOf(note))
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         } else if (reports[author]?.contains(note) == false) {
             reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
-            liveSet?.reports?.invalidateData()
+            liveSet?.innerReports?.invalidateData()
         }
     }
 
@@ -141,7 +143,7 @@ class User(val pubkeyHex: String) {
         if (author in reports.keys && reports[author]?.contains(deleteNote) == true) {
             reports[author]?.let {
                 reports = reports + Pair(author, it.minus(deleteNote))
-                liveSet?.reports?.invalidateData()
+                liveSet?.innerReports?.invalidateData()
             }
         }
     }
@@ -149,20 +151,20 @@ class User(val pubkeyHex: String) {
     fun addZap(zapRequest: Note, zap: Note?) {
         if (zapRequest !in zaps.keys) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
             zaps = zaps + Pair(zapRequest, zap)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
     fun removeZap(zapRequestOrZapEvent: Note) {
         if (zapRequestOrZapEvent in zaps.keys) {
             zaps = zaps.minus(zapRequestOrZapEvent)
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         } else if (zapRequestOrZapEvent in zaps.values) {
             zaps = zaps.filter { it.value != zapRequestOrZapEvent }
-            liveSet?.zaps?.invalidateData()
+            liveSet?.innerZaps?.invalidateData()
         }
     }
 
@@ -216,7 +218,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(room)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.addMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -224,7 +226,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg !in privateChatroom.roomMessages) {
             privateChatroom.addMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -238,7 +240,7 @@ class User(val pubkeyHex: String) {
         val privateChatroom = getOrCreatePrivateChatroom(user)
         if (msg in privateChatroom.roomMessages) {
             privateChatroom.removeMessageSync(msg)
-            liveSet?.messages?.invalidateData()
+            liveSet?.innerMessages?.invalidateData()
         }
     }
 
@@ -253,7 +255,7 @@ class User(val pubkeyHex: String) {
             here.counter++
         }
 
-        liveSet?.relayInfo?.invalidateData()
+        liveSet?.innerRelayInfo?.invalidateData()
     }
 
     fun updateUserInfo(newUserInfo: UserMetadata, latestMetadata: MetadataEvent) {
@@ -262,23 +264,15 @@ 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.
             }
         }
 
-        liveSet?.metadata?.invalidateData()
+        liveSet?.innerMetadata?.invalidateData()
     }
 
     fun isFollowing(user: User): Boolean {
@@ -325,7 +319,7 @@ class User(val pubkeyHex: String) {
         return latestContactList?.verifiedFollowKeySet ?: emptySet()
     }
 
-    fun cachedFollowingTagSet(): Set<HexKey> {
+    fun cachedFollowingTagSet(): Set<String> {
         return latestContactList?.verifiedFollowTagSet ?: emptySet()
     }
 
@@ -378,40 +372,72 @@ class User(val pubkeyHex: String) {
     }
 }
 
+@Stable
 class UserLiveSet(u: User) {
+    val innerMetadata = UserBundledRefresherLiveData(u)
+
     // UI Observers line up here.
-    val follows: UserLiveData = UserLiveData(u)
-    val followers: UserLiveData = UserLiveData(u)
-    val reports: UserLiveData = UserLiveData(u)
-    val messages: UserLiveData = UserLiveData(u)
-    val relays: UserLiveData = UserLiveData(u)
-    val relayInfo: UserLiveData = UserLiveData(u)
-    val metadata: UserLiveData = UserLiveData(u)
-    val zaps: UserLiveData = UserLiveData(u)
-    val bookmarks: UserLiveData = UserLiveData(u)
+    val innerFollows = UserBundledRefresherLiveData(u)
+    val innerFollowers = UserBundledRefresherLiveData(u)
+    val innerReports = UserBundledRefresherLiveData(u)
+    val innerMessages = UserBundledRefresherLiveData(u)
+    val innerRelays = UserBundledRefresherLiveData(u)
+    val innerRelayInfo = UserBundledRefresherLiveData(u)
+    val innerZaps = UserBundledRefresherLiveData(u)
+    val innerBookmarks = UserBundledRefresherLiveData(u)
+    val innerStatuses = UserBundledRefresherLiveData(u)
+
+    // UI Observers line up here.
+    val metadata = innerMetadata.map { it }
+    val follows = innerFollows.map { it }
+    val followers = innerFollowers.map { it }
+    val reports = innerReports.map { it }
+    val messages = innerMessages.map { it }
+    val relays = innerRelays.map { it }
+    val relayInfo = innerRelayInfo.map { it }
+    val zaps = innerZaps.map { it }
+    val bookmarks = innerBookmarks.map { it }
+    val statuses = innerStatuses.map { it }
+
+    val profilePictureChanges = innerMetadata.map {
+        it.user.profilePicture()
+    }.distinctUntilChanged()
+
+    val nip05Changes = innerMetadata.map {
+        it.user.nip05()
+    }.distinctUntilChanged()
+
+    val userMetadataInfo = innerMetadata.map {
+        it.user.info
+    }.distinctUntilChanged()
 
     fun isInUse(): Boolean {
-        return follows.hasObservers() ||
+        return metadata.hasObservers() ||
+            follows.hasObservers() ||
             followers.hasObservers() ||
             reports.hasObservers() ||
             messages.hasObservers() ||
             relays.hasObservers() ||
             relayInfo.hasObservers() ||
-            metadata.hasObservers() ||
             zaps.hasObservers() ||
-            bookmarks.hasObservers()
+            bookmarks.hasObservers() ||
+            statuses.hasObservers() ||
+            profilePictureChanges.hasObservers() ||
+            nip05Changes.hasObservers() ||
+            userMetadataInfo.hasObservers()
     }
 
     fun destroy() {
-        follows.destroy()
-        followers.destroy()
-        reports.destroy()
-        messages.destroy()
-        relays.destroy()
-        relayInfo.destroy()
-        metadata.destroy()
-        zaps.destroy()
-        bookmarks.destroy()
+        innerMetadata.destroy()
+        innerFollows.destroy()
+        innerFollowers.destroy()
+        innerReports.destroy()
+        innerMessages.destroy()
+        innerRelays.destroy()
+        innerRelayInfo.destroy()
+        innerZaps.destroy()
+        innerBookmarks.destroy()
+        innerStatuses.destroy()
     }
 }
 
@@ -422,64 +448,7 @@ data class RelayInfo(
     var counter: Long
 )
 
-@Stable
-class Chatroom() {
-    var roomMessages: Set<Note> = setOf()
-    var subject: String? = null
-    var subjectCreatedAt: Long? = null
-
-    @Synchronized
-    fun addMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-
-            val newSubject = msg.event?.subject()
-
-            if (newSubject != null && (msg.createdAt() ?: 0) > (subjectCreatedAt ?: 0)) {
-                subject = newSubject
-                subjectCreatedAt = msg.createdAt()
-            }
-        }
-    }
-
-    @Synchronized
-    fun removeMessageSync(msg: Note) {
-        checkNotInMainThread()
-
-        if (msg !in roomMessages) {
-            roomMessages = roomMessages + msg
-
-            roomMessages.filter { it.event?.subject() != null }.sortedBy { it.createdAt() }.lastOrNull()?.let {
-                subject = it.event?.subject()
-                subjectCreatedAt = it.createdAt()
-            }
-        }
-    }
-
-    fun senderIntersects(keySet: Set<HexKey>): Boolean {
-        return roomMessages.any { it.author?.pubkeyHex in keySet }
-    }
-
-    fun pruneMessagesToTheLatestOnly(): Set<Note> {
-        val sorted = roomMessages.sortedWith(compareBy({ it.createdAt() }, { it.idHex })).reversed()
-
-        val toKeep = if ((sorted.firstOrNull()?.createdAt() ?: 0) > TimeUtils.oneWeekAgo()) {
-            // Recent messages, keep last 100
-            sorted.take(100).toSet()
-        } else {
-            // Old messages, keep the last one.
-            sorted.take(1).toSet()
-        } + sorted.filter { it.liveSet?.isInUse() ?: false }
-
-        val toRemove = roomMessages.minus(toKeep)
-        roomMessages = toKeep
-        return toRemove
-    }
-}
-
-class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
+class UserBundledRefresherLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
     private val bundler = BundledUpdate(500, Dispatchers.IO)
 
@@ -488,18 +457,26 @@ class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     }
 
     fun invalidateData() {
-        if (!hasObservers()) return
         checkNotInMainThread()
 
         bundler.invalidate() {
             checkNotInMainThread()
 
-            if (hasActiveObservers()) {
-                postValue(UserState(user))
-            }
+            postValue(UserState(user))
         }
     }
 
+    fun <Y> map(
+        transform: (UserState) -> Y
+    ): UserLoadingLiveData<Y> {
+        val initialValue = this.value?.let { transform(it) }
+        val result = UserLoadingLiveData(user, initialValue)
+        result.addSource(this) { x -> result.value = transform(x) }
+        return result
+    }
+}
+
+class UserLoadingLiveData<Y>(val user: User, initialValue: Y?) : MediatorLiveData<Y>(initialValue) {
     override fun onActive() {
         super.onActive()
         NostrSingleUserDataSource.add(user)

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/Nip05Verifier.kt

@@ -47,13 +47,13 @@ class Nip05Verifier() {
                         if (it.isSuccessful) {
                             onSuccess(it.body.string())
                         } else {
-                            onError("Could not resolve $nip05. Error: ${it.code}. Check if the server up and if the address $nip05 is correct")
+                            onError("Could not resolve $nip05. Error: ${it.code}. Check if the server is up and if the address $nip05 is correct")
                         }
                     }
                 }
 
                 override fun onFailure(call: Call, e: java.io.IOException) {
-                    onError("Could not resolve $url. Check if the server up and if the address $nip05 is correct")
+                    onError("Could not resolve $url. Check if the server is up and if the address $nip05 is correct")
                     e.printStackTrace()
                 }
             })

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

@@ -0,0 +1,103 @@
+package com.vitorpamplona.amethyst.service
+
+import android.util.Log
+import android.util.LruCache
+import com.vitorpamplona.amethyst.model.RelayInformation
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException
+
+object Nip11CachedRetriever {
+    val relayInformationDocumentCache = LruCache<String, RelayInformation>(100)
+    val retriever = Nip11Retriever()
+
+    suspend fun loadRelayInfo(
+        dirtyUrl: String,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, Nip11Retriever.ErrorCode, String?) -> Unit
+    ) {
+        val url = retriever.cleanUrl(dirtyUrl)
+        val doc = relayInformationDocumentCache.get(url)
+
+        if (doc != null) {
+            onInfo(doc)
+        } else {
+            Nip11Retriever().loadRelayInfo(
+                url,
+                dirtyUrl,
+                onInfo = {
+                    relayInformationDocumentCache.put(url, it)
+                    onInfo(it)
+                },
+                onError
+            )
+        }
+    }
+}
+
+class Nip11Retriever {
+    enum class ErrorCode {
+        FAIL_TO_ASSEMBLE_URL,
+        FAIL_TO_REACH_SERVER,
+        FAIL_TO_PARSE_RESULT,
+        FAIL_WITH_HTTP_STATUS
+    }
+
+    fun cleanUrl(dirtyUrl: String): String {
+        return if (dirtyUrl.contains("://")) {
+            dirtyUrl
+                .replace("wss://", "https://")
+                .replace("ws://", "http://")
+        } else {
+            "https://$dirtyUrl"
+        }
+    }
+
+    suspend fun loadRelayInfo(
+        url: String,
+        dirtyUrl: String,
+        onInfo: (RelayInformation) -> Unit,
+        onError: (String, ErrorCode, String?) -> Unit
+    ) {
+        try {
+            val request: Request = Request
+                .Builder()
+                .header("Accept", "application/nostr+json")
+                .url(url)
+                .build()
+
+            HttpClient.getHttpClient()
+                .newCall(request)
+                .enqueue(
+                    object : Callback {
+                        override fun onResponse(call: Call, response: Response) {
+                            checkNotInMainThread()
+                            response.use {
+                                val body = it.body.string()
+                                try {
+                                    if (it.isSuccessful) {
+                                        onInfo(RelayInformation.fromJson(body))
+                                    } else {
+                                        onError(dirtyUrl, ErrorCode.FAIL_WITH_HTTP_STATUS, it.code.toString())
+                                    }
+                                } catch (e: Exception) {
+                                    Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
+                                    onError(dirtyUrl, ErrorCode.FAIL_TO_PARSE_RESULT, e.message)
+                                }
+                            }
+                        }
+
+                        override fun onFailure(call: Call, e: IOException) {
+                            Log.e("RelayInfoFail", "$dirtyUrl unavailable", e)
+                            onError(dirtyUrl, ErrorCode.FAIL_TO_REACH_SERVER, e.message)
+                        }
+                    }
+                )
+        } catch (e: Exception) {
+            Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
+            onError(dirtyUrl, ErrorCode.FAIL_TO_ASSEMBLE_URL, e.message)
+        }
+    }
+}

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") {
@@ -52,9 +61,9 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
         return TypedFilter(
             types = COMMON_FEED_TYPES,
             filter = JsonFilter(
-                kinds = listOf(AdvertisedRelayListEvent.kind),
+                kinds = listOf(AdvertisedRelayListEvent.kind, StatusEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                limit = 1
+                limit = 5
             )
         )
     }
@@ -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/NostrDataSource.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import java.util.UUID
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.Error
 
 abstract class NostrDataSource(val debugName: String) {
@@ -23,6 +24,7 @@ abstract class NostrDataSource(val debugName: String) {
     data class Counter(var counter: Int)
 
     private var eventCounter = mapOf<String, Counter>()
+    var changingFilters = AtomicBoolean()
 
     fun printCounter() {
         eventCounter.forEach {
@@ -49,7 +51,7 @@ abstract class NostrDataSource(val debugName: String) {
             // Log.e("ERROR", "Relay ${relay.url}: ${error.message}")
         }
 
-        override fun onRelayStateChange(type: Relay.Type, relay: Relay, channel: String?) {
+        override fun onRelayStateChange(type: Relay.Type, relay: Relay, subscriptionId: String?) {
             // Log.d("RELAY", "Relay ${relay.url} ${when (type) {
             //  Relay.Type.CONNECT -> "connected."
             //  Relay.Type.DISCONNECT -> "disconnected."
@@ -57,13 +59,19 @@ abstract class NostrDataSource(val debugName: String) {
             //  Relay.Type.EOSE -> "sent all events it had stored."
             // }}")
 
-            if (type == Relay.Type.EOSE && channel != null) {
+            if (type == Relay.Type.EOSE && subscriptionId != null && subscriptionId in subscriptions.keys) {
                 // updates a per subscripton since date
-                subscriptions[channel]?.updateEOSE(TimeUtils.now(), relay.url)
+                subscriptions[subscriptionId]?.updateEOSE(
+                    TimeUtils.fiveMinutesAgo(), // in case people's clock is slighly off.
+                    relay.url
+                )
             }
         }
 
         override fun onSendResponse(eventId: String, success: Boolean, message: String, relay: Relay) {
+            if (success) {
+                markAsSeenOnRelay(eventId, relay)
+            }
         }
 
         override fun onAuth(relay: Relay, challenge: String) {
@@ -111,12 +119,14 @@ abstract class NostrDataSource(val debugName: String) {
     private val bundler = BundledUpdate(300, Dispatchers.IO)
 
     fun invalidateFilters() {
-        bundler.invalidate() {
-            // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
+        scope.launch(Dispatchers.IO) {
+            bundler.invalidate() {
+                // println("DataSource: ${this.javaClass.simpleName} InvalidateFilters")
 
-            // adds the time to perform the refresh into this delay
-            // holding off new updates in case of heavy refresh routines.
-            resetFiltersSuspend()
+                // adds the time to perform the refresh into this delay
+                // holding off new updates in case of heavy refresh routines.
+                resetFiltersSuspend()
+            }
         }
     }
 
@@ -134,6 +144,8 @@ abstract class NostrDataSource(val debugName: String) {
         // saves the current content to only update if it changes
         val currentFilters = activeSubscriptions.associate { it.id to it.toJson() }
 
+        changingFilters.getAndSet(true)
+
         updateChannelFilters()
 
         // Makes sure to only send an updated filter when it actually changes.
@@ -165,12 +177,18 @@ abstract class NostrDataSource(val debugName: String) {
                 }
             }
         }
+
+        changingFilters.getAndSet(false)
     }
 
     open fun consume(event: Event, relay: Relay) {
         LocalCache.verifyAndConsume(event, relay)
     }
 
+    open fun markAsSeenOnRelay(eventId: String, relay: Relay) {
+        LocalCache.getNoteIfExists(eventId)?.addRelay(relay)
+    }
+
     abstract fun updateChannelFilters()
     open fun auth(relay: Relay, challenge: String) = Unit
 }

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

@@ -18,53 +18,66 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
 
     val latestEOSEs = EOSEAccount()
 
-    fun createLiveStreamFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+    fun createLiveStreamFilter(): List<TypedFilter> {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
 
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
-
-        return TypedFilter(
-            types = setOf(FeedType.GLOBAL),
-            filter = JsonFilter(
-                authors = followKeys,
-                kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
-                limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
-            )
+        return listOfNotNull(
+            TypedFilter(
+                types = setOf(FeedType.GLOBAL),
+                filter = JsonFilter(
+                    authors = follows,
+                    kinds = listOf(LiveActivitiesChatMessageEvent.kind, LiveActivitiesEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
+            ),
+            follows?.let {
+                TypedFilter(
+                    types = setOf(FeedType.GLOBAL),
+                    filter = JsonFilter(
+                        tags = mapOf("p" to it),
+                        kinds = listOf(LiveActivitiesEvent.kind),
+                        limit = 100,
+                        since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                    )
+                )
+            }
         )
     }
 
-    fun createPublicChatFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
+    fun createPublicChatFilter(): List<TypedFilter> {
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
+        val followChats = account.selectedChatsFollowList().toList()
 
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
-
-        return TypedFilter(
-            types = setOf(FeedType.PUBLIC_CHATS),
-            filter = JsonFilter(
-                authors = followKeys,
-                kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
-                limit = 300,
-                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+        return listOf(
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    authors = follows,
+                    kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind, ChannelMessageEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
+            ),
+            TypedFilter(
+                types = setOf(FeedType.PUBLIC_CHATS),
+                filter = JsonFilter(
+                    ids = followChats,
+                    kinds = listOf(ChannelCreateEvent.kind),
+                    limit = 300,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
+                )
             )
         )
     }
 
     fun createCommunitiesFilter(): TypedFilter {
-        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
+        val follows = account.selectedUsersFollowList(account.defaultDiscoveryFollowList)?.toList()
 
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter = JsonFilter(
-                authors = followKeys,
+                authors = follows,
                 kinds = listOf(CommunityDefinitionEvent.kind, CommunityPostApprovalEvent.kind),
                 limit = 300,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultDiscoveryFollowList)?.relayList
@@ -197,16 +210,16 @@ object NostrDiscoveryDataSource : NostrDataSource("DiscoveryFeed") {
     }
 
     override fun updateChannelFilters() {
-        discoveryFeedChannel.typedFilters = listOfNotNull(
-            createLiveStreamFilter(),
-            createPublicChatFilter(),
-            createCommunitiesFilter(),
-            createLiveStreamTagsFilter(),
-            createPublicChatsTagsFilter(),
-            createCommunitiesTagsFilter(),
-            createCommunitiesGeohashesFilter(),
-            createPublicChatsGeohashesFilter(),
-            createLiveStreamGeohashesFilter()
+        discoveryFeedChannel.typedFilters = createLiveStreamFilter().plus(createPublicChatFilter()).plus(
+            listOfNotNull(
+                createLiveStreamTagsFilter(),
+                createLiveStreamGeohashesFilter(),
+                createCommunitiesFilter(),
+                createPublicChatsTagsFilter(),
+                createCommunitiesTagsFilter(),
+                createCommunitiesGeohashesFilter(),
+                createPublicChatsGeohashesFilter()
+            )
         ).ifEmpty { null }
     }
 }

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

@@ -55,12 +55,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
 
     fun createFollowAccountsFilter(): TypedFilter {
         val follows = account.selectedUsersFollowList(account.defaultHomeFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 8)
-        }
-
-        val followSet = followKeys?.plus(account.userProfile().pubkeyHex.substring(0, 8))
+        val followSet = follows?.plus(account.userProfile().pubkeyHex)?.toList()?.ifEmpty { null }
 
         return TypedFilter(
             types = setOf(FeedType.FOLLOWS),

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/NostrSingleChannelDataSource.kt

@@ -1,7 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
+import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.PublicChatChannel
 import com.vitorpamplona.amethyst.service.relays.COMMON_FEED_TYPES
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -11,10 +11,10 @@ import com.vitorpamplona.quartz.events.ChannelCreateEvent
 import com.vitorpamplona.quartz.events.ChannelMetadataEvent
 
 object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
-    private var channelsToWatch = setOf<String>()
+    private var channelsToWatch = setOf<Channel>()
 
-    private fun createRepliesAndReactionsFilter(): TypedFilter? {
-        val reactionsToWatch = channelsToWatch.map { it }
+    private fun createMetadataChangeFilter(): TypedFilter? {
+        val reactionsToWatch = channelsToWatch.filter { it is PublicChatChannel }.map { it.idHex }
 
         if (reactionsToWatch.isEmpty()) {
             return null
@@ -32,7 +32,6 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadEventsIfNotLoadedFilter(): TypedFilter? {
         val directEventsToLoad = channelsToWatch
-            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
             .filter { it.notes.isEmpty() && it is PublicChatChannel }
 
         val interestedEvents = (directEventsToLoad).map { it.idHex }.toSet()
@@ -53,7 +52,6 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
 
     fun createLoadStreamingIfNotLoadedFilter(): List<TypedFilter>? {
         val directEventsToLoad = channelsToWatch
-            .mapNotNull { LocalCache.checkGetOrCreateChannel(it) }
             .filterIsInstance<LiveActivitiesChannel>()
             .filter { it.info == null }
 
@@ -81,7 +79,7 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
     val singleChannelChannel = requestNewChannel()
 
     override fun updateChannelFilters() {
-        val reactions = createRepliesAndReactionsFilter()
+        val reactions = createMetadataChangeFilter()
         val missing = createLoadEventsIfNotLoadedFilter()
         val missingStreaming = createLoadStreamingIfNotLoadedFilter()
 
@@ -90,13 +88,17 @@ object NostrSingleChannelDataSource : NostrDataSource("SingleChannelFeed") {
             ).ifEmpty { null }
     }
 
-    fun add(eventId: String) {
-        channelsToWatch = channelsToWatch.plus(eventId)
-        invalidateFilters()
+    fun add(eventId: Channel) {
+        if (eventId !in channelsToWatch) {
+            channelsToWatch = channelsToWatch.plus(eventId)
+            invalidateFilters()
+        }
     }
 
-    fun remove(eventId: String) {
-        channelsToWatch = channelsToWatch.minus(eventId)
-        invalidateFilters()
+    fun remove(eventId: Channel) {
+        if (eventId in channelsToWatch) {
+            channelsToWatch = channelsToWatch.minus(eventId)
+            invalidateFilters()
+        }
     }
 }

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

@@ -134,6 +134,9 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
     }
 
     val singleEventChannel = requestNewChannel { time, relayUrl ->
+        // Ignores EOSE if it is in the middle of a filter change.
+        if (changingFilters.get()) return@requestNewChannel
+
         checkNotInMainThread()
 
         eventsToWatch.forEach {

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

@@ -7,38 +7,65 @@ import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import com.vitorpamplona.quartz.events.MetadataEvent
 import com.vitorpamplona.quartz.events.ReportEvent
+import com.vitorpamplona.quartz.events.StatusEvent
 
 object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
     var usersToWatch = setOf<User>()
 
-    fun createUserFilter(): List<TypedFilter>? {
+    fun createUserMetadataFilter(): List<TypedFilter>? {
         if (usersToWatch.isEmpty()) return null
 
-        return usersToWatch.filter { it.info?.latestMetadata == null }.map {
+        val firstTimers = usersToWatch.filter { it.info?.latestMetadata == null }.map { it.pubkeyHex }
+
+        return listOf(
             TypedFilter(
                 types = COMMON_FEED_TYPES,
                 filter = JsonFilter(
-                    kinds = listOf(MetadataEvent.kind),
-                    authors = listOf(it.pubkeyHex),
-                    limit = 1
+                    kinds = listOf(MetadataEvent.kind, StatusEvent.kind),
+                    authors = firstTimers,
+                    limit = 10 * firstTimers.size
                 )
             )
-        }
+        )
     }
 
-    fun createUserReportFilter(): List<TypedFilter>? {
+    fun createUserMetadataFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
         if (usersToWatch.isEmpty()) return null
 
-        return usersToWatch.map {
-            TypedFilter(
-                types = COMMON_FEED_TYPES,
-                filter = JsonFilter(
-                    kinds = listOf(ReportEvent.kind),
-                    tags = mapOf("p" to listOf(it.pubkeyHex)),
-                    since = it.latestEOSEs
-                )
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(StatusEvent.kind),
+                authors = usersToWatch.map { it.pubkeyHex },
+                since = minLatestEOSEs
             )
-        }
+        )
+    }
+
+    fun createUserStatusFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
+        if (usersToWatch.isEmpty()) return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(StatusEvent.kind),
+                authors = usersToWatch.map { it.pubkeyHex },
+                since = minLatestEOSEs
+            )
+        )
+    }
+
+    fun createUserReportFilter(minLatestEOSEs: Map<String, EOSETime>): TypedFilter? {
+        if (usersToWatch.isEmpty()) return null
+
+        return TypedFilter(
+            types = COMMON_FEED_TYPES,
+            filter = JsonFilter(
+                kinds = listOf(ReportEvent.kind),
+                tags = mapOf("p" to usersToWatch.map { it.pubkeyHex }),
+                since = minLatestEOSEs
+            )
+        )
     }
 
     val userChannel = requestNewChannel() { time, relayUrl ->
@@ -50,17 +77,40 @@ object NostrSingleUserDataSource : NostrDataSource("SingleUserFeed") {
                 eose.time = time
             }
         }
+    }
 
+    val userChannelFirstTimers = requestNewChannel() { time, relayUrl ->
         // Many relays operate with limits in the amount of filters.
         // As information comes, the filters will be rotated to get more data.
         invalidateFilters()
     }
 
-    val userChannelOnce = requestNewChannel()
-
     override fun updateChannelFilters() {
-        userChannel.typedFilters = listOfNotNull(createUserFilter()).flatten().ifEmpty { null }
-        userChannelOnce.typedFilters = listOfNotNull(createUserReportFilter()).flatten().ifEmpty { null }
+        val minLatestEOSEs = mutableMapOf<String, EOSETime>()
+        val neverGottenAnEOSE = mutableSetOf<String>()
+        usersToWatch.forEach {
+            if (it.latestEOSEs.isEmpty()) { // first time
+                neverGottenAnEOSE.add(it.pubkeyHex)
+            } else {
+                it.latestEOSEs.forEach {
+                    val minEose = minLatestEOSEs[it.key]
+                    if (minEose == null) {
+                        minLatestEOSEs.put(it.key, EOSETime(it.value.time))
+                    } else if (it.value.time < minEose.time) {
+                        minEose.time = it.value.time
+                    }
+                }
+            }
+        }
+
+        userChannel.typedFilters = listOfNotNull(
+            createUserMetadataFilter(minLatestEOSEs),
+            createUserStatusFilter(minLatestEOSEs),
+            createUserReportFilter(minLatestEOSEs)
+        ).ifEmpty { null }
+        userChannelFirstTimers.typedFilters = listOfNotNull(
+            createUserMetadataFilter()
+        ).flatten().ifEmpty { null }
     }
 
     fun add(user: User) {

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

@@ -36,8 +36,10 @@ object NostrThreadDataSource : NostrDataSource("SingleThreadFeed") {
     }
 
     fun loadThread(noteId: String?) {
-        eventToWatch = noteId
+        if (eventToWatch != noteId) {
+            eventToWatch = noteId
 
-        invalidateFilters()
+            invalidateFilters()
+        }
     }
 }

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

@@ -14,16 +14,12 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     val latestEOSEs = EOSEAccount()
 
     fun createContextualFilter(): TypedFilter? {
-        val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)
-
-        val followKeys = follows?.map {
-            it.substring(0, 6)
-        }
+        val follows = account.selectedUsersFollowList(account.defaultStoriesFollowList)?.toList()
 
         return TypedFilter(
             types = setOf(FeedType.GLOBAL),
             filter = JsonFilter(
-                authors = followKeys,
+                authors = follows,
                 kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
                 limit = 200,
                 since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultStoriesFollowList)?.relayList

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
@@ -57,16 +51,16 @@ class LightningAddressResolver() {
                 if (it.isSuccessful) {
                     onSuccess(it.body.string())
                 } else {
-                    onError("Could not resolve $lnaddress. Error: ${it.code}. Check if the server up and if the lightning address $lnaddress is correct")
+                    onError("The receiver's lightning service at $url is not available. It was calculated from the lightning address \"${lnaddress}\". Error: ${it.code}. Check if the server is up and if the lightning address is correct")
                 }
             }
         } catch (e: Exception) {
             e.printStackTrace()
-            onError("Could not resolve $url. Check if the server up and if the lightning address $lnaddress is correct")
+            onError("Could not resolve $url. Check if the server is up and if the lightning address $lnaddress is correct")
         }
     }
 
-    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,14 +144,22 @@ 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 {
-                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from server")
+                                    onProgress(0.0f)
+                                    onError("Incorrect invoice amount (${invoiceAmount.toLong()} sats) from $lnaddress. It should have been $expectedAmountInSats")
                                 }
-                            } ?: onError("Invoice Not Created (element pr not found in the resulting JSON)")
+                            } ?: lnInvoice?.get("reason")?.asText()?.ifBlank { null }?.let { reason ->
+                                onProgress(0.0f)
+                                onError("Unable to create a lightning invoice before sending the zap. The receiver's lightning wallet sent the following error: $reason")
+                            } ?: run {
+                                onProgress(0.0f)
+                                onError("nable to create a lightning invoice before sending the zap. Element pr not found in the resulting JSON.")
+                            }
                         },
                         onError = onError
                     )

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
@@ -19,43 +21,127 @@ import com.vitorpamplona.quartz.events.LnZapEvent
 import com.vitorpamplona.quartz.events.LnZapRequestEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
+import com.vitorpamplona.quartz.utils.TimeUtils
 import kotlinx.collections.immutable.persistentSetOf
+import java.math.BigDecimal
 
 class EventNotificationConsumer(private val applicationContext: Context) {
+    suspend fun consume(event: GiftWrapEvent) {
+        if (!LocalCache.justVerify(event)) return
+        if (!notificationManager().areNotificationsEnabled()) return
 
-    fun consume(event: Event) {
-        if (LocalCache.notes[event.id] == null) {
-            if (LocalCache.justVerify(event)) {
-                LocalCache.justConsume(event, null)
+        // PushNotification Wraps don't include a receiver.
+        // Test with all logged in accounts
+        LocalPreferences.allSavedAccounts().forEach {
+            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+            if (acc != null && (acc.keyPair.privKey != null || acc.loginWithExternalSigner)) {
+                consumeIfMatchesAccount(event, acc)
+            }
+        }
+    }
 
-                val manager = notificationManager()
-                if (manager.areNotificationsEnabled()) {
-                    when (event) {
-                        is PrivateDmEvent -> notify(event)
-                        is LnZapEvent -> notify(event)
-                        is GiftWrapEvent -> unwrapAndNotify(event)
+    private suspend fun consumeIfMatchesAccount(pushWrappedEvent: GiftWrapEvent, account: Account) {
+        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)
+
+                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)
                     }
                 }
             }
         }
     }
 
-    fun unwrapAndConsume(event: Event, account: Account): Event? {
+    private fun unwrapAndConsume(event: Event, account: Account): Event? {
         if (!LocalCache.justVerify(event)) return null
 
         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 -> {
@@ -65,106 +151,106 @@ class EventNotificationConsumer(private val applicationContext: Context) {
         }
     }
 
-    private fun unwrapAndNotify(giftWrap: GiftWrapEvent) {
-        val giftWrapNote = LocalCache.notes[giftWrap.id] ?: return
+    private fun notify(event: ChatMessageEvent, acc: Account) {
+        if (event.createdAt > TimeUtils.fiveMinutesAgo() && // old event being re-broadcasted
+            event.pubKey != acc.userProfile().pubkeyHex
+        ) { // from the user
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+            val chatNote = LocalCache.notes[event.id] ?: return
+            val chatRoom = event.chatroomKey(acc.keyPair.pubKey.toHexKey())
 
-            if (acc != null && acc.userProfile().pubkeyHex == giftWrap.recipientPubKey()) {
-                val chatEvent = unwrapAndConsume(giftWrap, account = acc)
+            val followingKeySet = acc.followingKeySet()
 
-                if (chatEvent is ChatMessageEvent && acc.keyPair.privKey != null) {
-                    val chatNote = LocalCache.notes[chatEvent.id] ?: return
-                    val chatRoom = chatEvent.chatroomKey(acc.keyPair.pubKey.toHexKey())
+            val isKnownRoom = (
+                acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
+                    acc.userProfile().hasSentMessagesTo(chatRoom)
+                ) && !acc.isAllHidden(chatRoom.users)
 
-                    val followingKeySet = acc.followingKeySet()
-
-                    val isKnownRoom = (
-                        acc.userProfile().privateChatrooms[chatRoom]?.senderIntersects(followingKeySet) == true ||
-                            acc.userProfile().hasSentMessagesTo(chatRoom)
-                        ) && !acc.isAllHidden(chatRoom.users)
-
-                    if (isKnownRoom) {
-                        val content = chatNote.event?.content() ?: ""
-                        val user = chatNote.author?.toBestDisplayName() ?: ""
-                        val userPicture = chatNote.author?.profilePicture()
-                        val noteUri = chatNote.toNEvent()
-                        notificationManager().sendDMNotification(chatEvent.id, content, user, userPicture, noteUri, applicationContext)
-                    }
-                }
+            if (isKnownRoom) {
+                val content = chatNote.event?.content() ?: ""
+                val user = chatNote.author?.toBestDisplayName() ?: ""
+                val userPicture = chatNote.author?.profilePicture()
+                val noteUri = chatNote.toNEvent()
+                notificationManager().sendDMNotification(
+                    event.id,
+                    content,
+                    user,
+                    userPicture,
+                    noteUri,
+                    applicationContext
+                )
             }
         }
     }
 
-    private fun notify(event: PrivateDmEvent) {
+    private fun notify(event: PrivateDmEvent, acc: Account) {
         val note = LocalCache.notes[event.id] ?: return
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
 
-            if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
-                val followingKeySet = acc.followingKeySet()
+        if (acc != null && acc.userProfile().pubkeyHex == event.verifiedRecipientPubKey()) {
+            val followingKeySet = acc.followingKeySet()
 
-                val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
-                    (
-                        acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
-                            acc.userProfile().hasSentMessagesTo(it)
-                        ) && !acc.isAllHidden(it.users)
-                }.toSet()
+            val knownChatrooms = acc.userProfile().privateChatrooms.keys.filter {
+                (
+                    acc.userProfile().privateChatrooms[it]?.senderIntersects(followingKeySet) == true ||
+                        acc.userProfile().hasSentMessagesTo(it)
+                    ) && !acc.isAllHidden(it.users)
+            }.toSet()
 
-                note.author?.let {
-                    if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
-                        val content = acc.decryptContent(note) ?: ""
-                        val user = note.author?.toBestDisplayName() ?: ""
-                        val userPicture = note.author?.profilePicture()
-                        val noteUri = note.toNEvent()
-                        notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
-                    }
+            note.author?.let {
+                if (ChatroomKey(persistentSetOf(it.pubkeyHex)) in knownChatrooms) {
+                    val content = acc.decryptContent(note) ?: ""
+                    val user = note.author?.toBestDisplayName() ?: ""
+                    val userPicture = note.author?.profilePicture()
+                    val noteUri = note.toNEvent()
+                    notificationManager().sendDMNotification(event.id, content, user, userPicture, noteUri, applicationContext)
                 }
             }
         }
     }
 
-    private fun notify(event: LnZapEvent) {
+    private fun notify(event: LnZapEvent, acc: Account) {
         val noteZapEvent = LocalCache.notes[event.id] ?: return
 
-        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) }
+        // old event being re-broadcast
+        if (event.createdAt < TimeUtils.fiveMinutesAgo()) return
+
+        val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) }
 
-        LocalPreferences.allSavedAccounts().forEach {
-            val acc = LocalPreferences.loadFromEncryptedStorage(it.npub)
+        if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-            if (acc != null && acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
-                val amount = showAmount(event.amount)
-                val senderInfo = (noteZapRequest?.event as? LnZapRequestEvent)?.let {
-                    val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)
-                    if (decryptedContent != null) {
-                        val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-                        Pair(author, decryptedContent.content)
-                    } else if (!noteZapRequest.event?.content().isNullOrBlank()) {
-                        Pair(noteZapRequest.author, noteZapRequest.event?.content())
-                    } else {
-                        Pair(noteZapRequest.author, null)
-                    }
+        if (acc.userProfile().pubkeyHex == event.zappedAuthor().firstOrNull()) {
+            val amount = showAmount(event.amount)
+            val senderInfo = (noteZapRequest.event as? LnZapRequestEvent)?.let {
+                val decryptedContent = acc.decryptZapContentAuthor(noteZapRequest)
+                if (decryptedContent != null) {
+                    val author = LocalCache.getOrCreateUser(decryptedContent.pubKey)
+                    Pair(author, decryptedContent.content)
+                } else if (!noteZapRequest.event?.content().isNullOrBlank()) {
+                    Pair(noteZapRequest.author, noteZapRequest.event?.content())
+                } else {
+                    Pair(noteZapRequest.author, null)
                 }
-
-                val zappedContent =
-                    noteZapped?.let { it1 -> acc.decryptContent(it1)?.split("\n")?.get(0) }
-
-                val user = senderInfo?.first?.toBestDisplayName() ?: ""
-                var title = applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
-                senderInfo?.second?.ifBlank { null }?.let {
-                    title += " ($it)"
-                }
-                var content = applicationContext.getString(R.string.app_notification_zaps_channel_message_from, user)
-                zappedContent?.let {
-                    content += " " + applicationContext.getString(R.string.app_notification_zaps_channel_message_for, zappedContent)
-                }
-                val userPicture = senderInfo?.first?.profilePicture()
-                val noteUri = "nostr:Notifications"
-                notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
             }
+
+            val zappedContent =
+                noteZapped?.let { it1 -> acc.decryptContent(it1)?.split("\n")?.get(0) }
+
+            val user = senderInfo?.first?.toBestDisplayName() ?: ""
+            var title = applicationContext.getString(R.string.app_notification_zaps_channel_message, amount)
+            senderInfo?.second?.ifBlank { null }?.let {
+                title += " ($it)"
+            }
+            var content = applicationContext.getString(R.string.app_notification_zaps_channel_message_from, user)
+            zappedContent?.let {
+                content += " " + applicationContext.getString(R.string.app_notification_zaps_channel_message_for, zappedContent)
+            }
+            val userPicture = senderInfo?.first?.profilePicture()
+            val noteUri = "nostr:Notifications"
+            notificationManager().sendZapNotification(event.id, content, title, userPicture, noteUri, applicationContext)
         }
     }
 

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/service/relays/Constants.kt

@@ -16,9 +16,7 @@ object Constants {
     }
 
     val defaultRelays = arrayOf(
-        // Free relays for DMs and Follows
-        RelaySetupInfo("wss://no.str.cr", read = true, write = true, feedTypes = activeTypes),
-        RelaySetupInfo("wss://relay.snort.social", read = true, write = true, feedTypes = activeTypes),
+        // Free relays for only DMs and Follows due to the amount of spam
         RelaySetupInfo("wss://relay.damus.io", read = true, write = true, feedTypes = activeTypes),
 
         // Chats
@@ -40,6 +38,7 @@ object Constants {
         // NewRelayListViewModel.Relay("wss://brb.io", read = true, write = true, feedTypes = activeTypes),
 
         // Paid relays
+        RelaySetupInfo("wss://relay.snort.social", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://relay.nostr.com.au", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://eden.nostr.land", read = true, write = false, feedTypes = activeTypesGlobalChats),
         RelaySetupInfo("wss://nostr.milou.lol", read = true, write = false, feedTypes = activeTypesGlobalChats),
@@ -51,8 +50,15 @@ object Constants {
         RelaySetupInfo("wss://relay.nostrati.com", read = true, write = false, feedTypes = activeTypesGlobalChats),
 
         // Supporting NIP-50
-        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://filter.nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch)
     )
 
-    val forcedRelayForSearch = RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch)
+    val forcedRelayForSearch = arrayOf(
+        RelaySetupInfo("wss://relay.nostr.band", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://filter.nostr.wine", read = true, write = false, feedTypes = activeTypesSearch),
+        RelaySetupInfo("wss://relay.noswhere.com", read = true, write = false, feedTypes = activeTypesSearch)
+    )
+    val forcedRelaysForSearchSet = forcedRelayForSearch.map { it.url }
 }

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

@@ -60,7 +60,7 @@ class JsonFilter(
                     } else {
                         val jsonObjectSince = factory.objectNode()
                         entries.forEach { sincePairs ->
-                            put(sincePairs.key, "${sincePairs.value}")
+                            jsonObjectSince.put(sincePairs.key, "${sincePairs.value}")
                         }
                         put("since", jsonObjectSince)
                     }

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

@@ -47,6 +47,7 @@ class Relay(
     private var listeners = setOf<Listener>()
     private var socket: WebSocket? = null
     private var isReady: Boolean = false
+    private var usingCompression: Boolean = false
 
     var eventDownloadCounterInBytes = 0
     var eventUploadCounterInBytes = 0
@@ -85,6 +86,9 @@ class Relay(
     private var connectingBlock = AtomicBoolean()
 
     fun connectAndRun(onConnected: (Relay) -> Unit) {
+        // BRB is crashing OkHttp Deflater object :(
+        if (url.contains("brb.io")) return
+
         // If there is a connection, don't wait.
         if (connectingBlock.getAndSet(true)) {
             return
@@ -115,7 +119,10 @@ class Relay(
         override fun onOpen(webSocket: WebSocket, response: Response) {
             checkNotInMainThread()
 
-            markConnectionAsReady(response.receivedResponseAtMillis - response.sentRequestAtMillis)
+            markConnectionAsReady(
+                pingInMs = response.receivedResponseAtMillis - response.sentRequestAtMillis,
+                usingCompression = response.headers.get("Sec-WebSocket-Extensions")?.contains("permessage-deflate") ?: false
+            )
 
             // Log.w("Relay", "Relay OnOpen, Loading All subscriptions $url")
             onConnected(this@Relay)
@@ -175,15 +182,17 @@ class Relay(
         }
     }
 
-    fun markConnectionAsReady(pingInMs: Long) {
+    fun markConnectionAsReady(pingInMs: Long, usingCompression: Boolean) {
         this.afterEOSE = false
         this.isReady = true
         this.pingInMs = pingInMs
+        this.usingCompression = usingCompression
     }
 
     fun markConnectionAsClosed() {
         this.socket = null
         this.isReady = false
+        this.usingCompression = false
         this.afterEOSE = false
         this.closingTimeInSeconds = TimeUtils.now()
     }
@@ -239,6 +248,7 @@ class Relay(
         socket?.close(1000, "Normal close")
         socket = null
         isReady = false
+        usingCompression = false
         afterEOSE = false
     }
 

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

@@ -1,9 +1,13 @@
 package com.vitorpamplona.amethyst.service.relays
 
-import androidx.lifecycle.LiveData
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.quartz.events.Event
 import com.vitorpamplona.quartz.events.EventInterface
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 
 /**
  * RelayPool manages the connection to multiple Relays and lets consumers deal with simple events.
@@ -12,6 +16,11 @@ object RelayPool : Relay.Listener {
     private var relays = listOf<Relay>()
     private var listeners = setOf<Listener>()
 
+    // Backing property to avoid flow emissions from other classes
+    private var _lastStatus = RelayPoolStatus(0, 0)
+    private val _statusFlow = MutableSharedFlow<RelayPoolStatus>(1, 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+    val statusFlow: SharedFlow<RelayPoolStatus> = _statusFlow.asSharedFlow()
+
     fun availableRelays(): Int {
         return relays.size
     }
@@ -76,11 +85,13 @@ object RelayPool : Relay.Listener {
     fun addRelay(relay: Relay) {
         relay.register(this)
         relays += relay
+        updateStatus()
     }
 
     fun removeRelay(relay: Relay) {
         relay.unregister(this)
         relays = relays.minus(relay)
+        updateStatus()
     }
 
     fun register(listener: Listener) {
@@ -109,12 +120,14 @@ object RelayPool : Relay.Listener {
 
     override fun onError(relay: Relay, subscriptionId: String, error: Error) {
         listeners.forEach { it.onError(error, subscriptionId, relay) }
-        refreshObservers()
+        updateStatus()
     }
 
     override fun onRelayStateChange(relay: Relay, type: Relay.Type, channel: String?) {
         listeners.forEach { it.onRelayStateChange(type, relay, channel) }
-        refreshObservers()
+        if (type != Relay.Type.EOSE) {
+            updateStatus()
+        }
     }
 
     override fun onSendResponse(relay: Relay, eventId: String, success: Boolean, message: String) {
@@ -125,18 +138,15 @@ object RelayPool : Relay.Listener {
         listeners.forEach { it.onAuth(relay, challenge) }
     }
 
-    // Observers line up here.
-    val live: RelayPoolLiveData = RelayPoolLiveData(this)
-
-    private fun refreshObservers() {
-        live.refresh()
+    private fun updateStatus() {
+        val connected = connectedRelays()
+        val available = availableRelays()
+        if (_lastStatus.connected != connected || _lastStatus.available != available) {
+            _lastStatus = RelayPoolStatus(connected, available)
+            _statusFlow.tryEmit(_lastStatus)
+        }
     }
 }
 
-class RelayPoolLiveData(val relays: RelayPool) : LiveData<RelayPoolState>(RelayPoolState(relays)) {
-    fun refresh() {
-        postValue(RelayPoolState(relays))
-    }
-}
-
-class RelayPoolState(val relays: RelayPool)
+@Immutable
+data class RelayPoolStatus(val connected: Int, val available: Int, val isConnected: Boolean = connected > 0)

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
@@ -22,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
@@ -50,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)
@@ -65,7 +68,10 @@ class MainActivity : AppCompatActivity() {
             themeViewModel.onChange(LocalPreferences.getTheme())
             AmethystTheme(themeViewModel) {
                 // A surface container using the 'background' color from the theme
-                Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colors.background
+                ) {
                     val accountStateViewModel: AccountStateViewModel = viewModel {
                         AccountStateViewModel(this@MainActivity)
                     }
@@ -81,7 +87,8 @@ class MainActivity : AppCompatActivity() {
             .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
             .build()
 
-        val connectivityManager = getSystemService(ConnectivityManager::class.java) as ConnectivityManager
+        val connectivityManager =
+            getSystemService(ConnectivityManager::class.java) as ConnectivityManager
         connectivityManager.requestNetwork(networkRequest, networkCallback)
     }
 
@@ -94,20 +101,25 @@ 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())
         }
     }
 
     override fun onPause() {
+        ServiceManager.cleanObservers()
         // if (BuildConfig.DEBUG) {
         debugState(this)
         // }
 
-        ServiceManager.pause()
+        if (ServiceManager.shouldPauseService) {
+            ServiceManager.pause()
+        }
         super.onPause()
     }
 
@@ -127,7 +139,7 @@ class MainActivity : AppCompatActivity() {
         super.onTrimMemory(level)
         println("Trim Memory $level")
         GlobalScope.launch(Dispatchers.Default) {
-            ServiceManager.cleanUp()
+            ServiceManager.trimMemory()
         }
     }
 
@@ -139,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)
+                }
             }
         }
 
@@ -152,7 +166,8 @@ class MainActivity : AppCompatActivity() {
             super.onCapabilitiesChanged(network, networkCapabilities)
 
             GlobalScope.launch(Dispatchers.IO) {
-                val hasMobileData = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
+                val hasMobileData =
+                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)
                 val hasWifi = networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasMobileData $hasMobileData")
                 Log.d("NETWORKCALLBACK", "onCapabilitiesChanged: hasWifi $hasWifi")
@@ -169,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()
+                }
             }
         }
     }
@@ -177,9 +194,15 @@ class MainActivity : AppCompatActivity() {
 
 class GetMediaActivityResultContract : ActivityResultContracts.GetContent() {
 
+    @SuppressLint("MissingSuperCall")
     override fun createIntent(context: Context, input: String): Intent {
-        return super.createIntent(context, input).apply {
+        // Force only images and videos to be selectable
+        // Force OPEN Document because of the resulting URI must be passed to the
+        // Playback service and the picker's permissions only allow the activity to read the URI
+        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
             // Force only images and videos to be selectable
+            type = "*/*"
             putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("image/*", "video/*"))
         }
     }

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

@@ -3,6 +3,7 @@ package com.vitorpamplona.amethyst.ui.actions
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
+import android.util.Log
 import android.util.Size
 import android.widget.Toast
 import androidx.compose.foundation.Image
@@ -49,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
@@ -79,13 +81,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
     var showRelaysDialog by remember {
         mutableStateOf(false)
     }
-    var relayList = account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: account.convertLocalRelays().filter {
-        it.write
-    }
+    var relayList = account.activeWriteRelays()
 
     Dialog(
         onDismissRequest = { onClose() },
@@ -101,7 +97,7 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, ac
         ) {
             if (showRelaysDialog) {
                 RelaySelectionDialog(
-                    list = relayList,
+                    preSelectedList = relayList,
                     onClose = {
                         showRelaysDialog = false
                     },
@@ -191,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(
@@ -221,7 +216,8 @@ fun ImageVideoPost(postViewModel: NewMediaModel, accountViewModel: AccountViewMo
                         try {
                             bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
                         } catch (e: Exception) {
-                            postViewModel.imageUploadingError.emit("Unable to load file")
+                            postViewModel.imageUploadingError.emit("Unable to load thumbnail, but the video can be uploaded")
+                            Log.w("NewPostView", "Couldn't create thumbnail, but the video can be uploaded", e)
                         }
                     }
                 }
@@ -256,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
             },
@@ -292,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/NewPollVoteValueRange.kt

@@ -1,9 +1,11 @@
 package com.vitorpamplona.amethyst.ui.actions
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedTextField
@@ -11,8 +13,6 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -21,51 +21,11 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 
 @Composable
 fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
-    var textMax by rememberSaveable { mutableStateOf("") }
-    var textMin by rememberSaveable { mutableStateOf("") }
-
-    // check for zapMax amounts < 1
-    pollViewModel.isValidvalueMaximum.value = true
-    if (textMax.isNotEmpty()) {
-        try {
-            val int = textMax.toInt()
-            if (int < 1) {
-                pollViewModel.isValidvalueMaximum.value = false
-            } else { pollViewModel.valueMaximum = int }
-        } catch (e: Exception) { pollViewModel.isValidvalueMaximum.value = false }
-    }
-
-    // check for minZap amounts < 1
-    pollViewModel.isValidvalueMinimum.value = true
-    if (textMin.isNotEmpty()) {
-        try {
-            val int = textMin.toInt()
-            if (int < 1) {
-                pollViewModel.isValidvalueMinimum.value = false
-            } else { pollViewModel.valueMinimum = int }
-        } catch (e: Exception) { pollViewModel.isValidvalueMinimum.value = false }
-    }
-
-    // check for zapMin > zapMax
-    if (textMin.isNotEmpty() && textMax.isNotEmpty()) {
-        try {
-            val intMin = textMin.toInt()
-            val intMax = textMax.toInt()
-
-            if (intMin > intMax) {
-                pollViewModel.isValidvalueMinimum.value = false
-                pollViewModel.isValidvalueMaximum.value = false
-            }
-        } catch (e: Exception) {
-            pollViewModel.isValidvalueMinimum.value = false
-            pollViewModel.isValidvalueMaximum.value = false
-        }
-    }
-
     val colorInValid = TextFieldDefaults.outlinedTextFieldColors(
         focusedBorderColor = MaterialTheme.colors.error,
         unfocusedBorderColor = Color.Red
@@ -80,10 +40,10 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
         horizontalArrangement = Arrangement.Center
     ) {
         OutlinedTextField(
-            value = textMin,
-            onValueChange = { textMin = it },
+            value = pollViewModel.valueMinimum?.toString() ?: "",
+            onValueChange = { pollViewModel.updateMinZapAmountForPoll(it) },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            modifier = Modifier.width(150.dp),
+            modifier = Modifier.weight(1f),
             colors = if (pollViewModel.isValidvalueMinimum.value) colorValid else colorInValid,
             label = {
                 Text(
@@ -98,11 +58,14 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
                 )
             }
         )
+
+        Spacer(modifier = DoubleHorzSpacer)
+
         OutlinedTextField(
-            value = textMax,
-            onValueChange = { textMax = it },
+            value = pollViewModel.valueMaximum?.toString() ?: "",
+            onValueChange = { pollViewModel.updateMaxZapAmountForPoll(it) },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            modifier = Modifier.width(150.dp),
+            modifier = Modifier.weight(1f),
             colors = if (pollViewModel.isValidvalueMaximum.value) colorValid else colorInValid,
             label = {
                 Text(
@@ -118,10 +81,25 @@ fun NewPollVoteValueRange(pollViewModel: NewPostViewModel) {
             }
         )
     }
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+    ) {
+        Text(
+            text = stringResource(R.string.poll_zap_value_min_max_explainer),
+            color = MaterialTheme.colors.placeholderText,
+            modifier = Modifier.padding(vertical = 10.dp)
+        )
+    }
 }
 
 @Preview
 @Composable
 fun NewPollVoteValueRangePreview() {
-    NewPollVoteValueRange(NewPostViewModel())
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        NewPollVoteValueRange(NewPostViewModel())
+    }
 }

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(
@@ -133,16 +141,10 @@ fun NewPostView(
     var showRelaysDialog by remember {
         mutableStateOf(false)
     }
-    var relayList = account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: account.convertLocalRelays().filter {
-        it.write
-    }
+    var relayList = account.activeWriteRelays()
 
     LaunchedEffect(Unit) {
-        postViewModel.load(account, baseReplyTo, quote)
+        postViewModel.load(accountViewModel, baseReplyTo, quote)
 
         launch(Dispatchers.IO) {
             postViewModel.imageUploadingError.collect { error ->
@@ -169,7 +171,7 @@ fun NewPostView(
     ) {
         if (showRelaysDialog) {
             RelaySelectionDialog(
-                list = relayList,
+                preSelectedList = relayList,
                 onClose = {
                     showRelaysDialog = false
                 },
@@ -211,10 +213,8 @@ fun NewPostView(
                             }
                             PostButton(
                                 onPost = {
-                                    scope.launch(Dispatchers.IO) {
-                                        postViewModel.sendPost(relayList = relayList)
-                                        onClose()
-                                    }
+                                    postViewModel.sendPost(relayList = relayList)
+                                    onClose()
                                 },
                                 isActive = postViewModel.canPost()
                             )
@@ -327,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)
                                     }
                                 }
 
@@ -339,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 = {
@@ -518,6 +518,8 @@ private fun PollField(postViewModel: NewPostViewModel) {
             NewPollOption(postViewModel, index)
         }
 
+        NewPollVoteValueRange(postViewModel)
+
         Button(
             onClick = {
                 postViewModel.pollOptions[postViewModel.pollOptions.size] =
@@ -725,7 +727,7 @@ fun SendDirectMessageTo(postViewModel: NewPostViewModel) {
 }
 
 @Composable
-fun FowardZapTo(postViewModel: NewPostViewModel) {
+fun FowardZapTo(postViewModel: NewPostViewModel, accountViewModel: AccountViewModel) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -759,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)
@@ -769,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
                 )
             },
@@ -1288,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("") }
@@ -1374,8 +1405,8 @@ fun ImageVideoDescription(
                             try {
                                 bitmap = resolver.loadThumbnail(uri, Size(1200, 1000), null)
                             } catch (e: Exception) {
-                                onError("Unable to load file")
-                                Log.e("NewPostView", "Couldn't create thumbnail for $uri")
+                                onError("Unable to load thumbnail")
+                                Log.w("NewPostView", "Couldn't create thumbnail, but the video can be uploaded", e)
                             }
                         }
                     }
@@ -1403,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
 
@@ -73,8 +77,8 @@ open class NewPostViewModel() : ViewModel() {
     var wantsPoll by mutableStateOf(false)
     var zapRecipients = mutableStateListOf<HexKey>()
     var pollOptions = newStateMapPollOptions()
-    var valueMaximum: Int? = null
-    var valueMinimum: Int? = null
+    var valueMaximum by mutableStateOf<Int?>(null)
+    var valueMinimum by mutableStateOf<Int?>(null)
     var consensusThreshold: Int? = null
     var closedAt: Int? = null
 
@@ -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
@@ -494,7 +520,7 @@ open class NewPostViewModel() : ViewModel() {
         return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
             (!wantsZapraiser || zapRaiserAmount != null) &&
             (!wantsDirectMessage || !toUsers.text.isNullOrBlank()) &&
-            (!wantsPoll || pollOptions.values.all { it.isNotEmpty() }) &&
+            (!wantsPoll || (pollOptions.values.all { it.isNotEmpty() } && isValidvalueMinimum.value && isValidvalueMaximum.value)) &&
             contentToAddUrl == null
     }
 
@@ -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)
@@ -612,6 +638,54 @@ open class NewPostViewModel() : ViewModel() {
             nip24 = !nip24
         }
     }
+
+    fun updateMinZapAmountForPoll(textMin: String) {
+        if (textMin.isNotEmpty()) {
+            try {
+                val int = textMin.toInt()
+                if (int < 1) {
+                    valueMinimum = null
+                } else {
+                    valueMinimum = int
+                }
+            } catch (e: Exception) {}
+        } else {
+            valueMinimum = null
+        }
+
+        checkMinMax()
+    }
+
+    fun updateMaxZapAmountForPoll(textMax: String) {
+        if (textMax.isNotEmpty()) {
+            try {
+                val int = textMax.toInt()
+                if (int < 1) {
+                    valueMaximum = null
+                } else {
+                    valueMaximum = int
+                }
+            } catch (e: Exception) {}
+        } else {
+            valueMaximum = null
+        }
+
+        checkMinMax()
+    }
+
+    fun checkMinMax() {
+        if ((valueMinimum ?: 0) > (valueMaximum ?: Int.MAX_VALUE)) {
+            isValidvalueMinimum.value = false
+            isValidvalueMaximum.value = false
+        } else {
+            isValidvalueMinimum.value = true
+            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/NewRelayListViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.RelaySetupInfo
+import com.vitorpamplona.amethyst.service.Nip11CachedRetriever
 import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.RelayPool
@@ -24,6 +25,7 @@ class NewRelayListViewModel : ViewModel() {
     fun load(account: Account) {
         this.account = account
         clear()
+        loadRelayDocuments()
     }
 
     fun create() {
@@ -36,17 +38,34 @@ class NewRelayListViewModel : ViewModel() {
         clear()
     }
 
+    fun loadRelayDocuments() {
+        viewModelScope.launch(Dispatchers.IO) {
+            _relays.value.forEach { item ->
+                Nip11CachedRetriever.loadRelayInfo(
+                    dirtyUrl = item.url,
+                    onInfo = {
+                        togglePaidRelay(item, it.limitation?.payment_required ?: false)
+                    },
+                    onError = { url, errorCode, exceptionMessage ->
+                    }
+                )
+            }
+        }
+    }
+
     fun clear() {
         _relays.update {
             var relayFile = account.userProfile().latestContactList?.relays()
 
             // Ugly, but forces nostr.band as the only search-supporting relay today.
             // TODO: Remove when search becomes more available.
-            if (relayFile?.none { it.key == Constants.forcedRelayForSearch.url } == true) {
-                relayFile = relayFile + Pair(
-                    Constants.forcedRelayForSearch.url,
-                    ContactListEvent.ReadWrite(Constants.forcedRelayForSearch.read, Constants.forcedRelayForSearch.write)
-                )
+            if (relayFile?.none { it.key.removeSuffix("/") in Constants.forcedRelaysForSearchSet } == true) {
+                relayFile = relayFile + Constants.forcedRelayForSearch.map {
+                    Pair(
+                        it.url,
+                        ContactListEvent.ReadWrite(it.read, it.write)
+                    )
+                }
             }
 
             if (relayFile != null) {

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

@@ -1,8 +1,5 @@
 package com.vitorpamplona.amethyst.ui.actions
 
-import android.content.Context
-import android.util.Log
-import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -28,27 +25,24 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.RelayInformation
-import com.vitorpamplona.amethyst.service.HttpClient
-import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.components.ClickableEmail
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Request
-import okhttp3.Response
-import java.io.IOException
+import com.vitorpamplona.amethyst.ui.theme.Size55dp
+import com.vitorpamplona.amethyst.ui.theme.StdPadding
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun RelayInformationDialog(
     onClose: () -> Unit,
+    relayBriefInfo: RelayBriefInfo,
     relayInfo: RelayInformation,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -79,18 +73,25 @@ fun RelayInformationDialog(
                     })
                 }
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    Title(relayInfo.name ?: "")
-                }
+                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center, modifier = StdPadding.fillMaxWidth()) {
+                    Column() {
+                        RenderRelayIcon(
+                            relayBriefInfo.favIcon,
+                            Size55dp
+                        )
+                    }
 
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.Center
-                ) {
-                    SectionContent(relayInfo.description ?: "")
+                    Spacer(modifier = DoubleHorzSpacer)
+
+                    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                        Row() {
+                            Title(relayInfo.name?.trim() ?: "")
+                        }
+
+                        Row() {
+                            SubtitleContent(relayInfo.description?.trim() ?: "")
+                        }
+                    }
                 }
 
                 Section(stringResource(R.string.owner))
@@ -212,7 +213,7 @@ private fun DisplaySupportedNips(relayInfo: RelayInformation) {
             val text = item.toString().padStart(2, '0')
             Box(Modifier.padding(10.dp)) {
                 ClickableUrl(
-                    urlText = "$text",
+                    urlText = text,
                     url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
                 )
             }
@@ -222,7 +223,7 @@ private fun DisplaySupportedNips(relayInfo: RelayInformation) {
             val text = item.padStart(2, '0')
             Box(Modifier.padding(10.dp)) {
                 ClickableUrl(
-                    urlText = "$text",
+                    urlText = text,
                     url = "https://github.com/nostr-protocol/nips/blob/master/$text.md"
                 )
             }
@@ -247,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)
@@ -258,13 +259,18 @@ private fun DisplayOwnerInformation(
 
 @Composable
 fun Title(text: String) {
-    Spacer(modifier = DoubleVertSpacer)
     Text(
         text = text,
         fontWeight = FontWeight.Bold,
         fontSize = 24.sp
     )
-    Spacer(modifier = DoubleVertSpacer)
+}
+
+@Composable
+fun SubtitleContent(text: String) {
+    Text(
+        text = text
+    )
 }
 
 @Composable
@@ -285,85 +291,3 @@ fun SectionContent(text: String) {
         text = text
     )
 }
-
-fun loadRelayInfo(
-    dirtyUrl: String,
-    context: Context,
-    scope: CoroutineScope,
-    onInfo: (RelayInformation) -> Unit
-) {
-    try {
-        val url = if (dirtyUrl.contains("://")) {
-            dirtyUrl
-                .replace("wss://", "https://")
-                .replace("ws://", "http://")
-        } else {
-            "https://$dirtyUrl"
-        }
-
-        val request: Request = Request
-            .Builder()
-            .header("Accept", "application/nostr+json")
-            .url(url)
-            .build()
-
-        HttpClient.getHttpClient()
-            .newCall(request)
-            .enqueue(
-                object : Callback {
-                    override fun onResponse(call: Call, response: Response) {
-                        checkNotInMainThread()
-                        response.use {
-                            val body = it.body.string()
-                            try {
-                                if (it.isSuccessful) {
-                                    onInfo(RelayInformation.fromJson(body))
-                                } else {
-                                    scope.launch {
-                                        Toast
-                                            .makeText(
-                                                context,
-                                                context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-                                    }
-                                }
-                            } catch (e: Exception) {
-                                Log.e("RelayInfoFail", "Resulting Message from Relay $dirtyUrl in not parseable: $body", e)
-                                scope.launch {
-                                    Toast
-                                        .makeText(
-                                            context,
-                                            context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call, e: IOException) {
-                        Log.e("RelayInfoFail", "$dirtyUrl unavailable", e)
-                        scope.launch {
-                            Toast
-                                .makeText(
-                                    context,
-                                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                        }
-                    }
-                }
-            )
-    } catch (e: Exception) {
-        Log.e("RelayInfoFail", "Invalid URL $dirtyUrl", e)
-        scope.launch {
-            Toast
-                .makeText(
-                    context,
-                    context.getString(R.string.an_error_occurred_trying_to_get_relay_information, dirtyUrl),
-                    Toast.LENGTH_SHORT
-                ).show()
-        }
-    }
-}

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

@@ -29,19 +29,27 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.launch
 
 data class RelayList(
     val relay: Relay,
+    val relayInfo: RelayBriefInfo,
     val isSelected: Boolean
 )
 
+data class RelayInfoDialog(
+    val relayBriefInfo: RelayBriefInfo,
+    val relayInfo: RelayInformation
+)
+
 @Composable
 fun RelaySelectionDialog(
-    list: List<Relay>,
+    preSelectedList: List<Relay>,
     onClose: () -> Unit,
     onPost: (list: List<Relay>) -> Unit,
     accountViewModel: AccountViewModel,
@@ -49,34 +57,29 @@ fun RelaySelectionDialog(
 ) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
-    val relayList = accountViewModel.account.activeRelays()?.filter {
-        it.write
-    }?.map {
-        it
-    } ?: accountViewModel.account.convertLocalRelays().filter {
-        it.write
-    }
 
     var relays by remember {
         mutableStateOf(
-            relayList.map {
+            accountViewModel.account.activeWriteRelays().map {
                 RelayList(
-                    it,
-                    list.any { relay -> it.url == relay.url }
+                    relay = it,
+                    relayInfo = RelayBriefInfo(it.url),
+                    isSelected = preSelectedList.any { relay -> it.url == relay.url }
                 )
             }
         )
     }
-    var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
+    var relayInfo: RelayInfoDialog? by remember { mutableStateOf(null) }
 
-    if (relayInfo != null) {
+    relayInfo?.let {
         RelayInformationDialog(
             onClose = {
                 relayInfo = null
             },
-            relayInfo = relayInfo!!,
-            accountViewModel,
-            nav
+            relayInfo = it.relayInfo,
+            relayBriefInfo = it.relayBriefInfo,
+            accountViewModel = accountViewModel,
+            nav = nav
         )
     }
 
@@ -115,14 +118,14 @@ fun RelaySelectionDialog(
                         }
                     )
 
-                    PostButton(
+                    SaveButton(
                         onPost = {
                             val selectedRelays = relays.filter { it.isSelected }
                             if (selectedRelays.isEmpty()) {
                                 scope.launch {
                                     Toast.makeText(context, context.getString(R.string.select_a_relay_to_continue), Toast.LENGTH_SHORT).show()
                                 }
-                                return@PostButton
+                                return@SaveButton
                             }
                             onPost(selectedRelays.map { it.relay })
                             onClose()
@@ -153,10 +156,7 @@ fun RelaySelectionDialog(
                         key = { _, item -> item.relay.url }
                     ) { index, item ->
                         RelaySwitch(
-                            text = item.relay.url
-                                .removePrefix("ws://")
-                                .removePrefix("wss://")
-                                .removeSuffix("/"),
+                            text = item.relayInfo.displayUrl,
                             checked = item.isSelected,
                             onClick = {
                                 relays = relays.mapIndexed { j, item ->
@@ -168,9 +168,30 @@ fun RelaySelectionDialog(
                                 }
                             },
                             onLongPress = {
-                                loadRelayInfo(item.relay.url, context, scope) {
-                                    relayInfo = it
-                                }
+                                accountViewModel.retrieveRelayDocument(
+                                    item.relay.url,
+                                    onInfo = {
+                                        relayInfo = RelayInfoDialog(RelayBriefInfo(item.relay.url), it)
+                                    },
+                                    onError = { url, errorCode, exceptionMessage ->
+                                        val msg = when (errorCode) {
+                                            Nip11Retriever.ErrorCode.FAIL_TO_ASSEMBLE_URL -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_TO_REACH_SERVER -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_TO_PARSE_RESULT -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                            Nip11Retriever.ErrorCode.FAIL_WITH_HTTP_STATUS -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                        }
+
+                                        scope.launch {
+                                            Toast
+                                                .makeText(
+                                                    context,
+                                                    msg,
+                                                    Toast.LENGTH_SHORT
+                                                )
+                                                .show()
+                                        }
+                                    }
+                                )
                             }
                         )
                     }

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

@@ -59,38 +59,38 @@ fun buildAnnotatedStringWithUrlHighlighting(text: AnnotatedString, color: Color)
                                 )
                             )
                             newWord + restOfWord
+                        } else if (Patterns.WEB_URL.matcher(word).matches()) {
+                            val startIndex = builderBefore.toString().length
+                            val endIndex = startIndex + word.length
+
+                            val startNew = builderAfter.toString().length
+                            val endNew = startNew + word.length
+
+                            substitutions.add(
+                                RangesChanges(
+                                    TextRange(startIndex, endIndex),
+                                    TextRange(startNew, endNew)
+                                )
+                            )
+
+                            builderBefore.append("$word ")
+                            builderAfter.append("$word ")
+                            word
                         } else {
-                            builderBefore.append(word + " ")
-                            builderAfter.append(word + " ")
+                            builderBefore.append("$word ")
+                            builderAfter.append("$word ")
                             word
                         }
                     } catch (e: Exception) {
                         // if it can't parse the key, don't try to change.
-                        builderBefore.append(word + " ")
-                        builderAfter.append(word + " ")
+                        builderBefore.append("$word ")
+                        builderAfter.append("$word ")
                         word
                     }
                 }.joinToString(" ")
             }.joinToString("\n")
         )
 
-        val newText = toAnnotatedString()
-
-        newText.split("\\s+".toRegex()).filter { word ->
-            Patterns.WEB_URL.matcher(word).matches()
-        }.forEach {
-            val startIndex = text.indexOf(it)
-            val endIndex = startIndex + it.length
-            addStyle(
-                style = SpanStyle(
-                    color = color,
-                    textDecoration = TextDecoration.None
-                ),
-                start = startIndex,
-                end = endIndex
-            )
-        }
-
         substitutions.forEach {
             addStyle(
                 style = SpanStyle(

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/ClickableWithdrawal.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.LocalTextStyle
@@ -12,6 +13,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextDirection
 import androidx.core.content.ContextCompat
+import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.quartz.encoders.LnWithdrawalUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -41,10 +43,7 @@ fun MayBeWithdrawal(lnurlWord: String) {
 @Composable
 fun ClickableWithdrawal(withdrawalString: String) {
     val context = LocalContext.current
-
-    val uri = remember(withdrawalString) {
-        Uri.parse("lightning:$withdrawalString")
-    }
+    val scope = rememberCoroutineScope()
 
     val withdraw = remember(withdrawalString) {
         AnnotatedString("$withdrawalString ")
@@ -53,9 +52,18 @@ fun ClickableWithdrawal(withdrawalString: String) {
     ClickableText(
         text = withdraw,
         onClick = {
-            runCatching {
-                val intent = Intent(Intent.ACTION_VIEW, uri)
+            try {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$withdrawalString"))
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 ContextCompat.startActivity(context, intent, null)
+            } catch (e: Exception) {
+                scope.launch {
+                    Toast.makeText(
+                        context,
+                        context.getString(R.string.lightning_wallets_not_found),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
             }
         },
         style = LocalTextStyle.current.copy(color = MaterialTheme.colors.primary)

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/InvoicePreview.kt

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.components
 
 import android.content.Intent
 import android.net.Uri
+import android.widget.Toast
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
@@ -66,6 +67,7 @@ fun MayBeInvoicePreview(lnbcWord: String) {
 @Composable
 fun InvoicePreview(lnInvoice: String, amount: String?) {
     val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     Column(
         modifier = Modifier
@@ -118,9 +120,18 @@ fun InvoicePreview(lnInvoice: String, amount: String?) {
                     .fillMaxWidth()
                     .padding(vertical = 10.dp),
                 onClick = {
-                    runCatching {
+                    try {
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$lnInvoice"))
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         startActivity(context, intent, null)
+                    } catch (e: Exception) {
+                        scope.launch {
+                            Toast.makeText(
+                                context,
+                                context.getString(R.string.lightning_wallets_not_found),
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
                     }
                 },
                 shape = QuoteBorder,

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
@@ -30,8 +28,6 @@ import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.em
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.map
 import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.markdown.MarkdownParseOptions
 import com.halilibo.richtext.ui.material.MaterialRichText
@@ -115,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)
         }
@@ -245,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)
@@ -272,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)
@@ -322,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 ->
@@ -340,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,
@@ -352,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
+            }
         }
     }
 
@@ -368,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 }
                 }
             }
         }
@@ -421,15 +418,11 @@ private fun ObserveNIP19Event(
 
 @Composable
 fun ObserveNote(note: Note, onRefresh: () -> Unit) {
-    val loadedNoteId by note.live().metadata.map {
-        it.note.event?.id()
-    }.distinctUntilChanged().observeAsState(note.event?.id())
+    val loadedNoteId by note.live().metadata.observeAsState()
 
     LaunchedEffect(key1 = loadedNoteId) {
         if (loadedNoteId != null) {
-            launch(Dispatchers.IO) {
-                onRefresh()
-            }
+            onRefresh()
         }
     }
 }
@@ -437,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,166 +452,15 @@ private fun ObserveNIP19User(
 
 @Composable
 private fun ObserveUser(user: User, onRefresh: () -> Unit) {
-    val loadedUserMetaId by user.live().metadata.map {
-        it.user.info?.latestMetadata?.id
-    }.distinctUntilChanged().observeAsState(user.info?.latestMetadata?.id)
+    val loadedUserMetaId by user.live().metadata.observeAsState()
 
     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)
 
@@ -660,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 {
@@ -769,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 {
@@ -782,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
             }
         }
     }
@@ -800,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 {
@@ -854,9 +695,7 @@ private fun DisplayUserFromTag(
     val route = remember { "User/${baseUser.pubkeyHex}" }
     val hex = remember { baseUser.pubkeyDisplayHex() }
 
-    val meta by baseUser.live().metadata.map {
-        it.user.info
-    }.distinctUntilChanged().observeAsState(baseUser.info)
+    val meta by baseUser.live().userMetadataInfo.observeAsState(baseUser.info)
 
     Crossfade(targetState = meta) {
         Row() {

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/UrlPreview.kt

@@ -12,8 +12,6 @@ import com.vitorpamplona.amethyst.model.ConnectivityType
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import com.vitorpamplona.amethyst.service.connectivitystatus.ConnectivityStatus
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 @Composable
 fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel) {
@@ -37,10 +35,8 @@ fun UrlPreview(url: String, urlText: String, accountViewModel: AccountViewModel)
         // Doesn't use a viewModel because of viewModel reusing issues (too many UrlPreview are created).
         if (urlPreviewState == UrlPreviewState.Loading) {
             LaunchedEffect(url) {
-                launch(Dispatchers.IO) {
-                    UrlCachedPreviewer.previewInfo(url) {
-                        urlPreviewState = it
-                    }
+                accountViewModel.urlPreview(url) {
+                    urlPreviewState = it
                 }
             }
         }

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,6 +29,7 @@ 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
@@ -205,34 +206,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,
@@ -281,12 +282,14 @@ fun GetVideoController(
         UUID.randomUUID().toString()
     }
 
+    val scope = rememberCoroutineScope()
+
     // 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) {
+        scope.launch(Dispatchers.IO) {
+            if (controller.value == null) {
                 PlaybackClientController.prepareController(
                     uid,
                     videoUri,
@@ -332,38 +335,46 @@ fun GetVideoController(
                         }
                     }
                 }
-            }
-        } else {
-            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
-                    }
+            } else {
+                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()
+                    }
                 }
             }
         }
+
+        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) {
+                scope.launch(Dispatchers.IO) {
+                    if (controller.value == null) {
                         PlaybackClientController.prepareController(
-                            UUID.randomUUID().toString(),
+                            uid,
                             videoUri,
                             nostrUriCallback,
                             context
@@ -407,13 +418,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
-            }
         }
     }
 
@@ -522,7 +526,8 @@ private fun RenderVideoPlayer(
                     .defaultMinSize(minHeight = 100.dp)
                     .align(Alignment.Center)
             } else {
-                Modifier.fillMaxWidth()
+                Modifier
+                    .fillMaxWidth()
                     .defaultMinSize(minHeight = 100.dp)
                     .align(Alignment.Center)
             },
@@ -612,7 +617,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 +698,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
@@ -704,6 +709,7 @@ fun ControlWhenPlayerIsActive(
 
         controller.addListener(listener)
         onDispose {
+            view.keepScreenOn = false
             controller.removeListener(listener)
         }
     }

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/ChatroomListKnownFeedFilter.kt

@@ -7,7 +7,6 @@ import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
@@ -50,7 +49,6 @@ class ChatroomListKnownFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             .reversed()
     }
 
-    @OptIn(ExperimentalTime::class)
     override fun updateListWith(oldList: List<Note>, newItems: Set<Note>): List<Note> {
         val (feed, elapsed) = measureTimedValue {
             val me = account.userProfile()

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

@@ -6,7 +6,6 @@ import com.vitorpamplona.amethyst.ui.actions.updated
 import com.vitorpamplona.quartz.events.ChatroomKey
 import com.vitorpamplona.quartz.events.ChatroomKeyable
 import com.vitorpamplona.quartz.events.PrivateDmEvent
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>() {
@@ -38,7 +37,6 @@ class ChatroomListNewFeedFilter(val account: Account) : AdditiveFeedFilter<Note>
             .reversed()
     }
 
-    @OptIn(ExperimentalTime::class)
     override fun updateListWith(oldList: List<Note>, newItems: Set<Note>): List<Note> {
         val (feed, elapsed) = measureTimedValue {
             val me = account.userProfile()

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

@@ -2,11 +2,9 @@ package com.vitorpamplona.amethyst.ui.dal
 
 import android.util.Log
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 
 abstract class FeedFilter<T> {
-    @OptIn(ExperimentalTime::class)
     fun loadTop(): List<T> {
         checkNotInMainThread()
 
@@ -33,7 +31,6 @@ abstract class AdditiveFeedFilter<T> : FeedFilter<T>() {
     abstract fun applyFilter(collection: Set<T>): Set<T>
     abstract fun sort(collection: Set<T>): List<T>
 
-    @OptIn(ExperimentalTime::class)
     open fun updateListWith(oldList: List<T>, newItems: Set<T>): List<T> {
         checkNotInMainThread()
 

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

@@ -6,6 +6,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
@@ -34,6 +35,7 @@ class GeoHashFeedFilter(val tag: String, val account: Account) : AdditiveFeedFil
                         it.event is LongTextNoteEvent ||
                         it.event is ChannelMessageEvent ||
                         it.event is PrivateDmEvent ||
+                        it.event is PollNoteEvent ||
                         it.event is AudioHeaderEvent
                     ) &&
                     it.event?.isTaggedGeoHash(myTag) == true

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

@@ -6,6 +6,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.quartz.events.AudioHeaderEvent
 import com.vitorpamplona.quartz.events.ChannelMessageEvent
 import com.vitorpamplona.quartz.events.LongTextNoteEvent
+import com.vitorpamplona.quartz.events.PollNoteEvent
 import com.vitorpamplona.quartz.events.PrivateDmEvent
 import com.vitorpamplona.quartz.events.TextNoteEvent
 
@@ -34,6 +35,7 @@ class HashtagFeedFilter(val tag: String, val account: Account) : AdditiveFeedFil
                         it.event is LongTextNoteEvent ||
                         it.event is ChannelMessageEvent ||
                         it.event is PrivateDmEvent ||
+                        it.event is PollNoteEvent ||
                         it.event is AudioHeaderEvent
                     ) &&
                     it.event?.isTaggedHash(myTag) == true

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

@@ -14,13 +14,50 @@ 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()
     }
 }
 
+class HiddenWordsFeedFilter(val account: Account) : FeedFilter<String>() {
+    override fun feedKey(): String {
+        return account.userProfile().pubkeyHex
+    }
+
+    override fun showHiddenKey(): Boolean {
+        return true
+    }
+
+    override fun feed(): List<String> {
+        val blockList = account.getBlockList()
+        val decryptedContent = blockList?.decryptedContent ?: ""
+        if (account.loginWithExternalSigner) {
+            if (decryptedContent.isEmpty()) return emptyList()
+
+            return blockList
+                ?.publicAndPrivateWords(decryptedContent)?.toList()
+                ?: emptyList()
+        }
+
+        return blockList
+            ?.publicAndPrivateWords(account.keyPair.privKey)?.toList()
+            ?: emptyList()
+    }
+}
+
 class SpammerAccountsFeedFilter(val account: Account) : FeedFilter<User>() {
     override fun feedKey(): String {
         return account.userProfile().pubkeyHex

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

@@ -1,22 +1,30 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import androidx.compose.runtime.Immutable
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.ThreadAssembler
+import com.vitorpamplona.quartz.utils.TimeUtils
 
 @Immutable
-class ThreadFeedFilter(val noteId: String) : FeedFilter<Note>() {
+class ThreadFeedFilter(val account: Account, val noteId: String) : FeedFilter<Note>() {
 
     override fun feedKey(): String {
         return noteId
     }
 
     override fun feed(): List<Note> {
-        val cachedSignatures: MutableMap<Note, String> = mutableMapOf()
-        val eventsToWatch = ThreadAssembler().findThreadFor(noteId) ?: emptySet()
+        val cachedSignatures: MutableMap<Note, Note.LevelSignature> = mutableMapOf()
+        val followingSet = account.selectedUsersFollowList(KIND3_FOLLOWS) ?: emptySet()
+        val eventsToWatch = ThreadAssembler().findThreadFor(noteId)
+        val eventsInHex = eventsToWatch.map { it.idHex }.toSet()
+        val now = TimeUtils.now()
 
         // Currently orders by date of each event, descending, at each level of the reply stack
-        val order = compareByDescending<Note> { it.replyLevelSignature(eventsToWatch, cachedSignatures) }
+        val order = compareByDescending<Note> {
+            it.replyLevelSignature(eventsInHex, cachedSignatures, account.userProfile(), followingSet, now).signature
+        }
 
         return eventsToWatch.sortedWith(order)
     }

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

@@ -3,6 +3,9 @@ package com.vitorpamplona.amethyst.ui.navigation
 import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -80,7 +83,12 @@ fun AppNavigation(
         }
     }
 
-    NavHost(navController, startDestination = Route.Home.route) {
+    NavHost(
+        navController,
+        startDestination = Route.Home.route,
+        enterTransition = { fadeIn(animationSpec = tween(200)) },
+        exitTransition = { fadeOut(animationSpec = tween(200)) }
+    ) {
         Route.Home.let { route ->
             composable(route.route, route.arguments, content = { it ->
                 val nip47 = it.arguments?.getString("nip47")
@@ -215,6 +223,7 @@ fun AppNavigation(
             composable(route.route, route.arguments, content = {
                 ChatroomScreen(
                     roomId = it.arguments?.getString("id"),
+                    draftMessage = it.arguments?.getString("message"),
                     accountViewModel = accountViewModel,
                     nav = nav
                 )
@@ -275,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)
         }
     }
 }
@@ -451,8 +457,6 @@ fun GenericMainTopBar(
     nav: (String) -> Unit,
     content: @Composable (AccountViewModel) -> Unit
 ) {
-    val coroutineScope = rememberCoroutineScope()
-
     Column(modifier = BottomTopHeight) {
         MyTopAppBar(
             elevation = 0.dp,
@@ -476,6 +480,7 @@ fun GenericMainTopBar(
                 }
             },
             navigationIcon = {
+                val coroutineScope = rememberCoroutineScope()
                 LoggedInUserPictureDrawer(accountViewModel) {
                     coroutineScope.launch {
                         scaffoldState.drawerState.open()
@@ -506,10 +511,9 @@ private fun LoggedInUserPictureDrawer(
     accountViewModel: AccountViewModel,
     onClick: () -> Unit
 ) {
-    val accountUserState by accountViewModel.account.userProfile().live().metadata.observeAsState()
+    val profilePicture by accountViewModel.account.userProfile().live().profilePictureChanges.observeAsState()
 
-    val pubkeyHex = remember { accountUserState?.user?.pubkeyHex ?: "" }
-    val profilePicture = remember(accountUserState) { accountUserState?.user?.profilePicture() }
+    val pubkeyHex = remember { accountViewModel.userProfile().pubkeyHex }
 
     IconButton(
         onClick = onClick
@@ -525,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) {
@@ -573,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)
         }
     }
 
@@ -592,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()
                 }
             }
@@ -614,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
 ) {
@@ -651,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)
             }
         }
     }
@@ -754,9 +882,9 @@ fun debugState(context: Context) {
     Log.d("STATE DUMP", "Image Disk Cache ${(imageLoader.diskCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.diskCache?.maxSize ?: 0) / (1024 * 1024)} MB")
     Log.d("STATE DUMP", "Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (1024 * 1024)} MB")
 
-    Log.d("STATE DUMP", "Notes: " + LocalCache.notes.filter { it.value.liveSet != null }.size + " / " + LocalCache.notes.filter { it.value.event != null }.size + "/" + LocalCache.notes.size)
-    Log.d("STATE DUMP", "Addressables: " + LocalCache.addressables.filter { it.value.liveSet != null }.size + " / " + LocalCache.addressables.filter { it.value.event != null }.size + "/" + LocalCache.addressables.size)
-    Log.d("STATE DUMP", "Users: " + LocalCache.users.filter { it.value.liveSet != null }.size + " / " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size + "/" + LocalCache.users.size)
+    Log.d("STATE DUMP", "Notes: " + LocalCache.notes.filter { it.value.liveSet != null }.size + " / " + LocalCache.notes.filter { it.value.event != null }.size + " / " + LocalCache.notes.size)
+    Log.d("STATE DUMP", "Addressables: " + LocalCache.addressables.filter { it.value.liveSet != null }.size + " / " + LocalCache.addressables.filter { it.value.event != null }.size + " / " + LocalCache.addressables.size)
+    Log.d("STATE DUMP", "Users: " + LocalCache.users.filter { it.value.liveSet != null }.size + " / " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size + " / " + LocalCache.users.size)
 
     Log.d("STATE DUMP", "Memory used by Events: " + LocalCache.notes.values.sumOf { it.event?.countMemory() ?: 0 } / (1024 * 1024) + " MB")
 

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

@@ -19,6 +19,8 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.Divider
@@ -27,13 +29,19 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.ScaffoldState
 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.filled.Delete
+import androidx.compose.material.icons.filled.Send
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -46,14 +54,16 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 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.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.lifecycle.map
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.LocalPreferences
@@ -62,15 +72,20 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.HttpClient
+import com.vitorpamplona.amethyst.service.relays.RelayPool
+import com.vitorpamplona.amethyst.service.relays.RelayPoolStatus
 import com.vitorpamplona.amethyst.ui.actions.NewRelayListView
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.screen.RelayPoolViewModel
+import com.vitorpamplona.amethyst.ui.note.LoadStatuses
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountBackupDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ConnectOrbotDialog
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size16dp
+import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size26Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.quartz.events.toImmutableListOfLists
 import kotlinx.coroutines.CoroutineScope
@@ -95,8 +110,9 @@ fun DrawerContent(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 25.dp)
-                    .padding(top = 100.dp),
+                    .padding(top = 70.dp),
                 scaffoldState,
+                accountViewModel,
                 nav
             )
             Divider(
@@ -123,6 +139,7 @@ fun ProfileContent(
     baseAccountUser: User,
     modifier: Modifier = Modifier,
     scaffoldState: ScaffoldState,
+    accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -146,7 +163,7 @@ fun ProfileContent(
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(150.dp)
+                    .height(120.dp)
             )
         } else {
             Image(
@@ -155,7 +172,7 @@ fun ProfileContent(
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(150.dp)
+                    .height(120.dp)
             )
         }
 
@@ -204,7 +221,6 @@ fun ProfileContent(
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                     modifier = Modifier
-                        .padding(top = 15.dp)
                         .clickable(
                             onClick = {
                                 nav(route)
@@ -215,9 +231,14 @@ fun ProfileContent(
                         )
                 )
             }
+
+            Row(Modifier.padding(top = Size10dp)) {
+                EditStatusBox(baseAccountUser, accountViewModel)
+            }
+
             Row(
                 modifier = Modifier
-                    .padding(top = 15.dp)
+                    .padding(top = Size10dp)
                     .clickable(onClick = {
                         nav(route)
                         coroutineScope.launch {
@@ -231,6 +252,139 @@ fun ProfileContent(
     }
 }
 
+@Composable
+private fun EditStatusBox(baseAccountUser: User, accountViewModel: AccountViewModel) {
+    val scope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
+
+    LoadStatuses(user = baseAccountUser, accountViewModel) { statuses ->
+        if (statuses.isEmpty()) {
+            val currentStatus = remember {
+                mutableStateOf("")
+            }
+            val hasChanged by remember {
+                derivedStateOf {
+                    currentStatus.value != ""
+                }
+            }
+
+            OutlinedTextField(
+                value = currentStatus.value,
+                onValueChange = { currentStatus.value = it },
+                label = { Text(text = stringResource(R.string.status_update)) },
+                modifier = Modifier.fillMaxWidth(),
+                placeholder = {
+                    Text(
+                        text = stringResource(R.string.status_update),
+                        color = MaterialTheme.colors.placeholderText
+                    )
+                },
+                keyboardOptions = KeyboardOptions.Default.copy(
+                    imeAction = ImeAction.Send,
+                    capitalization = KeyboardCapitalization.Sentences
+                ),
+                keyboardActions = KeyboardActions(
+                    onSend = {
+                        accountViewModel.createStatus(currentStatus.value)
+                        focusManager.clearFocus(true)
+                    }
+                ),
+                singleLine = true,
+                trailingIcon = {
+                    if (hasChanged) {
+                        SendButton() {
+                            accountViewModel.createStatus(currentStatus.value)
+                            focusManager.clearFocus(true)
+                        }
+                    }
+                }
+            )
+        } else {
+            statuses.forEach {
+                val originalStatus by it.live().metadata.map {
+                    it.note.event?.content() ?: ""
+                }.observeAsState(it.event?.content() ?: "")
+
+                val thisStatus = remember {
+                    mutableStateOf(originalStatus)
+                }
+                val hasChanged by remember {
+                    derivedStateOf {
+                        thisStatus.value != originalStatus
+                    }
+                }
+
+                OutlinedTextField(
+                    value = thisStatus.value,
+                    onValueChange = { thisStatus.value = it },
+                    label = { Text(text = stringResource(R.string.status_update)) },
+                    modifier = Modifier.fillMaxWidth(),
+                    placeholder = {
+                        Text(
+                            text = stringResource(R.string.status_update),
+                            color = MaterialTheme.colors.placeholderText
+                        )
+                    },
+                    keyboardOptions = KeyboardOptions.Default.copy(
+                        imeAction = ImeAction.Send,
+                        capitalization = KeyboardCapitalization.Sentences
+                    ),
+                    keyboardActions = KeyboardActions(
+                        onSend = {
+                            accountViewModel.updateStatus(it, thisStatus.value)
+                            focusManager.clearFocus(true)
+                        }
+                    ),
+                    singleLine = true,
+                    trailingIcon = {
+                        if (hasChanged) {
+                            SendButton() {
+                                accountViewModel.updateStatus(it, thisStatus.value)
+                                focusManager.clearFocus(true)
+                            }
+                        } else {
+                            UserStatusDeleteButton() {
+                                accountViewModel.deleteStatus(it)
+                                focusManager.clearFocus(true)
+                            }
+                        }
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun SendButton(onClick: () -> Unit) {
+    IconButton(
+        modifier = Size26Modifier,
+        onClick = onClick
+    ) {
+        Icon(
+            imageVector = Icons.Default.Send,
+            null,
+            modifier = Size20Modifier,
+            tint = MaterialTheme.colors.placeholderText
+        )
+    }
+}
+
+@Composable
+fun UserStatusDeleteButton(onClick: () -> Unit) {
+    IconButton(
+        modifier = Size26Modifier,
+        onClick = onClick
+    ) {
+        Icon(
+            imageVector = Icons.Default.Delete,
+            null,
+            modifier = Size20Modifier,
+            tint = MaterialTheme.colors.placeholderText
+        )
+    }
+}
+
 @Composable
 private fun FollowingAndFollowerCounts(baseAccountUser: User) {
     var followingCount by remember { mutableStateOf("--") }
@@ -301,7 +455,6 @@ fun ListContent(
     }
 
     val coroutineScope = rememberCoroutineScope()
-    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
     var wantsToEditRelays by remember {
         mutableStateOf(false)
     }
@@ -337,7 +490,7 @@ fun ListContent(
         )
 
         IconRowRelays(
-            relayViewModel = relayViewModel,
+            accountViewModel = accountViewModel,
             onClick = {
                 coroutineScope.launch {
                     scaffoldState.drawerState.close()
@@ -355,17 +508,19 @@ fun ListContent(
             route = Route.BlockedUsers.route
         )
 
-        IconRow(
-            title = stringResource(R.string.backup_keys),
-            icon = R.drawable.ic_key,
-            tint = MaterialTheme.colors.onBackground,
-            onClick = {
-                coroutineScope.launch {
-                    scaffoldState.drawerState.close()
+        accountViewModel.account.keyPair.privKey?.let {
+            IconRow(
+                title = stringResource(R.string.backup_keys),
+                icon = R.drawable.ic_key,
+                tint = MaterialTheme.colors.onBackground,
+                onClick = {
+                    coroutineScope.launch {
+                        scaffoldState.drawerState.close()
+                    }
+                    backupDialogOpen = true
                 }
-                backupDialogOpen = true
-            }
-        )
+            )
+        }
 
         val textTorProxy = if (checked) stringResource(R.string.disconnect_from_your_orbot_setup) else stringResource(R.string.connect_via_tor_short)
         IconRow(
@@ -480,27 +635,37 @@ private fun enableTor(
 }
 
 @Composable
-private fun RelayStatus(
-    relayViewModel: RelayPoolViewModel
-) {
-    val connectedRelaysText by relayViewModel.connectionStatus.observeAsState("--/--")
-    val isConnected by relayViewModel.isConnected.distinctUntilChanged().observeAsState(false)
+private fun RelayStatus(accountViewModel: AccountViewModel) {
+    val connectedRelaysText by RelayPool.statusFlow.collectAsState(initial = RelayPoolStatus(0, 0))
 
-    RenderRelayStatus(connectedRelaysText, isConnected)
+    RenderRelayStatus(connectedRelaysText)
 }
 
 @Composable
 private fun RenderRelayStatus(
-    connectedRelaysText: String,
-    isConnected: Boolean
+    relayPool: RelayPoolStatus
 ) {
+    val text by remember(relayPool) {
+        derivedStateOf {
+            "${relayPool.connected}/${relayPool.available}"
+        }
+    }
+
+    val placeHolder = MaterialTheme.colors.placeholderText
+
+    val color by remember(relayPool) {
+        derivedStateOf {
+            if (relayPool.isConnected) {
+                placeHolder
+            } else {
+                Color.Red
+            }
+        }
+    }
+
     Text(
-        text = connectedRelaysText,
-        color = if (isConnected) {
-            MaterialTheme.colors.placeholderText
-        } else {
-            Color.Red
-        },
+        text = text,
+        color = color,
         style = MaterialTheme.typography.subtitle1
     )
 }
@@ -556,7 +721,7 @@ fun IconRow(title: String, icon: Int, tint: Color, onClick: () -> Unit, onLongCl
 }
 
 @Composable
-fun IconRowRelays(relayViewModel: RelayPoolViewModel, onClick: () -> Unit) {
+fun IconRowRelays(accountViewModel: AccountViewModel, onClick: () -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
@@ -583,7 +748,7 @@ fun IconRowRelays(relayViewModel: RelayPoolViewModel, onClick: () -> Unit) {
 
             Spacer(modifier = Modifier.width(Size16dp))
 
-            RelayStatus(relayViewModel = relayViewModel)
+            RelayStatus(accountViewModel = accountViewModel)
         }
     }
 }

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

@@ -120,9 +120,12 @@ sealed class Route(
     )
 
     object Room : Route(
-        route = "Room/{id}",
+        route = "Room/{id}?message={message}",
         icon = R.drawable.ic_moments,
-        arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList()
+        arguments = listOf(
+            navArgument("id") { type = NavType.StringType },
+            navArgument("message") { type = NavType.StringType; nullable = true; defaultValue = null }
+        ).toImmutableList()
     )
 
     object RoomByAuthor : Route(
@@ -147,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/BlankNote.kt

@@ -62,57 +62,63 @@ fun BlankNote(modifier: Modifier = Modifier, showDivider: Boolean = false, idHex
 @Composable
 fun HiddenNote(
     reports: ImmutableSet<Note>,
+    isHiddenAuthor: Boolean,
     accountViewModel: AccountViewModel,
     modifier: Modifier = Modifier,
     isQuote: Boolean = false,
     nav: (String) -> Unit,
     onClick: () -> Unit
 ) {
-    Column(modifier = modifier) {
-        Row(modifier = Modifier.padding(horizontal = if (!isQuote) 12.dp else 6.dp)) {
-            Column(modifier = Modifier.padding(start = if (!isQuote) 10.dp else 5.dp)) {
-                Row(
-                    modifier = Modifier.padding(
-                        start = 20.dp,
-                        end = 20.dp
-                    ),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(30.dp)) {
-                        Text(
-                            text = stringResource(R.string.post_was_flagged_as_inappropriate_by),
-                            color = Color.Gray
+    Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
+        Row(
+            modifier = Modifier.padding(start = if (!isQuote) 30.dp else 25.dp, end = 20.dp),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.padding(30.dp)
+            ) {
+                Text(
+                    text = stringResource(R.string.post_was_flagged_as_inappropriate_by),
+                    color = Color.Gray
+                )
+                FlowRow(modifier = Modifier.padding(top = 10.dp)) {
+                    if (isHiddenAuthor) {
+                        UserPicture(
+                            user = accountViewModel.userProfile(),
+                            size = Size35dp,
+                            nav = nav,
+                            accountViewModel = accountViewModel
+                        )
+                    }
+                    reports.forEach {
+                        NoteAuthorPicture(
+                            baseNote = it,
+                            size = Size35dp,
+                            nav = nav,
+                            accountViewModel = accountViewModel
                         )
-                        FlowRow(modifier = Modifier.padding(top = 10.dp)) {
-                            reports.forEach {
-                                NoteAuthorPicture(
-                                    baseNote = it,
-                                    nav = nav,
-                                    accountViewModel = accountViewModel,
-                                    size = Size35dp
-                                )
-                            }
-                        }
-
-                        Button(
-                            modifier = Modifier.padding(top = 10.dp),
-                            onClick = onClick,
-                            shape = ButtonBorder,
-                            colors = ButtonDefaults
-                                .buttonColors(
-                                    backgroundColor = MaterialTheme.colors.primary
-                                ),
-                            contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
-                        ) {
-                            Text(text = stringResource(R.string.show_anyway), color = Color.White)
-                        }
                     }
                 }
 
-                Divider(
-                    thickness = 0.25.dp
-                )
+                Button(
+                    modifier = Modifier.padding(top = 10.dp),
+                    onClick = onClick,
+                    shape = ButtonBorder,
+                    colors = ButtonDefaults
+                        .buttonColors(
+                            backgroundColor = MaterialTheme.colors.primary
+                        ),
+                    contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
+                ) {
+                    Text(text = stringResource(R.string.show_anyway), color = Color.White)
+                }
             }
         }
+
+        Divider(
+            thickness = 0.25.dp
+        )
     }
 }

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

@@ -76,7 +76,6 @@ import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_LIVE
 import com.vitorpamplona.quartz.events.LiveActivitiesEvent.Companion.STATUS_PLANNED
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -93,24 +92,10 @@ fun ChannelCardCompose(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val isBlank by baseNote.live().metadata.map {
-        it.note.event == null
-    }.distinctUntilChanged().observeAsState(baseNote.event == null)
+    val hasEvent by baseNote.live().hasEvent.observeAsState(baseNote.event != null)
 
-    Crossfade(targetState = isBlank) {
+    Crossfade(targetState = hasEvent) {
         if (it) {
-            LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
-                BlankNote(
-                    remember {
-                        modifier.combinedClickable(
-                            onClick = { },
-                            onLongClick = showPopup
-                        )
-                    },
-                    false
-                )
-            }
-        } else {
             if (forceEventKind == null || baseNote.event?.kind() == forceEventKind) {
                 CheckHiddenChannelCardCompose(
                     baseNote,
@@ -122,6 +107,18 @@ fun ChannelCardCompose(
                     nav
                 )
             }
+        } else {
+            LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
+                BlankNote(
+                    remember {
+                        modifier.combinedClickable(
+                            onClick = { },
+                            onLongClick = showPopup
+                        )
+                    },
+                    false
+                )
+            }
         }
     }
 }
@@ -137,13 +134,9 @@ fun CheckHiddenChannelCardCompose(
     nav: (String) -> Unit
 ) {
     if (showHidden) {
-        var state by remember {
+        val state by remember {
             mutableStateOf(
-                NoteComposeReportState(
-                    isAcceptable = true,
-                    canPreview = true,
-                    relevantReports = persistentSetOf()
-                )
+                AccountViewModel.NoteComposeReportState()
             )
         }
 
@@ -187,19 +180,14 @@ fun LoadedChannelCardCompose(
 ) {
     var state by remember {
         mutableStateOf(
-            NoteComposeReportState(
-                isAcceptable = true,
-                canPreview = true,
-                relevantReports = persistentSetOf()
-            )
+            AccountViewModel.NoteComposeReportState()
         )
     }
 
     val scope = rememberCoroutineScope()
 
-    WatchForReports(note, accountViewModel) { newIsAcceptable, newCanPreview, newRelevantReports ->
-        if (newIsAcceptable != state.isAcceptable || newCanPreview != state.canPreview) {
-            val newState = NoteComposeReportState(newIsAcceptable, newCanPreview, newRelevantReports)
+    WatchForReports(note, accountViewModel) { newState ->
+        if (state != newState) {
             scope.launch(Dispatchers.Main) {
                 state = newState
             }
@@ -221,7 +209,7 @@ fun LoadedChannelCardCompose(
 
 @Composable
 fun RenderChannelCardReportState(
-    state: NoteComposeReportState,
+    state: AccountViewModel.NoteComposeReportState,
     note: Note,
     routeForLastRead: String? = null,
     modifier: Modifier = Modifier,
@@ -235,6 +223,7 @@ fun RenderChannelCardReportState(
         if (showHiddenNote) {
             HiddenNote(
                 state.relevantReports,
+                state.isHiddenAuthor,
                 accountViewModel,
                 modifier,
                 false,
@@ -627,7 +616,7 @@ fun RenderCommunitiesThumb(baseNote: Note, accountViewModel: AccountViewModel, n
                 Spacer(modifier = StdHorzSpacer)
                 LikeReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel, nav)
                 Spacer(modifier = StdHorzSpacer)
-                ZapReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel)
+                ZapReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel, nav = nav)
             }
 
             description?.let {
@@ -657,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)
     }
 }
@@ -741,7 +730,7 @@ fun RenderChannelThumb(baseNote: Note, channel: Channel, accountViewModel: Accou
                 Spacer(modifier = StdHorzSpacer)
                 LikeReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel, nav)
                 Spacer(modifier = StdHorzSpacer)
-                ZapReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel)
+                ZapReaction(baseNote = baseNote, grayTint = MaterialTheme.colors.onSurface, accountViewModel = accountViewModel, nav = nav)
             }
 
             description?.let {

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
@@ -77,14 +76,12 @@ fun ChatroomHeaderCompose(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val isBlank by baseNote.live().metadata.map {
-        it.note.event == null
-    }.observeAsState(baseNote.event == null)
+    val hasEvent by baseNote.live().hasEvent.observeAsState(baseNote.event != null)
 
-    if (isBlank) {
-        BlankNote(Modifier)
-    } else {
+    if (hasEvent) {
         ChatroomComposeChannelOrUser(baseNote, accountViewModel, nav)
+    } else {
+        BlankNote(Modifier)
     }
 }
 
@@ -101,7 +98,7 @@ fun ChatroomComposeChannelOrUser(
     }
 
     if (channelHex != null) {
-        ChatroomChannel(channelHex, baseNote, accountViewModel, nav)
+        ChatroomChannel(channelHex!!, baseNote, accountViewModel, nav)
     } else {
         ChatroomPrivateMessages(baseNote, accountViewModel, nav)
     }
@@ -136,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)
     }
 }
@@ -258,11 +255,10 @@ private fun UserRoomCompose(
             note.createdAt()
         }
     }
-
     val content by remember(note) {
-        derivedStateOf {
+        mutableStateOf(
             accountViewModel.decrypt(note)
-        }
+        )
     }
 
     WatchNotificationChanges(note, route, accountViewModel) { newHasNewMessages ->
@@ -280,7 +276,7 @@ private fun UserRoomCompose(
             )
         },
         channelTitle = {
-            RoomNameDisplay(room, it, accountViewModel.userProfile())
+            RoomNameDisplay(room, it, accountViewModel)
         },
         channelLastTime = createAt,
         channelLastContent = content,
@@ -290,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)
         }
     }
 }
@@ -311,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(
@@ -325,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))
             }
@@ -336,6 +333,7 @@ private fun DisplayUserAndSubject(
 @Composable
 fun DisplayUserSetAsSubject(
     room: ChatroomKey,
+    accountViewModel: AccountViewModel,
     fontWeight: FontWeight = FontWeight.Bold
 ) {
     val userList = remember(room) {
@@ -345,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)
                 }
@@ -354,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)
                     }
@@ -419,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,11 +67,10 @@ 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
-import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -85,12 +85,20 @@ fun ChatroomMessageCompose(
     nav: (String) -> Unit,
     onWantsToReply: (Note) -> Unit
 ) {
-    val isBlank by baseNote.live().metadata.map {
-        it.note.event == null
-    }.observeAsState(baseNote.event == null)
+    val hasEvent by baseNote.live().hasEvent.observeAsState(baseNote.event != null)
 
-    Crossfade(targetState = isBlank) {
+    Crossfade(targetState = hasEvent) {
         if (it) {
+            CheckHiddenChatMessage(
+                baseNote,
+                routeForLastRead,
+                innerQuote,
+                parentBackgroundColor,
+                accountViewModel,
+                nav,
+                onWantsToReply
+            )
+        } else {
             LongPressToQuickAction(baseNote = baseNote, accountViewModel = accountViewModel) { showPopup ->
                 BlankNote(
                     remember {
@@ -101,16 +109,6 @@ fun ChatroomMessageCompose(
                     }
                 )
             }
-        } else {
-            CheckHiddenChatMessage(
-                baseNote,
-                routeForLastRead,
-                innerQuote,
-                parentBackgroundColor,
-                accountViewModel,
-                nav,
-                onWantsToReply
-            )
         }
     }
 }
@@ -154,17 +152,13 @@ fun LoadedChatMessageCompose(
 ) {
     var state by remember {
         mutableStateOf(
-            NoteComposeReportState(
-                isAcceptable = true,
-                canPreview = true,
-                relevantReports = persistentSetOf()
-            )
+            AccountViewModel.NoteComposeReportState()
         )
     }
 
-    WatchForReports(baseNote, accountViewModel) { newIsAcceptable, newCanPreview, newRelevantReports ->
-        if (newIsAcceptable != state.isAcceptable || newCanPreview != state.canPreview) {
-            state = NoteComposeReportState(newIsAcceptable, newCanPreview, newRelevantReports.toImmutableSet())
+    WatchForReports(baseNote, accountViewModel) { newState ->
+        if (state != newState) {
+            state = newState
         }
     }
 
@@ -180,6 +174,7 @@ fun LoadedChatMessageCompose(
         if (it) {
             HiddenNote(
                 state.relevantReports,
+                state.isHiddenAuthor,
                 accountViewModel,
                 Modifier,
                 innerQuote,
@@ -292,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 {
@@ -362,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
@@ -568,7 +563,7 @@ private fun StatusRow(
         Row(verticalAlignment = Alignment.CenterVertically, modifier = ReactionRowHeightChat) {
             LikeReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav)
             Spacer(modifier = StdHorzSpacer)
-            ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+            ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav = nav)
             Spacer(modifier = DoubleHorzSpacer)
             ReplyReaction(
                 baseNote = baseNote,
@@ -633,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) {
@@ -643,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
@@ -41,10 +42,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.components.ImageUrlType
@@ -54,7 +52,6 @@ import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.screen.CombinedZap
 import com.vitorpamplona.amethyst.ui.screen.MultiSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifier
 import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifierSmaller
@@ -71,10 +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.LnZapEvent
-import com.vitorpamplona.quartz.events.LnZapRequestEvent
+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
@@ -175,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 } }
 
@@ -184,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)
         }
@@ -253,7 +258,7 @@ fun RenderLikeGallery(
 
 @Composable
 fun RenderZapGallery(
-    zapEvents: ImmutableList<CombinedZap>,
+    zapEvents: ImmutableList<ZapAmountCommentNotification>,
     backgroundColor: MutableState<Color>,
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
@@ -300,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
@@ -311,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?,
@@ -354,8 +366,7 @@ private fun ParseAuthorCommentAndAmount(
     }
 
     LaunchedEffect(key1 = zapRequest.idHex, key2 = zapEvent?.idHex) {
-        launch(Dispatchers.IO) {
-            val newState = loadAmountState(zapRequest, zapEvent, accountViewModel)
+        accountViewModel.decryptAmountMessage(zapRequest, zapEvent) { newState ->
             if (newState != null) {
                 content.value = newState
             }
@@ -365,47 +376,21 @@ private fun ParseAuthorCommentAndAmount(
     onReady(content)
 }
 
-private suspend fun loadAmountState(
-    zapRequest: Note,
-    zapEvent: Note?,
-    accountViewModel: AccountViewModel
-): ZapAmountCommentNotification? {
-    (zapRequest.event as? LnZapRequestEvent)?.let {
-        val decryptedContent = accountViewModel.decryptZap(zapRequest)
-        val amount = (zapEvent?.event as? LnZapEvent)?.amount
-        if (decryptedContent != null) {
-            val newAuthor = LocalCache.getOrCreateUser(decryptedContent.pubKey)
-            return ZapAmountCommentNotification(
-                newAuthor,
-                decryptedContent.content.ifBlank { null },
-                showAmountAxis(amount)
-            )
-        } else {
-            if (!zapRequest.event?.content().isNullOrBlank() || amount != null) {
-                return ZapAmountCommentNotification(
-                    zapRequest.author,
-                    zapRequest.event?.content()?.ifBlank { null },
-                    showAmountAxis(amount)
-                )
-            }
-        }
+fun click(content: ZapAmountCommentNotification, nav: (String) -> Unit) {
+    content.user?.let {
+        nav(routeFor(it))
     }
-    return null
 }
 
 @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(
@@ -431,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)
@@ -552,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)
             }
         }
+        // }
     }
 }
 
@@ -579,9 +553,7 @@ private fun WatchNoteAuthor(
     baseNote: Note,
     onContent: @Composable (User?) -> Unit
 ) {
-    val author by baseNote.live().metadata.map {
-        it.note.author
-    }.observeAsState(baseNote.author)
+    val author by baseNote.live().authorChanges.observeAsState(baseNote.author)
 
     onContent(author)
 }
@@ -591,9 +563,7 @@ private fun WatchUserMetadata(
     author: User,
     onNewMetadata: @Composable (String?) -> Unit
 ) {
-    val userProfile by author.live().metadata.map {
-        it.user.profilePicture()
-    }.distinctUntilChanged().observeAsState(author.profilePicture())
+    val userProfile by author.live().profilePictureChanges.observeAsState(author.profilePicture())
 
     onNewMetadata(userProfile)
 }

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

@@ -3,43 +3,62 @@ package com.vitorpamplona.amethyst.ui.components
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.ClickableText
+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.icons.Icons
+import androidx.compose.material.icons.filled.OpenInNew
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableIntStateOf
 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.platform.LocalUriHandler
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.map
+import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.model.AddressableNote
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.service.Nip05Verifier
+import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
+import com.vitorpamplona.amethyst.ui.note.LoadStatuses
 import com.vitorpamplona.amethyst.ui.note.NIP05CheckingIcon
 import com.vitorpamplona.amethyst.ui.note.NIP05FailedVerification
 import com.vitorpamplona.amethyst.ui.note.NIP05VerifiedIcon
+import com.vitorpamplona.amethyst.ui.note.routeFor
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.Font14SP
 import com.vitorpamplona.amethyst.ui.theme.NIP05IconSize
+import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size5dp
+import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
+import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 import com.vitorpamplona.amethyst.ui.theme.nip05
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import com.vitorpamplona.quartz.events.AddressableEvent
 import com.vitorpamplona.quartz.events.UserMetadata
 import com.vitorpamplona.quartz.utils.TimeUtils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.delay
+import kotlin.time.Duration.Companion.seconds
 
 @Composable
-fun nip05VerificationAsAState(userMetadata: UserMetadata, pubkeyHex: String): MutableState<Boolean?> {
+fun nip05VerificationAsAState(userMetadata: UserMetadata, pubkeyHex: String, accountViewModel: AccountViewModel): MutableState<Boolean?> {
     val nip05Verified = remember(userMetadata.nip05) {
         // starts with null if must verify or already filled in if verified in the last hour
         val default = if ((userMetadata.nip05LastVerificationTime ?: 0) > TimeUtils.oneHourAgo()) {
@@ -53,37 +72,9 @@ fun nip05VerificationAsAState(userMetadata: UserMetadata, pubkeyHex: String): Mu
 
     if (nip05Verified.value == null) {
         LaunchedEffect(key1 = userMetadata.nip05) {
-            launch(Dispatchers.IO) {
-                userMetadata.nip05?.ifBlank { null }?.let { nip05 ->
-                    Nip05Verifier().verifyNip05(
-                        nip05,
-                        onSuccess = {
-                            // Marks user as verified
-                            if (it == pubkeyHex) {
-                                userMetadata.nip05Verified = true
-                                userMetadata.nip05LastVerificationTime = TimeUtils.now()
-
-                                if (nip05Verified.value != true) {
-                                    nip05Verified.value = true
-                                }
-                            } else {
-                                userMetadata.nip05Verified = false
-                                userMetadata.nip05LastVerificationTime = 0
-
-                                if (nip05Verified.value != false) {
-                                    nip05Verified.value = false
-                                }
-                            }
-                        },
-                        onError = {
-                            userMetadata.nip05LastVerificationTime = 0
-                            userMetadata.nip05Verified = false
-
-                            if (nip05Verified.value != false) {
-                                nip05Verified.value = false
-                            }
-                        }
-                    )
+            accountViewModel.verifyNip05(userMetadata, pubkeyHex) { newVerificationStatus ->
+                if (nip05Verified.value != newVerificationStatus) {
+                    nip05Verified.value = newVerificationStatus
                 }
             }
         }
@@ -93,47 +84,196 @@ fun nip05VerificationAsAState(userMetadata: UserMetadata, pubkeyHex: String): Mu
 }
 
 @Composable
-fun ObserveDisplayNip05Status(baseNote: Note, columnModifier: Modifier = Modifier) {
-    val noteState by baseNote.live().metadata.observeAsState()
-    val author by remember(noteState) {
-        derivedStateOf {
-            noteState?.note?.author
-        }
-    }
+fun ObserveDisplayNip05Status(
+    baseNote: Note,
+    columnModifier: Modifier = Modifier,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val author by baseNote.live().authorChanges.observeAsState()
 
     author?.let {
-        ObserveDisplayNip05Status(it, columnModifier)
+        ObserveDisplayNip05Status(it, columnModifier, accountViewModel, nav)
     }
 }
 
 @Composable
-fun ObserveDisplayNip05Status(baseUser: User, columnModifier: Modifier = Modifier) {
-    val nip05 by baseUser.live().metadata.map {
-        it.user.nip05()
-    }.observeAsState(baseUser.nip05())
+fun ObserveDisplayNip05Status(
+    baseUser: User,
+    columnModifier: Modifier = Modifier,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val nip05 by baseUser.live().nip05Changes.observeAsState(baseUser.nip05())
 
-    Crossfade(targetState = nip05, modifier = columnModifier) {
-        if (it != null) {
-            DisplayNIP05Line(it, baseUser, columnModifier)
-        } else {
-            Text(
-                text = baseUser.pubkeyDisplayHex(),
-                color = MaterialTheme.colors.placeholderText,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = columnModifier
-            )
+    LoadStatuses(baseUser, accountViewModel) { statuses ->
+        Crossfade(targetState = nip05, modifier = columnModifier, label = "ObserveDisplayNip05StatusCrossfade") {
+            VerifyAndDisplayNIP05OrStatusLine(it, statuses, baseUser, columnModifier, accountViewModel, nav)
         }
     }
 }
 
 @Composable
-private fun DisplayNIP05Line(nip05: String, baseUser: User, columnModifier: Modifier = Modifier) {
+private fun VerifyAndDisplayNIP05OrStatusLine(
+    nip05: String?,
+    statuses: ImmutableList<AddressableNote>,
+    baseUser: User,
+    columnModifier: Modifier = Modifier,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
     Column(modifier = columnModifier) {
-        val nip05Verified = nip05VerificationAsAState(baseUser.info!!, baseUser.pubkeyHex)
-        Crossfade(targetState = nip05Verified) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                DisplayNIP05(nip05, it)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            if (nip05 != null) {
+                val nip05Verified = nip05VerificationAsAState(baseUser.info!!, baseUser.pubkeyHex, accountViewModel)
+
+                if (nip05Verified.value != true) {
+                    DisplayNIP05(nip05, nip05Verified)
+                } else if (!statuses.isEmpty()) {
+                    RotateStatuses(statuses, accountViewModel, nav)
+                } else {
+                    DisplayNIP05(nip05, nip05Verified)
+                }
+            } else {
+                if (!statuses.isEmpty()) {
+                    RotateStatuses(statuses, accountViewModel, nav)
+                } else {
+                    DisplayUsersNpub(baseUser.pubkeyDisplayHex())
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun RotateStatuses(
+    statuses: ImmutableList<AddressableNote>,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    var indexToDisplay by remember(statuses) {
+        mutableIntStateOf(0)
+    }
+
+    DisplayStatus(statuses[indexToDisplay], accountViewModel, nav)
+
+    if (statuses.size > 1) {
+        LaunchedEffect(Unit) {
+            while (true) {
+                delay(10.seconds)
+                indexToDisplay = (indexToDisplay + 1) % statuses.size
+            }
+        }
+    }
+}
+
+@Composable
+fun DisplayUsersNpub(npub: String) {
+    Text(
+        text = npub,
+        fontSize = 14.sp,
+        color = MaterialTheme.colors.placeholderText,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+    )
+}
+
+@Composable
+fun DisplayStatus(
+    addressableNote: AddressableNote,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
+) {
+    val noteState by addressableNote.live().metadata.observeAsState()
+
+    val content = remember(noteState) { addressableNote.event?.content() ?: "" }
+    val type = remember(noteState) {
+        (addressableNote.event as? AddressableEvent)?.dTag() ?: ""
+    }
+    val url = remember(noteState) {
+        addressableNote.event?.firstTaggedUrl()?.ifBlank { null }
+    }
+    val nostrATag = remember(noteState) {
+        addressableNote.event?.firstTaggedAddress()
+    }
+    val nostrHexID = remember(noteState) {
+        addressableNote.event?.firstTaggedEvent()?.ifBlank { null }
+    }
+
+    when (type) {
+        "music" -> Icon(
+            painter = painterResource(id = R.drawable.tunestr),
+            null,
+            modifier = Size15Modifier.padding(end = Size5dp),
+            tint = MaterialTheme.colors.placeholderText
+        )
+        else -> {}
+    }
+
+    Text(
+        text = content,
+        fontSize = Font14SP,
+        color = MaterialTheme.colors.placeholderText,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis
+    )
+
+    if (url != null) {
+        val uri = LocalUriHandler.current
+        Spacer(modifier = StdHorzSpacer)
+        IconButton(
+            modifier = Size15Modifier,
+            onClick = { runCatching { uri.openUri(url.trim()) } }
+        ) {
+            Icon(
+                imageVector = Icons.Default.OpenInNew,
+                null,
+                modifier = Size15Modifier,
+                tint = MaterialTheme.colors.lessImportantLink
+            )
+        }
+    } else if (nostrATag != null) {
+        LoadAddressableNote(nostrATag, accountViewModel) { note ->
+            if (note != null) {
+                Spacer(modifier = StdHorzSpacer)
+                IconButton(
+                    modifier = Size15Modifier,
+                    onClick = {
+                        routeFor(
+                            note,
+                            accountViewModel.userProfile()
+                        )?.let { nav(it) }
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.OpenInNew,
+                        null,
+                        modifier = Size15Modifier,
+                        tint = MaterialTheme.colors.lessImportantLink
+                    )
+                }
+            }
+        }
+    } else if (nostrHexID != null) {
+        LoadNote(baseNoteHex = nostrHexID, accountViewModel) {
+            if (it != null) {
+                Spacer(modifier = StdHorzSpacer)
+                IconButton(
+                    modifier = Size15Modifier,
+                    onClick = {
+                        routeFor(
+                            it,
+                            accountViewModel.userProfile()
+                        )?.let { nav(it) }
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.OpenInNew,
+                        null,
+                        modifier = Size15Modifier,
+                        tint = MaterialTheme.colors.lessImportantLink
+                    )
+                }
             }
         }
     }
@@ -157,6 +297,7 @@ private fun DisplayNIP05(
     if (user != "_") {
         Text(
             text = remember(nip05) { AnnotatedString(user) },
+            fontSize = Font14SP,
             color = MaterialTheme.colors.nip05,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis
@@ -168,7 +309,7 @@ private fun DisplayNIP05(
     ClickableText(
         text = remember(nip05) { AnnotatedString(domain) },
         onClick = { runCatching { uri.openUri("https://$domain") } },
-        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.nip05),
+        style = LocalTextStyle.current.copy(color = MaterialTheme.colors.nip05, fontSize = Font14SP),
         maxLines = 1,
         overflow = TextOverflow.Visible
     )
@@ -186,12 +327,12 @@ private fun NIP05VerifiedSymbol(nip05Verified: MutableState<Boolean?>, modifier:
 }
 
 @Composable
-fun DisplayNip05ProfileStatus(user: User) {
+fun DisplayNip05ProfileStatus(user: User, accountViewModel: AccountViewModel) {
     val uri = LocalUriHandler.current
 
     user.nip05()?.let { nip05 ->
         if (nip05.split("@").size <= 2) {
-            val nip05Verified = nip05VerificationAsAState(user.info!!, user.pubkeyHex)
+            val nip05Verified = nip05VerificationAsAState(user.info!!, user.pubkeyHex, accountViewModel)
             Row(verticalAlignment = Alignment.CenterVertically) {
                 NIP05VerifiedSymbol(nip05Verified, Size16Modifier)
                 var domainPadStart = 5.dp

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.*
@@ -98,9 +102,7 @@ private fun WatchZapsAndUpdateTallies(
     val zapsState by baseNote.live().zaps.observeAsState()
 
     LaunchedEffect(key1 = zapsState) {
-        launch(Dispatchers.Default) {
-            pollViewModel.refreshTallies()
-        }
+        pollViewModel.refreshTallies()
     }
 }
 
@@ -115,7 +117,7 @@ private fun OptionNote(
     nav: (String) -> Unit
 ) {
     val tags = remember(baseNote) {
-        baseNote.event?.tags()?.toImmutableListOfLists() ?: ImmutableListOfLists()
+        baseNote.event?.tags()?.toImmutableListOfLists() ?: EmptyTagList
     }
 
     Row(
@@ -132,8 +134,7 @@ private fun OptionNote(
             ZapVote(
                 baseNote,
                 poolOption,
-                accountViewModel,
-                pollViewModel,
+                pollViewModel = pollViewModel,
                 nonClickablePrepend = {
                     RenderOptionAfterVote(
                         poolOption.descriptor,
@@ -147,18 +148,21 @@ private fun OptionNote(
                     )
                 },
                 clickablePrepend = {
-                }
+                },
+                accountViewModel = accountViewModel,
+                nav = nav
             )
         } else {
             ZapVote(
                 baseNote,
                 poolOption,
-                accountViewModel,
-                pollViewModel,
+                pollViewModel = pollViewModel,
                 nonClickablePrepend = {},
                 clickablePrepend = {
                     RenderOptionBeforeVote(poolOption.descriptor, canPreview, tags, backgroundColor, accountViewModel, nav)
-                }
+                },
+                accountViewModel = accountViewModel,
+                nav = nav
             )
         }
     }
@@ -269,11 +273,12 @@ private fun RenderOptionBeforeVote(
 fun ZapVote(
     baseNote: Note,
     poolOption: PollOption,
-    accountViewModel: AccountViewModel,
-    pollViewModel: PollNoteViewModel,
     modifier: Modifier = Modifier,
+    pollViewModel: PollNoteViewModel,
     nonClickablePrepend: @Composable () -> Unit,
-    clickablePrepend: @Composable () -> Unit
+    clickablePrepend: @Composable () -> Unit,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit
 ) {
     val isLoggedUser by remember {
         derivedStateOf {
@@ -282,7 +287,14 @@ 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) }
 
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -296,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(
@@ -360,6 +372,8 @@ fun ZapVote(
                                 zappingProgress = it
                             }
                         },
+                        onPayViaIntent = {
+                        },
                         zapType = accountViewModel.account.defaultZapType
                     )
                 } else {
@@ -384,17 +398,50 @@ fun ZapVote(
                 onError = {
                     scope.launch {
                         zappingProgress = 0f
-                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                        showErrorMessageDialog = it
                     }
                 },
                 onProgress = {
                     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
+                    }
+                }
+            )
+        }
+
+        if (showErrorMessageDialog != null) {
+            ErrorMessageDialog(
+                title = stringResource(id = R.string.error_dialog_zap_error),
+                textContent = showErrorMessageDialog ?: "",
+                onClickStartMessage = {
+                    baseNote.author?.let {
+                        nav(routeToMessage(it, showErrorMessageDialog, accountViewModel))
+                    }
+                },
+                onDismiss = { showErrorMessageDialog = null }
+            )
+        }
+
         clickablePrepend()
 
         if (poolOption.zappedByLoggedIn) {
@@ -448,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
 
@@ -487,6 +535,7 @@ fun FilteredZapAmountChoicePopup(
                             context,
                             onError,
                             onProgress,
+                            onPayViaIntent,
                             defaultZapType
                         )
                         onDismiss()
@@ -511,6 +560,7 @@ fun FilteredZapAmountChoicePopup(
                                     context,
                                     onError,
                                     onProgress,
+                                    onPayViaIntent,
                                     defaultZapType
                                 )
                                 onDismiss()

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

@@ -3,13 +3,16 @@ package com.vitorpamplona.amethyst.ui.note
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.quartz.events.*
 import com.vitorpamplona.quartz.utils.TimeUtils
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
 import java.math.BigDecimal
 import java.math.RoundingMode
 
@@ -30,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
@@ -46,18 +52,20 @@ 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)
     }
 
-    suspend fun refreshTallies() {
-        totalZapped = totalZapped()
-        wasZappedByLoggedInAccount = pollNote?.let { account?.calculateIfNoteWasZappedByAccount(it) } ?: false
+    fun refreshTallies() {
+        viewModelScope.launch(Dispatchers.Default) {
+            totalZapped = totalZapped()
+            wasZappedByLoggedInAccount = pollNote?.let { account?.calculateIfNoteWasZappedByAccount(it) } ?: false
 
-        _tallies.emit(
-            pollOptions?.keys?.map {
+            val newOptions = pollOptions?.keys?.map {
                 val zappedInOption = zappedPollOptionAmount(it)
 
                 val myTally = if (totalZapped.compareTo(BigDecimal.ZERO) > 0) {
@@ -71,8 +79,12 @@ class PollNoteViewModel : ViewModel() {
                 val consensus = consensusThreshold != null && myTally >= consensusThreshold!!
 
                 PollOption(it, pollOptions?.get(it) ?: "", zappedInOption, myTally, consensus, zappedByLoggedIn)
-            } ?: emptyList()
-        )
+            }
+
+            _tallies.emit(
+                newOptions ?: emptyList()
+            )
+        }
     }
 
     fun canZap(): Boolean {
@@ -103,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
@@ -138,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> {
@@ -169,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

@@ -40,6 +40,7 @@ import androidx.compose.material.ProgressIndicatorDefaults
 import androidx.compose.material.Text
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
@@ -77,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
@@ -106,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
@@ -132,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
@@ -210,7 +213,7 @@ private fun InnerReactionRow(
         ) {
             val (value, elapsed) = measureTimedValue {
                 Row(verticalAlignment = CenterVertically) {
-                    ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel)
+                    ZapReaction(baseNote, MaterialTheme.colors.placeholderText, accountViewModel, nav = nav)
                 }
             }
             Log.d("Rendering Metrics", "Reaction Zaps:  ${baseNote.event?.content()?.split("\n")?.getOrNull(0)?.take(15)}.. $elapsed")
@@ -241,14 +244,13 @@ private fun LoadAndDisplayZapraiser(
     wantsToSeeReactions: MutableState<Boolean>,
     accountViewModel: AccountViewModel
 ) {
-    val zapraiserAmount by remember {
+    val zapraiserAmount by remember(baseNote) {
         derivedStateOf {
             baseNote.event?.zapraiserAmount() ?: 0
         }
     }
 
     if (zapraiserAmount > 0) {
-        Spacer(modifier = Height4dpModifier)
         Box(
             modifier = remember {
                 ReactionRowZapraiserSize
@@ -261,42 +263,26 @@ private fun LoadAndDisplayZapraiser(
     }
 }
 
+@Immutable
+data class ZapraiserStatus(val progress: Float, val left: String)
+
 @Composable
 fun RenderZapRaiser(baseNote: Note, zapraiserAmount: Long, details: Boolean, accountViewModel: AccountViewModel) {
     val zapsState by baseNote.live().zaps.observeAsState()
 
-    var zapraiserProgress by remember { mutableStateOf(0F) }
-    var zapraiserLeft by remember { mutableStateOf("$zapraiserAmount") }
+    var zapraiserStatus by remember { mutableStateOf(ZapraiserStatus(0F, "$zapraiserAmount")) }
 
     LaunchedEffect(key1 = zapsState) {
-        launch(Dispatchers.Default) {
-            zapsState?.note?.let {
-                val newZapAmount = accountViewModel.calculateZapAmount(it)
-                var percentage = newZapAmount.div(zapraiserAmount.toBigDecimal()).toFloat()
-
-                if (percentage > 1) {
-                    percentage = 1f
-                }
-
-                if (Math.abs(zapraiserProgress - percentage) > 0.001) {
-                    val newZapraiserProgress = percentage
-                    val newZapraiserLeft = if (percentage > 0.99) {
-                        "0"
-                    } else {
-                        showAmount((zapraiserAmount * (1 - percentage)).toBigDecimal())
-                    }
-                    if (zapraiserLeft != newZapraiserLeft) {
-                        zapraiserLeft = newZapraiserLeft
-                    }
-                    if (zapraiserProgress != newZapraiserProgress) {
-                        zapraiserProgress = newZapraiserProgress
-                    }
+        zapsState?.note?.let {
+            accountViewModel.calculateZapraiser(baseNote) { newStatus ->
+                if (zapraiserStatus != newStatus) {
+                    zapraiserStatus = newStatus
                 }
             }
         }
     }
 
-    val color = if (zapraiserProgress > 0.99) {
+    val color = if (zapraiserStatus.progress > 0.99) {
         DarkerGreen
     } else {
         MaterialTheme.colors.mediumImportanceLink
@@ -307,7 +293,7 @@ fun RenderZapRaiser(baseNote: Note, zapraiserAmount: Long, details: Boolean, acc
             .fillMaxWidth()
             .height(if (details) 24.dp else 4.dp),
         color = color,
-        progress = zapraiserProgress
+        progress = zapraiserStatus.progress
     )
 
     if (details) {
@@ -315,14 +301,14 @@ fun RenderZapRaiser(baseNote: Note, zapraiserAmount: Long, details: Boolean, acc
             contentAlignment = Center,
             modifier = TinyBorders
         ) {
-            val totalPercentage by remember(zapraiserProgress) {
+            val totalPercentage by remember(zapraiserStatus) {
                 derivedStateOf {
-                    "${(zapraiserProgress * 100).roundToInt()}%"
+                    "${(zapraiserStatus.progress * 100).roundToInt()}%"
                 }
             }
 
             Text(
-                text = stringResource(id = R.string.sats_to_complete, totalPercentage, zapraiserLeft),
+                text = stringResource(id = R.string.sats_to_complete, totalPercentage, zapraiserStatus.left),
                 modifier = NoSoTinyBorders,
                 color = MaterialTheme.colors.placeholderText,
                 fontSize = Font14SP,
@@ -334,15 +320,7 @@ fun RenderZapRaiser(baseNote: Note, zapraiserAmount: Long, details: Boolean, acc
 
 @Composable
 private fun WatchReactionsZapsBoostsAndDisplayIfExists(baseNote: Note, content: @Composable () -> Unit) {
-    val hasReactions by baseNote.live().zaps.combineWith(
-        liveData1 = baseNote.live().boosts,
-        liveData2 = baseNote.live().reactions,
-        block = { zapsState, boostsState, reactionsState ->
-            zapsState?.note?.zaps?.isNotEmpty() == true ||
-                boostsState?.note?.boosts?.isNotEmpty() == true ||
-                reactionsState?.note?.reactions?.isNotEmpty() == true
-        }
-    ).observeAsState(
+    val hasReactions by baseNote.live().hasReactions.observeAsState(
         baseNote.zaps.isNotEmpty() ||
             baseNote.boosts.isNotEmpty() ||
             baseNote.reactions.isNotEmpty()
@@ -414,14 +392,7 @@ private fun ReactionDetailGallery(
     val defaultBackgroundColor = MaterialTheme.colors.background
     val backgroundColor = remember { mutableStateOf<Color>(defaultBackgroundColor) }
 
-    val hasReactions by baseNote.live().zaps.combineWith(
-        baseNote.live().boosts,
-        baseNote.live().reactions
-    ) { zapState, boostState, reactionState ->
-        zapState?.note?.zaps?.isNotEmpty() ?: false ||
-            boostState?.note?.boosts?.isNotEmpty() ?: false ||
-            reactionState?.note?.reactions?.isNotEmpty() ?: false
-    }.distinctUntilChanged().observeAsState(
+    val hasReactions by baseNote.live().hasReactions.observeAsState(
         baseNote.zaps.isNotEmpty() || baseNote.boosts.isNotEmpty() || baseNote.reactions.isNotEmpty()
     )
 
@@ -442,17 +413,16 @@ private fun WatchBoostsAndRenderGallery(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    val boostsState by baseNote.live().boosts.observeAsState()
-    val boostsEvents by remember(boostsState) {
-        derivedStateOf { baseNote.boosts.toImmutableList() }
-    }
+    val boostsEvents by baseNote.live().boostList.observeAsState()
 
-    if (boostsEvents.isNotEmpty()) {
-        RenderBoostGallery(
-            boostsEvents,
-            nav,
-            accountViewModel
-        )
+    boostsEvents?.let {
+        if (it.isNotEmpty()) {
+            RenderBoostGallery(
+                it,
+                nav,
+                accountViewModel
+            )
+        }
     }
 }
 
@@ -488,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()) {
@@ -574,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()
+                    }
                 }
             }
         }
@@ -594,9 +575,7 @@ fun ReplyReaction(
 
 @Composable
 fun ReplyCounter(baseNote: Note, textColor: Color) {
-    val repliesState by baseNote.live().replies.map {
-        it.note.replies.size
-    }.observeAsState(baseNote.replies.size)
+    val repliesState by baseNote.live().replyCount.observeAsState(baseNote.replies.size)
 
     SlidingAnimationCount(repliesState, textColor)
 }
@@ -685,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()
+                    }
                 }
             }
         }
@@ -708,6 +697,11 @@ fun BoostReaction(
                 onQuote = {
                     wantsToBoost = false
                     onQuotePress()
+                },
+                onRepost = {
+                    scope.launch(Dispatchers.IO) {
+                        accountViewModel.boost(baseNote)
+                    }
                 }
             )
         }
@@ -731,9 +725,7 @@ fun BoostIcon(baseNote: Note, iconSize: Dp = Size20dp, grayTint: Color, accountV
 
 @Composable
 fun BoostText(baseNote: Note, grayTint: Color) {
-    val boostState by baseNote.live().boosts.map {
-        it.note.boosts.size
-    }.distinctUntilChanged().observeAsState(baseNote.boosts.size)
+    val boostState by baseNote.live().boostCount.observeAsState(baseNote.boosts.size)
 
     SlidingAnimationCount(boostState, grayTint)
 }
@@ -773,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
+                        }
                     }
                 )
             },
@@ -847,10 +853,7 @@ private fun WatchReactionTypeForNote(baseNote: Note, accountViewModel: AccountVi
     val reactionsState by baseNote.live().reactions.observeAsState()
 
     LaunchedEffect(key1 = reactionsState) {
-        launch(Dispatchers.Default) {
-            val reactionNote = reactionsState?.note?.getReactionBy(accountViewModel.userProfile())
-            onNewReactionType(reactionNote)
-        }
+        accountViewModel.loadReactionTo(reactionsState?.note, onNewReactionType)
     }
 }
 
@@ -885,32 +888,9 @@ private fun RenderReactionType(
 
 @Composable
 fun LikeText(baseNote: Note, grayTint: Color) {
-    val reactionsCount = remember(baseNote) {
-        mutableStateOf(baseNote.reactions.size)
-    }
+    val reactionCount by baseNote.live().reactionCount.observeAsState(0)
 
-    val scope = rememberCoroutineScope()
-
-    WatchReactionCountForNote(baseNote) { newReactionsCount ->
-        if (reactionsCount.value != newReactionsCount) {
-            scope.launch(Dispatchers.Main) {
-                reactionsCount.value = newReactionsCount
-            }
-        }
-    }
-
-    SlidingAnimationCount(reactionsCount, grayTint)
-}
-
-@Composable
-private fun WatchReactionCountForNote(baseNote: Note, onNewReactionCount: (Int) -> Unit) {
-    val reactionsState by baseNote.live().reactions.observeAsState()
-
-    LaunchedEffect(key1 = reactionsState) {
-        launch(Dispatchers.Default) {
-            onNewReactionCount(reactionsState?.note?.countReactions() ?: 0)
-        }
-    }
+    SlidingAnimationCount(reactionCount, grayTint)
 }
 
 private fun likeClick(
@@ -918,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 {
@@ -931,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) {
@@ -961,11 +946,18 @@ fun ZapReaction(
     grayTint: Color,
     accountViewModel: AccountViewModel,
     iconSize: Dp = 20.dp,
-    animationSize: Dp = 14.dp
+    animationSize: Dp = 14.dp,
+    nav: (String) -> Unit
 ) {
     var wantsToZap by remember { mutableStateOf(false) }
     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()
@@ -991,6 +983,15 @@ fun ZapReaction(
                         },
                         onMultipleChoices = {
                             wantsToZap = true
+                        },
+                        onError = {
+                            scope.launch {
+                                zappingProgress = 0f
+                                showErrorMessageDialog = it
+                            }
+                        },
+                        onPayViaIntent = {
+                            wantsToPay = it
                         }
                     )
                 },
@@ -1017,23 +1018,80 @@ fun ZapReaction(
                 onError = {
                     scope.launch {
                         zappingProgress = 0f
-                        Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                        showErrorMessageDialog = it
                     }
                 },
                 onProgress = {
                     scope.launch(Dispatchers.Main) {
                         zappingProgress = it
                     }
+                },
+                onPayViaIntent = {
+                    wantsToPay = it
                 }
             )
         }
 
+        if (showErrorMessageDialog != null) {
+            ErrorMessageDialog(
+                title = stringResource(id = R.string.error_dialog_zap_error),
+                textContent = showErrorMessageDialog ?: "",
+                onClickStartMessage = {
+                    baseNote.author?.let {
+                        scope.launch(Dispatchers.IO) {
+                            val route = routeToMessage(it, showErrorMessageDialog, accountViewModel)
+                            nav(route)
+                        }
+                    }
+                },
+                onDismiss = { showErrorMessageDialog = null }
+            )
+        }
+
         if (wantsToChangeZapAmount) {
-            UpdateZapAmountDialog({ wantsToChangeZapAmount = false }, accountViewModel = accountViewModel)
+            UpdateZapAmountDialog(
+                onClose = { wantsToChangeZapAmount = false },
+                accountViewModel = accountViewModel
+            )
+        }
+
+        if (wantsToPay.isNotEmpty()) {
+            PayViaIntentDialog(
+                payingInvoices = wantsToPay,
+                accountViewModel = accountViewModel,
+                onClose = {
+                    wantsToPay = persistentListOf()
+                },
+                onError = {
+                    wantsToPay = persistentListOf()
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                }
+            )
         }
 
         if (wantsToSetCustomZap) {
-            ZapCustomDialog({ wantsToSetCustomZap = false }, accountViewModel, baseNote)
+            ZapCustomDialog(
+                onClose = { wantsToSetCustomZap = false },
+                onError = {
+                    scope.launch {
+                        zappingProgress = 0f
+                        showErrorMessageDialog = it
+                    }
+                },
+                onProgress = {
+                    scope.launch(Dispatchers.Main) {
+                        zappingProgress = it
+                    }
+                },
+                onPayViaIntent = {
+                    wantsToPay = it
+                },
+                accountViewModel = accountViewModel,
+                baseNote = baseNote
+            )
         }
 
         if (zappingProgress > 0.00001 && zappingProgress < 0.99999) {
@@ -1066,7 +1124,9 @@ private fun zapClick(
     scope: CoroutineScope,
     context: Context,
     onZappingProgress: (Float) -> Unit,
-    onMultipleChoices: () -> Unit
+    onMultipleChoices: () -> Unit,
+    onError: (String) -> Unit,
+    onPayViaIntent: (ImmutableList<ZapPaymentHandler.Payable>) -> Unit
 ) {
     if (accountViewModel.account.zapAmountChoices.isEmpty()) {
         scope.launch {
@@ -1078,7 +1138,7 @@ private fun zapClick(
                 )
                 .show()
         }
-    } else if (!accountViewModel.isWriteable()) {
+    } else if (!accountViewModel.isWriteable() && !accountViewModel.loggedInWithExternalSigner()) {
         scope.launch {
             Toast
                 .makeText(
@@ -1095,20 +1155,14 @@ private fun zapClick(
             null,
             "",
             context,
-            onError = {
-                scope.launch {
-                    onZappingProgress(0f)
-                    Toast
-                        .makeText(context, it, Toast.LENGTH_SHORT)
-                        .show()
-                }
-            },
+            onError = onError,
             onProgress = {
                 scope.launch(Dispatchers.Main) {
                     onZappingProgress(it)
                 }
             },
-            zapType = accountViewModel.account.defaultZapType
+            zapType = accountViewModel.account.defaultZapType,
+            onPayViaIntent = onPayViaIntent
         )
     } else if (accountViewModel.account.zapAmountChoices.size > 1) {
         onMultipleChoices()
@@ -1150,9 +1204,7 @@ private fun WatchZapsForNote(baseNote: Note, accountViewModel: AccountViewModel,
     val zapsState by baseNote.live().zaps.observeAsState()
 
     LaunchedEffect(key1 = zapsState) {
-        launch(Dispatchers.Default) {
-            onWasZapped(accountViewModel.calculateIfNoteWasZappedByAccount(baseNote))
-        }
+        accountViewModel.calculateIfNoteWasZappedByAccount(baseNote, onWasZapped)
     }
 }
 
@@ -1182,9 +1234,7 @@ fun WatchZapAmountsForNote(baseNote: Note, accountViewModel: AccountViewModel, o
     val zapsState by baseNote.live().zaps.observeAsState()
 
     LaunchedEffect(key1 = zapsState) {
-        launch(Dispatchers.Default) {
-            onZapAmount(showAmount(accountViewModel.calculateZapAmount(baseNote)))
-        }
+        accountViewModel.calculateZapAmount(baseNote, onZapAmount)
     }
 }
 
@@ -1228,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()
     }
@@ -1243,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()
                     }
                 },
@@ -1322,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
@@ -1344,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()
@@ -1423,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 = ""
@@ -1449,6 +1499,7 @@ fun ZapAmountChoicePopup(
                             context,
                             onError,
                             onProgress,
+                            onPayViaIntent,
                             account.defaultZapType
                         )
                         onDismiss()
@@ -1473,6 +1524,7 @@ fun ZapAmountChoicePopup(
                                     context,
                                     onError,
                                     onProgress,
+                                    onPayViaIntent,
                                     account.defaultZapType
                                 )
                                 onDismiss()

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

@@ -11,17 +11,16 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonBoxModifer
@@ -29,80 +28,40 @@ import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconButtonModifie
 import com.vitorpamplona.amethyst.ui.theme.ShowMoreRelaysButtonIconModifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 @Composable
 public fun RelayBadges(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var expanded by remember { mutableStateOf(false) }
-    var showShowMore by remember { mutableStateOf(false) }
 
-    var lazyRelayList by remember {
-        val baseNumber = baseNote.relays.map {
-            it.removePrefix("wss://").removePrefix("ws://")
-        }.toImmutableList()
-
-        mutableStateOf(baseNumber)
-    }
-    var shortRelayList by remember {
-        mutableStateOf(lazyRelayList.take(3).toImmutableList())
-    }
-
-    val scope = rememberCoroutineScope()
-
-    WatchRelayLists(baseNote) { relayList ->
-        if (!equalImmutableLists(relayList, lazyRelayList)) {
-            scope.launch(Dispatchers.Main) {
-                lazyRelayList = relayList
-                shortRelayList = relayList.take(3).toImmutableList()
-            }
-        }
-
-        val nextShowMore = relayList.size > 3
-        if (nextShowMore != showShowMore) {
-            scope.launch(Dispatchers.Main) {
-                // only triggers recomposition when actually different
-                showShowMore = nextShowMore
-            }
+    val relayList by baseNote.live().relayInfo.observeAsState(persistentListOf())
+    val shortRelayList by remember {
+        derivedStateOf {
+            relayList.take(3).toImmutableList()
         }
     }
 
     Spacer(DoubleVertSpacer)
 
     if (expanded) {
-        VerticalRelayPanelWithFlow(lazyRelayList, accountViewModel, nav)
+        VerticalRelayPanelWithFlow(relayList, accountViewModel, nav)
     } else {
         VerticalRelayPanelWithFlow(shortRelayList, accountViewModel, nav)
     }
 
-    if (showShowMore && !expanded) {
+    if (relayList.size > 3 && !expanded) {
         ShowMoreRelaysButton {
             expanded = true
         }
     }
 }
 
-@Composable
-private fun WatchRelayLists(baseNote: Note, onListChanges: (ImmutableList<String>) -> Unit) {
-    val noteRelaysState by baseNote.live().relays.observeAsState()
-
-    LaunchedEffect(key1 = noteRelaysState) {
-        launch(Dispatchers.IO) {
-            val relayList = noteRelaysState?.note?.relays?.map {
-                it.removePrefix("wss://").removePrefix("ws://")
-            } ?: emptyList()
-
-            onListChanges(relayList.toImmutableList())
-        }
-    }
-}
-
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 @Stable
 private fun VerticalRelayPanelWithFlow(
-    relays: ImmutableList<String>,
+    relays: ImmutableList<RelayBriefInfo>,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {

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

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.note
 
+import android.widget.Toast
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -17,7 +18,6 @@ import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -29,13 +29,15 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.RelayBriefInfo
 import com.vitorpamplona.amethyst.model.RelayInformation
+import com.vitorpamplona.amethyst.service.Nip11Retriever
 import com.vitorpamplona.amethyst.ui.actions.RelayInformationDialog
-import com.vitorpamplona.amethyst.ui.actions.loadRelayInfo
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.RelayIconFilter
@@ -44,6 +46,8 @@ import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size15dp
 import com.vitorpamplona.amethyst.ui.theme.StdStartPadding
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.launch
 
 @Composable
 public fun RelayBadgesHorizontal(baseNote: Note, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
@@ -59,15 +63,13 @@ public fun RelayBadgesHorizontal(baseNote: Note, accountViewModel: AccountViewMo
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun RenderRelayList(baseNote: Note, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val noteRelays by baseNote.live().relays.map {
-        it.note.relays
-    }.observeAsState(baseNote.relays)
+    val noteRelays by baseNote.live().relayInfo.observeAsState()
 
     FlowRow(StdStartPadding) {
         val relaysToDisplay = remember(noteRelays, expanded.value) {
-            if (expanded.value) noteRelays else noteRelays.take(3)
+            if (expanded.value) noteRelays else noteRelays?.take(3)?.toImmutableList()
         }
-        relaysToDisplay.forEach {
+        relaysToDisplay?.forEach {
             RenderRelay(it, accountViewModel, nav)
         }
     }
@@ -104,14 +106,7 @@ fun ChatRelayExpandButton(onClick: () -> Unit) {
 }
 
 @Composable
-fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    val iconUrl by remember(dirtyUrl) {
-        derivedStateOf {
-            val cleanUrl = dirtyUrl.trim().removePrefix("wss://").removePrefix("ws://").removeSuffix("/")
-            "https://$cleanUrl/favicon.ico"
-        }
-    }
-
+fun RenderRelay(relay: RelayBriefInfo, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     var relayInfo: RelayInformation? by remember { mutableStateOf(null) }
 
     if (relayInfo != null) {
@@ -120,8 +115,9 @@ fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (Stri
                 relayInfo = null
             },
             relayInfo = relayInfo!!,
-            accountViewModel,
-            nav
+            relayBriefInfo = relay,
+            accountViewModel = accountViewModel,
+            nav = nav
         )
     }
 
@@ -130,7 +126,7 @@ fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (Stri
     val interactionSource = remember { MutableInteractionSource() }
     val ripple = rememberRipple(bounded = false, radius = Size15dp)
 
-    val clickableModifier = remember(dirtyUrl) {
+    val clickableModifier = remember(relay) {
         Modifier
             .padding(1.dp)
             .size(Size15dp)
@@ -139,9 +135,30 @@ fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (Stri
                 interactionSource = interactionSource,
                 indication = ripple,
                 onClick = {
-                    loadRelayInfo(dirtyUrl, context, scope) {
-                        relayInfo = it
-                    }
+                    accountViewModel.retrieveRelayDocument(
+                        relay.url,
+                        onInfo = {
+                            relayInfo = it
+                        },
+                        onError = { url, errorCode, exceptionMessage ->
+                            val msg = when (errorCode) {
+                                Nip11Retriever.ErrorCode.FAIL_TO_ASSEMBLE_URL -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                Nip11Retriever.ErrorCode.FAIL_TO_REACH_SERVER -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                Nip11Retriever.ErrorCode.FAIL_TO_PARSE_RESULT -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                                Nip11Retriever.ErrorCode.FAIL_WITH_HTTP_STATUS -> context.getString(R.string.relay_information_document_error_assemble_url, url, exceptionMessage)
+                            }
+
+                            scope.launch {
+                                Toast
+                                    .makeText(
+                                        context,
+                                        msg,
+                                        Toast.LENGTH_SHORT
+                                    )
+                                    .show()
+                            }
+                        }
+                    )
                 }
             )
     }
@@ -149,17 +166,17 @@ fun RenderRelay(dirtyUrl: String, accountViewModel: AccountViewModel, nav: (Stri
     Box(
         modifier = clickableModifier
     ) {
-        RenderRelayIcon(iconUrl)
+        RenderRelayIcon(relay.favIcon)
     }
 }
 
 @Composable
-private fun RenderRelayIcon(iconUrl: String) {
+fun RenderRelayIcon(iconUrl: String, size: Dp = Size13dp) {
     val backgroundColor = MaterialTheme.colors.background
 
     val iconModifier = remember {
         Modifier
-            .size(Size13dp)
+            .size(size)
             .clip(shape = CircleShape)
             .background(backgroundColor)
     }

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)
                 }