AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: qetxdetails was missing this in 9eb7ee74e1

Browse Source
This commit is contained in:
Sander van Grieken
2022-08-15 07:48:47 +02:00
parent ff3c999fcb
commit 2ee6683dd0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/gui/qml/qetxdetails.py
View File

@@ -18,6 +18,7 @@ class QETxDetails(QObject):
_status = '' _status = ''
_amount = QEAmount(amount_sat=0) _amount = QEAmount(amount_sat=0)
_lnamount = QEAmount(amount_sat=0)
_fee = QEAmount(amount_sat=0) _fee = QEAmount(amount_sat=0)
_inputs = [] _inputs = []
_outputs = [] _outputs = []
@@ -86,6 +87,10 @@ class QETxDetails(QObject):
def amount(self): def amount(self):
return self._amount return self._amount
@pyqtProperty(QEAmount, notify=detailsChanged)
def lnAmount(self):
return self._lnamount
@pyqtProperty(QEAmount, notify=detailsChanged) @pyqtProperty(QEAmount, notify=detailsChanged)
def fee(self): def fee(self):
return self._fee return self._fee
@@ -185,7 +190,7 @@ class QETxDetails(QObject):
self._status = txinfo.status self._status = txinfo.status
self._fee = QEAmount(amount_sat=txinfo.fee) self._fee = QEAmount(amount_sat=txinfo.fee)
self._is_mined = txinfo.tx_mined_status != None self._is_mined = False if not txinfo.tx_mined_status else txinfo.tx_mined_status.height > 0
if self._is_mined: if self._is_mined:
self.update_mined_status(txinfo.tx_mined_status) self.update_mined_status(txinfo.tx_mined_status)
else: else:
@@ -194,6 +199,14 @@ class QETxDetails(QObject):
self._logger.error('TX is not mined, yet mempool_depth_bytes is None') self._logger.error('TX is not mined, yet mempool_depth_bytes is None')
self._mempool_depth = self._wallet.wallet.config.depth_tooltip(txinfo.mempool_depth_bytes) self._mempool_depth = self._wallet.wallet.config.depth_tooltip(txinfo.mempool_depth_bytes)
if self._wallet.wallet.lnworker:
lnworker_history = self._wallet.wallet.lnworker.get_onchain_history()
if self._txid in lnworker_history:
item = lnworker_history[self._txid]
self._lnamount = QEAmount(amount_sat=item['amount_msat'] / 1000)
else:
self._lnamount = QEAmount(amount_sat=0)
self._is_lightning_funding_tx = txinfo.is_lightning_funding_tx self._is_lightning_funding_tx = txinfo.is_lightning_funding_tx
self._can_bump = txinfo.can_bump self._can_bump = txinfo.can_bump
self._can_dscancel = txinfo.can_dscancel self._can_dscancel = txinfo.can_dscancel