AaronFiore/electrum
1
0
Fork 0
Code Activity

confirm_tx_dialog: Use future tense in warnings + minor fix

Browse Source
This commit is contained in:
ThomasV
2023-03-09 14:40:08 +01:00
parent c449c8eda8
commit b960433c60
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,11 +569,11 @@ class TxEditor(WindowModalDialog):
else: else:
warnings.append(long_warning) warnings.append(long_warning)
# warn if spending unconf # warn if spending unconf
if any(txin.block_height<=0 for txin in self.tx.inputs()): if any((txin.block_height is not None and txin.block_height<=0) for txin in self.tx.inputs()):
warnings.append(_('This transaction spends unconfirmed coins.')) warnings.append(_('This transaction will spend unconfirmed coins.'))
# warn if we merge from mempool # warn if we merge from mempool
if self.tx.rbf_merge_txid: if self.tx.rbf_merge_txid:
warnings.append(_('This payment was merged with another existing transaction.')) warnings.append(_('This payment will be merged with another existing transaction.'))
# warn if we use multiple change outputs # warn if we use multiple change outputs
num_change = sum(int(o.is_change) for o in self.tx.outputs()) num_change = sum(int(o.is_change) for o in self.tx.outputs())
if num_change > 1: if num_change > 1: