diff --git a/gui/gui_android.py b/gui/gui_android.py index 60bb0721..44427ff4 100644 --- a/gui/gui_android.py +++ b/gui/gui_android.py @@ -825,11 +825,9 @@ def settings_loop(): fee = int( 100000000 * Decimal(fee) ) except: modal_dialog('error','invalid fee value') - if wallet.fee != fee: - wallet.fee = fee - wallet.save() - set_listview() - + wallet.set_fee(fee) + set_listview() + elif pos == "4": if change_password_dialog(): set_listview() diff --git a/gui/gui_classic.py b/gui/gui_classic.py index fa25c823..2d73b5df 100644 --- a/gui/gui_classic.py +++ b/gui/gui_classic.py @@ -2031,9 +2031,7 @@ class ElectrumWindow(QMainWindow): QMessageBox.warning(self, _('Error'), _('Invalid value') +': %s'%fee, _('OK')) return - if self.wallet.fee != fee: - self.wallet.fee = fee - self.wallet.save() + self.wallet.set_fee(fee) nz = unicode(nz_e.text()) try: diff --git a/gui/gui_gtk.py b/gui/gui_gtk.py index 5423a035..3c3718f5 100644 --- a/gui/gui_gtk.py +++ b/gui/gui_gtk.py @@ -249,9 +249,7 @@ def run_settings_dialog(wallet, parent): except: show_message("error") return - if wallet.fee != fee: - wallet.fee = fee - wallet.save() + wallet.set_fee(fee) try: nz = int( nz ) diff --git a/lib/wallet.py b/lib/wallet.py index 4950b8d3..9949fcd3 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -873,6 +873,12 @@ class Wallet: else: return False + def set_fee(self, fee): + if self.fee != fee: + self.fee = fee + self.config.set_key('fee_per_kb', self.fee, True) + + def save(self): tx = {} for k,v in self.transactions.items():