From a270bb5c436f70ac297bef98cf3398767c701227 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Wed, 29 Mar 2023 16:24:55 +0200
Subject: [PATCH] qml swap dialog: show normal swap amount without mining fee,
 to be consistent with the qt GUI.

---
 electrum/gui/qml/components/SwapDialog.qml | 9 ++-------
 electrum/gui/qml/qeswaphelper.py           | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml
index 0a1b25ca5..e5aac63c5 100644
--- a/electrum/gui/qml/components/SwapDialog.qml
+++ b/electrum/gui/qml/components/SwapDialog.qml
@@ -47,7 +47,6 @@ ElDialog {
                     source: swaphelper.isReverse
                         ? '../../icons/lightning.png'
                         : '../../icons/bitcoin.png'
-                    visible: swaphelper.valid
                 }
             }
 
@@ -58,12 +57,10 @@ ElDialog {
                     id: tosend
                     text: Config.formatSats(swaphelper.tosend)
                     font.family: FixedFont
-                    visible: swaphelper.valid
                 }
                 Label {
                     text: Config.baseUnit
                     color: Material.accentColor
-                    visible: swaphelper.valid
                 }
             }
 
@@ -82,7 +79,6 @@ ElDialog {
                     source: swaphelper.isReverse
                         ? '../../icons/bitcoin.png'
                         : '../../icons/lightning.png'
-                    visible: swaphelper.valid
                 }
             }
 
@@ -93,12 +89,10 @@ ElDialog {
                     id: toreceive
                     text: Config.formatSats(swaphelper.toreceive)
                     font.family: FixedFont
-                    visible: swaphelper.valid
                 }
                 Label {
                     text: Config.baseUnit
                     color: Material.accentColor
-                    visible: swaphelper.valid
                 }
             }
 
@@ -140,11 +134,12 @@ ElDialog {
                 Label {
                     text: Config.formatSats(swaphelper.miningfee)
                     font.family: FixedFont
+                    visible: swaphelper.valid
                 }
                 Label {
-                    Layout.fillWidth: true
                     text: Config.baseUnit
                     color: Material.accentColor
+                    visible: swaphelper.valid
                 }
             }
         }
diff --git a/electrum/gui/qml/qeswaphelper.py b/electrum/gui/qml/qeswaphelper.py
index 5730767c1..5e09d4952 100644
--- a/electrum/gui/qml/qeswaphelper.py
+++ b/electrum/gui/qml/qeswaphelper.py
@@ -298,6 +298,7 @@ class QESwapHelper(AuthMixin, QObject):
             self.userinfo = _('Adds Lightning sending capacity.')
             self.isReverse = False
             self._send_amount = position
+            self.tosend = QEAmount(amount_sat=self._send_amount)
 
             self._receive_amount = swap_manager.get_recv_amount(send_amount=position, is_reverse=False)
             self.toreceive = QEAmount(amount_sat=self._receive_amount)
@@ -324,8 +325,6 @@ class QESwapHelper(AuthMixin, QObject):
         self.update_tx(self._send_amount)
         # add lockup fees, but the swap amount is position
         pay_amount = self._send_amount + self._tx.get_fee() if self._tx else 0
-        self.tosend = QEAmount(amount_sat=pay_amount)
-
         self.miningfee = QEAmount(amount_sat=self._tx.get_fee()) if self._tx else QEAmount()
         self.check_valid(pay_amount, self._receive_amount)