AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9704 from f321x/future_tx_fee

Browse Source 
tx / gui: Disable output value rounding for 0 fee tx and don't show relay fee warning in gui
This commit is contained in:
ghost43
2025-04-07 15:40:11 +00:00
committed by GitHub
parent d86276042a 42bd334f5b
commit 5dad7c55fd
6 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/qetxfinalizer.py
View File

@@ -299,7 +299,7 @@ class TxFeeSlider(FeeSlider):
if invoice_amt == 0:
invoice_amt = tx.output_value()
fee_warning_tuple = self._wallet.wallet.get_tx_fee_warning(
invoice_amt=invoice_amt, tx_size=tx.estimated_size(), fee=tx.get_fee())
invoice_amt=invoice_amt, tx_size=tx.estimated_size(), fee=tx.get_fee(), txid=tx.txid())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
self.warning = _('Warning') + ': ' + long_warning

2
electrum/gui/qt/confirm_tx_dialog.py
View File

@@ -517,7 +517,7 @@ class TxEditor(WindowModalDialog):
amount = self.tx.output_value() if self.output_value == '!' else self.output_value
tx_size = self.tx.estimated_size()
fee_warning_tuple = self.wallet.get_tx_fee_warning(
invoice_amt=amount, tx_size=tx_size, fee=fee)
invoice_amt=amount, tx_size=tx_size, fee=fee, txid=self.tx.txid())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
if not allow_send:

2
electrum/gui/qt/transaction_dialog.py
View File

@@ -905,7 +905,7 @@ class TxDialog(QDialog, MessageBoxMixin):
# 'amount' is zero for self-payments, so in that case we use sum-of-outputs
invoice_amt = abs(amount) if amount else self.tx.output_value()
fee_warning_tuple = self.wallet.get_tx_fee_warning(
invoice_amt=invoice_amt, tx_size=size, fee=fee)
invoice_amt=invoice_amt, tx_size=size, fee=fee, txid=self.tx.txid())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
fee_str += " - <font color={color}>{header}: {body}</font>".format(