Merge pull request #5604 from MrNaif2018/master

Fix for onchain_history summary building
This commit is contained in:
ThomasV 2019-09-02 18:35:23 +02:00 committed by GitHub
commit d5691129bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View file

@ -14,6 +14,8 @@ env/
bin/
/app.fil
.idea
.mypy_cache
.vscode
# icons
electrum/gui/kivy/theming/light-0.png

View file

@ -633,9 +633,9 @@ class Abstract_Wallet(AddressSynchronizer):
out.append(item)
# add summary
if out:
b, v = out[0]['balance'].value, out[0]['bc_value'].value
b, v = out[0]['bc_balance'].value, out[0]['bc_value'].value
start_balance = None if b is None or v is None else b - v
end_balance = out[-1]['balance'].value
end_balance = out[-1]['bc_balance'].value
if from_timestamp is not None and to_timestamp is not None:
start_date = timestamp_to_datetime(from_timestamp)
end_date = timestamp_to_datetime(to_timestamp)