[Improvement, GoodCollective] The total amount on the GC home page is not right #267 #298

EmekaManuel · 2025-07-15T14:57:01Z

Description

The total donations calculation was using stale totalDonations values from the subgraph, which didn't include current streaming amounts from donor collectives. This caused the displayed total to be lower than the actual current total.

This PR implements real-time streaming calculation by fetching donor collectives data and calculating additional streamed amounts since the last update for active streams, then aggregating all donor collective totals for accurate current donations.

Add donorCollectives query to fetch flowRate, timestamp, and contribution
Calculate real-time streaming amounts for active donor collectives
Aggregate all donor collective totals instead of using stale totalDonations
Handle both streaming and non-streaming donor collectives

About

#267

Description by Korbit AI

What change is being made?

Refactor the calculation and display logic for total amounts on the GoodCollective home page to accurately reflect donations by incorporating donor collective balances and improving error handling.

Why are these changes being made?

The current total amount displayed on the homepage was incorrect, necessitating a restructure to account for flowing balances of donor collectives, integrate token price conversion, and handle error states gracefully. This improves the reliability and user experience of the application, ensuring users see accurate, meaningful data.

Is this description stale? Ask me to generate a new description by commenting /korbit-generate-pr-description

- Add donorCollectives query to fetch flowRate, timestamp, and contribution - Calculate real-time streaming amounts for active donor collectives - Aggregate all donor collective totals instead of using stale totalDonations - Handle both streaming and non-streaming donor collectives Fixes issue where total donations didn't reflect current streaming amounts from donor collectives, only showing last recorded totals.

sourcery-ai

Hey @EmekaManuel - I've reviewed your changes and they look great!

Prompt for AI Agents

Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `packages/app/src/hooks/useTotalStats.ts:22` </location>
<code_context>
-    const donationsFormatted = formatGoodDollarAmount(totalDonations?.toString() ?? '0', 2);
+    if (!stats) return undefined;
+
+    const currentTime = Math.floor(Date.now() / 1000);
+
+    let totalFromDonorCollectives = BigInt(0);
</code_context>

<issue_to_address>
Using Date.now() directly may cause hydration mismatches in SSR environments.

Consider moving the Date.now() call into a useEffect or similar client-only logic to prevent SSR hydration issues.
</issue_to_address>

