tfix #1461 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f63bc61ec443c281829f030131df2763ad281959
DIR parent 0dfec561e5fc32791890f85219c76108753fe91e
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 25 Sep 2015 17:23:54 +0200
fix #1461
Diffstat:
M gui/qt/main_window.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1202,6 +1202,9 @@ class ElectrumWindow(QMainWindow, PrintError):
_("Amount to be sent") + ": " + self.format_amount_and_units(amount),
_("Transaction fee") + ": " + self.format_amount_and_units(fee),
]
+ if tx.get_fee() >= self.config.get('confirm_fee', 100000):
+ msg.append(_('Warning')+ ': ' + _("The fee for this transaction seems unusually high."))
+
if self.wallet.use_encryption:
msg.append(_("Enter your password to proceed"))
password = self.password_dialog('\n'.join(msg))
t@@ -1255,15 +1258,6 @@ class ElectrumWindow(QMainWindow, PrintError):
def broadcast_transaction(self, tx, tx_desc, parent=None):
- confirm_fee = self.config.get('confirm_fee', 100000)
- if tx.get_fee() >= confirm_fee:
- msg = '\n'.join([
- _("The fee for this transaction seems unusually high."),
- _("Are you really sure you want to pay %(fee)s in fees?")%{ 'fee' : self.format_amount_and_units(fee)}
- ])
- if not self.question(msg):
- return
-
def broadcast_thread():
# non-GUI thread
pr = self.payment_request