Update kivy GUI in order to merge with master

2015-09-03 15:09:45 +02:00
parent eca24ec396
commit 04b9d8fffa
5 changed files with 12 additions and 9 deletions
--- a/gui/kivy/uix/ui_screens/mainscreen.kv
+++ b/gui/kivy/uix/ui_screens/mainscreen.kv
@@ -268,7 +268,7 @@
                        id: fee_e
                        color: .761, .761, .761, 1
                        font_size: '12dp'
-                        amt: app.format_amount(app.wallet.fee) if app.wallet else 0
+                        amt: app.format_amount(app.wallet.fee_per_kb(app.gui_object.config)) if app.wallet else 0
                        text:
                            u'[b]{sign}{symbl}{amt}[/b] of fee'.\
                            format(symbl=lbl_symbl.text,\