AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: proper check for max amount onchain. move max amount lightning to superclass

Browse Source
This commit is contained in:
Sander van Grieken
2022-10-21 13:24:39 +02:00
parent a1fac70ebc
commit b37262f232
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/InvoiceDialog.qml
View File

@@ -115,7 +115,7 @@ ElDialog {
Label { Label {
width: parent.width width: parent.width
text: invoice.lnprops ? invoice.lnprops.pubkey : '' text: 'pubkey' in invoice.lnprops ? invoice.lnprops.pubkey : ''
font.family: FixedFont font.family: FixedFont
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }

12
electrum/gui/qml/qeinvoice.py
View File

@@ -107,10 +107,13 @@ class QEInvoice(QObject):
self.userinfoChanged.emit() self.userinfoChanged.emit()
def get_max_spendable_onchain(self): def get_max_spendable_onchain(self):
c, u, x = self._wallet.wallet.get_balance() spendable = self._wallet.confirmedBalance.satsInt
#TODO determine real max if not self._wallet.wallet.config.get('confirmed_only', False):
return c spendable += self._wallet.unconfirmedBalance.satsInt
return spendable
def get_max_spendable_lightning(self):
return self._wallet.wallet.lnworker.num_sats_can_send()
class QEInvoiceParser(QEInvoice): class QEInvoiceParser(QEInvoice):
@@ -303,9 +306,6 @@ class QEInvoiceParser(QEInvoice):
PR_UNKNOWN: _('Invoice has unknown status'), PR_UNKNOWN: _('Invoice has unknown status'),
}[self.status] }[self.status]
def get_max_spendable_lightning(self):
return self._wallet.wallet.lnworker.num_sats_can_send()
def setValidOnchainInvoice(self, invoice: Invoice): def setValidOnchainInvoice(self, invoice: Invoice):
self._logger.debug('setValidOnchainInvoice') self._logger.debug('setValidOnchainInvoice')
if invoice.is_lightning(): if invoice.is_lightning():