From 69e418ae5cdaf645adaeefed6d3158cf061fba8e Mon Sep 17 00:00:00 2001
From: Mahika <mahika.kakkad@ufl.edu>
Date: Fri, 16 Oct 2026 21:38:29 -0400
Subject: [PATCH 1/3] fix: label Team Stats axis as Volunteers

---
 src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx b/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
index da582103fa6..a153463f090 100644
--- a/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
+++ b/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
@@ -72,7 +72,7 @@ function TeamStatsBarChart({ data, yAxisLabel }) {
         >
           <XAxis type="number" tick={{ fill: darkMode ? 'white' : '#666' }}>
             <Label
-              value="Total Hours Contributed"
+              value="Volunteers"
               position="insideBottom"
               offset={-10}
               style={{

From 10c41e89c8649993ed87d304b626d23068250105 Mon Sep 17 00:00:00 2001
From: Mahika <mahika.kakkad@ufl.edu>
Date: Sat, 31 Oct 2026 20:55:28 -0400
Subject: [PATCH 2/3] fix: label Team Stats tooltip as Volunteers

---
 src/components/CustomTooltip.jsx              | 21 +++++++++++++++++--
 .../TeamStats/TeamStatsBarChart.jsx           |  9 +++++++-
 .../__tests__/CustomTooltip.test.jsx          | 17 +++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/components/CustomTooltip.jsx b/src/components/CustomTooltip.jsx
index 11fd7aa67b8..1eaa2a2d104 100644
--- a/src/components/CustomTooltip.jsx
+++ b/src/components/CustomTooltip.jsx
@@ -38,7 +38,15 @@ const getTooltipData = (payload, label) => {
   };
 };
 
-function CustomTooltip({ active, payload, label, tooltipType, darkMode = false }) {
+function CustomTooltip({
+  active,
+  payload,
+  label,
+  tooltipType,
+  darkMode = false,
+  valueLabel = 'Total Hours',
+  formatValue = false,
+}) {
   if (!active || !payload || !payload.length) return null;
 
   const isDarkMode = darkMode;
@@ -63,7 +71,12 @@ function CustomTooltip({ active, payload, label, tooltipType, darkMode = false }
     }
 
     if (totalHours !== undefined) {
-      return <div style={{ color: textColor, fontWeight: 'bold' }}>Total Hours: {totalHours}</div>;
+      const displayValue = formatValue ? formatNumber(totalHours) : totalHours;
+      return (
+        <div style={{ color: textColor, fontWeight: 'bold' }}>
+          {valueLabel}: {displayValue}
+        </div>
+      );
     }
 
     return null;
@@ -102,6 +115,8 @@ CustomTooltip.propTypes = {
   label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   tooltipType: PropTypes.string,
   darkMode: PropTypes.bool,
+  valueLabel: PropTypes.string,
+  formatValue: PropTypes.bool,
 };
 
 CustomTooltip.defaultProps = {
@@ -109,6 +124,8 @@ CustomTooltip.defaultProps = {
   payload: null,
   label: '',
   tooltipType: undefined,
+  valueLabel: 'Total Hours',
+  formatValue: false,
   darkMode: false,
 };
 
diff --git a/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx b/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
index a153463f090..57be9516d9d 100644
--- a/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
+++ b/src/components/TotalOrgSummary/TeamStats/TeamStatsBarChart.jsx
@@ -48,7 +48,14 @@ function createTeamStatsTooltipContent(yAxisLabel, darkMode) {
       payload: { ...item.payload, change: formatChangePercent(item.payload?.change) },
     }));
     return (
-      <CustomTooltip {...props} payload={formatted} yAxisLabel={yAxisLabel} darkMode={darkMode} />
+      <CustomTooltip
+        {...props}
+        payload={formatted}
+        yAxisLabel={yAxisLabel}
+        darkMode={darkMode}
+        valueLabel="Volunteers"
+        formatValue
+      />
     );
   }
   TeamStatsTooltipContent.displayName = 'TeamStatsTooltipContent';
diff --git a/src/components/__tests__/CustomTooltip.test.jsx b/src/components/__tests__/CustomTooltip.test.jsx
index 53ccfa23471..ce11eddfb76 100644
--- a/src/components/__tests__/CustomTooltip.test.jsx
+++ b/src/components/__tests__/CustomTooltip.test.jsx
@@ -28,4 +28,21 @@ describe('CustomTooltip', () => {
     expect(screen.getByText(/Total Hours: 12/)).toBeInTheDocument();
     expect(screen.getByText(/Percentage: 50%/)).toBeInTheDocument();
   });
+
+  it('uses a custom valueLabel when provided (e.g. Team Stats showing Volunteers, not Total Hours)', () => {
+    const payload2 = [{ payload: { name: 'In Team', totalHours: 963 } }];
+    render(<CustomTooltip active payload={payload2} valueLabel="Volunteers" />, container);
+    expect(screen.getByText(/Volunteers: 963/)).toBeInTheDocument();
+    expect(screen.queryByText(/Total Hours/)).not.toBeInTheDocument();
+  });
+
+  it('rounds the value to a whole number when formatValue is set, without affecting callers that leave it off', () => {
+    const payload2 = [{ payload: { name: 'In Team', totalHours: 963.7 } }];
+    render(
+      <CustomTooltip active payload={payload2} valueLabel="Volunteers" formatValue />,
+      container,
+    );
+    expect(screen.getByText(/Volunteers: 964/)).toBeInTheDocument();
+    expect(screen.queryByText(/963\.7/)).not.toBeInTheDocument();
+  });
 });

From 012d35ee9457bf398ff0a974cde21ee5b5c4e66e Mon Sep 17 00:00:00 2001
From: Mahika <mahika.kakkad@ufl.edu>
Date: Mon, 2 Nov 2026 23:10:47 -0500
Subject: [PATCH 3/3] fix: update failing test for Team Stats tooltip

---
 .../CommunityPortal/Activities/__tests__/ActivityList.test.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/CommunityPortal/Activities/__tests__/ActivityList.test.jsx b/src/components/CommunityPortal/Activities/__tests__/ActivityList.test.jsx
index d5751c59432..8f75e246724 100644
--- a/src/components/CommunityPortal/Activities/__tests__/ActivityList.test.jsx
+++ b/src/components/CommunityPortal/Activities/__tests__/ActivityList.test.jsx
@@ -57,6 +57,9 @@ describe('ActivityList', () => {
 
   test('sorts activities by date (latest to earliest)', () => {
     renderActivityList();
+    // All mock activity dates are in the past by now - without this, the
+    // default "hide past events" filter leaves nothing to sort.
+    fireEvent.click(screen.getByLabelText(/Show Past Events:/i));
 
     fireEvent.change(screen.getByLabelText(/Sort By:/i), {
       target: { value: 'latest' },