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

spesmilo · Apr 1, 2023 · 84cb210 · 84cb210
1 parent 9eb59fc
commit 84cb210
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml
@@ -55,10 +55,12 @@ Pane {
                         Layout.columnSpan: 2
                         Layout.fillWidth: true
                         Layout.bottomMargin: constants.paddingLarge
-                        visible: txdetails.canBump || txdetails.canCpfp || txdetails.canCancel
-                        text: 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'))
+                        visible: txdetails.canBump || txdetails.canCpfp || txdetails.canCancel || txdetails.canRemove
+                        text: txdetails.canRemove
+			   ? qsTr('This transaction is local to your wallet. It has not been published yet.')
+			   : 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 {

diff --git a/electrum/gui/qml/qetxdetails.py b/electrum/gui/qml/qetxdetails.py
@@ -277,10 +277,10 @@ def update(self):
         self._is_final = self._tx.is_final()
         self._is_unrelated = txinfo.amount is None and self._lnamount.isEmpty
         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_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_remove = txinfo.can_remove
         self._can_sign = not self._is_complete and self._wallet.wallet.can_sign(self._tx)