accumulator · Apr 15, 2026 · Apr 17, 2026 · Apr 15, 2026 · Apr 16, 2026 · Apr 15, 2026
diff --git a/electrum/commands.py b/electrum/commands.py
@@ -107,7 +107,7 @@ def satoshis(amount):
     return int(COIN*to_decimal(amount)) if amount is not None else None
 
 
-def format_satoshis(x: Union[float, int, Decimal, None]) -> Optional[str]:
+def format_satoshis(x: Union[int, Decimal, None]) -> Optional[str]:
     """
     input: satoshis as a Number
     output: str formatted as bitcoin amount
@@ -1420,7 +1420,7 @@ async def add_request(self, amount, memo='', expiry=3600, lightning=False, force
         else:
             addr = None
         expiry = int(expiry) if expiry else None
-        key = wallet.create_request(amount, memo, expiry, addr)
+        key = wallet.create_request(amount_sat=amount, message=memo, exp_delay=expiry, address=addr)
         req = wallet.get_request(key)
         return wallet.export_request(req)
 

diff --git a/electrum/gui/qml/components/BalanceDetails.qml b/electrum/gui/qml/components/BalanceDetails.qml
@@ -214,7 +214,7 @@ Pane {
                 Layout.preferredWidth: 1
                 text: qsTr('Lightning swap');
                 visible: Daemon.currentWallet.isLightning
-                enabled: Daemon.currentWallet.lightningCanSend.satsInt > 0 || Daemon.currentWallet.lightningCanReceive.satsInt > 0
+                enabled: !Daemon.currentWallet.lightningCanSend.isEmpty || !Daemon.currentWallet.lightningCanReceive.isEmpty
                 icon.source: Qt.resolvedUrl('../../icons/update.png')
                 onClicked: app.startSwap()
             }
@@ -224,7 +224,7 @@ Pane {
                 Layout.preferredWidth: 1
                 text: qsTr('Open Channel')
                 visible: Daemon.currentWallet.isLightning
-                enabled: Daemon.currentWallet.confirmedBalance.satsInt > 0
+                enabled: !Daemon.currentWallet.confirmedBalance.isEmpty
                 onClicked: {
                     var dialog = openChannelDialog.createObject(rootItem)
                     dialog.open()

diff --git a/electrum/gui/qml/components/ChannelDetails.qml b/electrum/gui/qml/components/ChannelDetails.qml
@@ -118,6 +118,7 @@ Pane {
                             FormattedAmount {
                                 visible: channeldetails.isOpen
                                 amount: channeldetails.localCapacity
+                                msatPrecision: true
                             }
 
                             Label {
@@ -136,6 +137,7 @@ Pane {
                                     visible: !channeldetails.frozenForSending
                                     amount: channeldetails.canSend
                                     singleLine: false
+                                    msatPrecision: true
                                 }
                                 Label {
                                     visible: channeldetails.frozenForSending
@@ -168,6 +170,7 @@ Pane {
                                     visible: !channeldetails.frozenForReceiving
                                     amount: channeldetails.canReceive
                                     singleLine: false
+                                    msatPrecision: true
                                 }
 
                                 Label {

diff --git a/electrum/gui/qml/components/Channels.qml b/electrum/gui/qml/components/Channels.qml
@@ -123,16 +123,16 @@ Pane {
                 Layout.fillWidth: true
                 Layout.preferredWidth: 1
                 text: qsTr('Swap');
-                enabled: Daemon.currentWallet.lightningCanSend.satsInt > 0 ||
-                    (Daemon.currentWallet.lightningCanReceive.satsInt > 0 && Daemon.currentWallet.confirmedBalance.satsInt > 0)
+                enabled: !Daemon.currentWallet.lightningCanSend.isEmpty ||
+                    (!Daemon.currentWallet.lightningCanReceive.isEmpty && !Daemon.currentWallet.confirmedBalance.isEmpty)
                 icon.source: Qt.resolvedUrl('../../icons/update.png')
                 onClicked: app.startSwap()
             }
 
             FlatButton {
                 Layout.fillWidth: true
                 Layout.preferredWidth: 1
-                enabled: Daemon.currentWallet.canHaveLightning && Daemon.currentWallet.confirmedBalance.satsInt > 0
+                enabled: Daemon.currentWallet.canHaveLightning && !Daemon.currentWallet.confirmedBalance.isEmpty
                 text: qsTr('Open Channel')
                 onClicked: {
                     if (Daemon.currentWallet.channelModel.count == 0) {

diff --git a/electrum/gui/qml/components/ConfirmTxDialog.qml b/electrum/gui/qml/components/ConfirmTxDialog.qml
@@ -29,20 +29,6 @@ ElDialog {
     height: parent.height
     padding: 0
 
-    function updateAmountText() {
-        if (finalizer.valid) {
-            btcValue.text = Config.formatSats(finalizer.effectiveAmount, false)
-            fiatValue.text = Daemon.fx.enabled
-                ? Daemon.fx.fiatValue(finalizer.effectiveAmount, false)
-                : ''
-        } else {
-            btcValue.text = Config.formatSats(finalizer.amount, false)
-            fiatValue.text = Daemon.fx.enabled
-                ? Daemon.fx.fiatValue(finalizer.amount, false)
-                : ''
-        }
-    }
-
     ColumnLayout {
         anchors.fill: parent
         spacing: 0
@@ -79,6 +65,7 @@ ElDialog {
                         Label {
                             id: btcValue
                             Layout.alignment: Qt.AlignRight
+                            text: Config.formatSats(finalizer.valid ? finalizer.effectiveAmount : finalizer.amount, false)
                             font.pixelSize: constants.fontSizeXLarge
                             font.family: FixedFont
                             font.bold: true
@@ -95,6 +82,9 @@ ElDialog {
                             id: fiatValue
                             Layout.alignment: Qt.AlignRight
                             visible: Daemon.fx.enabled
+                            text: Daemon.fx.enabled
+                                ? Daemon.fx.fiatValue(finalizer.valid ? finalizer.effectiveAmount : finalizer.amount, false)
+                                : ''
                             font.pixelSize: constants.fontSizeMedium
                             color: constants.mutedForeground
                         }
@@ -106,16 +96,6 @@ ElDialog {
                             font.pixelSize: constants.fontSizeMedium
                             color: constants.mutedForeground
                         }
-                        Component.onCompleted: updateAmountText()
-                        Connections {
-                            target: finalizer
-                            function onEffectiveAmountChanged() {
-                                updateAmountText()
-                            }
-                            function onValidChanged() {
-                                updateAmountText()
-                            }
-                        }
                     }
                 }
 

diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -231,16 +231,16 @@ ElDialog {
                                 color: readOnly
                                     ? Material.accentColor
                                     : Material.foreground
-                                onTextAsSatsChanged: {
+                                onValueChanged: {
                                     if (!amountMax.checked)
                                         invoice.amountOverride.copyFrom(textAsSats)
                                 }
                                 Connections {
                                     target: invoice.amountOverride
-                                    function onSatsIntChanged() {
-                                        console.log('amountOverride satsIntChanged, sats=' + invoice.amountOverride.satsInt)
+                                    function onValueChanged() {
+                                        console.log('amountOverride valueChanged, sats=' + invoice.amountOverride.satsStr)
                                         if (amountMax.checked)  // amountOverride updated by max amount estimate
-                                            amountBtc.text = Config.formatSatsForEditing(invoice.amountOverride.satsInt)
+                                            amountBtc.text = Config.formatSatsForEditing(invoice.amountOverride)
                                     }
                                 }
                             }
@@ -473,7 +473,7 @@ ElDialog {
                 enabled: !invoice.isSaved && invoice.canSave
                 onClicked: {
                     if (invoice.amount.isEmpty) {
-                        invoice.amountOverride = Config.unitsToSats(amountBtc.text)
+                        invoice.amountOverride = Config.baseunitStrToAmount(amountBtc.text)
                         if (amountMax.checked)
                             invoice.amountOverride.isMax = true
                     }
@@ -491,7 +491,7 @@ ElDialog {
                 enabled: invoice.invoiceType != Invoice.Invalid && invoice.canPay
                 onClicked: {
                     if (invoice.amount.isEmpty) {
-                        invoice.amountOverride = Config.unitsToSats(amountBtc.text)
+                        invoice.amountOverride = Config.baseunitStrToAmount(amountBtc.text)
                         if (amountMax.checked)
                             invoice.amountOverride.isMax = true
                     }

diff --git a/electrum/gui/qml/components/LightningPaymentDetails.qml b/electrum/gui/qml/components/LightningPaymentDetails.qml
@@ -49,7 +49,7 @@ Pane {
             }
 
             Label {
-                text: lnpaymentdetails.amount.msatsInt > 0
+                text: lnpaymentdetails.amount.positive
                         ? qsTr('Amount received')
                         : qsTr('Amount sent')
                 color: Material.accentColor
@@ -58,18 +58,20 @@ Pane {
             FormattedAmount {
                 amount: lnpaymentdetails.amount
                 timestamp: lnpaymentdetails.timestamp
+                msatPrecision: true
             }
 
             Label {
-                visible: lnpaymentdetails.amount.msatsInt < 0
+                visible: !lnpaymentdetails.amount.positive
                 text: qsTr('Transaction fee')
                 color: Material.accentColor
             }
 
             FormattedAmount {
-                visible: lnpaymentdetails.amount.msatsInt < 0
+                visible: !lnpaymentdetails.amount.positive
                 amount: lnpaymentdetails.fee
                 timestamp: lnpaymentdetails.timestamp
+                msatPrecision: true
             }
 
             Label {

diff --git a/electrum/gui/qml/components/LnurlPayRequestDialog.qml b/electrum/gui/qml/components/LnurlPayRequestDialog.qml
@@ -19,10 +19,15 @@ ElDialog {
     needsSystemBarPadding: false
 
     property bool commentValid: comment.text.length <= invoiceParser.lnurlData['comment_allowed']
-    property bool amountValid: amountBtc.textAsSats.satsInt >= parseInt(invoiceParser.lnurlData['min_sendable_sat'])
-        && amountBtc.textAsSats.satsInt <= parseInt(invoiceParser.lnurlData['max_sendable_sat'])
+    property bool amountValid: isValidAmount()
     property bool valid: commentValid && amountValid
 
+    function isValidAmount() {
+        return amountBtc.textAsSats.bind.gte(invoiceParser.lnurlData['min_sendable_msat'])
+            && amountBtc.textAsSats.bind.lte(invoiceParser.lnurlData['max_sendable_msat'])
+            && amountBtc.textAsSats.bind.lte(invoiceParser.wallet.lightningCanSend)
+    }
+
     ColumnLayout {
         width: parent.width
 
@@ -41,8 +46,11 @@ ElDialog {
                 Layout.columnSpan: 2
                 Layout.fillWidth: true
                 compact: true
-                visible: invoiceParser.lnurlData['min_sendable_sat'] != invoiceParser.lnurlData['max_sendable_sat']
-                text: qsTr('Amount must be between %1 and %2 %3').arg(Config.formatSats(invoiceParser.lnurlData['min_sendable_sat'])).arg(Config.formatSats(invoiceParser.lnurlData['max_sendable_sat'])).arg(Config.baseUnit)
+                visible: !invoiceParser.lnurlData['min_sendable_msat'].eq(invoiceParser.lnurlData['max_sendable_msat'])
+                text: qsTr('Amount must be between %1 and %2 %3')
+                    .arg(Config.formatMilliSats(invoiceParser.lnurlData['min_sendable_msat']))
+                    .arg(Config.formatMilliSats(invoiceParser.lnurlData['max_sendable_msat']))
+                    .arg(Config.baseUnit)
                 backgroundColor: constants.darkerDialogBackground
             }
 
@@ -74,13 +82,12 @@ ElDialog {
                 BtcField {
                     id: amountBtc
                     Layout.preferredWidth: rootLayout.width /3
-                    text: Config.formatSatsForEditing(invoiceParser.lnurlData['min_sendable_sat'])
-                    enabled: invoiceParser.lnurlData['min_sendable_sat'] != invoiceParser.lnurlData['max_sendable_sat']
+                    text: Config.formatMilliSatsForEditing(invoiceParser.lnurlData['min_sendable_msat'])
+                    enabled: !invoiceParser.lnurlData['min_sendable_msat'].eq(invoiceParser.lnurlData['max_sendable_msat'])
                     color: Material.foreground // override gray-out on disabled
                     fiatfield: amountFiat
-                    onTextAsSatsChanged: {
-                        invoiceParser.amountOverride = textAsSats
-                    }
+                    msatPrecision: true
+                    onValueChanged: invoiceParser.amountOverride = textAsSats
                 }
                 Label {
                     text: Config.baseUnit