Merge pull request #3455 from getAlby/subsat-amounts

feat: handle sub sat amounts

Author: pavanjoshi914

src/app/screens/ConfirmPayment/index.tsx

@@ -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 () => {
@@ -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}
                   />

src/app/screens/ConfirmPaymentAsync/index.tsx

@@ -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);
 
@@ -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}
                 />

src/extension/background-script/connectors/galoy.ts

@@ -225,7 +225,7 @@ class Galoy implements Connector {
             const rate = await getCurrencyRateWithCache(CURRENCIES[currency]);
             absSettlementAmount = this.fromFiatCents(absSettlementAmount);
             displayAmount = [absSettlementAmount, CURRENCIES[currency]];
-            absSettlementAmount = Math.floor(absSettlementAmount / rate);
+            absSettlementAmount = Math.ceil(absSettlementAmount / rate);
           }
 
           const createdAtDate = new Date(tx.createdAt * 1000);

src/extension/background-script/connectors/lnbits.ts

@@ -142,7 +142,7 @@ class LnBits implements Connector {
               settled: !transaction.pending,
               settleDate: transaction.time * 1000,
               creationDate: creationDate,
-              totalAmount: Math.abs(Math.floor(transaction.amount / 1000)),
+              totalAmount: Math.ceil(Math.abs(transaction.amount / 1000)),
               type: transaction.amount > 0 ? "received" : "sent",
             };
           })

src/extension/background-script/connectors/nwc.ts

@@ -103,7 +103,7 @@ class NWCConnector implements Connector {
             settled: transaction.state == "settled",
             settleDate: transaction.settled_at * 1000,
             creationDate: transaction.created_at * 1000,
-            totalAmount: Math.floor(transaction.amount / 1000),
+            totalAmount: Math.ceil(transaction.amount / 1000),
             type: transaction.type == "incoming" ? "received" : "sent",
             custom_records: this.tlvToCustomRecords(
               transaction.metadata?.["tlv_records"] as TLVRecord[] | undefined