tfollow up da8fce1914e03b49945cde6df296788bbaf5023e - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b5313ce17d8a570ddd5bffcbd5d5a6dac759bcfc
DIR parent da8fce1914e03b49945cde6df296788bbaf5023e
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 14 Jan 2016 16:23:12 +0100
follow up da8fce1914e03b49945cde6df296788bbaf5023e
Diffstat:
M gui/qt/main_window.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -34,7 +34,7 @@ import PyQt4.QtCore as QtCore
import icons_rc
-from electrum.bitcoin import MIN_RELAY_TX_FEE, COIN, is_valid
+from electrum.bitcoin import COIN, is_valid
from electrum.plugins import run_hook
from electrum.i18n import _
from electrum.util import block_explorer, block_explorer_info, block_explorer_URL
t@@ -1214,7 +1214,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.show_message(str(e))
return
- if tx.get_fee() < MIN_RELAY_TX_FEE and tx.requires_fee(self.wallet):
+ if tx.get_fee() < self.wallet.relayfee() and tx.requires_fee(self.wallet):
self.show_error(_("This transaction requires a higher fee, or it will not be propagated by the network"))
return