ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1709 from stackernews/fix-client-pending-forwards-paid 

Fix pending forwards considered paid by client
This commit is contained in:
Keyan 2024-12-11 14:43:33 -06:00 committed by GitHub
parent 3fe5f4b435 4e6fb40c0b
commit 0e765d4179
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/item-act.js
View File

@ -232,9 +232,15 @@ export function useAct ({ query = ACT_MUTATION, ...options } = {}) {
// because the mutation name we use varies, // because the mutation name we use varies,
// we need to extract the result/invoice from the response // we need to extract the result/invoice from the response
const getPaidActionResult = data => Object.values(data)[0] const getPaidActionResult = data => Object.values(data)[0]
const wallets = useSendWallets()
const [act] = usePaidMutation(query, { const [act] = usePaidMutation(query, {
waitFor: inv => inv?.satsReceived > 0, waitFor: inv =>
// if we have attached wallets, we might be paying a wrapped invoice in which case we need to make sure
// we don't prematurely consider the payment as successful (important for receiver fallbacks)
wallets.length > 0
? inv?.actionState === 'PAID'
: inv?.satsReceived > 0,
...options, ...options,
update: (cache, { data }) => { update: (cache, { data }) => {
const response = getPaidActionResult(data) const response = getPaidActionResult(data)

6
components/use-invoice.js
View File

@ -23,12 +23,12 @@ export default function useInvoice () {
throw new InvoiceExpiredError(data.invoice) throw new InvoiceExpiredError(data.invoice)
} }
const failed = cancelled || actionError const failedForward = forwardStatus && forwardStatus !== 'CONFIRMED'
if (failedForward) {
if (failed && (forwardStatus && forwardStatus !== 'CONFIRMED')) {
throw new WalletReceiverError(data.invoice) throw new WalletReceiverError(data.invoice)
} }
const failed = cancelled || actionError
if (failed) { if (failed) {
throw new InvoiceCanceledError(data.invoice, actionError) throw new InvoiceCanceledError(data.invoice, actionError)
} }