### Comment 2
<location> `packages/app/src/hooks/useTotalStats.ts:28` </location>
<code_context>
+
+    stats.donorCollectives?.forEach((donorCollective) => {
+      const flowRate = BigInt(donorCollective.flowRate || '0');
+      const lastUpdateTime = donorCollective.timestamp || 0;
+      const baseContribution = BigInt(donorCollective.contribution || '0');
+
</code_context>

<issue_to_address>
Defaulting timestamp to 0 may result in large, unrealistic time intervals.

Defaulting to 0 can inflate timeElapsed and donation calculations. Please handle missing timestamps more carefully.
</issue_to_address>

### Comment 3
<location> `packages/app/src/hooks/useTotalStats.ts:32` </location>
<code_context>
+      const baseContribution = BigInt(donorCollective.contribution || '0');
+
+      if (flowRate > 0) {
+        const timeElapsed = BigInt(currentTime - lastUpdateTime);
+        const additionalStreamingAmount = flowRate * timeElapsed;
+        const totalForThisCollective = baseContribution + additionalStreamingAmount;
</code_context>

<issue_to_address>
No check for negative timeElapsed could lead to incorrect calculations.

If currentTime is earlier than lastUpdateTime, timeElapsed becomes negative, potentially causing incorrect results. Please add a check to prevent negative timeElapsed values.
</issue_to_address>

<suggested_fix>
<<<<<<< SEARCH
      if (flowRate > 0) {
        const timeElapsed = BigInt(currentTime - lastUpdateTime);
        const additionalStreamingAmount = flowRate * timeElapsed;
        const totalForThisCollective = baseContribution + additionalStreamingAmount;

        totalFromDonorCollectives += totalForThisCollective;
      } else {
=======
      if (flowRate > 0) {
        let timeElapsed = BigInt(currentTime - lastUpdateTime);
        if (timeElapsed < 0) {
          timeElapsed = BigInt(0);
        }
        const additionalStreamingAmount = flowRate * timeElapsed;
        const totalForThisCollective = baseContribution + additionalStreamingAmount;

        totalFromDonorCollectives += totalForThisCollective;
      } else {
>>>>>>> REPLACE

</suggested_fix>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

packages/app/src/hooks/useTotalStats.ts

sourcery-ai · 2025-07-15T14:57:48Z

packages/app/src/hooks/useTotalStats.ts

+
+    stats.donorCollectives?.forEach((donorCollective) => {
+      const flowRate = BigInt(donorCollective.flowRate || '0');
+      const lastUpdateTime = donorCollective.timestamp || 0;


issue (bug_risk): Defaulting timestamp to 0 may result in large, unrealistic time intervals.

Defaulting to 0 can inflate timeElapsed and donation calculations. Please handle missing timestamps more carefully.

please add error handling in this flow, and show a message in UI if it fails to show/calculate the current flowing total amount.
Better show error message, then a wrong amount

Great suggestion! To address this, you should:

Add error handling in the useTotalStats hook (or wherever the streaming calculation is performed). If an error occurs (e.g., missing or invalid timestamp, failed fetch, or calculation error), set an error state.

In the HomePage component, check for this error state. If present, display a clear error message in the UI (e.g., using a Text component or a banner) instead of the total amount.

This way, users will see an explicit error message if the calculation fails, rather than a potentially misleading or incorrect total. If you need a code example for this pattern, let me know!

@EmekaManuel Sorry, this addition of errors is a bit overdoing it.
You can handle it with just a single try/catch block in the forEach loop

sourcery-ai · 2025-07-15T14:57:48Z

packages/app/src/hooks/useTotalStats.ts

+      if (flowRate > 0) {
+        const timeElapsed = BigInt(currentTime - lastUpdateTime);
+        const additionalStreamingAmount = flowRate * timeElapsed;
+        const totalForThisCollective = baseContribution + additionalStreamingAmount;
+
+        totalFromDonorCollectives += totalForThisCollective;
+      } else {


suggestion (bug_risk): No check for negative timeElapsed could lead to incorrect calculations.

If currentTime is earlier than lastUpdateTime, timeElapsed becomes negative, potentially causing incorrect results. Please add a check to prevent negative timeElapsed values.

Suggested change

if (flowRate > 0) {

const timeElapsed = BigInt(currentTime - lastUpdateTime);

const additionalStreamingAmount = flowRate * timeElapsed;

const totalForThisCollective = baseContribution + additionalStreamingAmount;

totalFromDonorCollectives += totalForThisCollective;

} else {

if (flowRate > 0) {

let timeElapsed = BigInt(currentTime - lastUpdateTime);

if (timeElapsed < 0) {

timeElapsed = BigInt(0);

}

const additionalStreamingAmount = flowRate * timeElapsed;

const totalForThisCollective = baseContribution + additionalStreamingAmount;

totalFromDonorCollectives += totalForThisCollective;

} else {

korbit-ai

Review by Korbit AI

Korbit automatically attempts to detect when you fix issues in new commits.

Category	Issue	Status
	Redundant Timestamp Calculation ▹ view	✅ Fix detected
	Missing timestamp validation in streaming calculation ▹ view	✅ Fix detected
	Extract Complex Calculation Logic ▹ view	✅ Fix detected

Files scanned

File Path	Reviewed
packages/app/src/subgraph/useSubgraphTotalStats.ts	✅
packages/app/src/subgraph/useSubgraphData.ts	✅
packages/app/src/hooks/useTotalStats.ts	✅

Explore our documentation to understand the languages and file types we support and the files we ignore.

Check out our docs on how you can make Korbit work best for you and your team.

Loving Korbit!? Share us on LinkedIn Reddit and X

packages/app/src/hooks/useTotalStats.ts

+      if (flowRate > 0) {
+        const timeElapsed = BigInt(currentTime - lastUpdateTime);
+        const additionalStreamingAmount = flowRate * timeElapsed;


packages/app/src/hooks/useTotalStats.ts

+    stats.donorCollectives?.forEach((donorCollective) => {
+      const flowRate = BigInt(donorCollective.flowRate || '0');
+      const lastUpdateTime = donorCollective.timestamp || 0;
+      const baseContribution = BigInt(donorCollective.contribution || '0');
+
+      if (flowRate > 0) {
+        const timeElapsed = BigInt(currentTime - lastUpdateTime);
+        const additionalStreamingAmount = flowRate * timeElapsed;
+        const totalForThisCollective = baseContribution + additionalStreamingAmount;
+
+        totalFromDonorCollectives += totalForThisCollective;
+      } else {
+        totalFromDonorCollectives += baseContribution;
+      }


L03TJ3

@EmekaManuel I think mostly looks good.

But one thing is missing, which is that the stream is not reflecting on the home-page as stream.
It does update the amount after a page refresh.

Look at the other pages where show flowing balances.

on a collectives page: https://dev-goodcollective.vercel.app/collective/0x627dbf00ce1a54067f5a34d6596a217a029c1532
In code you can look for example to the flow of 'this wallet has donated' here:

GoodCollective/packages/app/src/components/WalletDetails/BothWalletDetails.tsx

Line 45 in 2baeed1

<GoodDollarAmount
also check out the useFlowingBalance hook: https://github.com/GoodDollar/GoodCollective/blob/master/packages/app/src/hooks/useFlowingBalance.tsx

That should give you an idea how you can handle it for the homepage.

Any questions, let us know!

EmekaManuel · 2025-07-21T22:36:38Z

Screen.Recording.2025-07-21.at.23.36.00.mov

implemented the streaming / flowing balance functionality - @L03TJ3

L03TJ3 · 2025-07-23T07:52:29Z

packages/app/src/hooks/useTotalStats.ts

+
+    stats.donorCollectives?.forEach((donorCollective) => {
+      const flowRate = BigInt(donorCollective.flowRate || '0');
+      const lastUpdateTime = donorCollective.timestamp || 0;


please add error handling in this flow, and show a message in UI if it fails to show/calculate the current flowing total amount.
Better show error message, then a wrong amount

L03TJ3 · 2025-07-23T08:12:43Z

packages/app/src/pages/HomePage.tsx

-  totalMembers: {
-    copy: 'GoodCollective Members Paid',
-  },
+const useDonorCollectivesData = (collectiveAddresses: string[], tokenPrice: number) => {


This seems unneccary and duplicate of the calculation logic done in useTotalStats.
keep the calculation(s) in the useTotalStats, and get the needed amounts there.

implemented @L03TJ3

…mplementation incase of errors

L03TJ3 · 2025-07-24T17:07:59Z

@EmekaManuel
The last commit is too much, and makes hard to read code and maintance.
Please revert and

The request is:

remove duplication of the same calculation logic
introduce something of an error handling
all calculations should be done in useTotalStats.
in homepage, all we do is format with the copy.

Here is an example of how this can be handled in useTotalStats: https://gist.github.com/L03TJ3/01c702d5245328656d233cc3802f7a39

…back

EmekaManuel · 2025-07-24T20:53:29Z

@EmekaManuel The last commit is too much, and makes hard to read code and maintance. Please revert and

The request is:

remove duplication of the same calculation logic

introduce something of an error handling

all calculations should be done in useTotalStats.

in homepage, all we do is format with the copy.

Here is an example of how this can be handled in useTotalStats: https://gist.github.com/L03TJ3/01c702d5245328656d233cc3802f7a39

thanks for this, i have made the necessary changes as requested

packages/app/src/hooks/useTotalStats.ts

packages/app/src/lib/calculateGoodDollarAmounts.ts

…tsts

packages/app/src/pages/HomePage.tsx

EmekaManuel temporarily deployed to external July 15, 2025 14:57 — with GitHub Actions Inactive

sourcery-ai bot reviewed Jul 15, 2025

View reviewed changes

EmekaManuel mentioned this pull request Jul 15, 2025

[Improvement, GoodCollective] The total amount on the GC home page is not right #267

Closed

2 tasks

korbit-ai bot reviewed Jul 15, 2025

View reviewed changes

EmekaManuel deployed to preview July 21, 2025 11:32 — with GitHub Actions View deployment

L03TJ3 requested changes Jul 21, 2025

View reviewed changes

chore(): implemented the streaming/flowing balance functionality

c13000a

EmekaManuel temporarily deployed to external July 21, 2025 22:35 — with GitHub Actions Inactive

EmekaManuel deployed to preview July 23, 2025 07:54 — with GitHub Actions View deployment

L03TJ3 requested changes Jul 23, 2025

View reviewed changes

chore(): added comprehensive error handling to usetotalstats and UI i…

e0bdd7c

…mplementation incase of errors

EmekaManuel had a problem deploying to external July 23, 2025 11:43 — with GitHub Actions Failure

chore(): implemented all changes as requested in the most recent feed…

ff83f1f

…back

EmekaManuel had a problem deploying to external July 24, 2025 20:52 — with GitHub Actions Failure

L03TJ3 requested changes Jul 25, 2025

View reviewed changes

packages/app/src/hooks/useTotalStats.ts Show resolved Hide resolved

packages/app/src/lib/calculateGoodDollarAmounts.ts Show resolved Hide resolved

chore(): reverted calculateGooddollaramount, and simplified useTotals…

df1ddee

…tsts

EmekaManuel temporarily deployed to external July 25, 2025 09:31 — with GitHub Actions Inactive

EmekaManuel requested a review from L03TJ3 July 25, 2025 13:00

EmekaManuel deployed to preview July 28, 2025 11:33 — with GitHub Actions View deployment

L03TJ3 reviewed Jul 28, 2025

View reviewed changes

packages/app/src/pages/HomePage.tsx Outdated Show resolved Hide resolved

L03TJ3 reviewed Jul 28, 2025

View reviewed changes

packages/app/src/pages/HomePage.tsx Outdated Show resolved Hide resolved

Apply suggestions from code review

208ce12

L03TJ3 had a problem deploying to external July 28, 2025 16:19 — with GitHub Actions Failure

L03TJ3 approved these changes Jul 28, 2025

View reviewed changes

L03TJ3 merged commit 4128f2b into GoodDollar:master Jul 28, 2025
1 of 2 checks passed

L03TJ3 linked an issue Nov 21, 2025 that may be closed by this pull request

[Improvement, GoodCollective] The total amount on the GC home page is not right #267

Closed

2 tasks

[Improvement, GoodCollective] The total amount on the GC home page is not right #267 #298

[Improvement, GoodCollective] The total amount on the GC home page is not right #267 #298

Uh oh!

Conversation

EmekaManuel commented Jul 15, 2025 • edited by korbit-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

About

Description by Korbit AI

What change is being made?

Why are these changes being made?

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sourcery-ai bot Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

L03TJ3 Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

L03TJ3 Jul 24, 2025

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Jul 15, 2025

Choose a reason for hiding this comment

Uh oh!

korbit-ai bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Review by Korbit AI

Korbit automatically attempts to detect when you fix issues in new commits.

Uh oh!

This comment was marked as resolved.

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

L03TJ3 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

EmekaManuel commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

L03TJ3 Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

L03TJ3 Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

EmekaManuel Jul 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

L03TJ3 commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

EmekaManuel commented Jul 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

EmekaManuel commented Jul 15, 2025 •

edited by korbit-ai bot

Loading

korbit-ai bot left a comment •

edited

Loading

L03TJ3 left a comment •

edited

Loading

EmekaManuel commented Jul 21, 2025 •

edited

Loading

EmekaManuel Jul 23, 2025 •

edited

Loading

L03TJ3 commented Jul 24, 2025 •

edited

Loading