qml: refactor QEConfig.unitsToSats to QEConfig.baseunitStrToAmount and

QEConfig.satsToUnits to QEConfig.amountToBaseunitStr with the latter now
also taking a QEAmount instance

Author: accumulator

electrum/gui/qml/components/InvoiceDialog.qml

@@ -469,7 +469,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
                     }
@@ -487,7 +487,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
                     }

electrum/gui/qml/components/WalletMainView.qml

@@ -131,7 +131,7 @@ Item {
     }
 
     function createRequest(lightning, reuse_address) {
-        var qamt = Config.unitsToSats(_request_amount)
+        var qamt = Config.baseunitStrToAmount(_request_amount)
         Daemon.currentWallet.createRequest(qamt, _request_description, _request_expiry, lightning, reuse_address)
     }
 

electrum/gui/qml/components/controls/BtcField.qml

@@ -18,7 +18,7 @@ TextField {
 
     property Amount textAsSats
     onTextChanged: {
-        textAsSats = Config.unitsToSats(amount.text)
+        textAsSats = Config.baseunitStrToAmount(amount.text)
         if (fiatfield.activeFocus)
             return
         fiatfield.text = text == '' ? '' : Daemon.fx.fiatValue(amount.textAsSats)
@@ -28,7 +28,7 @@ TextField {
         target: Config
         function onBaseUnitChanged() {
             amount.text = amount.textAsSats.msatsInt != 0
-                ? Config.satsToUnits(amount.textAsSats)
+                ? Config.amountToBaseunitStr(amount.textAsSats)
                 : ''
         }
     }

electrum/gui/qml/components/controls/FiatField.qml

@@ -19,15 +19,15 @@ TextField {
         if (amountFiat.activeFocus)
             btcfield.text = text == ''
                 ? ''
-                : Config.satsToUnits(Daemon.fx.satoshiValue(amountFiat.text))
+                : Config.amountToBaseunitStr(parseInt(Daemon.fx.satoshiValue(amountFiat.text)))
     }
 
     Connections {
         target: Daemon.fx
         function onQuotesUpdated() {
             amountFiat.text = btcfield.text == ''
                 ? ''
-                : Daemon.fx.fiatValue(Config.unitsToSats(btcfield.text))
+                : Daemon.fx.fiatValue(Config.baseunitStrToAmount(btcfield.text))
         }
     }
 

electrum/gui/qml/qeconfig.py

@@ -410,7 +410,7 @@ def formatMilliSats(self, amount, with_unit=False):
             return self.config.format_amount(sats, precision=precision)
 
     @pyqtSlot(str, result=QEAmount)
-    def unitsToSats(self, unitAmount):
+    def baseunitStrToAmount(self, unitAmount):
         self._amount = QEAmount()
         try:
             x = Decimal(unitAmount)
@@ -422,6 +422,12 @@ def unitsToSats(self, unitAmount):
         self._amount = QEAmount(amount_msat=msat_max_prec_amount)
         return self._amount
 
-    @pyqtSlot('quint64', result=float)
-    def satsToUnits(self, satoshis):
-        return satoshis / pow(10, self.config.BTC_AMOUNTS_DECIMAL_POINT)
+    @pyqtSlot('quint64', result=str)
+    @pyqtSlot(QEAmount, result=str)
+    def amountToBaseunitStr(self, amount) -> str:
+        assert isinstance(amount, (QEAmount, int))
+        if isinstance(amount, QEAmount):
+            satoshis = Decimal(amount.msatsInt) / 1000
+        elif isinstance(amount, int):
+            satoshis = Decimal(amount)
+        return str(satoshis / pow(10, self.config.BTC_AMOUNTS_DECIMAL_POINT))