Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion src/components/HOCs/WithLeaderboard/WithLeaderboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@ const WithLeaderboard = function (WrappedComponent, initialMonthsPast = 1, initi
const merged = _clone(this.state.leaderboard);
if (merged) {
merged.splice(userLeaderboard[0].rank - 1, userLeaderboard.length, ...userLeaderboard);
this.setState({ leaderboard: merged });
// Deduplicate by userId, keeping the first occurrence at the correct
// rank position. This prevents duplicate entries when the user already
// appeared in the initially fetched leaderboard at a different index.
const seen = new Set();
const deduped = merged.filter((entry) => {
if (seen.has(entry.userId)) return false;
seen.add(entry.userId);
return true;
});
this.setState({ leaderboard: deduped });
}
}
};
Expand Down
1 change: 1 addition & 0 deletions src/services/Leaderboard/Leaderboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ export const initializeLeaderboardParams = function (
endDate,
) {
if (numberMonths === CURRENT_MONTH) {
params.monthDuration = CURRENT_MONTH;
params.start = startOfMonth(new Date()).toISOString();
params.end = endOfDay(new Date()).toISOString();
} else if (numberMonths === CUSTOM_RANGE && startDate && endDate) {
Expand Down
Loading