electrum

commit f39f43d58c403e54209316834a99f5602022a9cd
parent c3f3843cc3f31862f7e3bea1126cb42150c405c4
Author: ThomasV <thomasv@electrum.org>
Date:   Mon,  5 Feb 2018 16:08:57 +0100

fix #3845

Diffstat:
M
gui/kivy/uix/screens.py
 | 
1
-
M
gui/qt/history_list.py
 | 
1
-
M
lib/wallet.py
 | 
11
++++-------

3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
@@ -91,7 +91,6 @@ class CScreen(Factory.Screen):
 TX_ICONS = [
     "close",
     "close",
-    "close",
     "unconfirmed",
     "close",
     "close",
diff --git a/gui/qt/history_list.py b/gui/qt/history_list.py
@@ -36,7 +36,6 @@ from electrum.util import timestamp_to_datetime, profiler
 TX_ICONS = [
     "warning.png",
     "warning.png",
-    "warning.png",
     "unconfirmed.png",
     "unconfirmed.png",
     "offline_tx.png",
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -66,7 +66,6 @@ from .contacts import Contacts
 TX_STATUS = [
     _('Replaceable'),
     _('Unconfirmed parent'),
-    _('Low fee'),
     _('Unconfirmed'),
     _('Not Verified'),
     _('Local only'),
@@ -877,16 +876,14 @@ class Abstract_Wallet(PrintError):
                 status = 1
             elif height == TX_HEIGHT_UNCONFIRMED and not is_final:
                 status = 0
-            elif height == TX_HEIGHT_UNCONFIRMED and is_lowfee:
-                status = 2
             elif height == TX_HEIGHT_UNCONFIRMED:
-                status = 3
+                status = 2
             else:
-                status = 4
+                status = 3
         else:
-            status = 5 + min(conf, 6)
+            status = 4 + min(conf, 6)
         time_str = format_time(timestamp) if timestamp else _("unknown")
-        status_str = TX_STATUS[status] if status < 6 else time_str
+        status_str = TX_STATUS[status] if status < 5 else time_str
         if exp_n:
             status_str += ' [%d sat/b, %.2f MB]'%(fee_per_kb//1000, exp_n/1000000)
         return status, status_str