From 59b35c68dcd768e3ca99a5b73801497e09edb0f9 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Wed, 22 Nov 2023 17:30:25 -0800 Subject: [PATCH] Bug fix: Open offers --- backend/controllers/cln/payments.js | 6 +++++- server/controllers/cln/payments.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/controllers/cln/payments.js b/backend/controllers/cln/payments.js index 6c299cc2..900aa192 100644 --- a/backend/controllers/cln/payments.js +++ b/backend/controllers/cln/payments.js @@ -127,6 +127,10 @@ export const postPayment = (req, res, next) => { else { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Invoice Payment..' }); } + if (req.body.paymentType === 'OFFER') { + // delete amount for zero amt offer also as fetchinvoice already has amount information + delete options_body.amount_msat; + } delete options_body.uiMessage; delete options_body.fromDialog; delete options_body.paymentType; @@ -145,7 +149,7 @@ export const postPayment = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body }); if (req.body.paymentType === 'OFFER') { if (req.body.saveToDB && req.body.bolt12) { - const offerToUpdate = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() }; + const offerToUpdate = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount_msat), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() }; if (req.body.issuer) { offerToUpdate['issuer'] = req.body.issuer; } diff --git a/server/controllers/cln/payments.ts b/server/controllers/cln/payments.ts index e37efbe7..735087bc 100644 --- a/server/controllers/cln/payments.ts +++ b/server/controllers/cln/payments.ts @@ -117,6 +117,10 @@ export const postPayment = (req, res, next) => { } else { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sending Invoice Payment..' }); } + if (req.body.paymentType === 'OFFER') { + // delete amount for zero amt offer also as fetchinvoice already has amount information + delete options_body.amount_msat; + } delete options_body.uiMessage; delete options_body.fromDialog; delete options_body.paymentType; @@ -135,7 +139,7 @@ export const postPayment = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Payment Sent', data: body }); if (req.body.paymentType === 'OFFER') { if (req.body.saveToDB && req.body.bolt12) { - const offerToUpdate: Offer = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() }; + const offerToUpdate: Offer = { bolt12: req.body.bolt12, amountMSat: (req.body.zeroAmtOffer ? 0 : req.body.amount_msat), title: req.body.title, lastUpdatedAt: new Date(Date.now()).getTime() }; if (req.body.issuer) { offerToUpdate['issuer'] = req.body.issuer; } if (req.body.description) { offerToUpdate['description'] = req.body.description; } // eslint-disable-next-line arrow-body-style