Skip to content

Fix typings for addition in eth_sum #5243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 2, 2019
Merged

Fix typings for addition in eth_sum #5243

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a262a0d
Fix typings for addition in eth_sum
edsonayllon Sep 24, 2019
bdf1486
Merge branch 'master' into master
danlipert Sep 25, 2019
ba213ef
Merge branch 'master' into master
edsonayllon Sep 26, 2019
e4ab880
list comprehension
edsonayllon Sep 28, 2019
9d81f81
Merge branch 'master' of https://github.com/edsonayllon/web
edsonayllon Sep 28, 2019
11a5069
Merge branch 'master' into master
edsonayllon Sep 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/dashboard/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,8 +3254,8 @@ def get_eth_sum(self, sum_type='collected', network='mainnet', bounties=None):
logger.exception(e)
pass

# if sum_type == 'collected':
# eth_sum = eth_sum + float(sum([amount.value_in_eth for amount in self.tips])) if self.tips else eth_sum
if sum_type == 'collected' and self.tips:
eth_sum = eth_sum + sum([ float(amount.value_in_eth) for amount in self.tips ])

return eth_sum

Expand Down