v0.15.2

Adjusting New Post screen's keyboard cutting off in long posts
Removing DataSource stops in ViewModels to make sure this is handled by the Screen class
2026-07-22 15:52:22 +00:00 · 2023-02-13 16:14:17 -05:00 · 2023-02-13 16:13:47 -05:00 · 2023-02-13 15:50:50 -05:00 · 2023-02-13 15:49:51 -05:00 · 2023-02-13 09:40:46 -05:00
56 changed files with 1506 additions and 287 deletions
--- a/README.md
+++ b/README.md
@@ -17,14 +17,16 @@ Amethyst brings the best social network to your Android phone. Just insert your
 - [x] Private Messages (NIP-04)
 - [x] User Profiles (follow/unfollow)
 - [x] Public Chats (NIP-28)
- [ ] Notification Bubbles
+- [x] Notification Bubbles
+- [x] Reporting and Hide User capability
+- [x] Profile Edit
+- [x] Relay Edit (separate relay sets for home, dms, public chats, global)
+- [x] Dropdown to Link Users when writing
+- [x] Lightning Tips
+- [ ] Zaps 
 - [ ] Infinity Scroll 
- [ ] Dropdown to Link Users/Posts when writing
 - [ ] Identity Verification (NIP-05)
 - [ ] Event Delegation (NIP-09)
- [ ] Filter messages from Unknown People
- [ ] Profile Edit
- [ ] Relay Edit
 - [ ] Account Creation / Backup Guidance
 - [ ] Message Sent feedback

@@ -123,4 +125,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
        applicationId "com.vitorpamplona.amethyst"
        minSdk 26
        targetSdk 33
