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
12 changes: 11 additions & 1 deletion components/PoliticianEmbed/PoliticianEmbed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ export function PoliticianEmbed({
const biographySource = politician?.biographySource;
const officeTitle = `${politician?.currentOffice?.title} - ${politician?.currentOffice?.subtitleShort}`;
const upcomingRace = politician?.upcomingRace;
const isPastElection = new Date(upcomingRace?.electionDate) < new Date();
// Compare calendar dates so election day still shows "Running For" (avoids UTC midnight vs local time)
const electionDateStr = upcomingRace?.electionDate
? (typeof upcomingRace.electionDate === "string"
? upcomingRace.electionDate
: new Date(upcomingRace.electionDate).toISOString()
).slice(0, 10)
: "";
const today = new Date();
const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, "0")}-${String(today.getDate()).padStart(2, "0")}`;
const isPastElection =
electionDateStr !== "" && electionDateStr < todayStr;

if (isLoading) return <LoaderFlag />;
if (error) return <div>Something went wrong loading this politician.</div>;
Expand Down
14 changes: 12 additions & 2 deletions components/PoliticianPage/ElectionInfo/ElectionInfoSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,23 @@ function ElectionInfoSection() {
});
const politicianId = data?.politicianBySlug?.id;
const upcomingRace = data?.politicianBySlug?.upcomingRace;
const isPastElection = new Date(upcomingRace?.electionDate) < new Date();
// Compare calendar dates so election day still shows "Next Election" (avoids UTC midnight vs local time)
const electionDateStr = upcomingRace?.electionDate
? (typeof upcomingRace.electionDate === "string"
? upcomingRace.electionDate
: new Date(upcomingRace.electionDate).toISOString()
).slice(0, 10)
: "";
const today = new Date();
const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, "0")}-${String(today.getDate()).padStart(2, "0")}`;
const isPastElection =
electionDateStr !== "" && electionDateStr < todayStr;

if (isLoading) return <LoaderFlag />;

const opponents =
upcomingRace?.candidates?.filter(
(candidate) => candidate.id != politicianId
(candidate) => candidate.id != politicianId,
) || [];
if (!upcomingRace) return null;

Expand Down