tfix #3964 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 649b5a729852883f371f8d52cbd3dfee3614531a
DIR parent f1b757821838ec4496e9e978cca70cee222f98e9
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sat, 24 Feb 2018 22:37:03 +0100
fix #3964
Diffstat:
M gui/qt/history_list.py | 4 +---
M lib/util.py | 2 ++
M lib/wallet.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/qt/history_list.py b/gui/qt/history_list.py
t@@ -29,8 +29,7 @@ import datetime
from electrum.wallet import AddTransactionException, TX_HEIGHT_LOCAL
from .util import *
from electrum.i18n import _
-from electrum.util import block_explorer_URL
-from electrum.util import timestamp_to_datetime, profiler
+from electrum.util import block_explorer_URL, profiler
try:
from electrum.plot import plot_history, NothingToPlotException
t@@ -234,7 +233,6 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
entry = ['', tx_hash, status_str, label, v_str, balance_str]
fiat_value = None
if value is not None and fx and fx.show_history():
- date = timestamp_to_datetime(time.time() if conf <= 0 else timestamp)
fiat_value = tx_item['fiat_value'].value
value_str = fx.format_fiat(fiat_value)
entry.append(value_str)
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -419,6 +419,8 @@ def format_satoshis(x, is_diff=False, num_zeros = 0, decimal_point = 8, whitespa
return result
def timestamp_to_datetime(timestamp):
+ if timestamp is None:
+ return None
return datetime.fromtimestamp(timestamp)
def format_time(timestamp):
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1000,7 +1000,7 @@ class Abstract_Wallet(PrintError):
'value': Satoshis(value),
'balance': Satoshis(balance)
}
- item['date'] = timestamp_to_datetime(timestamp) if timestamp is not None else None
+ item['date'] = timestamp_to_datetime(timestamp)
item['label'] = self.get_label(tx_hash)
if show_addresses:
tx = self.transactions.get(tx_hash)