0.40.2

- Keeps position in the Video feed between screen
- Animates to the top when posting
- Adds NIP-95 in-disk caching
- Fixes the Crossfade for BlurHash on NIP94 and NIP95 events

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 134
-        versionName "0.40.0"
+        versionCode 136
+        versionName "0.40.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

@@ -72,7 +72,6 @@ object ServiceManager {
             LocalCache.pruneOldAndHiddenMessages(it)
             LocalCache.pruneHiddenMessages(it)
             LocalCache.pruneContactLists(it)
-            LocalCache.pruneFileStorageEvents(it)
             // LocalCache.pruneNonFollows(it)
         }
     }

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

@@ -20,6 +20,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import nostr.postr.Persona
+import nostr.postr.Utils
+import java.math.BigDecimal
 import java.util.Locale
 
 val DefaultChannels = setOf(
@@ -170,7 +172,32 @@ class Account(
         return zapPaymentRequest != null
     }
 
-    fun sendZapPaymentRequestFor(bolt11: String, onResponse: (Response?) -> Unit) {
+    fun isNIP47Author(pubkeyHex: String?): Boolean {
+        val privKey = zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!!
+        val pubKey = Utils.pubkeyCreate(privKey).toHexKey()
+        return (pubKey == pubkeyHex)
+    }
+
+    fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? {
+        val myNip47 = zapPaymentRequest ?: return null
+        return zapResponseEvent.response(
+            myNip47.secret?.toByteArray() ?: loggedIn.privKey!!,
+            myNip47.pubKeyHex.toByteArray()
+        )
+    }
+
+    fun calculateIfNoteWasZappedByAccount(zappedNote: Note): Boolean {
+        return zappedNote.isZappedBy(userProfile(), this) == true
+    }
+
+    fun calculateZappedAmount(zappedNote: Note?): BigDecimal {
+        return zappedNote?.zappedAmount(
+            zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!!,
+            zapPaymentRequest?.pubKeyHex?.toByteArray()
+        ) ?: BigDecimal.ZERO
+    }
+
+    fun sendZapPaymentRequestFor(bolt11: String, zappedNote: Note?, onResponse: (Response?) -> Unit) {
         if (!isWriteable()) return
 
         zapPaymentRequest?.let { nip47 ->
@@ -179,11 +206,11 @@ class Account(
             val wcListener = NostrLnZapPaymentResponseDataSource(nip47.pubKeyHex, event.pubKey, event.id)
             wcListener.start()
 
-            LocalCache.consume(event) {
+            LocalCache.consume(event, zappedNote) {
                 // After the response is received.
                 val privKey = nip47.secret?.toByteArray()
                 if (privKey != null) {
-                    onResponse(it.response(privKey, event.pubKey.toByteArray()))
+                    onResponse(it.response(privKey, nip47.pubKeyHex.toByteArray()))
                 }
             }
 
@@ -376,7 +403,7 @@ class Account(
         }
     }
 
-    fun sendNip95(data: ByteArray, headerInfo: FileHeader): Note? {
+    fun createNip95(data: ByteArray, headerInfo: FileHeader): Pair<FileStorageEvent, FileStorageHeaderEvent>? {
         if (!isWriteable()) return null
 
         val data = FileStorageEvent.create(
@@ -395,6 +422,12 @@ class Account(
             privateKey = loggedIn.privKey!!
         )
 
+        return Pair(data, signedEvent)
+    }
+
+    fun sendNip95(data: FileStorageEvent, signedEvent: FileStorageHeaderEvent): Note? {
+        if (!isWriteable()) return null
+
         Client.send(data)
         LocalCache.consume(data, null)
 

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

@@ -1,10 +1,11 @@
 package com.vitorpamplona.amethyst.model
 
 import android.util.Log
+import androidx.core.net.toUri
 import androidx.lifecycle.LiveData
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.vitorpamplona.amethyst.service.NostrAccountDataSource.account
+import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.relays.Relay
 import com.vitorpamplona.amethyst.ui.components.BundledInsert
@@ -12,6 +13,9 @@ import fr.acinq.secp256k1.Hex
 import kotlinx.coroutines.*
 import nostr.postr.toNpub
 import java.io.ByteArrayInputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -31,7 +35,8 @@ object LocalCache {
     val channels = ConcurrentHashMap<HexKey, Channel>()
     val addressables = ConcurrentHashMap<String, AddressableNote>(100)
 
-    val awaitingPaymentRequests = ConcurrentHashMap<HexKey, (LnZapPaymentResponseEvent) -> Unit>(10)
+    val awaitingPaymentRequests =
+        ConcurrentHashMap<HexKey, Pair<Note?, (LnZapPaymentResponseEvent) -> Unit>>(10)
 
     fun checkGetOrCreateUser(key: String): User? {
         if (isValidHexNpub(key)) {
@@ -379,6 +384,7 @@ object LocalCache {
                     masterNote.removeBoost(deleteNote)
                     masterNote.removeReaction(deleteNote)
                     masterNote.removeZap(deleteNote)
+                    masterNote.removeZapPayment(deleteNote)
                     masterNote.removeReport(deleteNote)
                 }
 
@@ -719,7 +725,21 @@ object LocalCache {
         // Already processed this event.
         if (note.event != null) return
 
-        note.loadEvent(event, author, emptyList())
+        try {
+            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+            cachePath.mkdirs()
+            val stream = FileOutputStream(File(cachePath, event.id))
+            stream.write(event.decode())
+            stream.close()
+            Log.e("EventLogger", "Saved to disk as ${File(cachePath, event.id).toUri()}")
+        } catch (e: IOException) {
+            Log.e("FileSotrageEvent", "FileStorageEvent save to disk error: " + event.id, e)
+        }
+
+        // this is an invalid event. But we don't need to keep the data in memory.
+        val eventNoData = FileStorageEvent(event.id, event.pubKey, event.createdAt, event.tags, "", event.sig)
+
+        note.loadEvent(eventNoData, author, emptyList())
 
         refreshObservers(note)
     }
@@ -728,12 +748,41 @@ object LocalCache {
         // Does nothing without a response callback.
     }
 
-    fun consume(event: LnZapPaymentRequestEvent, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
-        awaitingPaymentRequests.put(event.id, onResponse)
+    fun consume(event: LnZapPaymentRequestEvent, zappedNote: Note?, onResponse: (LnZapPaymentResponseEvent) -> Unit) {
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        zappedNote?.addZapPayment(note, null)
+
+        awaitingPaymentRequests.put(event.id, Pair(zappedNote, onResponse))
+
+        refreshObservers(note)
     }
 
     fun consume(event: LnZapPaymentResponseEvent) {
-        val responseCallback = awaitingPaymentRequests[event.requestId()]
+        val requestId = event.requestId()
+        val pair = awaitingPaymentRequests[requestId] ?: return
+
+        val (zappedNote, responseCallback) = pair
+
+        val requestNote = requestId?.let { checkGetOrCreateNote(requestId) }
+
+        val note = getOrCreateNote(event.id)
+        val author = getOrCreateUser(event.pubKey)
+
+        // Already processed this event.
+        if (note.event != null) return
+
+        note.loadEvent(event, author, emptyList())
+
+        requestNote?.let { request ->
+            zappedNote?.addZapPayment(request, note)
+        }
 
         if (responseCallback != null) {
             responseCallback(event)
@@ -781,14 +830,6 @@ object LocalCache {
         }
     }
 
-    fun pruneFileStorageEvents(account: Account) {
-        val toBeRemoved = notes.filter { it.value.event is FileStorageEvent }
-
-        toBeRemoved.forEach {
-            notes.remove(it.key)
-        }
-    }
-
     fun pruneOldAndHiddenMessages(account: Account) {
         channels.forEach { it ->
             val toBeRemoved = it.value.pruneOldAndHiddenMessages(account)

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.model
 
 import androidx.lifecycle.LiveData
 import com.vitorpamplona.amethyst.service.NostrSingleEventDataSource
+import com.vitorpamplona.amethyst.service.lnurl.LnInvoiceUtil
 import com.vitorpamplona.amethyst.service.model.*
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.EOSETime
@@ -45,6 +46,8 @@ open class Note(val idHex: String) {
         private set
     var zaps = mapOf<Note, Note?>()
         private set
+    var zapPayments = mapOf<Note, Note?>()
+        private set
 
     var relays = setOf<String>()
         private set
@@ -156,6 +159,17 @@ open class Note(val idHex: String) {
         }
     }
 
+    fun removeZapPayment(note: Note) {
+        if (zapPayments[note] != null) {
+            zapPayments = zapPayments.minus(note)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapPayments.containsValue(note)) {
+            val toRemove = zapPayments.filterValues { it == note }
+            zapPayments = zapPayments.minus(toRemove.keys)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun addBoost(note: Note) {
         if (note !in boosts) {
             boosts = boosts + note
@@ -174,6 +188,17 @@ open class Note(val idHex: String) {
         }
     }
 
+    @Synchronized
+    fun addZapPayment(zapPaymentRequest: Note, zapPayment: Note?) {
+        if (zapPaymentRequest !in zapPayments.keys) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            liveSet?.zaps?.invalidateData()
+        } else if (zapPaymentRequest in zapPayments.keys && zapPayments[zapPaymentRequest] == null) {
+            zapPayments = zapPayments + Pair(zapPaymentRequest, zapPayment)
+            liveSet?.zaps?.invalidateData()
+        }
+    }
+
     fun addReaction(note: Note) {
         if (note !in reactions) {
             reactions = reactions + note
@@ -204,6 +229,14 @@ open class Note(val idHex: String) {
         // Zaps who the requester was the user
         return zaps.any {
             it.key.author === user || account.decryptZapContentAuthor(it.key)?.pubKey == user.pubkeyHex
+        } || zapPayments.any {
+            val zapResponseEvent = it.value?.event as? LnZapPaymentResponseEvent
+            val response = if (zapResponseEvent != null) {
+                account.decryptZapPaymentResponseEvent(zapResponseEvent)
+            } else {
+                null
+            }
+            response is PayInvoiceSuccessResponse && account.isNIP47Author(zapResponseEvent?.requestAuthor())
         }
     }
 
@@ -233,12 +266,44 @@ open class Note(val idHex: String) {
         }.flatten()
     }
 
-    fun zappedAmount(): BigDecimal {
-        return zaps.mapNotNull { it.value?.event }
+    fun zappedAmount(privKey: ByteArray?, walletServicePubkey: ByteArray?): BigDecimal {
+        // Regular Zap Receipts
+        val completedZaps = zaps.asSequence()
+            .mapNotNull { it.value?.event }
             .filterIsInstance<LnZapEvent>()
-            .mapNotNull {
-                it.amount
-            }.sumOf { it }
+            .filter { it.amount != null }
+            .associate {
+                it.lnInvoice() to it.amount
+            }
+            .toMap()
+
+        val completedPayments = if (privKey != null && walletServicePubkey != null) {
+            // Payments confirmed by the User's Wallet
+            zapPayments
+                .asSequence()
+                .filter {
+                    val response = (it.value?.event as? LnZapPaymentResponseEvent)?.response(privKey, walletServicePubkey)
+                    response is PayInvoiceSuccessResponse
+                }
+                .associate {
+                    val lnInvoice = (it.key.event as? LnZapPaymentRequestEvent)?.lnInvoice(privKey)
+                    val amount = try {
+                        if (lnInvoice == null) {
+                            null
+                        } else {
+                            LnInvoiceUtil.getAmountInSats(lnInvoice)
+                        }
+                    } catch (e: java.lang.Exception) {
+                        null
+                    }
+                    lnInvoice to amount
+                }
+                .toMap()
+        } else {
+            emptyMap()
+        }
+
+        return (completedZaps + completedPayments).values.filterNotNull().sumOf { it }
     }
 
     fun hasPledgeBy(user: User): Boolean {

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

@@ -19,12 +19,24 @@ class FileHeader(
 ) {
     companion object {
         fun prepare(fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
-            val imageData = URL(fileUrl).readBytes()
+            try {
+                val imageData = URL(fileUrl).readBytes()
 
-            prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+                prepare(imageData, fileUrl, mimeType, description, onReady, onError)
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                onError()
+            }
         }
 
-        fun prepare(data: ByteArray, fileUrl: String, mimeType: String?, description: String?, onReady: (FileHeader) -> Unit, onError: () -> Unit) {
+        fun prepare(
+            data: ByteArray,
+            fileUrl: String,
+            mimeType: String?,
+            description: String?,
+            onReady: (FileHeader) -> Unit,
+            onError: () -> Unit
+        ) {
             try {
                 val sha256 = MessageDigest.getInstance("SHA-256")
 

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

@@ -1,7 +1,7 @@
 package com.vitorpamplona.amethyst.service
 
 import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
-import com.vitorpamplona.amethyst.service.model.FileStorageEvent
+import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
 import com.vitorpamplona.amethyst.service.relays.FeedType
 import com.vitorpamplona.amethyst.service.relays.JsonFilter
 import com.vitorpamplona.amethyst.service.relays.TypedFilter
@@ -10,7 +10,7 @@ object NostrVideoDataSource : NostrDataSource("VideoFeed") {
     fun createGlobalFilter() = TypedFilter(
         types = setOf(FeedType.GLOBAL),
         filter = JsonFilter(
-            kinds = listOf(FileHeaderEvent.kind, FileStorageEvent.kind),
+            kinds = listOf(FileHeaderEvent.kind, FileStorageHeaderEvent.kind),
             limit = 200
         )
     )

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

@@ -86,10 +86,6 @@ open class BaseTextNoteEvent(
             val parsed = Nip19.parseComponents(uriScheme, type, key, additionalChars)
 
             if (parsed != null) {
-                if (content.contains("Testing event")) {
-                    println("AAAA $key")
-                }
-
                 try {
                     val tag = tags.firstOrNull { it.size > 1 && it[1] == parsed.hex }
 

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

@@ -207,6 +207,7 @@ open class Event(
             .registerTypeAdapter(Event::class.java, EventDeserializer())
             .registerTypeAdapter(ByteArray::class.java, ByteArraySerializer())
             .registerTypeAdapter(ByteArray::class.java, ByteArrayDeserializer())
+            .registerTypeAdapter(Response::class.java, ResponseDeserializer())
             .create()
 
         fun fromJson(json: String, lenient: Boolean = false): Event = gson.fromJson(json, Event::class.java).getRefinedEvent(lenient)

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

@@ -57,7 +57,7 @@ class LnZapEvent(
         return content
     }
 
-    private fun lnInvoice() = tags.firstOrNull { it.size > 1 && it[0] == "bolt11" }?.get(1)
+    fun lnInvoice() = tags.firstOrNull { it.size > 1 && it[0] == "bolt11" }?.get(1)
 
     private fun description() = tags.firstOrNull { it.size > 1 && it[0] == "description" }?.get(1)
 

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

@@ -1,9 +1,14 @@
 package com.vitorpamplona.amethyst.service.model
 
 import android.util.Log
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
 import com.google.gson.annotations.SerializedName
 import com.vitorpamplona.amethyst.model.HexKey
 import nostr.postr.Utils
+import java.lang.reflect.Type
 
 class LnZapPaymentResponseEvent(
     id: HexKey,
@@ -36,7 +41,8 @@ class LnZapPaymentResponseEvent(
 
     fun response(privKey: ByteArray, pubKey: ByteArray): Response? = try {
         if (content.isNotEmpty()) {
-            gson.fromJson(decrypt(privKey, pubKey), Response::class.java)
+            val decrypted = decrypt(privKey, pubKey)
+            gson.fromJson(decrypted, Response::class.java)
         } else {
             null
         }
@@ -58,7 +64,7 @@ abstract class Response(
 
 // PayInvoice Call
 
-class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams) :
+class PayInvoiceSuccessResponse(val result: PayInvoiceResultParams? = null) :
     Response("pay_invoice") {
     class PayInvoiceResultParams(val preimage: String)
 }
@@ -86,3 +92,39 @@ class PayInvoiceErrorResponse(val error: PayInvoiceErrorParams? = null) :
         OTHER // Other error.
     }
 }
+
+class ResponseDeserializer :
+    JsonDeserializer<Response?> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): Response? {
+        val jsonObject = json.asJsonObject
+        val resultType = jsonObject.get("result_type")?.asString
+
+        if (resultType == "pay_invoice") {
+            val result = jsonObject.get("result")?.asJsonObject
+            val error = jsonObject.get("error")?.asJsonObject
+            if (result != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (error != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        } else {
+            // tries to guess
+            if (jsonObject.get("result")?.asJsonObject?.get("preimage") != null) {
+                return context.deserialize<PayInvoiceSuccessResponse>(jsonObject, PayInvoiceSuccessResponse::class.java)
+            }
+            if (jsonObject.get("error")?.asJsonObject?.get("code") != null) {
+                return context.deserialize<PayInvoiceErrorResponse>(jsonObject, PayInvoiceErrorResponse::class.java)
+            }
+        }
+        return null
+    }
+
+    companion object {
+    }
+}

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

@@ -22,6 +22,7 @@ import com.vitorpamplona.amethyst.ServiceManager
 import com.vitorpamplona.amethyst.VideoCache
 import com.vitorpamplona.amethyst.service.nip19.Nip19
 import com.vitorpamplona.amethyst.service.relays.Client
+import com.vitorpamplona.amethyst.ui.components.muted
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.Nip47
 import com.vitorpamplona.amethyst.ui.screen.AccountScreen
@@ -92,6 +93,8 @@ class MainActivity : FragmentActivity() {
     @OptIn(DelicateCoroutinesApi::class)
     override fun onResume() {
         super.onResume()
+        // starts muted every time
+        muted.value = true
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {

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

@@ -79,7 +79,7 @@ object ImageSaver {
     }
 
     fun saveImage(
-        byteArray: ByteArray,
+        localFile: File,
         mimeType: String?,
         context: Context,
         onSuccess: () -> Any?,
@@ -87,7 +87,7 @@ object ImageSaver {
     ) {
         try {
             val extension = mimeType?.let { MimeTypeMap.getSingleton().getExtensionFromMimeType(it) } ?: ""
-            val buffer = byteArray.inputStream().source().buffer()
+            val buffer = localFile.inputStream().source().buffer()
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 saveContentQ(

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

@@ -2,6 +2,7 @@ package com.vitorpamplona.amethyst.ui.actions
 
 import android.content.Context
 import android.net.Uri
+import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -13,6 +14,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
+import java.net.URL
 
 open class NewMediaModel : ViewModel() {
     var account: Account? = null
@@ -27,6 +29,11 @@ open class NewMediaModel : ViewModel() {
     // Images and Videos
     var galleryUri by mutableStateOf<Uri?>(null)
 
+    var uploadingPercentage = mutableStateOf(0.0f)
+    var uploadingDescription = mutableStateOf<String?>(null)
+
+    var onceUploaded: () -> Unit = {}
+
     open fun load(account: Account, uri: Uri, contentType: String?) {
         this.account = account
         this.galleryUri = uri
@@ -40,7 +47,7 @@ open class NewMediaModel : ViewModel() {
         }
     }
 
-    fun upload(context: Context, onClose: () -> Unit) {
+    fun upload(context: Context) {
         isUploadingImage = true
 
         val contentResolver = context.contentResolver
@@ -48,23 +55,32 @@ open class NewMediaModel : ViewModel() {
         val serverToUse = selectedServer ?: return
 
         if (selectedServer == ServersAvailable.NIP95) {
+            uploadingPercentage.value = 0.1f
+            uploadingDescription.value = "Loading"
             val contentType = contentResolver.getType(uri)
             contentResolver.openInputStream(uri)?.use {
-                createNIP95Record(it.readBytes(), contentType, description, onClose)
+                createNIP95Record(it.readBytes(), contentType, description)
             }
                 ?: viewModelScope.launch {
                     imageUploadingError.emit("Failed to upload the image / video")
+                    isUploadingImage = false
+                    uploadingPercentage.value = 0.00f
+                    uploadingDescription.value = null
                 }
         } else {
+            uploadingPercentage.value = 0.1f
+            uploadingDescription.value = "Uploading"
             ImageUploader.uploadImage(
                 uri = uri,
                 server = serverToUse,
                 contentResolver = contentResolver,
                 onSuccess = { imageUrl, mimeType ->
-                    createNIP94Record(imageUrl, mimeType, description, onClose)
+                    createNIP94Record(imageUrl, mimeType, description)
                 },
                 onError = {
                     isUploadingImage = false
+                    uploadingPercentage.value = 0.00f
+                    uploadingDescription.value = null
                     viewModelScope.launch {
                         imageUploadingError.emit("Failed to upload the image / video")
                     }
@@ -77,6 +93,8 @@ open class NewMediaModel : ViewModel() {
         galleryUri = null
         isUploadingImage = false
         mediaType = null
+        uploadingDescription.value = null
+        uploadingPercentage.value = 0.0f
 
         description = ""
         selectedServer = account?.defaultFileServer
@@ -86,37 +104,68 @@ open class NewMediaModel : ViewModel() {
         return !isUploadingImage && galleryUri != null && selectedServer != null
     }
 
-    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String, onClose: () -> Unit) {
+    fun createNIP94Record(imageUrl: String, mimeType: String?, description: String) {
+        uploadingPercentage.value = 0.40f
         viewModelScope.launch(Dispatchers.IO) {
+            uploadingDescription.value = "Server Processing"
             // Images don't seem to be ready immediately after upload
 
             if (mimeType?.startsWith("image/") == true) {
                 delay(2000)
             } else {
-                delay(5000)
+                delay(15000)
             }
 
-            FileHeader.prepare(
-                imageUrl,
-                mimeType,
-                description,
-                onReady = {
-                    val note = account?.sendHeader(it)
-                    isUploadingImage = false
-                    cancel()
-                    onClose()
-                },
-                onError = {
-                    isUploadingImage = false
-                    viewModelScope.launch {
-                        imageUploadingError.emit("Failed to upload the image / video")
+            uploadingDescription.value = "Downloading"
+            uploadingPercentage.value = 0.60f
+
+            try {
+                val imageData = URL(imageUrl).readBytes()
+
+                uploadingPercentage.value = 0.80f
+                uploadingDescription.value = "Hashing"
+
+                FileHeader.prepare(
+                    imageData,
+                    imageUrl,
+                    mimeType,
+                    description,
+                    onReady = {
+                        uploadingPercentage.value = 0.90f
+                        uploadingDescription.value = "Sending"
+                        val note = account?.sendHeader(it)
+                        uploadingPercentage.value = 1.00f
+                        isUploadingImage = false
+                        onceUploaded()
+                        cancel()
+                    },
+                    onError = {
+                        cancel()
+                        uploadingPercentage.value = 0.00f
+                        uploadingDescription.value = null
+                        isUploadingImage = false
+                        viewModelScope.launch {
+                            imageUploadingError.emit("Failed to upload the image / video")
+                        }
                     }
+                )
+            } catch (e: Exception) {
+                Log.e("ImageDownload", "Couldn't download image from server: ${e.message}")
+                cancel()
+                uploadingPercentage.value = 0.00f
+                uploadingDescription.value = null
+                isUploadingImage = false
+                viewModelScope.launch {
+                    imageUploadingError.emit("Failed to upload the image / video")
                 }
-            )
+            }
         }
     }
 
-    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String, onClose: () -> Unit) {
+    fun createNIP95Record(bytes: ByteArray, mimeType: String?, description: String) {
+        uploadingPercentage.value = 0.20f
+        uploadingDescription.value = "Hashing"
+
         viewModelScope.launch(Dispatchers.IO) {
             FileHeader.prepare(
                 bytes,
@@ -124,13 +173,26 @@ open class NewMediaModel : ViewModel() {
                 mimeType,
                 description,
                 onReady = {
-                    account?.sendNip95(bytes, headerInfo = it)
+                    uploadingDescription.value = "Signing"
+                    uploadingPercentage.value = 0.30f
+                    val nip95 = account?.createNip95(bytes, headerInfo = it)
+
+                    if (nip95 != null) {
+                        uploadingDescription.value = "Sending"
+                        uploadingPercentage.value = 0.60f
+                        account?.sendNip95(nip95.first, nip95.second)
+                    }
+
+                    uploadingPercentage.value = 1.00f
                     isUploadingImage = false
+                    onceUploaded()
                     cancel()
-                    onClose()
                 },
                 onError = {
+                    uploadingDescription.value = null
+                    uploadingPercentage.value = 0.00f
                     isUploadingImage = false
+                    cancel()
                     viewModelScope.launch {
                         imageUploadingError.emit("Failed to upload the image / video")
                     }
@@ -142,4 +204,7 @@ open class NewMediaModel : ViewModel() {
     fun isImage() = mediaType?.startsWith("image")
     fun isVideo() = mediaType?.startsWith("video")
     fun defaultServer() = account?.defaultFileServer
+    fun onceUploaded(onceUploaded: () -> Unit) {
+        this.onceUploaded = onceUploaded
+    }
 }

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

@@ -28,7 +28,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import coil.compose.AsyncImage
 import com.vitorpamplona.amethyst.R
@@ -36,23 +35,20 @@ import com.vitorpamplona.amethyst.ui.components.*
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.TextSpinner
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @Composable
-fun NewMediaView(uri: Uri, onClose: () -> Unit, accountViewModel: AccountViewModel, navController: NavController) {
+fun NewMediaView(uri: Uri, onClose: () -> Unit, postViewModel: NewMediaModel, accountViewModel: AccountViewModel, navController: NavController) {
     val account = accountViewModel.accountLiveData.value?.account ?: return
     val resolver = LocalContext.current.contentResolver
-    val postViewModel: NewMediaModel = viewModel()
     val context = LocalContext.current
 
     val scroolState = rememberScrollState()
 
-    LaunchedEffect(Unit) {
-        val mediaType = resolver.getType(uri) ?: ""
-        postViewModel.load(account, uri, mediaType)
-        delay(100)
+    val mediaType = resolver.getType(uri) ?: ""
+    postViewModel.load(account, uri, mediaType)
 
+    LaunchedEffect(Unit) {
         postViewModel.imageUploadingError.collect { error ->
             Toast.makeText(context, error, Toast.LENGTH_SHORT).show()
         }
@@ -85,15 +81,11 @@ fun NewMediaView(uri: Uri, onClose: () -> Unit, accountViewModel: AccountViewMod
                         onClose()
                     })
 
-                    if (postViewModel.isUploadingImage) {
-                        LoadingAnimation()
-                    }
-
                     PostButton(
                         onPost = {
-                            postViewModel.upload(context) {
-                                onClose()
-                            }
+                            onClose()
+                            postViewModel.upload(context)
+                            postViewModel.selectedServer?.let { account.changeDefaultFileServer(it) }
                         },
                         isActive = postViewModel.canPost()
                     )
@@ -154,7 +146,11 @@ fun ImageVideoPost(postViewModel: NewMediaModel) {
             LaunchedEffect(key1 = postViewModel.galleryUri) {
                 scope.launch(Dispatchers.IO) {
                     postViewModel.galleryUri?.let {
-                        bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
+                        try {
+                            bitmap = resolver.loadThumbnail(it, Size(1200, 1000), null)
+                        } catch (e: Exception) {
+                            postViewModel.imageUploadingError.emit("Unable to load file")
+                        }
                     }
                 }
             }
@@ -182,7 +178,7 @@ fun ImageVideoPost(postViewModel: NewMediaModel) {
     ) {
         TextSpinner(
             label = stringResource(id = R.string.file_server),
-            placeholder = fileServers.filter { it.first == postViewModel.defaultServer() }.firstOrNull()?.second ?: fileServers[0].second,
+            placeholder = fileServers.firstOrNull { it.first == postViewModel.selectedServer }?.second ?: fileServers[0].second,
             options = fileServerOptions,
             explainers = fileServerExplainers,
             onSelect = {

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

@@ -329,7 +329,8 @@ open class NewPostViewModel : ViewModel() {
                 mimeType,
                 description,
                 onReady = {
-                    val note = account?.sendNip95(bytes, headerInfo = it)
+                    val nip95 = account?.createNip95(bytes, headerInfo = it)
+                    val note = nip95?.let { it1 -> account?.sendNip95(it1.first, it1.second) }
 
                     isUploadingImage = false
 

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

@@ -18,6 +18,7 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.vitorpamplona.amethyst.R
 import kotlinx.coroutines.launch
+import java.io.File
 
 /**
  * A button to save the remote image to the gallery.
@@ -86,14 +87,14 @@ fun SaveToGallery(url: String) {
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun SaveToGallery(byteArray: ByteArray, mimeType: String?) {
+fun SaveToGallery(localFile: File, mimeType: String?) {
     val localContext = LocalContext.current
     val scope = rememberCoroutineScope()
 
     fun saveImage() {
         ImageSaver.saveImage(
             context = localContext,
-            byteArray = byteArray,
+            localFile = localFile,
             mimeType = mimeType,
             onSuccess = {
                 scope.launch {

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

@@ -89,7 +89,6 @@ fun RichTextViewer(
         if (content.startsWith("> ") ||
             content.startsWith("# ") ||
             content.contains("##") ||
-            content.contains("**") ||
             content.contains("__") ||
             content.contains("```")
         ) {

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

@@ -1,17 +1,48 @@
 package com.vitorpamplona.amethyst.ui.components
 
+import android.content.Context
+import android.media.AudioManager
 import android.net.Uri
+import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.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.icons.Icons
+import androidx.compose.material.icons.filled.VolumeOff
+import androidx.compose.material.icons.filled.VolumeUp
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import com.google.android.exoplayer2.C
@@ -19,10 +50,20 @@ import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.MediaItem
 import com.google.android.exoplayer2.MediaMetadata
 import com.google.android.exoplayer2.Player
+import com.google.android.exoplayer2.audio.AudioAttributes
 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.util.Util
 import com.vitorpamplona.amethyst.VideoCache
+import java.io.File
+
+public var muted = mutableStateOf(true)
+
+@Composable
+fun VideoView(localFile: File, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+    VideoView(localFile.toUri(), description, onDialog)
+}
 
 @Composable
 fun VideoView(videoUri: String, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
@@ -34,6 +75,14 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
     val context = LocalContext.current
     val lifecycleOwner = rememberUpdatedState(LocalLifecycleOwner.current)
 
+    val myAudioManager =
+        context.applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+    val myAudioAttributes = AudioAttributes.Builder()
+        .setUsage(C.USAGE_MEDIA)
+        .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+        .build()
+
     val exoPlayer = remember(videoUri) {
         val mediaBuilder = MediaItem.Builder().setUri(videoUri)
 
@@ -48,35 +97,76 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
         ExoPlayer.Builder(context).build().apply {
             repeatMode = Player.REPEAT_MODE_ALL
             videoScalingMode = C.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
-            setMediaSource(
-                ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(
-                    media
+            setAudioAttributes(myAudioAttributes, true)
+            if (Util.SDK_INT >= 23) {
+                myAudioManager.adjustStreamVolume(
+                    C.STREAM_TYPE_MUSIC,
+                    if (muted.value) AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE,
+                    0
                 )
-            )
+            } else {
+                myAudioManager.setStreamMute(C.STREAM_TYPE_MUSIC, muted.value)
+            }
+            if (videoUri.scheme?.startsWith("file") == true) {
+                setMediaItem(media)
+            } else {
+                setMediaSource(
+                    ProgressiveMediaSource.Factory(VideoCache.get()).createMediaSource(
+                        media
+                    )
+                )
+            }
             prepare()
         }
     }
 
     DisposableEffect(
-        AndroidView(
-            modifier = Modifier.fillMaxWidth(),
-            factory = {
-                StyledPlayerView(context).apply {
-                    player = exoPlayer
-                    layoutParams = FrameLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    )
-                    resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
-                    onDialog?.let { innerOnDialog ->
-                        setFullscreenButtonClickListener {
+        Box() {
+            AndroidView(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.Center)
+                    .onVisibilityChanges { visible ->
+                        if (visible) {
+                            exoPlayer.play()
+                        } else {
                             exoPlayer.pause()
-                            innerOnDialog(it)
+                        }
+                    },
+                factory = {
+                    StyledPlayerView(context).apply {
+                        player = exoPlayer
+                        layoutParams = FrameLayout.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT
+                        )
+                        controllerAutoShow = false
+                        hideController()
+                        resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH
+                        onDialog?.let { innerOnDialog ->
+                            setFullscreenButtonClickListener {
+                                exoPlayer.pause()
+                                innerOnDialog(it)
+                            }
                         }
                     }
                 }
+            )
+
+            MuteButton(muted, Modifier) {
+                muted.value = !muted.value
+                if (Util.SDK_INT >= 23) {
+                    myAudioManager.adjustStreamVolume(
+                        C.STREAM_TYPE_MUSIC,
+                        if (muted.value) AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE,
+                        0
+                    )
+                } else {
+                    myAudioManager.setStreamMute(C.STREAM_TYPE_MUSIC, muted.value)
+                }
             }
-        )
+        }
+
     ) {
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
@@ -96,6 +186,75 @@ fun VideoView(videoUri: Uri, description: String? = null, onDialog: ((Boolean) -
     }
 }
 
-@Composable
-fun VideoView(videoBytes: ByteArray, description: String? = null, onDialog: ((Boolean) -> Unit)? = null) {
+fun Modifier.onVisibilityChanges(onVisibilityChanges: (Boolean) -> Unit): Modifier = composed {
+    val view = LocalView.current
+    var isVisible: Boolean? by remember { mutableStateOf(null) }
+
+    LaunchedEffect(isVisible) {
+        onVisibilityChanges(isVisible == true)
+    }
+
+    onGloballyPositioned { coordinates ->
+        isVisible = coordinates.isCompletelyVisible(view)
+    }
+}
+
+fun LayoutCoordinates.isCompletelyVisible(view: View): Boolean {
+    if (!isAttached) return false
+    // Window relative bounds of our compose root view that are visible on the screen
+    val globalRootRect = android.graphics.Rect()
+    if (!view.getGlobalVisibleRect(globalRootRect)) {
+        // we aren't visible at all.
+        return false
+    }
+    val bounds = boundsInWindow()
+    // Make sure we are completely in bounds.
+    return bounds.top >= globalRootRect.top &&
+        bounds.left >= globalRootRect.left &&
+        bounds.right <= globalRootRect.right &&
+        bounds.bottom <= globalRootRect.bottom
+}
+
+@Composable
+private fun MuteButton(muted: MutableState<Boolean>, modifier: Modifier, toggle: () -> Unit) {
+    Box(
+        modifier
+            .width(70.dp)
+            .height(70.dp)
+            .padding(10.dp)
+    ) {
+        Box(
+            Modifier
+                .clip(CircleShape)
+                .fillMaxSize(0.6f)
+                .align(Alignment.Center)
+                .background(MaterialTheme.colors.background)
+        )
+
+        if (muted.value) {
+            IconButton(
+                onClick = toggle,
+                modifier = Modifier.size(50.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.VolumeOff,
+                    "Hash Verified",
+                    tint = MaterialTheme.colors.onBackground,
+                    modifier = Modifier.size(30.dp)
+                )
+            }
+        } else {
+            IconButton(
+                onClick = toggle,
+                modifier = Modifier.size(50.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.VolumeUp,
+                    "Hash Verified",
+                    tint = MaterialTheme.colors.onBackground,
+                    modifier = Modifier.size(30.dp)
+                )
+            }
+        }
+    }
 }

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

@@ -3,6 +3,9 @@ package com.vitorpamplona.amethyst.ui.components
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -71,6 +74,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.engawapg.lib.zoomable.rememberZoomState
 import net.engawapg.lib.zoomable.zoomable
+import java.io.File
 import java.security.MessageDigest
 
 abstract class ZoomableContent(
@@ -106,7 +110,7 @@ abstract class ZoomablePreloadedContent(
 ) : ZoomableContent(description)
 
 class ZoomableBitmapImage(
-    val byteArray: ByteArray?,
+    val localFile: File,
     val mimeType: String? = null,
     description: String? = null,
     val bluehash: String? = null,
@@ -115,7 +119,7 @@ class ZoomableBitmapImage(
 ) : ZoomablePreloadedContent(description, isVerified, uri)
 
 class ZoomableBytesVideo(
-    val byteArray: ByteArray,
+    val localFile: File,
     val mimeType: String? = null,
     description: String? = null,
     isVerified: Boolean? = null,
@@ -166,7 +170,7 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
             }
         }
     } else if (content is ZoomableBitmapImage) {
-        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
             if (imageState is AsyncImagePainter.State.Success) {
                 scope.launch(Dispatchers.IO) {
                     verifiedHash = content.isVerified
@@ -174,12 +178,8 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
             }
         }
     } else if (content is ZoomableBytesVideo) {
-        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
-            if (imageState is AsyncImagePainter.State.Success) {
-                scope.launch(Dispatchers.IO) {
-                    verifiedHash = content.isVerified
-                }
-            }
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            verifiedHash = content.isVerified
         }
     }
 
@@ -214,7 +214,7 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
     }
 
     if (content is ZoomableUrlImage) {
-        Box() {
+        Box(contentAlignment = Alignment.Center) {
             AsyncImage(
                 model = content.url,
                 contentDescription = content.description,
@@ -231,13 +231,16 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
             if (imageState is AsyncImagePainter.State.Success) {
                 HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
             }
-        }
 
-        if (imageState !is AsyncImagePainter.State.Success) {
-            if (content.bluehash != null) {
-                DisplayBlueHash(content, mainImageModifier)
-            } else {
-                DisplayUrlWithLoadingSymbol(content)
+            AnimatedVisibility(
+                visible = imageState !is AsyncImagePainter.State.Success,
+                exit = fadeOut(animationSpec = tween(200))
+            ) {
+                if (content.bluehash != null) {
+                    DisplayBlueHash(content, mainImageModifier)
+                } else {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
             }
         }
     } else if (content is ZoomableUrlVideo) {
@@ -245,7 +248,7 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
     } else if (content is ZoomableBitmapImage) {
         Box() {
             AsyncImage(
-                model = content.byteArray,
+                model = content.localFile,
                 contentDescription = content.description,
                 contentScale = ContentScale.FillWidth,
                 modifier = mainImageModifier,
@@ -270,6 +273,7 @@ fun ZoomableContentView(content: ZoomableContent, images: List<ZoomableContent>
             }
         }
     } else if (content is ZoomableBytesVideo) {
+        VideoView(content.localFile, content.description) { dialogOpen = true }
     }
 
     if (dialogOpen) {
@@ -384,8 +388,8 @@ fun ZoomableImageDialog(imageUrl: ZoomableContent, allImages: List<ZoomableConte
                     val myContent = allImages[pagerState.currentPage]
                     if (myContent is ZoomableUrlContent) {
                         SaveToGallery(url = myContent.url)
-                    } else if (myContent is ZoomableBitmapImage && myContent.byteArray != null) {
-                        SaveToGallery(byteArray = myContent.byteArray, mimeType = myContent.mimeType)
+                    } else if (myContent is ZoomableBitmapImage && myContent.localFile != null) {
+                        SaveToGallery(localFile = myContent.localFile, mimeType = myContent.mimeType)
                     }
                 }
 
@@ -428,7 +432,7 @@ fun RenderImageOrVideo(content: ZoomableContent) {
             }
         }
     } else if (content is ZoomableBitmapImage) {
-        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
             if (imageState is AsyncImagePainter.State.Success) {
                 scope.launch(Dispatchers.IO) {
                     verifiedHash = content.isVerified
@@ -436,12 +440,8 @@ fun RenderImageOrVideo(content: ZoomableContent) {
             }
         }
     } else if (content is ZoomableBytesVideo) {
-        LaunchedEffect(key1 = content.byteArray, key2 = imageState) {
-            if (imageState is AsyncImagePainter.State.Success) {
-                scope.launch(Dispatchers.IO) {
-                    verifiedHash = content.isVerified
-                }
-            }
+        LaunchedEffect(key1 = content.localFile, key2 = imageState) {
+            verifiedHash = content.isVerified
         }
     }
 
@@ -461,11 +461,21 @@ fun RenderImageOrVideo(content: ZoomableContent) {
                     imageState = it
                 }
             )
-            if (imageState !is AsyncImagePainter.State.Success) {
-                DisplayBlueHash(content = content, modifier = Modifier.fillMaxWidth())
-            } else {
+
+            if (imageState is AsyncImagePainter.State.Success) {
                 HashVerificationSymbol(verifiedHash, Modifier.align(Alignment.TopEnd))
             }
+
+            AnimatedVisibility(
+                visible = imageState !is AsyncImagePainter.State.Success,
+                exit = fadeOut(animationSpec = tween(200))
+            ) {
+                if (content.bluehash != null) {
+                    DisplayBlueHash(content = content, modifier = Modifier.fillMaxWidth())
+                } else {
+                    DisplayUrlWithLoadingSymbol(content)
+                }
+            }
         }
     } else if (content is ZoomableUrlVideo) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
@@ -474,7 +484,7 @@ fun RenderImageOrVideo(content: ZoomableContent) {
     } else if (content is ZoomableBitmapImage) {
         Box() {
             AsyncImage(
-                model = content.byteArray,
+                model = content.localFile,
                 contentDescription = content.description,
                 contentScale = ContentScale.FillWidth,
                 modifier = Modifier
@@ -496,7 +506,7 @@ fun RenderImageOrVideo(content: ZoomableContent) {
         }
     } else if (content is ZoomableBytesVideo) {
         Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxSize(1f)) {
-            VideoView(content.byteArray, content.description)
+            VideoView(content.localFile, content.description)
         }
     }
 }

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

@@ -58,6 +58,7 @@ import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import com.vitorpamplona.amethyst.ui.theme.Following
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import java.io.File
 import java.math.BigDecimal
 import java.net.URL
 import kotlin.time.ExperimentalTime
@@ -892,6 +893,7 @@ fun FileHeaderDisplay(note: Note) {
 
 @Composable
 fun FileStorageHeaderDisplay(baseNote: Note) {
+    val appContext = LocalContext.current.applicationContext
     val eventHeader = (baseNote.event as? FileStorageHeaderEvent) ?: return
 
     val fileNote = eventHeader.dataEventId()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
@@ -906,16 +908,17 @@ fun FileStorageHeaderDisplay(baseNote: Note) {
     LaunchedEffect(key1 = eventHeader.id, key2 = noteState) {
         withContext(Dispatchers.IO) {
             val uri = "nostr:" + baseNote.toNEvent()
+            val localDir = File(File(appContext.externalCacheDir, "NIP95"), fileNote.idHex)
             val bytes = eventBytes?.decode()
             val blurHash = eventHeader.blurhash()
             val description = eventHeader.content
             val mimeType = eventHeader.mimeType()
 
             content = if (mimeType?.startsWith("image") == true) {
-                ZoomableBitmapImage(bytes, mimeType, description, blurHash, true, uri)
+                ZoomableBitmapImage(localDir, mimeType, description, blurHash, true, uri)
             } else {
                 if (bytes != null) {
-                    ZoomableBytesVideo(bytes, mimeType, description, true, uri)
+                    ZoomableBytesVideo(localDir, mimeType, description, true, uri)
                 } else {
                     null
                 }

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

@@ -56,8 +56,7 @@ fun PollNote(
     val account = accountState?.account ?: return
 
     val pollViewModel = PollNoteViewModel()
-    pollViewModel.account = account
-    pollViewModel.load(zappedNote)
+    pollViewModel.load(account, zappedNote)
 
     pollViewModel.pollEvent?.pollOptions()?.forEach { poll_op ->
         OptionNote(
@@ -212,7 +211,7 @@ fun ZapVote(
     clickablePrepend: @Composable () -> Unit
 ) {
     val zapsState by baseNote.live().zaps.observeAsState()
-    val zappedNote = zapsState?.note
+    val zappedNote = zapsState?.note ?: return
 
     var wantsToZap by remember { mutableStateOf(false) }
 
@@ -253,7 +252,7 @@ fun ZapVote(
                             )
                             .show()
                     }
-                } else if (accountViewModel.isLoggedUser(zappedNote?.author)) {
+                } else if (accountViewModel.isLoggedUser(zappedNote.author)) {
                     scope.launch {
                         Toast
                             .makeText(
@@ -376,7 +375,7 @@ fun ZapVote(
     LaunchedEffect(key1 = zapsState) {
         withContext(Dispatchers.IO) {
             if (!wasZappedByLoggedInUser) {
-                wasZappedByLoggedInUser = zappedNote?.isZappedBy(accountViewModel.userProfile(), account) == true
+                wasZappedByLoggedInUser = accountViewModel.calculateIfNoteWasZappedByAccount(zappedNote)
             }
         }
     }

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

@@ -20,8 +20,10 @@ class PollNoteViewModel {
     var consensusThreshold: BigDecimal? = null
 
     var totalZapped: BigDecimal = BigDecimal.ZERO
+    var wasZappedByAuthor: Boolean = false
 
-    fun load(note: Note?) {
+    fun load(acc: Account, note: Note?) {
+        account = acc
         pollNote = note
         pollEvent = pollNote?.event as PollNoteEvent
         pollOptions = pollEvent?.pollOptions()
@@ -31,13 +33,14 @@ class PollNoteViewModel {
         closedAt = pollEvent?.getTagInt(CLOSED_AT)
 
         totalZapped = totalZapped()
+        wasZappedByAuthor = note?.let { account?.calculateIfNoteWasZappedByAccount(it) } ?: false
     }
 
     fun canZap(): Boolean {
         val account = account ?: return false
         val user = account.userProfile() ?: return false
         val note = pollNote ?: return false
-        return user != note.author && !note.isZappedBy(user, account)
+        return user != note.author && !wasZappedByAuthor
     }
 
     fun isVoteAmountAtomic() = valueMaximum != null && valueMinimum != null && valueMinimum == valueMaximum

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

@@ -309,7 +309,7 @@ fun ZapReaction(
     val account = accountState?.account ?: return
 
     val zapsState by baseNote.live().zaps.observeAsState()
-    val zappedNote = zapsState?.note
+    val zappedNote = zapsState?.note ?: return
     val zapMessage = ""
 
     var wantsToZap by remember { mutableStateOf(false) }
@@ -326,7 +326,7 @@ fun ZapReaction(
     LaunchedEffect(key1 = zapsState) {
         withContext(Dispatchers.IO) {
             if (!wasZappedByLoggedInUser) {
-                wasZappedByLoggedInUser = zappedNote?.isZappedBy(account.userProfile(), account) == true
+                wasZappedByLoggedInUser = accountViewModel.calculateIfNoteWasZappedByAccount(zappedNote)
             }
         }
     }
@@ -459,7 +459,7 @@ fun ZapReaction(
 
     LaunchedEffect(key1 = zapsState) {
         withContext(Dispatchers.IO) {
-            zapAmount = zappedNote?.zappedAmount()
+            zapAmount = account.calculateZappedAmount(zappedNote)
         }
     }
 

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

@@ -1,17 +1,22 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.saveable.rememberSaveable
 import com.vitorpamplona.amethyst.ui.navigation.Route
+import kotlin.math.roundToInt
 
 private val savedScrollStates = mutableMapOf<String, ScrollState>()
-private data class ScrollState(val index: Int, val scrollOffset: Int)
+
+private data class ScrollState(val index: Int, val scrollOffsetFraction: Float)
 
 object ScrollStateKeys {
     const val GLOBAL_SCREEN = "Global"
     const val NOTIFICATION_SCREEN = "Notifications"
+    const val VIDEO_SCREEN = "Video"
     val HOME_FOLLOWS = Route.Home.base + "Follows"
     val HOME_REPLIES = Route.Home.base + "FollowsReplies"
 }
@@ -25,16 +30,42 @@ fun rememberForeverLazyListState(
     val scrollState = rememberSaveable(saver = LazyListState.Saver) {
         val savedValue = savedScrollStates[key]
         val savedIndex = savedValue?.index ?: initialFirstVisibleItemIndex
-        val savedOffset = savedValue?.scrollOffset ?: initialFirstVisibleItemScrollOffset
+        val savedOffset = savedValue?.scrollOffsetFraction ?: initialFirstVisibleItemScrollOffset.toFloat()
         LazyListState(
             savedIndex,
-            savedOffset
+            savedOffset.roundToInt()
         )
     }
     DisposableEffect(Unit) {
         onDispose {
             val lastIndex = scrollState.firstVisibleItemIndex
             val lastOffset = scrollState.firstVisibleItemScrollOffset
+            savedScrollStates[key] = ScrollState(lastIndex, lastOffset.toFloat())
+        }
+    }
+    return scrollState
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun rememberForeverPagerState(
+    key: String,
+    initialFirstVisibleItemIndex: Int = 0,
+    initialFirstVisibleItemScrollOffset: Float = 0.0f
+): PagerState {
+    val scrollState = rememberSaveable(saver = PagerState.Saver) {
+        val savedValue = savedScrollStates[key]
+        val savedIndex = savedValue?.index ?: initialFirstVisibleItemIndex
+        val savedOffset = savedValue?.scrollOffsetFraction ?: initialFirstVisibleItemScrollOffset
+        PagerState(
+            savedIndex,
+            savedOffset
+        )
+    }
+    DisposableEffect(Unit) {
+        onDispose {
+            val lastIndex = scrollState.currentPage
+            val lastOffset = scrollState.currentPageOffsetFraction
             savedScrollStates[key] = ScrollState(lastIndex, lastOffset)
         }
     }

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

@@ -59,6 +59,10 @@ class AccountViewModel(private val account: Account) : ViewModel() {
         zap(note, amount, pollOption, message, context, onError, onProgress, account.defaultZapType)
     }
 
+    fun calculateIfNoteWasZappedByAccount(zappedNote: Note): Boolean {
+        return account.calculateIfNoteWasZappedByAccount(zappedNote)
+    }
+
     fun zap(note: Note, amount: Long, pollOption: Int?, message: String, context: Context, onError: (String) -> Unit, onProgress: (percent: Float) -> Unit, zapType: LnZapEvent.ZapType) {
         val lud16 = note.event?.zapAddress() ?: note.author?.info?.lud16?.trim() ?: note.author?.info?.lud06?.trim()
 
@@ -88,6 +92,7 @@ class AccountViewModel(private val account: Account) : ViewModel() {
                 if (account.hasWalletConnectSetup()) {
                     account.sendZapPaymentRequestFor(
                         bolt11 = it,
+                        note,
                         onResponse = { response ->
                             if (response is PayInvoiceErrorResponse) {
                                 onProgress(0.0f)

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

@@ -565,7 +565,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, accountViewMode
                     onSuccess = {
                         // pay directly
                         if (account.hasWalletConnectSetup()) {
-                            account.sendZapPaymentRequestFor(it) { response ->
+                            account.sendZapPaymentRequestFor(it, null) { response ->
                                 if (response is PayInvoiceSuccessResponse) {
                                     scope.launch {
                                         Toast.makeText(

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

@@ -6,6 +6,8 @@ import android.os.Build
 import androidx.compose.animation.Crossfade
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -22,10 +24,12 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.VerticalPager
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.runtime.Composable
@@ -37,16 +41,26 @@ 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.graphics.ColorMatrix
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
+import com.google.accompanist.flowlayout.FlowRow
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -56,10 +70,13 @@ import com.vitorpamplona.amethyst.service.NostrVideoDataSource
 import com.vitorpamplona.amethyst.service.model.FileHeaderEvent
 import com.vitorpamplona.amethyst.service.model.FileStorageHeaderEvent
 import com.vitorpamplona.amethyst.ui.actions.GallerySelect
+import com.vitorpamplona.amethyst.ui.actions.NewMediaModel
 import com.vitorpamplona.amethyst.ui.actions.NewMediaView
 import com.vitorpamplona.amethyst.ui.actions.NewPostView
 import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
+import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.dal.VideoFeedFilter
+import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.FileHeaderDisplay
 import com.vitorpamplona.amethyst.ui.note.FileStorageHeaderDisplay
 import com.vitorpamplona.amethyst.ui.note.LikeReaction
@@ -73,6 +90,10 @@ import com.vitorpamplona.amethyst.ui.screen.FeedError
 import com.vitorpamplona.amethyst.ui.screen.FeedState
 import com.vitorpamplona.amethyst.ui.screen.LoadingFeed
 import com.vitorpamplona.amethyst.ui.screen.NostrVideoFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
+import com.vitorpamplona.amethyst.ui.screen.rememberForeverPagerState
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @Composable
 fun VideoScreen(
@@ -116,7 +137,7 @@ fun VideoScreen(
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
         ) {
-            FeedView(videoFeedView, accountViewModel, navController)
+            FeedView(videoFeedView, accountViewModel, navController, ScrollStateKeys.VIDEO_SCREEN, scrollToTop)
         }
     }
 }
@@ -125,7 +146,9 @@ fun VideoScreen(
 fun FeedView(
     videoFeedView: NostrVideoFeedViewModel,
     accountViewModel: AccountViewModel,
-    navController: NavController
+    navController: NavController,
+    scrollStateKey: String? = null,
+    scrollToTop: Boolean = false
 ) {
     val feedState by videoFeedView.feedContent.collectAsState()
 
@@ -148,7 +171,9 @@ fun FeedView(
                         SlidingCarousel(
                             state.feed,
                             accountViewModel,
-                            navController
+                            navController,
+                            scrollStateKey,
+                            scrollToTop
                         )
                     }
 
@@ -166,15 +191,30 @@ fun FeedView(
 fun SlidingCarousel(
     feed: MutableState<List<Note>>,
     accountViewModel: AccountViewModel,
-    navController: NavController
+    navController: NavController,
+    scrollStateKey: String? = null,
+    scrollToTop: Boolean = false
 ) {
-    val pagerState: PagerState = remember { PagerState() }
+    val pagerState = if (scrollStateKey != null) {
+        rememberForeverPagerState(scrollStateKey)
+    } else {
+        remember { PagerState() }
+    }
+
+    if (scrollToTop) {
+        LaunchedEffect(Unit) {
+            pagerState.scrollToPage(page = 0)
+        }
+    }
 
     VerticalPager(
         pageCount = feed.value.size,
         state = pagerState,
         beyondBoundsPageCount = 1,
-        modifier = Modifier.fillMaxSize(1f)
+        modifier = Modifier.fillMaxSize(1f),
+        key = { index ->
+            feed.value.getOrNull(index)?.idHex ?: "$index"
+        }
     ) { index ->
         feed.value.getOrNull(index)?.let { note ->
             RenderVideoOrPictureNote(note, accountViewModel, navController)
@@ -209,14 +249,14 @@ private fun RenderVideoOrPictureNote(
     Row(verticalAlignment = Alignment.Bottom, modifier = Modifier.fillMaxSize(1f)) {
         Column(Modifier.weight(1f)) {
             Row(Modifier.padding(10.dp), verticalAlignment = Alignment.Bottom) {
-                Column(Modifier.size(45.dp), verticalArrangement = Arrangement.Center) {
-                    NoteAuthorPicture(note, navController, loggedIn, 45.dp)
+                Column(Modifier.size(55.dp), verticalArrangement = Arrangement.Center) {
+                    NoteAuthorPicture(note, navController, loggedIn, 55.dp)
                 }
 
                 Column(
                     Modifier
                         .padding(start = 10.dp, end = 10.dp)
-                        .height(45.dp)
+                        .height(60.dp)
                         .weight(1f),
                     verticalArrangement = Arrangement.Center
                 ) {
@@ -240,6 +280,9 @@ private fun RenderVideoOrPictureNote(
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         ObserveDisplayNip05Status(note.author!!, Modifier.weight(1f))
                     }
+                    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 5.dp)) {
+                        RelayBadges(baseNote = note)
+                    }
                 }
             }
         }
@@ -257,6 +300,42 @@ private fun RenderVideoOrPictureNote(
     }
 }
 
+@Composable
+private fun RelayBadges(baseNote: Note) {
+    val noteRelaysState by baseNote.live().relays.observeAsState()
+    val noteRelays = noteRelaysState?.note?.relays ?: emptySet()
+
+    var expanded by remember { mutableStateOf(false) }
+
+    val relaysToDisplay = noteRelays
+
+    val uri = LocalUriHandler.current
+
+    FlowRow() {
+        relaysToDisplay.forEach {
+            val url = it.removePrefix("wss://").removePrefix("ws://")
+            Box(
+                Modifier
+                    .size(15.dp)
+                    .padding(1.dp)
+            ) {
+                RobohashFallbackAsyncImage(
+                    robot = "https://$url/favicon.ico",
+                    robotSize = 15.dp,
+                    model = "https://$url/favicon.ico",
+                    contentDescription = stringResource(id = R.string.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") })
+                )
+            }
+        }
+    }
+}
+
 @Composable
 fun ReactionsColumn(baseNote: Note, accountViewModel: AccountViewModel, navController: NavController) {
     val accountState by accountViewModel.accountLiveData.observeAsState()
@@ -305,6 +384,26 @@ fun NewImageButton(accountViewModel: AccountViewModel, navController: NavControl
         mutableStateOf<Uri?>(null)
     }
 
+    val scope = rememberCoroutineScope()
+
+    val postViewModel: NewMediaModel = viewModel()
+    postViewModel.onceUploaded {
+        scope.launch {
+            // awaits an refresh on the list
+            delay(250)
+            val route = Route.Video.route.replace("{scrollToTop}", "true")
+            navController.navigate(route) {
+                navController.graph.startDestinationRoute?.let { start ->
+                    popUpTo(start) { inclusive = false }
+                    restoreState = true
+                }
+
+                launchSingleTop = true
+                restoreState = true
+            }
+        }
+    }
+
     if (wantsToPost) {
         val cameraPermissionState =
             rememberPermissionState(
@@ -336,21 +435,53 @@ fun NewImageButton(accountViewModel: AccountViewModel, navController: NavControl
     }
 
     pickedURI?.let {
-        NewMediaView(it, onClose = { pickedURI = null }, accountViewModel = accountViewModel, navController = navController)
-    }
-
-    OutlinedButton(
-        onClick = { wantsToPost = true },
-        modifier = Modifier.size(55.dp),
-        shape = CircleShape,
-        colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
-        contentPadding = PaddingValues(0.dp)
-    ) {
-        Icon(
-            painter = painterResource(R.drawable.ic_compose),
-            null,
-            modifier = Modifier.size(26.dp),
-            tint = Color.White
+        NewMediaView(
+            uri = it,
+            onClose = { pickedURI = null },
+            postViewModel = postViewModel,
+            accountViewModel = accountViewModel,
+            navController = navController
         )
     }
+
+    if (postViewModel.isUploadingImage) {
+        ShowProgress(postViewModel)
+    } else {
+        OutlinedButton(
+            onClick = { wantsToPost = true },
+            modifier = Modifier.size(55.dp),
+            shape = CircleShape,
+            colors = ButtonDefaults.outlinedButtonColors(backgroundColor = MaterialTheme.colors.primary),
+            contentPadding = PaddingValues(0.dp)
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.ic_compose),
+                null,
+                modifier = Modifier.size(26.dp),
+                tint = Color.White
+            )
+        }
+    }
+}
+
+@Composable
+private fun ShowProgress(postViewModel: NewMediaModel) {
+    Box(Modifier.size(55.dp), contentAlignment = Alignment.Center) {
+        CircularProgressIndicator(
+            progress = postViewModel.uploadingPercentage.value,
+            modifier = Modifier
+                .size(55.dp)
+                .background(MaterialTheme.colors.background)
+                .clip(CircleShape),
+            strokeWidth = 5.dp
+        )
+        postViewModel.uploadingDescription.value?.let {
+            Text(
+                it,
+                color = MaterialTheme.colors.onSurface,
+                fontSize = 10.sp,
+                textAlign = TextAlign.Center
+            )
+        }
+    }
 }