Skip to content

feat: handle sub sat amounts #3455

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
merged 3 commits into from
Nov 7, 2025
+18 −16
Merged

feat: handle sub sat amounts #3455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35c194a
feat: handle sub sat amounts
pavanjoshi914 Oct 23, 2025
466a098
Merge remote-tracking branch 'upstream/master' into subsat-amounts
pavanjoshi914 Nov 4, 2025
4cc4337
feat: use Math.ceil to round off
pavanjoshi914 Nov 7, 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
17 changes: 9 additions & 8 deletions src/app/screens/ConfirmPayment/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,26 @@ function ConfirmPayment() {
const paymentRequest = navState.args?.paymentRequest as string;
const invoice = lightningPayReq.decode(paymentRequest);

const amountSat =
invoice.satoshis || Number(invoice.millisatoshis) / 1000 || 0;

const navigate = useNavigate();
const auth = useAccount();

const [budget, setBudget] = useState(
((invoice.satoshis || 0) * 10).toString()
);
const [budget, setBudget] = useState((amountSat * 10).toString());
const [fiatAmount, setFiatAmount] = useState("");
const [fiatBudgetAmount, setFiatBudgetAmount] = useState("");

const formattedInvoiceSats = getFormattedSats(invoice.satoshis || 0);
const formattedInvoiceSats = getFormattedSats(amountSat);

useEffect(() => {
(async () => {
if (showFiat && invoice.satoshis) {
const res = await getFormattedFiat(invoice.satoshis);
if (showFiat && amountSat !== 0) {
const res = await getFormattedFiat(amountSat);
setFiatAmount(res);
}
})();
}, [invoice.satoshis, showFiat, getFormattedFiat]);
}, [amountSat, showFiat, getFormattedFiat]);

useEffect(() => {
(async () => {
Expand Down Expand Up @@ -150,7 +151,7 @@ function ConfirmPayment() {
<div className="my-4">
<div className="mb-4 p-4 shadow bg-white dark:bg-surface-02dp rounded-lg">
<PaymentSummary
amount={invoice.satoshis || "0"} // TODO: allow entering amount or do not allow zero-amount invoices
amount={amountSat} // TODO: allow entering amount or do not allow zero-amount invoices
fiatAmount={fiatAmount}
description={invoice.tagsObject.description}
/>
Expand Down
11 changes: 6 additions & 5 deletions src/app/screens/ConfirmPaymentAsync/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,20 @@ function ConfirmPaymentAsync() {
const navState = useNavigationState();
const paymentRequest = navState.args?.paymentRequest as string;
const invoice = lightningPayReq.decode(paymentRequest);

const amountSat =
invoice.satoshis || Number(invoice.millisatoshis) / 1000 || 0;
const navigate = useNavigate();

const [fiatAmount, setFiatAmount] = useState("");

useEffect(() => {
(async () => {
if (showFiat && invoice.satoshis) {
const res = await getFormattedFiat(invoice.satoshis);
if (showFiat && amountSat !== 0) {
const res = await getFormattedFiat(amountSat);
setFiatAmount(res);
}
})();
}, [invoice.satoshis, showFiat, getFormattedFiat]);
}, [amountSat, showFiat, getFormattedFiat]);

const [loading, setLoading] = useState(false);

Expand Down Expand Up @@ -99,7 +100,7 @@ function ConfirmPaymentAsync() {
<div className="my-4">
<div className="mb-4 p-4 shadow bg-white dark:bg-surface-02dp rounded-lg">
<PaymentSummary
amount={invoice.satoshis || "0"} // TODO: allow entering amount or do not allow zero-amount invoices
amount={amountSat} // TODO: allow entering amount or do not allow zero-amount invoices
fiatAmount={fiatAmount}
description={invoice.tagsObject.description}
/>
Expand Down