From b960433c60b129f3f146f4827d97d6b7174f98f9 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 9 Mar 2023 14:40:08 +0100 Subject: [PATCH] confirm_tx_dialog: Use future tense in warnings + minor fix --- electrum/gui/qt/confirm_tx_dialog.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qt/confirm_tx_dialog.py b/electrum/gui/qt/confirm_tx_dialog.py index 786f43d02..540928c9d 100644 --- a/electrum/gui/qt/confirm_tx_dialog.py +++ b/electrum/gui/qt/confirm_tx_dialog.py @@ -569,11 +569,11 @@ class TxEditor(WindowModalDialog): else: warnings.append(long_warning) # warn if spending unconf - if any(txin.block_height<=0 for txin in self.tx.inputs()): - warnings.append(_('This transaction spends unconfirmed coins.')) + if any((txin.block_height is not None and txin.block_height<=0) for txin in self.tx.inputs()): + warnings.append(_('This transaction will spend unconfirmed coins.')) # warn if we merge from mempool 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 num_change = sum(int(o.is_change) for o in self.tx.outputs()) if num_change > 1: