LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #3845

Browse source
This commit is contained in:
ThomasV 2018-02-05 16:08:57 +01:00
parent c3f3843cc3
commit f39f43d58c
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gui/kivy/uix/screens.py
View file

@ -89,7 +89,6 @@ class CScreen(Factory.Screen):
# note: this list needs to be kept in sync with another in qt # note: this list needs to be kept in sync with another in qt
TX_ICONS = [ TX_ICONS = [
"close",
"close", "close",
"close", "close",
"unconfirmed", "unconfirmed",

1
gui/qt/history_list.py
View file

@ -34,7 +34,6 @@ from electrum.util import timestamp_to_datetime, profiler
# note: this list needs to be kept in sync with another in kivy # note: this list needs to be kept in sync with another in kivy
TX_ICONS = [ TX_ICONS = [
"warning.png",
"warning.png", "warning.png",
"warning.png", "warning.png",
"unconfirmed.png", "unconfirmed.png",

11
lib/wallet.py
View file

@ -66,7 +66,6 @@ from .contacts import Contacts
TX_STATUS = [ TX_STATUS = [
_('Replaceable'), _('Replaceable'),
_('Unconfirmed parent'), _('Unconfirmed parent'),
_('Low fee'),
_('Unconfirmed'), _('Unconfirmed'),
_('Not Verified'), _('Not Verified'),
_('Local only'), _('Local only'),
@ -877,16 +876,14 @@ class Abstract_Wallet(PrintError):
status = 1 status = 1
elif height == TX_HEIGHT_UNCONFIRMED and not is_final: elif height == TX_HEIGHT_UNCONFIRMED and not is_final:
status = 0 status = 0
elif height == TX_HEIGHT_UNCONFIRMED and is_lowfee:
status = 2
elif height == TX_HEIGHT_UNCONFIRMED: elif height == TX_HEIGHT_UNCONFIRMED:
status = 2
else:
status = 3 status = 3
else: else:
status = 4 status = 4 + min(conf, 6)
else:
status = 5 + min(conf, 6)
time_str = format_time(timestamp) if timestamp else _("unknown") 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: if exp_n:
status_str += ' [%d sat/b, %.2f MB]'%(fee_per_kb//1000, exp_n/1000000) status_str += ' [%d sat/b, %.2f MB]'%(fee_per_kb//1000, exp_n/1000000)
return status, status_str return status, status_str