Skip to content
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

Remove solana donations from calculation #51

Merged
merged 2 commits into from
Mar 17, 2024
+7 −1
Merged

Remove solana donations from calculation #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c77ed80
Remove solana donations from calculation
mohammadranjbarz Mar 14, 2024
9f5fa09
add missing options for download in calculate-updated
divine-comedian Mar 14, 2024
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
5 changes: 5 additions & 0 deletions src/givethIoService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export const getEligibleDonations = async (
transactionNetworkId
amount
givbackFactor
chainType
isProjectVerified
projectRank
powerRound
Expand Down Expand Up @@ -126,6 +127,7 @@ export const getEligibleDonations = async (
moment(donation.createdAt) < secondDate
&& moment(donation.createdAt) > firstDate
&& donation.valueUsd
&& donation.chainType == 'EVM'
&& donation.isProjectVerified
&& donation.status === 'verified'
)
Expand All @@ -136,6 +138,7 @@ export const getEligibleDonations = async (
moment(donation.createdAt) < secondDate
&& moment(donation.createdAt) > firstDate
&& donation.valueUsd
&& donation.chainType == 'EVM'
&& !donation.isProjectVerified
&& donation.status === 'verified'
)
Expand Down Expand Up @@ -276,6 +279,7 @@ export const getVerifiedPurpleListDonations = async (beginDate: string, endDate:
transactionId
transactionNetworkId
amount
chainType
isProjectVerified
project {
slug
Expand All @@ -299,6 +303,7 @@ export const getVerifiedPurpleListDonations = async (beginDate: string, endDate:
moment(donation.createdAt) < secondDate
&& moment(donation.createdAt) > firstDate
&& donation.valueUsd
&& donation.chainType == 'EVM'
&& donation.isProjectVerified
&& donation.status === 'verified'
)
Expand Down
2 changes: 1 addition & 1 deletion src/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
"type": "string",
"description": "If you want to see json here set no, but if you want to download a file set yes",
"default": "no",
"enum": ["yes","no"],
"enum": ["no", "optimism","all-other-chains", "NICE" ],
"in": "query"
}
],
Expand Down
1 change: 1 addition & 0 deletions src/types/general.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export interface GivethIoDonation {
transactionNetworkId: number,
fromWalletAddress: string,
toWalletAddress: string
chainType: string
source: string,
user: {
name: string,
Expand Down