-        versionCode 42
-        versionName "0.14.2"
+        versionCode 45
+        versionName "0.15.2"

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

    buildTypes {
        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            //minifyEnabled true
+            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
            resValue "string", "app_name", "@string/app_name_release"
        }
        debug {
@@ -93,6 +93,9 @@ dependencies {
    // Json Serialization
    implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2'

+    // Robohash for Avatars
+    implementation group: 'com.github.vitorpamplona', name: 'android-robohash', version: 'master-SNAPSHOT', ext: 'aar'
+
    // link preview
    implementation 'tw.com.oneup.www:Baha-UrlPreview:1.0.1'
    implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha04'
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -31,5 +31,7 @@
 -keep class * extends com.google.gson.reflect.TypeToken
 -keep public class * implements java.lang.reflect.Type

+-keep class com.vitorpamplona.amethyst.lnurl.** { *; }
 -keep class com.vitorpamplona.amethyst.model.** { *; }
-keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.service.** { *; }
+-keep class com.vitorpamplona.amethyst.ui.** { *; }
--- a/app/src/main/java/com/vitorpamplona/amethyst/RoboHashCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/RoboHashCache.kt
@@ -0,0 +1,23 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.LruCache
+import java.util.UUID
+import name.neuhalfen.projects.android.robohash.RoboHash
+
+object RoboHashCache {
+
+  lateinit var robots: RoboHash
+
+  @Synchronized
+  fun get(context: Context, hash: String): Bitmap {
+    if (!this::robots.isInitialized) {
+      robots = RoboHash(context)
+      robots.useCache(LruCache(100));
+    }
+
+    return robots.imageForHandle(robots.calculateHandleFromUUID(UUID.nameUUIDFromBytes("aaaa".toByteArray())))
+  }
+
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
@@ -45,13 +45,13 @@ object ServiceManager {
      NostrUserProfileFollowersDataSource.account = myAccount

      NostrAccountDataSource.start()
-      NostrGlobalDataSource.start()
+      //NostrGlobalDataSource.start()
      NostrHomeDataSource.start()
      NostrNotificationDataSource.start()
      NostrSingleEventDataSource.start()
      NostrSingleChannelDataSource.start()
      NostrSingleUserDataSource.start()
-      NostrThreadDataSource.start()
+      //NostrThreadDataSource.start()
      NostrChatroomListDataSource.start()
    } else {
      // if not logged in yet, start a basic service wit default relays
--- a/app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt
@@ -0,0 +1,41 @@
+package com.vitorpamplona.amethyst
+
+import android.content.Context
+import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource
+import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
+import com.google.android.exoplayer2.upstream.cache.SimpleCache
+
+object VideoCache {
+
+  var exoPlayerCacheSize: Long = 90 * 1024 * 1024 // 90MB
+
+  var leastRecentlyUsedCacheEvictor = LeastRecentlyUsedCacheEvictor(exoPlayerCacheSize)
+
+  lateinit var exoDatabaseProvider: StandaloneDatabaseProvider
+  lateinit var simpleCache: SimpleCache
+
+  lateinit var cacheDataSourceFactory: CacheDataSource.Factory
+
+  fun get(context: Context): CacheDataSource.Factory {
+    if (!this::simpleCache.isInitialized) {
+      exoDatabaseProvider = StandaloneDatabaseProvider(context)
+
+      simpleCache = SimpleCache(
+        context.cacheDir,
+        leastRecentlyUsedCacheEvictor,
+        exoDatabaseProvider
+      )
+
+      cacheDataSourceFactory = CacheDataSource.Factory()
+        .setCache(simpleCache)
+        .setUpstreamDataSourceFactory(
+          DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+        )
+        .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+    }
+
+    return cacheDataSourceFactory
+  }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/lnurl/LightningAddressResolver.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/lnurl/LightningAddressResolver.kt
@@ -1,7 +1,7 @@
 package com.vitorpamplona.amethyst.lnurl

 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import kotlin.math.ln
+import java.net.URLEncoder
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -27,15 +27,20 @@ class LightningAddressResolver {
    return "https://${parts[1]}/.well-known/lnurlp/${parts[0]}"
  }

-  fun fetchLightningAddressJson(lnaddress: String, onSucess: (String) -> Unit) {
+  fun fetchLightningAddressJson(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
    val scope = CoroutineScope(Job() + Dispatchers.IO)
    scope.launch {
-      fetchLightningAddressJsonSuspend(lnaddress, onSucess)
+      fetchLightningAddressJsonSuspend(lnaddress, onSuccess, onError)
    }
  }

-  private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSucess: (String) -> Unit) {
-    val url = assembleUrl(lnaddress) ?: return
+  private suspend fun fetchLightningAddressJsonSuspend(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    val url = assembleUrl(lnaddress)
+
+    if (url == null) {
+      onError("Could not assemble LNUrl from Lightning Address \"${lnaddress}\". Check the user's setup")
+      return
+    }

    withContext(Dispatchers.IO) {
      val request: Request = Request.Builder().url(url).build()
@@ -43,64 +48,101 @@ class LightningAddressResolver {
      client.newCall(request).enqueue(object : Callback {
        override fun onResponse(call: Call, response: Response) {
          response.use {
-            onSucess(response.body.string())
+            onSuccess(response.body.string())
          }
        }

        override fun onFailure(call: Call, e: java.io.IOException) {
+          onError("Could not resolve User's LNURL address from ${url}. Check if the server up and if the lightning address ${lnaddress} is correct")
          e.printStackTrace()
        }
      })
    }
  }

-  fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, onSucess: (String) -> Unit) {
+  fun fetchLightningInvoice(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
    val scope = CoroutineScope(Job() + Dispatchers.IO)
    scope.launch {
-      fetchLightningInvoiceSuspend(lnCallback, milliSats, message, onSucess)
+      fetchLightningInvoiceSuspend(lnCallback, milliSats, message, nostrRequest, onSuccess, onError)
    }
  }

-  private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, onSucess: (String) -> Unit) {
-    val urlBinder = if (lnCallback.contains("?")) "&" else "?"
-    val url = "$lnCallback${urlBinder}amount=$milliSats&comment=$message"
-
+  private suspend fun fetchLightningInvoiceSuspend(lnCallback: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
    withContext(Dispatchers.IO) {
+      val encodedMessage = URLEncoder.encode(message, "utf-8")
+
+      val urlBinder = if (lnCallback.contains("?")) "&" else "?"
+      var url = "$lnCallback${urlBinder}amount=$milliSats&comment=$encodedMessage"
+
+      if (nostrRequest != null) {
+        val encodedNostrRequest = URLEncoder.encode(nostrRequest, "utf-8")
+        url += "&nostr=$encodedNostrRequest"
+      }
+
      val request: Request = Request.Builder().url(url).build()

      client.newCall(request).enqueue(object : Callback {
        override fun onResponse(call: Call, response: Response) {
          response.use {
-            onSucess(response.body.string())
+            onSuccess(response.body.string())
          }
        }

        override fun onFailure(call: Call, e: java.io.IOException) {
+          onError("Could not fetch an invoice from ${lnCallback}. Message ${e.message}")
          e.printStackTrace()
        }
      })
    }
  }

-  fun lnAddressToLnUrl(lnaddress: String, onSucess: (String) -> Unit) {
-    fetchLightningAddressJson(lnaddress) {
-      onSucess(Bech32.encodeBytes("lnurl",it.toByteArray(), Bech32.Encoding.Bech32))
-    }
+  fun lnAddressToLnUrl(lnaddress: String, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
+    fetchLightningAddressJson(lnaddress,
+      onSuccess = {
+        onSuccess(Bech32.encodeBytes("lnurl",it.toByteArray(), Bech32.Encoding.Bech32))
+      },
+      onError = onError
+    )
  }

-  fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, onSucess: (String) -> Unit) {
+  fun lnAddressInvoice(lnaddress: String, milliSats: Long, message: String, nostrRequest: String? = null, onSuccess: (String) -> Unit, onError: (String) -> Unit) {
    val mapper = jacksonObjectMapper()

-    fetchLightningAddressJson(lnaddress) {
-      mapper.readTree(it)?.get("callback")?.asText()?.let { callback ->
-        fetchLightningInvoice(callback, milliSats, message,
-          onSucess = {
-            mapper.readTree(it)?.get("pr")?.asText()?.let { pr ->
-              onSucess(pr)
-            }
-          }
-        )
-      }
-    }
+    fetchLightningAddressJson(lnaddress,
+      onSuccess = {
+        val lnurlp = try {
+          mapper.readTree(it)
+        } catch (t: Throwable) {
+          onError("Error Parsing JSON from Lightning Address. Check the user's lightning setup")
+          null
+        }
+        val callback = lnurlp?.get("callback")?.asText()
+
+        if (callback == null) {
+          onError("Callback URL not found in the User's lightning address server configuration")
+        }
+
+        val allowsNostr = lnurlp?.get("allowsNostr")?.asBoolean() ?: false
+
+        callback?.let { callback ->
+          fetchLightningInvoice(callback, milliSats, message, if (allowsNostr) nostrRequest else null,
+            onSuccess = {
+              val lnInvoice = try {
+                mapper.readTree(it)
+              } catch (t: Throwable) {
+                onError("Error Parsing JSON from Lightning Address's invoice fetch. Check the user's lightning setup")
+                null
+              }
+
+              lnInvoice?.get("pr")?.asText()?.let { pr ->
+                onSuccess(pr)
+              }
+            },
+            onError = onError
+          )
+        }
+      },
+      onError = onError
+    )
  }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -7,6 +7,7 @@ import com.vitorpamplona.amethyst.service.relays.Constants
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -119,6 +120,27 @@ class Account(
    }
  }

+  fun createZapRequestFor(note: Note): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    if (note.hasZapped(userProfile())) {
+      // has already liked this note
+      return null
+    }
+
+    note.event?.let {
+      return LnZapRequestEvent.create(it, userProfile().relays?.keys ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+    }
+
+    return null
+  }
+
+  fun createZapRequestFor(user: User): LnZapRequestEvent? {
+    if (!isWriteable()) return null
+
+    return LnZapRequestEvent.create(user.pubkeyHex, userProfile().relays?.keys ?: localRelays.map { it.url }.toSet(), loggedIn.privKey!!)
+  }
+
  fun report(note: Note, type: ReportEvent.ReportType) {
    if (!isWriteable()) return

@@ -402,12 +424,12 @@ class Account(
  fun isAcceptable(user: User): Boolean {
    return user !in hiddenUsers()  // if user hasn't hided this author
        && user.reportsBy( userProfile() ).isEmpty() // if user has not reported this post
-        && user.reportsBy( userProfile().follows ).size < 5
+        && user.reportAuthorsBy( userProfile().follows ).size < 5
  }

  fun isAcceptableDirect(note: Note): Boolean {
    return note.reportsBy( userProfile() ).isEmpty()  // if user has not reported this post
-        && note.reportsBy( userProfile().follows ).size < 5 // if it has 5 reports by reliable users
+        && note.reportAuthorsBy( userProfile().follows ).size < 5 // if it has 5 reports by reliable users
  }

  fun isAcceptable(note: Note): Boolean {
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt
@@ -34,9 +34,9 @@ class Channel(val id: ByteArray) {
        live.refresh()
    }

-    fun profilePicture(): String {
+    fun profilePicture(): String? {
        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${idHex}.png"
+        return info.picture
    }

    fun anyNameStartsWith(prefix: String): Boolean {
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -10,6 +10,8 @@ import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -405,6 +407,72 @@ object LocalCache {

  }

+  fun consume(event: LnZapEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.map { getOrCreateUser(it) }
+    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    val zapRequest = event.containedPost?.id?.toHexKey()?.let { getOrCreateNote(it) }
+    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)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(zapRequest, note)
+    }
+    mentions.forEach {
+      it.addZap(zapRequest, note)
+    }
+  }
+
+  fun consume(event: LnZapRequestEvent) {
+    val note = getOrCreateNote(event.id.toHexKey())
+
+    // Already processed this event.
+    if (note.event != null) return
+
+    val author = getOrCreateUser(event.pubKey.toHexKey())
+    val mentions = event.zappedAuthor.map { getOrCreateUser(it) }
+    val repliesTo = event.zappedPost.map { getOrCreateNote(it) }
+
+    note.loadEvent(event, author, mentions, repliesTo)
+
+    Log.d("ZP", "New Zap Request ${event.content} (${notes.size},${users.size}) ${note.author?.toBestDisplayName()} ${formattedDateTime(event.createdAt)}")
+
+    // Adds notifications to users.
+    mentions.forEach {
+      it.addTaggedPost(note)
+    }
+    repliesTo.forEach {
+      it.author?.addTaggedPost(note)
+    }
+
+    repliesTo.forEach {
+      it.addZap(note, null)
+    }
+    mentions.forEach {
+      it.addZap(note, null)
+    }
+  }
+
  fun findUsersStartingWith(username: String): List<User> {
    return users.values.filter {
           it.info.anyNameStartsWith(username)
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -1,7 +1,9 @@
 package com.vitorpamplona.amethyst.model

 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
@@ -16,6 +18,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import com.vitorpamplona.amethyst.service.relays.Relay
+import java.math.BigDecimal
 import java.util.Date
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.regex.Matcher
@@ -44,7 +47,9 @@ class Note(val idHex: String) {
        private set
    var boosts = setOf<Note>()
        private set
-    var reports = setOf<Note>()
+    var reports = mapOf<User, Set<Note>>()
+        private set
+    var zaps = mapOf<Note, Note?>()
        private set

    var relays = setOf<String>()
@@ -104,6 +109,16 @@ class Note(val idHex: String) {
        }
    }

+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        }
+    }
+
    fun addReaction(note: Note) {
        if (note !in reactions) {
            reactions = reactions + note
@@ -112,8 +127,13 @@ class Note(val idHex: String) {
    }

    fun addReport(note: Note) {
-        if (note !in reports) {
-            reports = reports + note
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveReports.invalidateData()
+        } else {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
            liveReports.invalidateData()
        }
    }
@@ -125,6 +145,11 @@ class Note(val idHex: String) {
        }
    }

+    fun isZappedBy(user: User): Boolean {
+        // Zaps who the requester was the user
+        return zaps.any { it.key.author == user }
+    }
+
    fun isReactedBy(user: User): Boolean {
        return reactions.any { it.author == user }
    }
@@ -133,18 +158,34 @@ class Note(val idHex: String) {
        return boosts.any { it.author == user }
    }

-    fun reportsBy(user: User): List<Note> {
-        return reports.filter { it.author == user }
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
    }

    fun reportsBy(users: Set<User>): List<Note> {
-        return reports.filter { it.author in users }
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
    }

    fun hasAnyReports(): Boolean {
        val dayAgo = Date().time / 1000 - 24*60*60
-        return author?.reports?.filter { it.event?.createdAt ?: 0 > dayAgo }?.isNotEmpty() ?: false
-            || reports.isNotEmpty()
+        return reports.isNotEmpty() ||
+          (author?.reports?.values?.filter {
+              it.firstOrNull { it.event?.createdAt ?: 0 > dayAgo } != null
+          }?.isNotEmpty() ?: false)
    }

    fun directlyCiteUsers(): Set<User> {
@@ -174,6 +215,10 @@ class Note(val idHex: String) {
        return event is RepostEvent || replyTo == null || replyTo?.size == 0
    }

+    fun hasZapped(loggedIn: User): Boolean {
+        return zaps.any { it.key.author == loggedIn }
+    }
+
    fun hasReacted(loggedIn: User, content: String): Boolean {
        return reactions.firstOrNull { it.author == loggedIn && it.event?.content == content } != null
    }
@@ -191,6 +236,7 @@ class Note(val idHex: String) {
    val liveReplies: NoteLiveData = NoteLiveData(this)
    val liveReports: NoteLiveData = NoteLiveData(this)
    val liveRelays: NoteLiveData = NoteLiveData(this)
+    val liveZaps: NoteLiveData = NoteLiveData(this)
 }

 class NoteLiveData(val note: Note): LiveData<NoteState>(NoteState(note)) {
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
@@ -1,13 +1,16 @@
 package com.vitorpamplona.amethyst.model

 import androidx.lifecycle.LiveData
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.NostrSingleUserDataSource
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import fr.acinq.secp256k1.Hex
+import java.math.BigDecimal
 import java.util.Collections
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
@@ -45,7 +48,10 @@ class User(val pubkeyHex: String) {
    var taggedPosts = setOf<Note>()
        private set

-    var reports = setOf<Note>()
+    var reports = mapOf<User, Set<Note>>()
+        private set
+
+    var zaps = mapOf<Note, Note?>()
        private set

    var relays: Map<String, ContactListEvent.ReadWrite>? = null
@@ -72,9 +78,9 @@ class User(val pubkeyHex: String) {
        return info.displayName?.ifBlank { null } ?: info.display_name?.ifBlank { null }
    }

-    fun profilePicture(): String {
+    fun profilePicture(): String? {
        if (info.picture.isNullOrBlank()) info.picture = null
-        return info.picture ?: "https://robohash.org/${pubkeyHex}.png"
+        return info.picture
    }

    fun follow(user: User, followedAt: Long) {
@@ -153,18 +159,47 @@ class User(val pubkeyHex: String) {
    }

    fun addReport(note: Note) {
-        if (note !in reports) {
-            reports = reports + note
+        val author = note.author ?: return
+
+        if (author !in reports.keys) {
+            reports = reports + Pair(author, setOf(note))
+            liveReports.invalidateData()
+        } else {
+            reports = reports + Pair(author, (reports[author] ?: emptySet()) + note)
            liveReports.invalidateData()
        }
    }

-    fun reportsBy(user: User): List<Note> {
-        return reports.filter { it.author == user }
+    fun addZap(zapRequest: Note, zap: Note?) {
+        if (zapRequest !in zaps.keys) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        } else if (zapRequest in zaps.keys && zaps[zapRequest] == null) {
+            zaps = zaps + Pair(zapRequest, zap)
+            liveZaps.invalidateData()
+        }
+    }
+
+    fun zappedAmount(): BigDecimal {
+        return zaps.mapNotNull { it.value?.event }
+            .filterIsInstance<LnZapEvent>()
+            .mapNotNull {
+                it.amount
+            }.sumOf { it }
+    }
+
+    fun reportsBy(user: User): Set<Note> {
+        return reports[user] ?: emptySet()
+    }
+
+    fun reportAuthorsBy(users: Set<User>): List<User> {
+        return reports.keys.filter { it in users }
    }

    fun reportsBy(users: Set<User>): List<Note> {
-        return reports.filter { it.author in users }
+        return reportAuthorsBy(users).mapNotNull {
+            reports[it]
+        }.flatten()
    }

    @Synchronized
@@ -247,10 +282,8 @@ class User(val pubkeyHex: String) {
    }

    fun hasReport(loggedIn: User, type: ReportEvent.ReportType): Boolean {
-        return reports.firstOrNull {
-            it.author == loggedIn
-              && it.event is ReportEvent
-              && (it.event as ReportEvent).reportType.contains(type)
+        return reports[loggedIn]?.firstOrNull() {
+              it.event is ReportEvent && (it.event as ReportEvent).reportType.contains(type)
        } != null
    }

@@ -300,6 +333,7 @@ class User(val pubkeyHex: String) {
    val liveRelays: UserLiveData = UserLiveData(this)
    val liveRelayInfo: UserLiveData = UserLiveData(this)
    val liveMetadata: UserLiveData = UserLiveData(this)
+    val liveZaps: UserLiveData = UserLiveData(this)
 }

 class UserMetadata {
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt
@@ -3,6 +3,9 @@ package com.vitorpamplona.amethyst.service
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
@@ -50,6 +53,9 @@ object NostrAccountDataSource: NostrDataSource<Note>("AccountData") {
  fun createNotificationFilter() = TypedFilter(
    types = FeedType.values().toSet(),
    filter = JsonFilter(
+      kinds = listOf(
+        TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind, ChannelMessageEvent.kind
+      ),
      tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
      limit = 200
    )
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt
@@ -8,6 +8,8 @@ import com.vitorpamplona.amethyst.service.model.ChannelHideMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMuteUserEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -68,6 +70,14 @@ abstract class NostrDataSource<T>(val debugName: String) {
              ReactionEvent.kind -> LocalCache.consume(ReactionEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
              ReportEvent.kind -> LocalCache.consume(ReportEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))

+              LnZapEvent.kind -> {
+                val zapEvent = LnZapEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig)
+
+                zapEvent.containedPost?.let { onEvent(it, subscriptionId, relay) }
+                LocalCache.consume(zapEvent)
+              }
+              LnZapRequestEvent.kind -> LocalCache.consume(LnZapRequestEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
+
              ChannelCreateEvent.kind -> LocalCache.consume(ChannelCreateEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
              ChannelMetadataEvent.kind -> LocalCache.consume(ChannelMetadataEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig))
              ChannelMessageEvent.kind -> LocalCache.consume(ChannelMessageEvent(event.id, event.pubKey, event.createdAt, event.tags, event.content, event.sig), relay)
@@ -115,8 +125,10 @@ abstract class NostrDataSource<T>(val debugName: String) {

  open fun stop() {
    subscriptions.values.forEach { channel ->
-      if (channel.typedFilters != null) // if it is active, close
+      if (channel.typedFilters != null) {// if it is active, close
        Client.close(channel.id)
+        channel.typedFilters = null
+      }
    }
  }

--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrNotificationDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrNotificationDataSource.kt
@@ -6,6 +6,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapRequestEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import nostr.postr.JsonFilter

@@ -19,6 +20,7 @@ object NostrNotificationDataSource: NostrDataSource<Note>("NotificationFeed") {
      .filter {
           it.event !is ChannelCreateEvent
        && it.event !is ChannelMetadataEvent
+        && it.event !is LnZapRequestEvent
      }
      .sortedBy { it.event?.createdAt }
      .reversed()
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
@@ -5,6 +5,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -34,7 +35,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
        types = FeedType.values().toSet(),
        filter = JsonFilter(
          kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, ReportEvent.kind, LnZapEvent.kind
          ),
          tags = mapOf("e" to listOf(it.idHex)),
          since = it.lastReactionsDownloadTime
@@ -68,7 +69,7 @@ object NostrSingleEventDataSource: NostrDataSource<Note>("SingleEventFeed") {
        types = FeedType.values().toSet(),
        filter = JsonFilter(
          kinds = listOf(
-            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind,
+            TextNoteEvent.kind, ReactionEvent.kind, RepostEvent.kind, LnZapEvent.kind,
            ChannelMessageEvent.kind, ChannelCreateEvent.kind, ChannelMetadataEvent.kind
          ),
          ids = interestedEvents.toList()
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
 import nostr.postr.JsonFilter
@@ -42,6 +43,17 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
    )
  }

+  fun createUserReceivedZapsFilter(): TypedFilter {
+    return TypedFilter(
+      types = FeedType.values().toSet(),
+      filter = JsonFilter(
+        kinds = listOf(LnZapEvent.kind),
+        tags = mapOf("e" to listOf(user!!.pubkeyHex)),
+        limit = 100
+      )
+    )
+  }
+
  fun createFollowFilter(): TypedFilter {
    return TypedFilter(
      types = FeedType.values().toSet(),
@@ -76,7 +88,8 @@ object NostrUserProfileDataSource: NostrDataSource<Note>("UserProfileFeed") {
      createUserInfoFilter(),
      createUserPostsFilter(),
      createFollowFilter(),
-      createFollowersFilter()
+      createFollowersFilter(),
+      createUserReceivedZapsFilter()
    ).ifEmpty { null }
  }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileZapsDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileZapsDataSource.kt
@@ -0,0 +1,25 @@
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import nostr.postr.JsonFilter
+import nostr.postr.events.ContactListEvent
+
+object NostrUserProfileZapsDataSource: NostrDataSource<Pair<Note,Note>>("UserProfileZapsFeed") {
+  lateinit var account: Account
+  var user: User? = null
+
+  fun loadUserProfile(userId: String) {
+    user = LocalCache.users[userId]
+    resetFilters()
+  }
+
+  override fun feed(): List<Pair<Note,Note>> {
+    return (user?.zaps?.filter { it.value != null }?.toList()?.sortedBy { (it.second?.event as? LnZapEvent)?.amount }?.reversed() ?: emptyList()) as List<Pair<Note, Note>>
+  }
+
+  override fun updateChannelFilters() {}
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
@@ -0,0 +1,50 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.math.BigDecimal
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class LnZapEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+  @Transient val containedPost: Event?
+  @Transient val lnInvoice: String?
+  @Transient val preimage: String?
+  @Transient val amount: BigDecimal?
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+
+    lnInvoice = tags.filter { it.firstOrNull() == "bolt11" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+    amount = lnInvoice?.let { LnInvoiceUtil.getAmountInSats(lnInvoice) }
+    preimage = tags.filter { it.firstOrNull() == "preimage" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    val description = tags.filter { it.firstOrNull() == "description" }.mapNotNull { it.getOrNull(1) }.firstOrNull()
+
+    containedPost = try {
+      if (description == null)
+        null
+      else
+        fromJson(description, Client.lenient)
+    } catch (e: Exception) {
+      null
+    }
+  }
+
+  companion object {
+    const val kind = 9735
+  }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
@@ -0,0 +1,89 @@
+package com.vitorpamplona.amethyst.service.model
+
+import com.vitorpamplona.amethyst.service.relays.Client
+import java.util.Date
+import nostr.postr.Utils
+import nostr.postr.events.ContactListEvent
+import nostr.postr.events.Event
+import nostr.postr.toHex
+
+class LnZapRequestEvent (
+  id: ByteArray,
+  pubKey: ByteArray,
+  createdAt: Long,
+  tags: List<List<String>>,
+  content: String,
+  sig: ByteArray
+): Event(id, pubKey, createdAt, kind, tags, content, sig) {
+
+  @Transient val zappedPost: List<String>
+  @Transient val zappedAuthor: List<String>
+
+  init {
+    zappedPost = tags.filter { it.firstOrNull() == "e" }.mapNotNull { it.getOrNull(1) }
+    zappedAuthor = tags.filter { it.firstOrNull() == "p" }.mapNotNull { it.getOrNull(1) }
+  }
+
+  companion object {
+    const val kind = 9734
+
+    fun create(originalNote: Event, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+      val content = ""
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf(
+        listOf("e", originalNote.id.toHex()),
+        listOf("p", originalNote.pubKey.toHex()),
+        listOf("relays") + relays
+      )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+
+    fun create(userHex: String, relays: Set<String>, privateKey: ByteArray, createdAt: Long = Date().time / 1000): LnZapRequestEvent {
+      val content = ""
+      val pubKey = Utils.pubkeyCreate(privateKey)
+      val tags = listOf(
+        listOf("p", userHex),
+        listOf("relays") + relays
+      )
+      val id = generateId(pubKey, createdAt, kind, tags, content)
+      val sig = Utils.sign(id, privateKey)
+      return LnZapRequestEvent(id, pubKey, createdAt, tags, content, sig)
+    }
+  }
+}
+
+/*
+{
+  "pubkey": "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245",
+  "content": "",
+  "id": "d9cc14d50fcb8c27539aacf776882942c1a11ea4472f8cdec1dea82fab66279d",
+  "created_at": 1674164539,
+  "sig": "77127f636577e9029276be060332ea565deaf89ff215a494ccff16ae3f757065e2bc59b2e8c113dd407917a010b3abd36c8d7ad84c0e3ab7dab3a0b0caa9835d",
+  "kind": 9734,
+  "tags": [
+  [
+    "e",
+    "3624762a1274dd9636e0c552b53086d70bc88c165bc4dc0f9e836a1eaf86c3b8"
+  ],
+  [
+    "p",
+    "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245"
+  ],
+  [
+    "relays",
+    "wss://relay.damus.io",
+    "wss://nostr-relay.wlvs.space",
+    "wss://nostr.fmt.wiz.biz",
+    "wss://relay.nostr.bg",
+    "wss://nostr.oxtr.dev",
+    "wss://nostr.v0l.io",
+    "wss://brb.io",
+    "wss://nostr.bitcoiner.social",
+    "ws://monad.jb55.com:8080",
+    "wss://relay.snort.social"
+  ]
+  ]
+}
+*/
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
@@ -175,8 +175,8 @@ class Relay(
                    }
                }
            } else {
-                // waits 10 seconds to reconnect after disconnected.
-                if (Date().time / 1000 > closingTime + 10) {
+                // waits 60 seconds to reconnect after disconnected.
+                if (Date().time / 1000 > closingTime + 60) {
                    // sends all filters after connection is successful.
                    requestAndWatch()
                }
@@ -186,8 +186,11 @@ class Relay(

    fun sendFilterOnlyIfDisconnected() {
        if (socket == null) {
-            //println("sendfilter Only if Disconnected ${url} ")
-            requestAndWatch()
+            // waits 60 seconds to reconnect after disconnected.
+            if (Date().time / 1000 > closingTime + 60) {
+                //println("sendfilter Only if Disconnected ${url} ")
+                requestAndWatch()
+            }
        }
    }

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
@@ -1,60 +1,75 @@
 package com.vitorpamplona.amethyst.ui.actions

-import android.graphics.Bitmap
+import android.content.ContentResolver
+import android.net.Uri
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.ByteArrayOutputStream
-import java.io.IOException
-import java.util.UUID
-import okhttp3.Call
-import okhttp3.Callback
+import okhttp3.*
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
+import okio.BufferedSink
+import okio.source
+import java.io.IOException
+import java.util.*

 object ImageUploader {
-  private fun encodeImage(bitmap: Bitmap): ByteArray {
-    val byteArrayOutPutStream = ByteArrayOutputStream()
-    bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutPutStream)
-    return byteArrayOutPutStream.toByteArray()
-  }
+  fun uploadImage(
+    uri: Uri,
+    contentResolver: ContentResolver,
+    onSuccess: (String) -> Unit,
+    onError: (Throwable) -> Unit,
+) {
+    val contentType = contentResolver.getType(uri)

-  fun uploadImage(bitmap: Bitmap, onSuccess: (String) -> Unit) {
    val client = OkHttpClient.Builder().build()

-    val body: RequestBody = MultipartBody.Builder()
+    val requestBody: RequestBody = MultipartBody.Builder()
      .setType(MultipartBody.FORM)
      .addFormDataPart(
        "image",
-        "${UUID.randomUUID()}.png",
-        encodeImage(bitmap).toRequestBody("image/png".toMediaType())
+        "${UUID.randomUUID()}",
+        object : RequestBody() {
+          override fun contentType(): MediaType? =
+            contentType?.toMediaType()
+
+          override fun writeTo(sink: BufferedSink) {
+            val imageInputStream = contentResolver.openInputStream(uri)
+            checkNotNull(imageInputStream) {
+              "Can't open the image input stream"
+            }
+
+            imageInputStream.source().use(sink::writeAll)
+          }
+        }
      )
      .build()

    val request: Request = Request.Builder()
      .url("https://api.imgur.com/3/image")
      .header("Authorization", "Client-ID e6aea87296f3f96")
-      .post(body)
+      .post(requestBody)
      .build()

    client.newCall(request).enqueue(object : Callback {
      override fun onResponse(call: Call, response: Response) {
-        response.use {
-          val body = response.body
-          if (body != null) {
+        try {
+          check(response.isSuccessful)
+          response.body.use { body ->
            val tree = jacksonObjectMapper().readTree(body.string())
            val url = tree?.get("data")?.get("link")?.asText()
-            if (url != null)
-              onSuccess(url)
+            checkNotNull(url) {
+              "There must be an uploaded image URL in the response"
+            }
+
+            onSuccess(url)
          }
+        } catch (e: Exception) {
+          e.printStackTrace()
+          onError(e)
        }
      }

      override fun onFailure(call: Call, e: IOException) {
        e.printStackTrace()
+        onError(e)
      }
    })
  }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
@@ -1,27 +1,13 @@
 package com.vitorpamplona.amethyst.ui.actions

+import android.widget.Toast
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.Button
-import androidx.compose.material.ButtonDefaults
-import androidx.compose.material.Icon
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -37,11 +23,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -49,12 +33,7 @@ import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.ui.components.UrlPreview
-import com.vitorpamplona.amethyst.ui.components.VideoView
-import com.vitorpamplona.amethyst.ui.components.imageExtension
-import com.vitorpamplona.amethyst.ui.components.isValidURL
-import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
-import com.vitorpamplona.amethyst.ui.components.videoExtension
+import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.navigation.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.note.ReplyInformation
 import com.vitorpamplona.amethyst.ui.screen.UserLine
@@ -78,19 +57,23 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
    LaunchedEffect(Unit) {
        delay(100)
        focusRequester.requestFocus()
+
+        postViewModel.imageUploadingError.collect { error ->
+            Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
+        }
    }

    Dialog(
        onDismissRequest = { onClose() },
        properties = DialogProperties(
            usePlatformDefaultWidth = false,
-            dismissOnClickOutside = false
+            dismissOnClickOutside = false,
+            decorFitsSystemWindows = false
        )
    ) {
        Surface(
            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight()
+                .fillMaxWidth().fillMaxHeight()
        ) {
            Column(
                modifier = Modifier.padding(10.dp)
@@ -106,7 +89,9 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                        onClose()
                    })

-                    UploadFromGallery {
+                    UploadFromGallery(
+                        isUploading = postViewModel.isUploadingImage,
+                    ) {
                        postViewModel.upload(it, context)
                    }

@@ -115,7 +100,8 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                            postViewModel.sendPost()
                            onClose()
                        },
-                        postViewModel.message.text.isNotBlank()
+                        isActive = postViewModel.message.text.isNotBlank()
+                                && !postViewModel.isUploadingImage
                    )
                }

@@ -145,7 +131,7 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
                            if (it.isFocused) {
                                keyboardController?.show()
                            }
-                        },
+                        }.imePadding(),
                    placeholder = {
                        Text(
                            text = "What's on your mind?",
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
@@ -1,24 +1,19 @@
 package com.vitorpamplona.amethyst.ui.actions

 import android.content.Context
-import android.graphics.ImageDecoder
 import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
-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.model.decodePublicKey
-import com.vitorpamplona.amethyst.model.toHexKey
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.*
 import com.vitorpamplona.amethyst.ui.components.isValidURL
 import com.vitorpamplona.amethyst.ui.components.noProtocolUrlValidator
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.launch
 import nostr.postr.toNpub

 class NewPostViewModel: ViewModel() {
@@ -30,6 +25,8 @@ class NewPostViewModel: ViewModel() {

    var message by mutableStateOf(TextFieldValue(""))
    var urlPreview by mutableStateOf<String?>(null)
+    var isUploadingImage by mutableStateOf(false)
+    val imageUploadingError = MutableSharedFlow<String?>()

    var userSuggestions by mutableStateOf<List<User>>(emptyList())
    var userSuggestionAnchor: TextRange? = null
@@ -104,26 +101,33 @@ class NewPostViewModel: ViewModel() {

        message = TextFieldValue("")
        urlPreview = null
+        isUploadingImage = false
    }

    fun upload(it: Uri, context: Context) {
-        val img = if (Build.VERSION.SDK_INT < 28) {
-            MediaStore.Images.Media.getBitmap(context.contentResolver, it)
-        } else {
-            ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, it))
-        }
+        isUploadingImage = true

-        img?.let {
-            ImageUploader.uploadImage(img) {
-                message = TextFieldValue(message.text + "\n\n" + it)
+        ImageUploader.uploadImage(
+            uri = it,
+            contentResolver = context.contentResolver,
+            onSuccess = { imageUrl ->
+                isUploadingImage = false
+                message = TextFieldValue(message.text + "\n\n" + imageUrl)
                urlPreview = findUrlInMessage()
+            },
+            onError = {
+                isUploadingImage = false
+                viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image")
+                }
            }
-        }
+        )
    }

    fun cancel() {
        message = TextFieldValue("")
        urlPreview = null
+        isUploadingImage = false
    }

    fun findUrlInMessage(): String? {
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/UploadFromGallery.kt
@@ -9,12 +9,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Button
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -24,7 +19,10 @@ import com.google.accompanist.permissions.rememberPermissionState

@OptIn(ExperimentalPermissionsApi::class)
@Composable
-fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
+fun UploadFromGallery(
+    isUploading: Boolean,
+    onImageChosen: (Uri) -> Unit,
+) {
    val cameraPermissionState =
        rememberPermissionState(
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -50,18 +48,30 @@ fun UploadFromGallery(onImageChosen: (Uri) -> Unit) {
                    modifier = Modifier
                        .align(Alignment.TopCenter)
                        .padding(4.dp),
+                    enabled = !isUploading,
                    onClick = {
                        showGallerySelect = true
                    }
                ) {
-                    Text("Upload Image")
+                    if (!isUploading) {
+                        Text("Upload Image")
+                    } else {
+                        Text("Uploading…")
+                    }
                }
            }
        }
    } else {
        Column {
-            Button(onClick = { cameraPermissionState.launchPermissionRequest() }) {
-                Text("Upload Image")
+            Button(
+                onClick = { cameraPermissionState.launchPermissionRequest() },
+                enabled = !isUploading,
+            ) {
+                if (!isUploading) {
+                    Text("Upload Image")
+                } else {
+                    Text("Uploading…")
+                }
            }
        }
    }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/InvoiceRequest.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.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -21,6 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 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
@@ -36,10 +38,12 @@ import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat.startActivity
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
+import kotlinx.coroutines.launch

@Composable
 fun InvoiceRequest(lud16: String, onClose: () -> Unit ) {
  val context = LocalContext.current
+  val scope = rememberCoroutineScope()

  Column(modifier = Modifier
    .fillMaxWidth()
@@ -124,13 +128,21 @@ fun InvoiceRequest(lud16: String, onClose: () -> Unit ) {
      Button(
        modifier = Modifier.fillMaxWidth().padding(vertical = 10.dp),
        onClick = {
-          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message) {
-            runCatching {
-              val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
-              startActivity(context, intent, null)
+          LightningAddressResolver().lnAddressInvoice(lud16, amount * 1000, message,
+            onSuccess = {
+              runCatching {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
+                startActivity(context, intent, null)
+              }
+              onClose()
+            },
+            onError = {
+              scope.launch {
+                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                onClose()
+              }
            }
-            onClose()
-          }
+          )
        },
        shape = RoundedCornerShape(15.dp),
        colors = ButtonDefaults.buttonColors(
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreviewCard.kt
@@ -36,7 +36,7 @@ fun UrlPreviewCard(
    Column {
      AsyncImage(
        model = previewInfo.image,
-        contentDescription = "Profile Image",
+        contentDescription = "Preview Card Image for ${url}",
        contentScale = ContentScale.FillWidth,
        modifier = Modifier.fillMaxWidth()
      )
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/VideoView.kt
@@ -13,8 +13,12 @@ import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.source.ProgressiveMediaSource
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
 import com.google.android.exoplayer2.ui.StyledPlayerView
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource
+import com.vitorpamplona.amethyst.VideoCache

@Composable
 fun VideoView(videoUri: String) {
@@ -28,17 +32,17 @@ fun VideoView(videoUri: String) {
  }

  DisposableEffect(exoPlayer) {
-    exoPlayer.setMediaItem(MediaItem.fromUri(videoUri))
+    exoPlayer.setMediaSource(
+      ProgressiveMediaSource.Factory(VideoCache.get(context.applicationContext)).createMediaSource(MediaItem.fromUri(videoUri))
+    )
    exoPlayer.prepare()
-
    onDispose {
      exoPlayer.release()
    }
  }

  AndroidView(
-    modifier = Modifier
-      .fillMaxWidth(),
+    modifier = Modifier.fillMaxWidth(),
    factory = {
      StyledPlayerView(context).apply {
        player = exoPlayer
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
@@ -46,6 +46,7 @@ import coil.Coil
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
 import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
@@ -82,7 +83,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
    val account = accountState?.account ?: return

    val accountUserState by account.userProfile().liveMetadata.observeAsState()
-    val accountUser = accountUserState?.user
+    val accountUser = accountUserState?.user ?: return

    val relayViewModel: RelayPoolViewModel = viewModel { RelayPoolViewModel() }
    val connectedRelaysLiveData by relayViewModel.connectedRelaysLiveData.observeAsState()
@@ -91,6 +92,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
    val coroutineScope = rememberCoroutineScope()

    val context = LocalContext.current
+    val ctx = LocalContext.current.applicationContext

    var wantsToEditRelays by remember {
        mutableStateOf(false)
@@ -196,8 +198,10 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                    modifier = Modifier
                ) {
                    AsyncImage(
-                        model = accountUser?.profilePicture() ?: "https://robohash.org/ohno.png",
-                        placeholder = rememberAsyncImagePainter("https://robohash.org/${accountUser?.pubkeyHex}.png"),
+                        model = accountUser.profilePicture(),
+                        placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                        error = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
                        contentDescription = "Profile Image",
                        modifier = Modifier
                            .width(34.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt
@@ -71,6 +71,8 @@ import com.google.zxing.qrcode.encoder.ByteMatrix

 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.PathFillType
+import androidx.compose.ui.platform.LocalContext
+import com.vitorpamplona.amethyst.RoboHashCache

@Composable
 fun DrawerContent(navController: NavHostController,
@@ -124,6 +126,8 @@ fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffol
    val accountUserFollowsState by baseAccountUser.liveFollows.observeAsState()
    val accountUserFollows = accountUserFollowsState?.user ?: return

+    val ctx = LocalContext.current.applicationContext
+
    Box {
        val banner = accountUser.info.banner
        if (banner != null && banner.isNotBlank()) {
@@ -150,7 +154,9 @@ fun ProfileContent(baseAccountUser: User, modifier: Modifier = Modifier, scaffol
            AsyncImage(
                model = accountUser.profilePicture(),
                contentDescription = "Profile Image",
-                placeholder = rememberAsyncImagePainter("https://robohash.org/${accountUser.pubkeyHex}.png"),
+                placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
+                error = rememberAsyncImagePainter(RoboHashCache.get(ctx, accountUser.pubkeyHex)),
                modifier = Modifier
                    .width(100.dp)
                    .height(100.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomCompose.kt
@@ -40,6 +40,7 @@ import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -85,7 +86,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr

            ChannelName(
                channelPicture = channel.profilePicture(),
-                channelPicturePlaceholder = null,
+                channelPicturePlaceholder = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
                channelTitle = {
                    Text(
                        "${channel.info.name}",
@@ -138,7 +139,7 @@ fun ChatroomCompose(baseNote: Note, accountViewModel: AccountViewModel, navContr

@Composable
 fun ChannelName(
-    channelPicture: String,
+    channelPicture: String?,
    channelPicturePlaceholder: Painter?,
    channelTitle: @Composable (Modifier) -> Unit,
    channelLastTime: Long?,
@@ -151,7 +152,9 @@ fun ChannelName(
            AsyncImage(
                model = channelPicture,
                placeholder = channelPicturePlaceholder,
-                contentDescription = "Profile Image",
+                fallback = channelPicturePlaceholder,
+                error = channelPicturePlaceholder,
+                contentDescription = "Channel Image",
                modifier = Modifier
                    .width(55.dp)
                    .height(55.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
@@ -53,6 +53,7 @@ import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
@@ -151,7 +152,7 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                        ) {

                            val authorState by note.author!!.liveMetadata.observeAsState()
-                            val author = authorState?.user
+                            val author = authorState?.user!!

                            if (innerQuote || author != accountUser && note.event is ChannelMessageEvent) {
                                Row(
@@ -160,8 +161,10 @@ fun ChatroomMessageCompose(baseNote: Note, routeForLastRead: String?, innerQuote
                                    modifier = Modifier.padding(top = 5.dp)
                                ) {
                                    AsyncImage(
-                                        model = author?.profilePicture(),
-                                        placeholder = rememberAsyncImagePainter("https://robohash.org/${author?.pubkeyHex}.png"),
+                                        model = author.profilePicture(),
+                                        placeholder = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        fallback = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
+                                        error = rememberAsyncImagePainter(RoboHashCache.get(context, author.pubkeyHex)),
                                        contentDescription = "Profile Image",
                                        modifier = Modifier
                                            .width(25.dp)
@@ -277,6 +280,7 @@ private fun RelayBadges(baseNote: Note) {
    val relaysToDisplay = if (expanded) noteRelays else noteRelays.take(3)

    val uri = LocalUriHandler.current
+    val ctx = LocalContext.current.applicationContext

    FlowRow(Modifier.padding(start = 10.dp)) {
        relaysToDisplay.forEach {
@@ -284,9 +288,9 @@ private fun RelayBadges(baseNote: Note) {
            Box(Modifier.size(15.dp).padding(1.dp)) {
                AsyncImage(
                    model = "https://${url}/favicon.ico",
-                    placeholder = rememberAsyncImagePainter("https://robohash.org/$url.png"),
-                    fallback = rememberAsyncImagePainter("https://robohash.org/$url.png"),
-                    error = rememberAsyncImagePainter("https://robohash.org/$url.png"),
+                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    error = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
                    contentDescription = "Relay Icon",
                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
                    modifier = Modifier
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.note

 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -57,11 +58,13 @@ import coil.compose.rememberAsyncImagePainter
 import com.google.accompanist.flowlayout.FlowRow
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.model.toNote
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -96,6 +99,9 @@ fun NoteCompose(

    val context = LocalContext.current.applicationContext

+    var moreActionsExpanded by remember { mutableStateOf(false) }
+
+
    if (note?.event == null) {
        BlankNote(modifier.combinedClickable(
            onClick = {  },
@@ -190,7 +196,9 @@ fun NoteCompose(
                                            .align(Alignment.BottomEnd)) {
                                        AsyncImage(
                                            model = channel.profilePicture(),
-                                            placeholder = null,
+                                            placeholder = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                                            fallback = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                                            error = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
                                            contentDescription = "Group Picture",
                                            modifier = Modifier
                                                .width(30.dp)
@@ -228,6 +236,20 @@ fun NoteCompose(
                                color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                                maxLines = 1
                            )
+
+                            IconButton(
+                                modifier = Modifier.then(Modifier.size(24.dp)),
+                                onClick = { moreActionsExpanded = true }
+                            ) {
+                                Icon(
+                                    imageVector = Icons.Default.MoreVert,
+                                    null,
+                                    modifier = Modifier.size(15.dp),
+                                    tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                                )
+
+                                NoteDropDownMenu(baseNote, moreActionsExpanded, { moreActionsExpanded = false }, accountViewModel)
+                            }
                        } else {
                            Text(
                                "  boosted",
@@ -306,30 +328,37 @@ private fun RelayBadges(baseNote: Note) {
    val relaysToDisplay = if (expanded) noteRelays else noteRelays.take(3)

    val uri = LocalUriHandler.current
+    val ctx = LocalContext.current.applicationContext

    FlowRow(Modifier.padding(top = 10.dp, start = 5.dp, end = 4.dp)) {
        relaysToDisplay.forEach {
            val url = it.removePrefix("wss://")
-            Box(Modifier.size(15.dp).padding(1.dp)) {
+            Box(
+                Modifier
+                    .size(15.dp)
+                    .padding(1.dp)) {
                AsyncImage(
                    model = "https://${url}/favicon.ico",
-                    placeholder = rememberAsyncImagePainter("https://robohash.org/$url.png"),
-                    fallback = rememberAsyncImagePainter("https://robohash.org/$url.png"),
-                    error = rememberAsyncImagePainter("https://robohash.org/$url.png"),
+                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
+                    error = rememberAsyncImagePainter(RoboHashCache.get(ctx, url)),
                    contentDescription = "Relay Icon",
                    colorFilter = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(0f) }),
                    modifier = Modifier
                        .fillMaxSize(1f)
                        .clip(shape = CircleShape)
                        .background(MaterialTheme.colors.background)
-                        .clickable(onClick = { uri.openUri("https://" + url) } )
+                        .clickable(onClick = { uri.openUri("https://" + url) })
                )
            }
        }
    }

    if (noteRelays.size > 3 && !expanded) {
-        Row(Modifier.fillMaxWidth().height(25.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.Top) {
+        Row(
+            Modifier
+                .fillMaxWidth()
+                .height(25.dp), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.Top) {
            IconButton(
                modifier = Modifier.then(Modifier.size(24.dp)),
                onClick = { expanded = true }
@@ -373,15 +402,16 @@ fun NoteAuthorPicture(

    val author = note.author

+    val ctx = LocalContext.current.applicationContext
+
    Box(
        Modifier
            .width(size)
            .height(size)) {
        if (author == null) {
-            AsyncImage(
-                model = "https://robohash.org/ohno.png",
+            Image(
+                painter = rememberAsyncImagePainter(RoboHashCache.get(ctx, "ohnothisauthorisnotfound")),
                contentDescription = "Unknown Author",
-                placeholder = rememberAsyncImagePainter("https://robohash.org/ohno.png"),
                modifier = pictureModifier
                    .fillMaxSize(1f)
                    .clip(shape = CircleShape)
@@ -417,6 +447,8 @@ fun UserPicture(
    val userState by baseUser.liveMetadata.observeAsState()
    val user = userState?.user ?: return

+    val ctx = LocalContext.current.applicationContext
+
    Box(
        Modifier
            .width(size)
@@ -425,9 +457,9 @@ fun UserPicture(
        AsyncImage(
            model = user.profilePicture(),
            contentDescription = "Profile Image",
-            placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
-            fallback = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
-            error = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
+            placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+            error = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
            modifier = pictureModifier
                .fillMaxSize(1f)
                .clip(shape = CircleShape)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
@@ -1,32 +1,32 @@
 package com.vitorpamplona.amethyst.ui.note

+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.BarChart
-import androidx.compose.material.icons.outlined.Visibility
+import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
@@ -34,15 +34,19 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
 import coil.compose.AsyncImage
-import coil.imageLoader
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import java.math.BigDecimal
+import java.math.RoundingMode
+import kotlinx.coroutines.launch

@Composable
 fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
@@ -55,13 +59,16 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
  val boostsState by baseNote.liveBoosts.observeAsState()
  val boostedNote = boostsState?.note

+  val zapsState by baseNote.liveZaps.observeAsState()
+  val zappedNote = zapsState?.note
+
  val repliesState by baseNote.liveReplies.observeAsState()
  val replies = repliesState?.note?.replies ?: emptySet()

  val grayTint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
-
-  var popupExpanded by remember { mutableStateOf(false) }
  val uri = LocalUriHandler.current
+  val context = LocalContext.current
+  val scope = rememberCoroutineScope()

  var wantsToReplyTo by remember {
    mutableStateOf<Note?>(null)
@@ -78,8 +85,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
    horizontalArrangement = Arrangement.SpaceBetween
  ) {
    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) wantsToReplyTo = baseNote }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          wantsToReplyTo = baseNote
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to reply",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
    ) {
      Icon(
        painter = painterResource(R.drawable.ic_comment),
@@ -97,8 +115,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
    )

    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) accountViewModel.boost(baseNote) }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          accountViewModel.boost(baseNote)
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to boost posts",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
    ) {
      if (boostedNote?.isBoostedBy(account.userProfile()) == true) {
        Icon(
@@ -125,8 +154,19 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
    )

    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { if (account.isWriteable()) accountViewModel.reactTo(baseNote) }
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable())
+          accountViewModel.reactTo(baseNote)
+        else
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to like Posts",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+      }
    ) {
      if (reactedNote?.isReactedBy(account.userProfile()) == true) {
        Icon(
@@ -152,9 +192,53 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
      modifier = Modifier.weight(1f)
    )

+    IconButton(
+      modifier = Modifier.then(Modifier.size(20.dp)),
+      onClick = {
+        if (account.isWriteable()) {
+          accountViewModel.zap(baseNote, 1000 * 1000, "", context) {
+            scope.launch {
+              Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+            }
+          }
+        } else {
+          scope.launch {
+            Toast.makeText(
+              context,
+              "Login with a Private key to be able to send Zaps",
+              Toast.LENGTH_SHORT
+            ).show()
+          }
+        }
+      }
+    ) {
+      if (zappedNote?.isZappedBy(account.userProfile()) == true) {
+        Icon(
+          imageVector = Icons.Default.Bolt,
+          contentDescription = "Zaps",
+          modifier = Modifier.size(20.dp),
+          tint = BitcoinOrange
+        )
+      } else {
+        Icon(
+          imageVector = Icons.Outlined.Bolt,
+          contentDescription = "Zaps",
+          modifier = Modifier.size(20.dp),
+          tint = grayTint
+        )
+      }
+    }
+
+    Text(
+      showAmount(zappedNote?.zappedAmount()),
+      fontSize = 14.sp,
+      color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+      modifier = Modifier.weight(1f)
+    )
+

    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
+      modifier = Modifier.then(Modifier.size(20.dp)),
      onClick = { uri.openUri("https://counter.amethyst.social/${baseNote.idHex}/") }
    ) {
      Icon(
@@ -178,25 +262,33 @@ fun ReactionsRow(baseNote: Note, accountViewModel: AccountViewModel) {
        colorFilter = ColorFilter.tint(grayTint)
      )
    }
-
-
-    IconButton(
-      modifier = Modifier.then(Modifier.size(24.dp)),
-      onClick = { popupExpanded = true }
-    ) {
-      Icon(
-        imageVector = Icons.Default.MoreVert,
-        null,
-        modifier = Modifier.size(15.dp),
-        tint = grayTint,
-      )
-    }
  }
-
-  NoteDropDownMenu(baseNote, popupExpanded, { popupExpanded = false }, accountViewModel)
 }

-fun showCount(size: Int?): String {
-  if (size == null) return " "
-  return if (size == 0) return " " else "$size"
+fun showCount(count: Int?): String {
+  if (count == null) return " "
+  if (count == 0) return " "
+
+  return when {
+    count >= 1000000000 -> "${Math.round(count / 1000000000f)}G"
+    count >= 1000000 -> "${Math.round(count / 1000000f)}M"
+    count >= 1000 -> "${Math.round(count / 1000f)}k"
+    else -> "$count"
+  }
+}
+
+val OneGiga = BigDecimal(1000000000)
+val OneMega = BigDecimal(1000000)
+val OneKilo = BigDecimal(1000)
+
+fun showAmount(amount: BigDecimal?): String {
+  if (amount == null) return " "
+  if (amount.abs() < BigDecimal(0.01)) return " "
+
+  return when {
+    amount >= OneGiga -> "%.1fG".format(amount.div(OneGiga).setScale(1, RoundingMode.HALF_UP))
+    amount >= OneMega -> "%.1fM".format(amount.div(OneMega).setScale(1, RoundingMode.HALF_UP))
+    amount >= OneKilo -> "%.1fk".format(amount.div(OneKilo).setScale(1, RoundingMode.HALF_UP))
+    else -> "%.0f".format(amount)
+  }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserCompose.kt
@@ -49,7 +49,8 @@ fun UserCompose(baseUser: User, accountViewModel: AccountViewModel, navControlle
                .padding(
                    start = 12.dp,
                    end = 12.dp,
-                    top = 10.dp)
+                    top = 10.dp),
+            verticalAlignment = Alignment.CenterVertically
        ) {

            UserPicture(baseUser, navController, account.userProfile(), 55.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapNoteCompose.kt
@@ -0,0 +1,123 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.lnurl.LnInvoiceUtil
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
+import com.vitorpamplona.amethyst.ui.screen.FollowButton
+import com.vitorpamplona.amethyst.ui.screen.ShowUserButton
+import com.vitorpamplona.amethyst.ui.screen.UnfollowButton
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+
+@Composable
+fun ZapNoteCompose(baseNote: Pair<Note, Note>, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val userState by account.userProfile().liveFollows.observeAsState()
+    val userFollows = userState?.user ?: return
+
+    val noteState by baseNote.second.live.observeAsState()
+    val noteZap = noteState?.note ?: return
+
+    val baseNoteRequest by baseNote.first.live.observeAsState()
+    val noteZapRequest = baseNoteRequest?.note ?: return
+
+    val baseAuthor = noteZapRequest.author
+
+    val ctx = LocalContext.current.applicationContext
+
+    if (baseAuthor == null) {
+        BlankNote()
+    } else {
+        Column(modifier =
+            Modifier.clickable(
+                onClick = { navController.navigate("User/${baseAuthor.pubkeyHex}") }
+            ),
+            verticalArrangement = Arrangement.Center
+        ) {
+            Row(
+                modifier = Modifier
+                    .padding(
+                        start = 12.dp,
+                        end = 12.dp,
+                        top = 10.dp
+                    ),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+
+                UserPicture(baseAuthor, navController, account.userProfile(), 55.dp)
+
+                Column(modifier = Modifier.padding(start = 10.dp).weight(1f)) {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        UsernameDisplay(baseAuthor)
+                    }
+
+                    val userState by baseAuthor.liveMetadata.observeAsState()
+                    val user = userState?.user ?: return
+
+                    Text(
+                        user.info.about ?: "",
+                        color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                }
+
+                val amount =
+                    (noteZap.event as? LnZapEvent)?.amount
+
+                Column(
+                    modifier = Modifier.padding(start = 10.dp),
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Text(
+                        showAmount(amount) + " sats",
+                        color = BitcoinOrange,
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.W500,
+                    )
+                }
+
+                Column(modifier = Modifier.padding(start = 10.dp)) {
+                    if (account.isHidden(baseAuthor)) {
+                        ShowUserButton {
+                            account.showUser(baseAuthor.pubkeyHex)
+                            LocalPreferences(ctx).saveToEncryptedStorage(account)
+                        }
+                    } else if (userFollows.isFollowing(baseAuthor)) {
+                        UnfollowButton { account.unfollow(baseAuthor) }
+                    } else {
+                        FollowButton { account.follow(baseAuthor) }
+                    }
+                }
+            }
+
+            Divider(
+                modifier = Modifier.padding(top = 10.dp),
+                thickness = 0.25.dp
+            )
+        }
+    }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapSetCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapSetCompose.kt
@@ -0,0 +1,91 @@
+package com.vitorpamplona.amethyst.ui.note
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.google.accompanist.flowlayout.FlowRow
+import com.vitorpamplona.amethyst.NotificationCache
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
+import com.vitorpamplona.amethyst.ui.screen.ZapSetCard
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+
+@Composable
+fun ZapSetCompose(zapSetCard: ZapSetCard, modifier: Modifier = Modifier, isInnerNote: Boolean = false, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
+    val noteState by zapSetCard.note.live.observeAsState()
+    val note = noteState?.note
+
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    val context = LocalContext.current.applicationContext
+
+    if (note == null) {
+        BlankNote(Modifier, isInnerNote)
+    } else {
+        val isNew = zapSetCard.createdAt > NotificationCache.load(routeForLastRead, context)
+        NotificationCache.markAsRead(routeForLastRead, zapSetCard.createdAt, context)
+
+        Column(
+            modifier = Modifier.background(
+                if (isNew) MaterialTheme.colors.primary.copy(0.12f) else MaterialTheme.colors.background
+            )
+        ) {
+            Row(modifier = Modifier
+                .padding(
+                    start = if (!isInnerNote) 12.dp else 0.dp,
+                    end = if (!isInnerNote) 12.dp else 0.dp,
+                    top = 10.dp)
+            ) {
+
+                // Draws the like picture outside the boosted card.
+                if (!isInnerNote) {
+                    Box(modifier = Modifier
+                        .width(55.dp)
+                        .padding(0.dp)) {
+                        Icon(
+                            imageVector = Icons.Default.Bolt,
+                            contentDescription = "Zaps",
+                            tint = BitcoinOrange,
+                            modifier = Modifier.size(25.dp).align(Alignment.TopEnd)
+                        )
+                    }
+                }
+
+                Column(modifier = Modifier.padding(start = if (!isInnerNote) 10.dp else 0.dp)) {
+                    FlowRow() {
+                        zapSetCard.zapEvents.forEach {
+                            NoteAuthorPicture(
+                                note = it,
+                                navController = navController,
+                                userAccount = account.userProfile(),
+                                size = 35.dp
+                            )
+                        }
+                    }
+
+                    NoteCompose(note, null, Modifier.padding(top = 5.dp), true, accountViewModel, navController)
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/qrcode/ShowQRDialog.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -34,6 +35,7 @@ import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.actions.CloseButton
 import com.vitorpamplona.amethyst.ui.qrcode.QrCodeScanner
@@ -43,6 +45,8 @@ import nostr.postr.toNpub
 fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
  var presenting by remember { mutableStateOf(true) }

+  val ctx = LocalContext.current.applicationContext
+
  Dialog(
    onDismissRequest = onClose,
    properties = DialogProperties(usePlatformDefaultWidth = false)
@@ -76,9 +80,11 @@ fun ShowQRDialog(user: User, onScan: (String) -> Unit, onClose: () -> Unit) {
            Column(modifier = Modifier.fillMaxWidth()) {
              Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
                AsyncImage(
-                  model = user.profilePicture() ?: "https://robohash.org/ohno.png",
+                  model = user.profilePicture(),
+                  placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
+                  error = rememberAsyncImagePainter(RoboHashCache.get(ctx, user.pubkeyHex)),
                  contentDescription = "Profile Image",
-                  placeholder = rememberAsyncImagePainter("https://robohash.org/${user.pubkeyHex}.png"),
                  modifier = Modifier
                    .width(100.dp)
                    .height(100.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedState.kt
@@ -24,6 +24,14 @@ class LikeSetCard(val note: Note, val likeEvents: List<Note>): Card() {
    override fun id() = note.idHex + "L" + createdAt
 }

+class ZapSetCard(val note: Note, val zapEvents: List<Note>): Card() {
+    val createdAt = zapEvents.maxOf { it.event?.createdAt ?: 0 }
+    override fun createdAt(): Long {
+        return createdAt
+    }
+    override fun id() = note.idHex + "Z" + createdAt
+}
+
 class BoostSetCard(val note: Note, val boostEvents: List<Note>): Card() {
    val createdAt = boostEvents.maxOf { it.event?.createdAt ?: 0 }

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
@@ -23,6 +23,7 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 import com.vitorpamplona.amethyst.ui.note.BoostSetCompose
 import com.vitorpamplona.amethyst.ui.note.LikeSetCompose
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.ZapSetCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
@@ -100,6 +101,13 @@ private fun FeedLoaded(
                    navController = navController,
                    routeForLastRead = routeForLastRead
                )
+                is ZapSetCard -> ZapSetCompose(
+                    item,
+                    isInnerNote = false,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    routeForLastRead = routeForLastRead
+                )
                is LikeSetCard -> LikeSetCompose(
                    item,
                    isInnerNote = false,
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt
@@ -11,6 +11,7 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.NostrDataSource
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
+import com.vitorpamplona.amethyst.service.model.LnZapEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
 import java.util.concurrent.atomic.AtomicBoolean
@@ -68,6 +69,21 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {

        val reactionCards = reactionsPerEvent.map { LikeSetCard(it.key, it.value) }

+        val zapsPerEvent = mutableMapOf<Note, MutableList<Note>>()
+        notes
+            .filter { it.event is LnZapEvent}
+            .forEach { zapEvent ->
+                val zappedPost = zapEvent.replyTo?.lastOrNull() { it.event !is ChannelMetadataEvent && it.event !is ChannelCreateEvent }
+                if (zappedPost != null) {
+                    val key = zappedPost.zaps.filter { it.value == zapEvent }.keys.firstOrNull()
+                    if (key != null) {
+                        zapsPerEvent.getOrPut(zappedPost, { mutableListOf() }).add(key)
+                    }
+                }
+            }
+
+        val zapCards = zapsPerEvent.map { ZapSetCard(it.key, it.value) }
+
        val boostsPerEvent = mutableMapOf<Note, MutableList<Note>>()
        notes
            .filter { it.event is RepostEvent }
@@ -79,9 +95,9 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {

        val boostCards = boostsPerEvent.map { BoostSetCard(it.key, it.value) }

-        val textNoteCards = notes.filter { it.event !is ReactionEvent && it.event !is RepostEvent }.map { NoteCard(it) }
+        val textNoteCards = notes.filter { it.event !is ReactionEvent && it.event !is RepostEvent  && it.event !is LnZapEvent }.map { NoteCard(it) }

-        return (reactionCards + boostCards + textNoteCards).sortedBy { it.createdAt() }.reversed()
+        return (reactionCards + boostCards + zapCards + textNoteCards).sortedBy { it.createdAt() }.reversed()
    }

    private fun updateFeed(notes: List<Card>) {
@@ -125,9 +141,6 @@ class CardFeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {

    override fun onCleared() {
        LocalCache.live.removeObserver(cacheListener)
-
-        dataSource.stop()
-        viewModelScope.cancel()
        super.onCleared()
    }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
@@ -77,7 +77,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
                            navController
                        )
                    }
-                    FeedState.Loading -> {
+                    is FeedState.Loading -> {
                        LoadingFeed()
                    }
                }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
@@ -1,8 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen

-import android.util.Log
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
@@ -16,19 +14,16 @@ import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrHomeDataSource
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
-import com.vitorpamplona.amethyst.service.model.RepostEvent
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import nostr.postr.events.TextNoteEvent
-import java.util.concurrent.atomic.AtomicBoolean

 class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
 class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
@@ -138,9 +133,6 @@ abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel()

    override fun onCleared() {
        LocalCache.live.removeObserver(cacheListener)
-
-        dataSource.stop()
-        viewModelScope.cancel()
        super.onCleared()
    }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedState.kt
@@ -0,0 +1,11 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.runtime.MutableState
+import com.vitorpamplona.amethyst.model.Note
+
+sealed class LnZapFeedState {
+    object Loading : LnZapFeedState()
+    class Loaded(val feed: MutableState<List<Pair<Note, Note>>>): LnZapFeedState()
+    object Empty : LnZapFeedState()
+    class FeedError(val errorMessage: String) : LnZapFeedState()
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedView.kt
@@ -0,0 +1,91 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.google.accompanist.swiperefresh.SwipeRefresh
+import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.vitorpamplona.amethyst.ui.note.UserCompose
+import com.vitorpamplona.amethyst.ui.note.ZapNoteCompose
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+
+@Composable
+fun LnZapFeedView(viewModel: LnZapFeedViewModel, accountViewModel: AccountViewModel, navController: NavController) {
+    val feedState by viewModel.feedContent.collectAsState()
+
+    var isRefreshing by remember { mutableStateOf(false) }
+    val swipeRefreshState = rememberSwipeRefreshState(isRefreshing)
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            viewModel.refresh()
+            isRefreshing = false
+        }
+    }
+
+    SwipeRefresh(
+        state = swipeRefreshState,
+        onRefresh = {
+            isRefreshing = true
+        },
+    ) {
+        Column() {
+            Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
+                when (state) {
+                    is LnZapFeedState.Empty -> {
+                        FeedEmpty {
+                            isRefreshing = true
+                        }
+                    }
+                    is LnZapFeedState.FeedError -> {
+                        FeedError(state.errorMessage) {
+                            isRefreshing = true
+                        }
+                    }
+                    is LnZapFeedState.Loaded -> {
+                        LnZapFeedLoaded(state, accountViewModel, navController)
+                    }
+                    is LnZapFeedState.Loading -> {
+                        LoadingFeed()
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LnZapFeedLoaded(
+    state: LnZapFeedState.Loaded,
+    accountViewModel: AccountViewModel,
+    navController: NavController
+) {
+    val listState = rememberLazyListState()
+
+    LazyColumn(
+        contentPadding = PaddingValues(
+            top = 10.dp,
+            bottom = 10.dp
+        ),
+        state = listState
+    ) {
+        itemsIndexed(state.feed.value, key = { _, item -> item.second.idHex }) { index, item ->
+            ZapNoteCompose(item, accountViewModel = accountViewModel, navController = navController)
+        }
+    }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/LnZapFeedViewModel.kt
@@ -0,0 +1,92 @@
+package com.vitorpamplona.amethyst.ui.screen
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.LocalCacheState
+import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileZapsDataSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.concurrent.atomic.AtomicBoolean
+
+class NostrUserProfileZapsFeedViewModel: LnZapFeedViewModel(NostrUserProfileZapsDataSource)
+
+open class LnZapFeedViewModel(val dataSource: NostrDataSource<Pair<Note, Note>>): ViewModel() {
+    private val _feedContent = MutableStateFlow<LnZapFeedState>(LnZapFeedState.Loading)
+    val feedContent = _feedContent.asStateFlow()
+
+    fun refresh() {
+        val scope = CoroutineScope(Job() + Dispatchers.Default)
+        scope.launch {
+            refreshSuspended()
+        }
+    }
+
+
+    private fun refreshSuspended() {
+        val notes = dataSource.loadTop()
+
+        val oldNotesState = feedContent.value
+        if (oldNotesState is LnZapFeedState.Loaded) {
+            if (notes != oldNotesState.feed) {
+                updateFeed(notes)
+            }
+        } else {
+            updateFeed(notes)
+        }
+    }
+
+    private fun updateFeed(notes: List<Pair<Note,Note>>) {
+        val scope = CoroutineScope(Job() + Dispatchers.Main)
+        scope.launch {
+            val currentState = feedContent.value
+            if (notes.isEmpty()) {
+                _feedContent.update { LnZapFeedState.Empty }
+            } else if (currentState is LnZapFeedState.Loaded) {
+                // updates the current list
+                currentState.feed.value = notes
+            } else {
+                _feedContent.update { LnZapFeedState.Loaded(mutableStateOf(notes)) }
+            }
+        }
+    }
+
+    var handlerWaiting = AtomicBoolean()
+
+    @Synchronized
+    private fun invalidateData() {
+        if (handlerWaiting.getAndSet(true)) return
+
+        handlerWaiting.set(true)
+        val scope = CoroutineScope(Job() + Dispatchers.Default)
+        scope.launch {
+            delay(100)
+            refresh()
+            handlerWaiting.set(false)
+        }
+    }
+
+    private val cacheListener: (LocalCacheState) -> Unit = {
+        invalidateData()
+    }
+
+    init {
+        LocalCache.live.observeForever(cacheListener)
+    }
+
+    override fun onCleared() {
+        LocalCache.live.removeObserver(cacheListener)
+        super.onCleared()
+    }
+}
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedState.kt
@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.screen

 import androidx.compose.runtime.MutableState
+import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User

 sealed class UserFeedState {
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt
@@ -59,7 +59,7 @@ fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewMode
                    is UserFeedState.Loaded -> {
                        FeedLoaded(state, accountViewModel, navController)
                    }
-                    UserFeedState.Loading -> {
+                    is UserFeedState.Loading -> {
                        LoadingFeed()
                    }
                }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
@@ -102,9 +102,6 @@ open class UserFeedViewModel(val dataSource: NostrDataSource<User>): ViewModel()

    override fun onCleared() {
        LocalCache.live.removeObserver(cacheListener)
-
-        dataSource.stop()
-        viewModelScope.cancel()
        super.onCleared()
    }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
@@ -1,10 +1,14 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn

 import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
 import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.AccountState
 import com.vitorpamplona.amethyst.model.Note
@@ -20,6 +24,27 @@ class AccountViewModel(private val account: Account): ViewModel() {
    account.reactTo(note)
  }

+  fun zap(note: Note, amount: Long, message: String, context: Context, onError: (String) -> Unit) {
+    val lud16 = note.author?.info?.lud16
+
+    if (lud16.isNullOrBlank()) {
+      onError("User does not have a lightning address setup to receive sats")
+      return
+    }
+
+    val zapRequest = account.createZapRequestFor(note)
+
+    LightningAddressResolver().lnAddressInvoice(lud16, amount, message, zapRequest?.toJson(),
+      onSuccess = {
+        runCatching {
+          val intent = Intent(Intent.ACTION_VIEW, Uri.parse("lightning:$it"))
+          ContextCompat.startActivity(context, intent, null)
+        }
+      },
+      onError = onError
+    )
+  }
+
  fun report(note: Note, type: ReportEvent.ReportType) {
    account.report(note, type)
  }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
@@ -55,6 +55,7 @@ import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.LocalPreferences
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.Note
@@ -147,15 +148,19 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
@Composable
 fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel: AccountStateViewModel, navController: NavController) {
    val channelState by baseChannel.live.observeAsState()
-    val channel = channelState?.channel
+    val channel = channelState?.channel ?: return
+
+    val context = LocalContext.current.applicationContext

    Column() {
        Column(modifier = Modifier.padding(12.dp)) {
            Row(verticalAlignment = Alignment.CenterVertically) {

                AsyncImage(
-                    model = channel?.profilePicture(),
-                    placeholder = null,
+                    model = channel.profilePicture(),
+                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                    fallback = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
+                    error = rememberAsyncImagePainter(RoboHashCache.get(context, channel.idHex)),
                    contentDescription = "Profile Image",
                    modifier = Modifier
                        .width(35.dp)
@@ -168,14 +173,14 @@ fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel:
                    .weight(1f)) {
                    Row(verticalAlignment = Alignment.CenterVertically) {
                        Text(
-                            "${channel?.info?.name}",
+                            "${channel.info.name}",
                            fontWeight = FontWeight.Bold,
                        )
                    }

                    Row(verticalAlignment = Alignment.CenterVertically) {
                        Text(
-                            "${channel?.info?.about}",
+                            "${channel.info.about}",
                            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f),
                            maxLines = 2,
                            overflow = TextOverflow.Ellipsis,
@@ -185,19 +190,18 @@ fun ChannelHeader(baseChannel: Channel, account: Account, accountStateViewModel:
                }

                Row(modifier = Modifier.height(35.dp).padding(bottom = 3.dp)) {
-                    channel?.let { NoteCopyButton(it) }
+                    NoteCopyButton(channel)

-                    channel?.let {
-                        if (channel.creator == account.userProfile()) {
-                            EditButton(account, it)
-                        }
-
-                        if (account.followingChannels.contains(channel.idHex)) {
-                            LeaveButton(account, channel, navController)
-                        } else {
-                            JoinButton(account, channel, navController)
-                        }
+                    if (channel.creator == account.userProfile()) {
+                        EditButton(account, channel)
                    }
+
+                    if (account.followingChannels.contains(channel.idHex)) {
+                        LeaveButton(account, channel, navController)
+                    } else {
+                        JoinButton(account, channel, navController)
+                    }
+
                }
            }
        }
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
@@ -24,10 +24,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.TextFieldValue
@@ -38,6 +40,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import coil.compose.rememberAsyncImagePainter
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
 import com.vitorpamplona.amethyst.ui.actions.PostButton
@@ -124,6 +127,8 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr

@Composable
 fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val ctx = LocalContext.current.applicationContext
+
    Column(modifier = Modifier.clickable(
            onClick = { navController.navigate("User/${baseUser.pubkeyHex}") }
        )
@@ -132,11 +137,13 @@ fun ChatroomHeader(baseUser: User, accountViewModel: AccountViewModel, navContro
            Row(verticalAlignment = Alignment.CenterVertically) {

                val authorState by baseUser.liveMetadata.observeAsState()
-                val author = authorState?.user
+                val author = authorState?.user!!

                AsyncImage(
-                    model = author?.profilePicture(),
-                    placeholder = rememberAsyncImagePainter("https://robohash.org/${author?.pubkeyHex}.png"),
+                    model = author.profilePicture(),
+                    placeholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, author.pubkeyHex)),
+                    fallback = rememberAsyncImagePainter(RoboHashCache.get(ctx, author.pubkeyHex)),
+                    error = rememberAsyncImagePainter(RoboHashCache.get(ctx, author.pubkeyHex)),
                    contentDescription = "Profile Image",
                    modifier = Modifier
                        .width(35.dp)
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
@@ -40,6 +41,8 @@ import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
@@ -52,13 +55,16 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.lnurl.LightningAddressResolver
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
 import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileZapsDataSource
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.ui.actions.NewUserMetadataView
 import com.vitorpamplona.amethyst.ui.components.InvoiceRequest
 import com.vitorpamplona.amethyst.ui.note.UserPicture
+import com.vitorpamplona.amethyst.ui.note.showAmount
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import kotlinx.coroutines.launch
@@ -73,15 +79,29 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro

    if (userId == null) return

-    DisposableEffect(account) {
-        NostrUserProfileDataSource.loadUserProfile(userId)
-        NostrUserProfileFollowersDataSource.loadUserProfile(userId)
-        NostrUserProfileFollowsDataSource.loadUserProfile(userId)
+    val lifeCycleOwner = LocalLifecycleOwner.current

+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { source, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Profile Start")
+                NostrUserProfileDataSource.loadUserProfile(userId)
+                NostrUserProfileFollowersDataSource.loadUserProfile(userId)
+                NostrUserProfileFollowsDataSource.loadUserProfile(userId)
+                NostrUserProfileZapsDataSource.loadUserProfile(userId)
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Profile Stop")
+                NostrUserProfileDataSource.stop()
+                NostrUserProfileFollowsDataSource.stop()
+                NostrUserProfileFollowersDataSource.stop()
+                NostrUserProfileZapsDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
        onDispose {
-            NostrUserProfileDataSource.stop()
-            NostrUserProfileFollowsDataSource.stop()
-            NostrUserProfileFollowersDataSource.stop()
+            lifeCycleOwner.lifecycle.removeObserver(observer)
        }
    }

@@ -173,6 +193,17 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                        Tab(
                            selected = pagerState.currentPage == 3,
                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(3) } },
+                            text = {
+                                val userState by baseUser.liveZaps.observeAsState()
+                                val userZaps = userState?.user?.zappedAmount()
+
+                                Text(text = "${showAmount(userZaps)} Zaps")
+                            }
+                        )
+
+                        Tab(
+                            selected = pagerState.currentPage == 4,
+                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(4) } },
                            text = {
                                val userState by baseUser.liveRelays.observeAsState()
                                val userRelaysBeingUsed =
@@ -186,7 +217,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                        )
                    }
                    HorizontalPager(
-                        count = 4,
+                        count = 5,
                        state = pagerState,
                        modifier = with(LocalDensity.current) {
                            Modifier.height((columnSize.height - tabsSize.height).toDp())
@@ -196,7 +227,8 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
                            0 -> TabNotes(baseUser, accountViewModel, navController)
                            1 -> TabFollows(baseUser, accountViewModel, navController)
                            2 -> TabFollowers(baseUser, accountViewModel, navController)
-                            3 -> TabRelays(baseUser, accountViewModel, navController)
+                            3 -> TabReceivedZaps(baseUser, accountViewModel, navController)
+                            4 -> TabRelays(baseUser, accountViewModel, navController)
                        }
                    }
                }
@@ -452,6 +484,22 @@ fun TabFollowers(user: User, accountViewModel: AccountViewModel, navController:
    }
 }

+@Composable
+fun TabReceivedZaps(user: User, accountViewModel: AccountViewModel, navController: NavController) {
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    if (accountState != null) {
+        val feedViewModel: NostrUserProfileZapsFeedViewModel = viewModel()
+
+        Column(Modifier.fillMaxHeight()) {
+            Column(
+                modifier = Modifier.padding(vertical = 0.dp)
+            ) {
+                LnZapFeedView(feedViewModel, accountViewModel, navController)
+            }
+        }
+    }
+}
+
@Composable
 fun TabRelays(user: User, accountViewModel: AccountViewModel, navController: NavController) {
    val feedViewModel: RelayFeedViewModel = viewModel()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
@@ -36,19 +36,26 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
+import coil.compose.rememberAsyncImagePainter
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.RoboHashCache
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Channel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
@@ -69,9 +76,24 @@ import kotlinx.coroutines.withContext
@Composable
 fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController) {
    val feedViewModel: NostrGlobalFeedViewModel = viewModel()
+    val lifeCycleOwner = LocalLifecycleOwner.current

-    LaunchedEffect(Unit) {
-        feedViewModel.refresh()
+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { source, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Global Start")
+                NostrGlobalDataSource.start()
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Global Stop")
+                NostrGlobalDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
    }

    Column(Modifier.fillMaxHeight()) {
@@ -95,6 +117,8 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont

    val onlineSearch = NostrSearchEventOrUserDataSource

+    val ctx = LocalContext.current.applicationContext
+
    val isTrailingIconVisible by remember {
        derivedStateOf {
            searchValue.isNotBlank()
@@ -210,7 +234,7 @@ private fun SearchBar(accountViewModel: AccountViewModel, navController: NavCont
            itemsIndexed(searchResultsChannels.value, key = { _, item -> "c"+item.idHex }) { index, item ->
                ChannelName(
                    channelPicture = item.profilePicture(),
-                    channelPicturePlaceholder = null,
+                    channelPicturePlaceholder = rememberAsyncImagePainter(RoboHashCache.get(ctx, item.idHex)),
                    channelTitle = {
                        Text(
                            "${item.info.name}",
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt
@@ -8,19 +8,40 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileZapsDataSource
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navController: NavController) {
    val account by accountViewModel.accountLiveData.observeAsState()

-    DisposableEffect(account) {
+    val lifeCycleOwner = LocalLifecycleOwner.current
+
+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { source, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                println("Thread Start")
+                NostrThreadDataSource.start()
+            }
+            if (event == Lifecycle.Event.ON_PAUSE) {
+                println("Thread Stop")
+                NostrThreadDataSource.stop()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
        onDispose {
-            NostrThreadDataSource.stop()
+            lifeCycleOwner.lifecycle.removeObserver(observer)
        }
    }

--- a/docs/design/amethystlogo-squared.jpg
+++ b/docs/design/amethystlogo-squared.jpg
Author	SHA1	Message	Date
Vitor Pamplona	b89a8e5f8f	v0.15.2	2023-02-13 16:14:17 -05:00
Vitor Pamplona	a01a282e2e	Adjusting New Post screen's keyboard cutting off in long posts	2023-02-13 16:13:47 -05:00
Vitor Pamplona	2ed0ca5fdb	Removing DataSource stops in ViewModels to make sure this is handled by the Screen class	2023-02-13 15:50:50 -05:00
Vitor Pamplona	49366ac47d	Speeding up report queries	2023-02-13 15:49:51 -05:00
Vitor Pamplona	2ac4ed8ac4	Merge pull request #118 from Radiokot/fix/gif_image_upload Fix GIF image upload #115	2023-02-13 09:40:46 -05:00
Oleg Koretsky	bb76bbd313	Show running image uploading. Show error message if the uploading is failed	2023-02-13 16:24:49 +02:00
Vitor Pamplona	2c5ba69657	v0.15.1	2023-02-13 08:54:23 -05:00
Vitor Pamplona	a618e84d32	Image seems to better support Bitmap models than Async Image	2023-02-13 08:45:32 -05:00
Oleg Koretsky	108ad4dadc	Do not encode images to JPEG before uploading. Fixes GIF upload #115	2023-02-13 11:57:26 +02:00
Vitor Pamplona	80bede648f	Moving the ThreadView to the same Model as Global: Only active when using this view.	2023-02-12 21:53:22 -05:00
Vitor Pamplona	e5ee367761	Doesn't start the Global to make sure home updates faster.	2023-02-12 21:48:07 -05:00
Vitor Pamplona	4e53a9fda0	Removes unnecessary println	2023-02-12 21:47:53 -05:00
Vitor Pamplona	caa170f78e	Forces profile screen and search screen to only be active when in such views.	2023-02-12 21:47:38 -05:00
Vitor Pamplona	a857b587a1	Forces the use of a single RoboHash for performance	2023-02-12 21:47:02 -05:00
Vitor Pamplona	420bacea3d	Forcing the Account Datasource to only download notifications (Removing new followers, for instance)	2023-02-12 21:46:40 -05:00
Vitor Pamplona	b2da651fd1	Clears filters when DataSource closes	2023-02-12 21:44:18 -05:00
Vitor Pamplona	04d94b4dbf	Removes Raw ZapNotes from Notifications	2023-02-12 21:43:19 -05:00
Vitor Pamplona	64f2575228	Lightning Zaps.	2023-02-12 18:23:02 -05:00
Vitor Pamplona	dc07aea525	Merge remote-tracking branch 'origin/main'	2023-02-11 10:34:09 -05:00
Vitor Pamplona	21ac1542ee	Add a logo option with borders for the play store.	2023-02-11 10:33:56 -05:00
Vitor Pamplona	9cd90db6b3	Update README.md	2023-02-11 10:16:50 -05:00
Vitor Pamplona	8a65f3fbe7	Moving channels to the local version of RoboHash	2023-02-10 17:29:10 -05:00
Vitor Pamplona	e6153e7ef5	Enabling local RoboHash for User Pictures	2023-02-10 17:14:34 -05:00
Vitor Pamplona	c62c4c7545	Reconnect after 60 seconds instead of 10 seconds.	2023-02-10 17:14:08 -05:00
Vitor Pamplona	c4d3c105f7	Better content descriptors for UrlPreviewCard	2023-02-10 17:13:51 -05:00
Vitor Pamplona	3d3578666d	Using a local version of RoboHash	2023-02-10 17:13:25 -05:00
Vitor Pamplona	01c060caa1	Caching videos to reduce initialization delay.	2023-02-10 14:30:39 -05:00
Vitor Pamplona	d6cd8e2804	v0.14.3	2023-02-10 11:56:02 -05:00
Vitor Pamplona	fa559c8428	Disabling ProGuard until we figure out why crashes only happen in the release build.	2023-02-10 11:55:31 -05:00