AaronFiore/electrum
1
0
Fork 0
Code Activity

trustedcoin: restore the display of fees

Browse Source
This commit is contained in:
ThomasV
2016-02-02 16:26:47 +01:00
parent eb36884c66
commit 5aa0a87d7a
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/qt/main_window.py
View File

@@ -1245,12 +1245,18 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
confirm_amount = self.config.get('confirm_amount', COIN)
msg = [
_("Amount to be sent") + ": " + self.format_amount_and_units(amount),
_("Transaction fee") + ": " + self.format_amount_and_units(fee),
_("Mining fee") + ": " + self.format_amount_and_units(fee),
]
extra_fee = run_hook('get_additional_fee', self.wallet, tx)
if extra_fee:
msg.append( _("Additional fees") + ": " + self.format_amount_and_units(extra_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("")
msg.append(_("Enter your password to proceed"))
password = self.password_dialog('\n'.join(msg))
if not password: