Skip to content

fix: from and to descriptions in transaction item for zaps and swaps #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolznz merged 3 commits into from
Sep 17, 2025
Merged

fix: from and to descriptions in transaction item for zaps and swaps #1730

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94bbb6f
fix: from and to descriptions in transaction item for zaps and swaps
rolznz Sep 17, 2025
f117349
fix: only set to if type is outgoing
rolznz Sep 17, 2025
f3cde5f
fix: swap to copy
rolznz Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions frontend/src/components/TransactionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,28 @@ function TransactionItem({ tx }: Props) {
const npub = pubkey ? safeNpubEncode(pubkey) : undefined;

const payerName = tx.metadata?.payer_data?.name;
const from = payerName
? `from ${payerName}`
: npub
? `zap from ${npub.substring(0, 12)}...`
const from =
type === "incoming"
? payerName
? `from ${payerName}`
: npub
? `zap from ${npub.substring(0, 12)}...`
: swap
? `swap from ${swap.lockupAddress}`
: undefined
: undefined;

const recipientIdentifier = tx.metadata?.recipient_data?.identifier;
const to =
swap?.type === "out" ? swap.destinationAddress : recipientIdentifier;
type === "outgoing"
? npub
? `zap to ${npub.substring(0, 12)}...`
: swap?.type === "out"
? `swap to ${swap.destinationAddress}`
: recipientIdentifier
? `${tx.state === "failed" ? "payment " : ""}to ${recipientIdentifier}`
: undefined
: undefined;

const eventId = tx.metadata?.nostr?.tags?.find((t) => t[0] === "e")?.[1];

Expand Down Expand Up @@ -162,11 +175,7 @@ function TransactionItem({ tx }: Props) {
<span className="md:text-xl font-semibold break-all line-clamp-1">
{typeStateText}
{from !== undefined && <>&nbsp;{from}</>}
{to !== undefined && (
<>
&nbsp;{tx.state === "failed" ? "payment " : ""}to {to}
</>
)}
{to !== undefined && <>&nbsp;{to}</>}
</span>
<span className="text-xs md:text-base text-muted-foreground shrink-0">
{dayjs(tx.updatedAt).fromNow()}
Expand Down
Loading