laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-10-06 19:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3373 from vitorpamplona/claude/adoring-shannon-h3pkfe

Browse Source 
Render zap receipts as full notes in MultiSetCompose
This commit is contained in:
Vitor Pamplona
2026-06-25 20:07:03 -04:00
committed by GitHub
parent 97efa23548 1614e01f0e
commit 74446e39cd
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
+20 -12
View File
@@ -87,8 +87,6 @@ import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.navigation.routes.authorRouteFor
import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
import com.vitorpamplona.amethyst.ui.note.elements.NoteDropDownMenu
import com.vitorpamplona.amethyst.ui.note.types.RenderLnZap
import com.vitorpamplona.amethyst.ui.note.types.RenderNutzap
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.CombinedZap
import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.MultiSetCard
@@ -185,29 +183,39 @@ fun MultiSetCompose(
},
onLongClick = { popupExpanded.value = true },
).padding(
start = 12.dp,
end = 12.dp,
top = 10.dp,
bottom = if (isLargeCard) 10.dp else 0.dp,
// The large-card branch renders through NoteCompose, which applies
// its own 12dp/10dp note padding; let it own the inset there so we
// don't double it up. The gallery branch keeps the card's padding.
start = if (isLargeCard) 0.dp else 12.dp,
end = if (isLargeCard) 0.dp else 12.dp,
top = if (isLargeCard) 0.dp else 10.dp,
bottom = 0.dp,
)
}
Column(modifier = columnModifier) {
when {
// Render the lone zap/nutzap as a full note (author picture on the left,
// the zap card as its body) by reusing NoteCompose on the receipt note,
// instead of dropping the bare activity card into the feed.
singleZap != null ->
RenderLnZap(
note = singleZap.response,
NoteCompose(
baseNote = singleZap.response,
routeForLastRead = null,
isHiddenFeed = showHidden,
quotesLeft = 1,
backgroundColor = backgroundColor,
parentBackgroundColor = backgroundColor,
accountViewModel = accountViewModel,
nav = nav,
)
singleNutzap != null ->
RenderNutzap(
note = singleNutzap,
NoteCompose(
baseNote = singleNutzap,
routeForLastRead = null,
isHiddenFeed = showHidden,
quotesLeft = 1,
backgroundColor = backgroundColor,
parentBackgroundColor = backgroundColor,
accountViewModel = accountViewModel,
nav = nav,
)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+10
View File
@@ -2010,6 +2010,16 @@ fun RenderAuthorImages(
} else {
NoteAuthorPicture(baseNote, Size55dp, accountViewModel = accountViewModel, nav = nav)
}
} else if (noteEvent is LnZapEvent) {
// Zap receipts are signed by the recipient's lightning provider; show the
// sender from the embedded zap request instead of the service key, matching
// how the thread's master note resolves the author.
val zapSender = observeZapSender(baseNote, accountViewModel).value
if (zapSender != null) {
UserPicture(zapSender, Size55dp, accountViewModel = accountViewModel, nav = nav)
} else {
NoteAuthorPicture(baseNote, Size55dp, accountViewModel = accountViewModel, nav = nav)
}
} else {
NoteAuthorPicture(baseNote, Size55dp, accountViewModel = accountViewModel, nav = nav)
}