AaronFiore/electrum
1
0
Fork 0
Code Activity

qml TxDetails: do not show rbf buttons if the tx is local

Browse Source
This commit is contained in:
ThomasV
2023-04-01 17:07:09 +02:00
parent 9eb59fc360
commit 84cb210e7e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/qml/components/TxDetails.qml
View File

@@ -55,10 +55,12 @@ Pane {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillWidth: true Layout.fillWidth: true
Layout.bottomMargin: constants.paddingLarge Layout.bottomMargin: constants.paddingLarge
visible: txdetails.canBump || txdetails.canCpfp || txdetails.canCancel visible: txdetails.canBump || txdetails.canCpfp || txdetails.canCancel || txdetails.canRemove
text: qsTr('This transaction is still unconfirmed.') + '\n' + (txdetails.canCancel text: txdetails.canRemove
? qsTr('You can bump its fee to speed up its confirmation, or cancel this transaction') ? qsTr('This transaction is local to your wallet. It has not been published yet.')
: qsTr('You can bump its fee to speed up its confirmation')) : qsTr('This transaction is still unconfirmed.') + '\n' + (txdetails.canCancel
? qsTr('You can bump its fee to speed up its confirmation, or cancel this transaction')
: qsTr('You can bump its fee to speed up its confirmation'))
} }
RowLayout { RowLayout {

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

@@ -277,10 +277,10 @@ class QETxDetails(QObject, QtEventListener):
self._is_final = self._tx.is_final() self._is_final = self._tx.is_final()
self._is_unrelated = txinfo.amount is None and self._lnamount.isEmpty self._is_unrelated = txinfo.amount is None and self._lnamount.isEmpty
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_dscancel = txinfo.can_dscancel
self._can_broadcast = txinfo.can_broadcast self._can_broadcast = txinfo.can_broadcast
self._can_cpfp = txinfo.can_cpfp self._can_bump = txinfo.can_bump and not txinfo.can_remove
self._can_dscancel = txinfo.can_dscancel and not txinfo.can_remove
self._can_cpfp = txinfo.can_cpfp and not txinfo.can_remove
self._can_save_as_local = txinfo.can_save_as_local and not txinfo.can_remove self._can_save_as_local = txinfo.can_save_as_local and not txinfo.can_remove
self._can_remove = txinfo.can_remove self._can_remove = txinfo.can_remove
self._can_sign = not self._is_complete and self._wallet.wallet.can_sign(self._tx) self._can_sign = not self._is_complete and self._wallet.wallet.can_sign(self._tx)