fix(wallet): gate the received-payment toast on status, not absent pending #169

Merged
padreug merged 1 commit from fix/wallet-payment-toast-guard into dev 2026-09-22 21:16:07 +00:00
Showing only changes of commit 18304984ce - Show all commits

fix(wallet): gate the received-payment toast on status, not absent pending

Last remaining reader of the phantom `pending` field, same root cause as
#161: it is a pydantic `@property` and never appears in the payload, so
`!payment.pending` was always true. The guard reduced to `amount > 0`
alone and never actually suppressed an unsettled payment, which is what
it was there to do. Now checks `status === 'success'`.

The nested `else` that toasted "Sent N sats" was unreachable: the
enclosing condition already required `amount > 0`. Dropped rather than
repaired, because a send made from this app is already confirmed by
SendDialog's own success toast and re-announcing it here would double
up. An outgoing payment made from another client on the same wallet
still lands in the history list; it just does not raise a toast.

Verified against a live settled payment over the websocket:

  amount=44000  status=success  pending key present=False

Found while checking that the six merged wallet PRs behaved correctly
together.
Padreug 2026-09-22 23:10:31 +02:00

View file

@ -289,14 +289,21 @@ export class WalletWebSocketService extends BaseService {
this.walletService.addTransaction(payment)
}
// Show toast notification for incoming payments
if (payment.amount > 0 && !payment.pending) {
// Toast incoming payments only, and only once settled.
//
// This guard used to read `!payment.pending`, which is never present in
// the payload (a pydantic `@property`; see mapPaymentStatus in
// WalletService), so it was always true and an unsettled payment could
// announce itself as received. `status` is the real field.
//
// The old `else` branch toasted outgoing payments but was unreachable,
// since the enclosing condition already required `amount > 0`. It is
// dropped rather than fixed: a send made from this app is already
// confirmed by SendDialog's own toast, so re-announcing it here would
// double up.
if (payment.amount > 0 && payment.status === 'success') {
const amountSats = Math.abs(payment.amount / 1000)
if (payment.amount > 0) {
this.toast.success(`Received ${amountSats} sats!`)
} else {
this.toast.info(`Sent ${amountSats} sats`)
}
this.toast.success(`Received ${amountSats} sats!`)
}
}