AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #5604 from MrNaif2018/master

Browse Source 
Fix for onchain_history summary building
This commit is contained in:
ThomasV
2019-09-02 18:35:23 +02:00
committed by GitHub
parent 74366f5cce 1dab0aa719
commit d5691129bb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

4
electrum/wallet.py
View File

@@ -633,9 +633,9 @@ class Abstract_Wallet(AddressSynchronizer):
out.append(item) out.append(item)
# add summary # add summary
if out: 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 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: if from_timestamp is not None and to_timestamp is not None:
start_date = timestamp_to_datetime(from_timestamp) start_date = timestamp_to_datetime(from_timestamp)
end_date = timestamp_to_datetime(to_timestamp) end_date = timestamp_to_datetime(to_timestamp)