AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #3963

Browse Source
This commit is contained in:
ThomasV
2018-02-27 16:00:56 +01:00
parent 51630416fc
commit a3554dc2b7
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/exchange_rate.py
View File

@@ -520,6 +520,8 @@ class FxThread(ThreadJob):
return "%s" % (self.ccy_amount_str(value, True))
def history_rate(self, d_t):
if d_t is None:
return Decimal('NaN')
rate = self.exchange.historical_rate(self.ccy, d_t)
# Frequently there is no rate for today, until tomorrow :)
# Use spot quotes in that case

10
lib/wallet.py
View File

@@ -1055,8 +1055,8 @@ class Abstract_Wallet(PrintError):
start_date = timestamp_to_datetime(from_timestamp)
end_date = timestamp_to_datetime(to_timestamp)
else:
start_date = out[0]['date']
end_date = out[-1]['date']
start_date = None
end_date = None
summary = {
'start_date': start_date,
'end_date': end_date,
@@ -1071,10 +1071,8 @@ class Abstract_Wallet(PrintError):
summary['fiat_income'] = Fiat(fiat_income, fx.ccy)
summary['fiat_expenditures'] = Fiat(fiat_expenditures, fx.ccy)
summary['unrealized_gains'] = Fiat(unrealized, fx.ccy)
if start_date:
summary['start_fiat_balance'] = Fiat(fx.historical_value(start_balance, start_date), fx.ccy)
if end_date:
summary['end_fiat_balance'] = Fiat(fx.historical_value(end_balance, end_date), fx.ccy)
summary['start_fiat_balance'] = Fiat(fx.historical_value(start_balance, start_date), fx.ccy)
summary['end_fiat_balance'] = Fiat(fx.historical_value(end_balance, end_date), fx.ccy)
else:
summary = {}
return {