From da502fa533b49f3970b1de3a7e07c1024ab2924c Mon Sep 17 00:00:00 2001 From: Jon Layton Date: Sun, 21 Jan 2018 00:11:56 -0600 Subject: [PATCH] mZCL -> ZCL for qt and kivy --- gui/kivy/main_window.py | 2 +- gui/qt/main_window.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index 31b0768a..28fc7cd0 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -154,7 +154,7 @@ class ElectrumWindow(App): self._trigger_update_history() def _get_bu(self): - return self.electrum_config.get('base_unit', 'mZCL') + return self.electrum_config.get('base_unit', 'ZCL') def _set_bu(self, value): assert value in base_units.keys() diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index e4e2b84d..bb83cb52 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -123,9 +123,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): self.create_status_bar() self.need_update = threading.Event() - self.decimal_point = config.get('decimal_point', 5) + self.decimal_point = config.get('decimal_point', 8) self.fee_unit = config.get('fee_unit', 0) - self.num_zeros = int(config.get('num_zeros',0)) + self.num_zeros = int(config.get('num_zeros', 0)) self.completions = QStringListModel() @@ -3032,7 +3032,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): return fee = fee_e.get_amount() if fee > max_fee: - self.show_error(_('Max fee exceeded')) + self.show_error(_('Max fee exceeded!')) return new_tx = self.wallet.cpfp(parent_tx, fee) new_tx.set_rbf(True) @@ -3065,7 +3065,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): new_fee = fee_e.get_amount() delta = new_fee - fee if delta < 0: - self.show_error("fee too low") + self.show_error("Fee too low!") return try: new_tx = self.wallet.bump_fee(tx, delta)