Browse Source

qml: fix regressions after can_rbf removal, remove RbF checkboxes

master
Sander van Grieken 3 years ago
parent
commit
02dce339cc
  1. 12
      electrum/gui/qml/components/ConfirmTxDialog.qml
  2. 11
      electrum/gui/qml/components/RbfBumpFeeDialog.qml
  3. 2
      electrum/gui/qml/components/WalletMainView.qml
  4. 3
      electrum/gui/qml/qetxfinalizer.py

12
electrum/gui/qml/components/ConfirmTxDialog.qml

@ -178,18 +178,6 @@ ElDialog {
feeslider: finalizer
}
CheckBox {
id: final_cb
text: qsTr('Replace-by-Fee')
Layout.columnSpan: 2
checked: finalizer.rbf
visible: finalizer.canRbf
onCheckedChanged: {
if (activeFocus)
finalizer.rbf = checked
}
}
InfoTextArea {
Layout.columnSpan: 2
Layout.preferredWidth: parent.width * 3/4

11
electrum/gui/qml/components/RbfBumpFeeDialog.qml

@ -147,17 +147,6 @@ ElDialog {
feeslider: rbffeebumper
}
CheckBox {
id: final_cb
text: qsTr('Replace-by-Fee')
Layout.columnSpan: 2
checked: rbffeebumper.rbf
onCheckedChanged: {
if (activeFocus)
rbffeebumper.rbf = checked
}
}
InfoTextArea {
Layout.columnSpan: 2
Layout.preferredWidth: parent.width * 3/4

2
electrum/gui/qml/components/WalletMainView.qml

@ -308,7 +308,7 @@ Item {
title: qsTr('Confirm Payment')
finalizer: TxFinalizer {
wallet: Daemon.currentWallet
canRbf: Config.useRbf
canRbf: true
}
onClosed: destroy()
}

3
electrum/gui/qml/qetxfinalizer.py

@ -280,8 +280,7 @@ class QETxFinalizer(TxFeeSlider):
if self._canRbf != canRbf:
self._canRbf = canRbf
self.canRbfChanged.emit()
if not canRbf and self.rbf:
self.rbf = False
self.rbf = self._canRbf # if we can RbF, we do RbF
@profiler
def make_tx(self, amount):

Loading…
Cancel
Save