Skip to content

Merge zaps into ReactionGroup to fix duplicate notification cards#102

Merged
barrydeen merged 1 commit intomainfrom
refactor/merge-zaps-into-reaction-groups
Mar 1, 2026
Merged

Merge zaps into ReactionGroup to fix duplicate notification cards#102
barrydeen merged 1 commit intomainfrom
refactor/merge-zaps-into-reaction-groups

Conversation

@barrydeen
Copy link
Copy Markdown
Owner

Summary

  • Merges ZapGroup into ReactionGroup using a ZAP_EMOJI sentinel key (same pattern as REPOST_EMOJI), fixing duplicate notification cards when a note receives both reactions and zaps
  • Adds zapEntries: List<ZapEntry> field to ReactionGroup to preserve per-zap data (sats, message)
  • Removes ZapGroup data class, ZapGroupRow composable, and all associated branching
  • Zap rows render inside ReactionGroupRow in order: zaps → reposts → emoji reactions

Test plan

  • Receive reactions + zaps on the same note — single card with zap rows + reaction rows
  • Old zap + recent reaction — zap should NOT appear in "recent" split
  • ZAPS filter tab still shows relevant notifications
  • Zap amounts and messages still display correctly
  • Repost + zap + reaction on same note — all three sections render in correct order

…cation cards

Notes receiving both reactions and zaps previously appeared as separate cards.
Zaps now use a ZAP_EMOJI sentinel key in ReactionGroup (same pattern as reposts),
with ZapEntry data stored in a new zapEntries field. ZapGroup is removed entirely.
@barrydeen barrydeen merged commit 34a9289 into main Mar 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant