diff --git a/src/components/views/home/DonationsCount.tsx b/src/components/views/home/DonationsCount.tsx index 3fc9451..627198b 100644 --- a/src/components/views/home/DonationsCount.tsx +++ b/src/components/views/home/DonationsCount.tsx @@ -26,10 +26,12 @@ const DonationsCount = () => { const [fromDate, setFromDate] = useState(firstOfGiveth()); const [toDate, setToDate] = useState(firstOfNextMonth()); const [fromOptimism, setFromOptimism] = useState(false); + const [onlyVerified, setOnlyVerified] = useState(false); const { donationsCount, loading } = useDonationsCount( fromDate, toDate, fromOptimism, + onlyVerified, ); const { total, totalPerMonthAndYear } = donationsCount || {}; @@ -64,6 +66,12 @@ const DonationsCount = () => { onChange={setFromOptimism} label='From Optimism only' /> +
+ diff --git a/src/components/views/home/TotalDonations.tsx b/src/components/views/home/TotalDonations.tsx index 1348a19..9f5fc72 100644 --- a/src/components/views/home/TotalDonations.tsx +++ b/src/components/views/home/TotalDonations.tsx @@ -28,21 +28,21 @@ const TotalDonations = () => { const [fromDate, setFromDate] = useState(firstOfGiveth()); const [toDate, setToDate] = useState(firstOfNextMonth()); const [fromOptimism, setFromOptimism] = useState(false); + const [onlyVerified, setOnlyVerified] = useState(false); const { totalDonations, loading: loadingTotal } = useTotalDonations( fromDate, toDate, fromOptimism, + onlyVerified, ); const { categoryDonations, loading: loadingCategories } = - useCategoryDonations(fromDate, toDate, fromOptimism); + useCategoryDonations(fromDate, toDate, fromOptimism, onlyVerified); const totalCategoryDonations = categoryDonations?.reduce( (i, j) => i + j.totalUsd, 0, ); - console.log('totalCategoryDonations', fromDate); - const norCategoryDonations = categoryDonations?.map(i => { return { ...i, @@ -84,6 +84,12 @@ const TotalDonations = () => { onChange={setFromOptimism} label='From Optimism only' /> +
+ diff --git a/src/gql/gqlDonations.ts b/src/gql/gqlDonations.ts index 0085d24..1127e89 100644 --- a/src/gql/gqlDonations.ts +++ b/src/gql/gqlDonations.ts @@ -3,11 +3,13 @@ export const fetchTotalDonationsUSD = ` $fromDate: String $toDate: String $fromOptimismOnly: Boolean + $onlyVerified: Boolean ) { donationsTotalUsdPerDate ( fromDate: $fromDate toDate: $toDate fromOptimismOnly: $fromOptimismOnly + onlyVerified: $onlyVerified ) { total totalPerMonthAndYear { @@ -23,11 +25,13 @@ export const fetchTotalDonationsPerCategory = ` $fromDate: String $toDate: String $fromOptimismOnly: Boolean + $onlyVerified: Boolean ) { totalDonationsPerCategory ( fromDate: $fromDate toDate: $toDate fromOptimismOnly: $fromOptimismOnly + onlyVerified: $onlyVerified ) { id title @@ -42,11 +46,13 @@ export const fetchDonationsCount = ` $fromDate: String $toDate: String $fromOptimismOnly: Boolean + $onlyVerified: Boolean ) { totalDonationsNumberPerDate ( fromDate: $fromDate toDate: $toDate fromOptimismOnly: $fromOptimismOnly + onlyVerified: $onlyVerified ) { total totalPerMonthAndYear { diff --git a/src/hooks/useCategoryDonations.ts b/src/hooks/useCategoryDonations.ts index 1b1badd..00a42e5 100644 --- a/src/hooks/useCategoryDonations.ts +++ b/src/hooks/useCategoryDonations.ts @@ -11,6 +11,7 @@ const useCategoryDonations = ( fromDate: Date, toDate: Date, fromOptimism?: boolean, + onlyVerified?: boolean, ) => { const [categoryDonations, setCategoryDonations] = useState(); @@ -22,6 +23,7 @@ const useCategoryDonations = ( fromDate: formatDateToISO(fromDate), toDate: formatDateToISO(toDate), fromOptimismOnly: fromOptimism || false, + onlyVerified, }; backendGQLRequest(fetchTotalDonationsPerCategory, variables) .then((res: IFetchTotalDonationsPerCategory) => { @@ -30,7 +32,7 @@ const useCategoryDonations = ( }) .catch(showToastError) .finally(() => setLoading(false)); - }, [fromDate, toDate, fromOptimism]); + }, [fromDate, toDate, fromOptimism, onlyVerified]); return { categoryDonations, loading }; }; diff --git a/src/hooks/useDonationsCount.ts b/src/hooks/useDonationsCount.ts index 5159cb3..9bfa5dc 100644 --- a/src/hooks/useDonationsCount.ts +++ b/src/hooks/useDonationsCount.ts @@ -8,6 +8,7 @@ const useDonationsCount = ( fromDate: Date, toDate: Date, fromOptimism?: boolean, + onlyVerified?: boolean, ) => { const [donationsCount, setDonationsCount] = useState(); const [loading, setLoading] = useState(true); @@ -18,6 +19,7 @@ const useDonationsCount = ( fromDate: formatDateToISO(fromDate), toDate: formatDateToISO(toDate), fromOptimismOnly: fromOptimism || false, + onlyVerified, }; backendGQLRequest(fetchDonationsCount, variables) .then((res: IFetchDonationsCount) => { @@ -25,7 +27,7 @@ const useDonationsCount = ( }) .catch(showToastError) .finally(() => setLoading(false)); - }, [fromDate, toDate, fromOptimism]); + }, [fromDate, toDate, fromOptimism, onlyVerified]); return { donationsCount, loading }; }; diff --git a/src/hooks/useTotalDonations.ts b/src/hooks/useTotalDonations.ts index 47bdc6d..6bc2877 100644 --- a/src/hooks/useTotalDonations.ts +++ b/src/hooks/useTotalDonations.ts @@ -8,6 +8,7 @@ const useTotalDonations = ( fromDate: Date, toDate: Date, fromOptimism?: boolean, + onlyVerified?: boolean, ) => { const [totalDonations, setTotalDonations] = useState(); const [loading, setLoading] = useState(true); @@ -18,6 +19,7 @@ const useTotalDonations = ( fromDate: formatDateToISO(fromDate), toDate: formatDateToISO(toDate), fromOptimismOnly: fromOptimism || false, + onlyVerified, }; backendGQLRequest(fetchTotalDonationsUSD, variables) .then((res: IFetchTotalDonationsUSD) => { @@ -26,7 +28,7 @@ const useTotalDonations = ( }) .catch(showToastError) .finally(() => setLoading(false)); - }, [fromDate, toDate, fromOptimism]); + }, [fromDate, toDate, fromOptimism, onlyVerified]); return { totalDonations, loading }; };