BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mZCL -> ZCL for qt and kivy

This commit is contained in:
Jon Layton 2018-01-21 00:11:56 -06:00 committed by Chris Sulmone
parent 037a27e3cf
commit da502fa533
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/kivy/main_window.py
View File

@ -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()

8
gui/qt/main_window.py
View File

@ -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)