Skip to content
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

Jump to bottom

fix: correct total amount in notifcations #3194

Merged
merged 3 commits into from
Jul 18, 2024
Merged

fix: correct total amount in notifcations #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ce2d73
feat: show totalamount including fees in notifications
pavanjoshi914 Jul 15, 2024
d7c7269
Merge remote-tracking branch 'upstream/master' into fix-notification-…
pavanjoshi914 Jul 16, 2024
0bc4201
fix: return totalAmount as only amount send by the user for notificat…
pavanjoshi914 Jul 18, 2024
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
3 changes: 2 additions & 1 deletion src/extension/background-script/connectors/lnd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,12 @@ class Lnd implements Connector {
if (data.payment_error) {
throw new Error(data.payment_error);
}
const { total_amt, total_fees } = data.payment_route;
return {
data: {
preimage: utils.base64ToHex(data.payment_preimage),
paymentHash: utils.base64ToHex(data.payment_hash),
route: data.payment_route,
route: { total_amt: total_amt - total_fees, total_fees },
},
};
});
Expand Down
2 changes: 1 addition & 1 deletion src/extension/background-script/events/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const paymentSuccessNotification = async (

const route = paymentResponseData?.data.route;
const { total_amt, total_fees } = route;
const paymentAmount = total_amt - total_fees;
const paymentAmount = total_amt;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if this is correct for all the connectors?
is that correct for LND, NWC, alby?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alby to lndhub -correct
lndhub to alby - fees is always zero. total amount is correct no issues
lnd to lnd (testnet) - correct
nwc to alby oauth - totalAmount correct, fees shown 0
alby oauth to nwc - totalAmount correct, fees shown 8 sats

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for all the cases totalAmount is correct which is the amount that user paid. but in some cases even if fees is charged fees is not returned in the route which maybe corrected on server side

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I think LND returns the total_amt with the fees (which is why we deduct it here)
but all others return the paid amount without the fee.

which means your change is OK. but we might need to change the LND connector to return the sent amount.


const { settings } = state.getState();
const { showFiat, currency, locale } = settings;
Expand Down
Loading