kivy: fix bump fee dialog

This commit is contained in:
ThomasV 2017-03-12 20:09:25 +01:00
parent e78531d913
commit a2fcb2ba8f
1 changed files with 10 additions and 9 deletions

View File

@ -3,7 +3,6 @@ from kivy.factory import Factory
from kivy.properties import ObjectProperty from kivy.properties import ObjectProperty
from kivy.lang import Builder from kivy.lang import Builder
from electrum.bitcoin import FEE_STEP, RECOMMENDED_FEE
from electrum.util import fee_levels from electrum.util import fee_levels
from electrum_gui.kivy.i18n import _ from electrum_gui.kivy.i18n import _
@ -73,6 +72,7 @@ class BumpFeeDialog(Factory.Popup):
self.tx_size = size self.tx_size = size
self.callback = callback self.callback = callback
self.config = app.electrum_config self.config = app.electrum_config
self.fee_step = self.config.max_fee_rate() / 10
self.dynfees = self.config.get('dynamic_fees', True) and self.app.network self.dynfees = self.config.get('dynamic_fees', True) and self.app.network
self.ids.old_fee.value = self.app.format_amount_and_units(self.init_fee) self.ids.old_fee.value = self.app.format_amount_and_units(self.init_fee)
self.update_slider() self.update_slider()
@ -90,20 +90,21 @@ class BumpFeeDialog(Factory.Popup):
if self.dynfees: if self.dynfees:
slider.range = (0, 4) slider.range = (0, 4)
slider.step = 1 slider.step = 1
slider.value = 0 slider.value = 3
else: else:
slider.range = (FEE_STEP, 2*RECOMMENDED_FEE) slider.range = (1, 10)
slider.step = FEE_STEP slider.step = 1
slider.value = self.init_fee*1.5 rate = self.init_fee*1000//self.tx_size
slider.value = min( rate * 2 // self.fee_step, 10)
def get_fee(self): def get_fee(self):
value = int(self.ids.slider.value) value = int(self.ids.slider.value)
if self.dynfees: if self.dynfees:
dynfee = self.app.network.dynfee(value) if self.config.has_fee_estimates():
if dynfee: dynfee = self.config.dynfee(value)
return dynfee*self.tx_size/1000 return dynfee * self.tx_size // 1000
else: else:
return value*self.tx_size/1000 return value*self.fee_step * self.tx_size // 1000
def on_ok(self): def on_ok(self):
new_fee = self.get_fee() new_fee = self.get_fee()