Skip to content

Update DashboardGovernanceActions.tsx - attempt 2 #3941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bosko-m merged 1 commit into from
Jul 23, 2025
Merged

Update DashboardGovernanceActions.tsx - attempt 2 #3941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect, useCallback } from "react";
import { useState, useEffect, useCallback, useMemo } from "react";
import { Box, CircularProgress, Tab, Tabs, styled } from "@mui/material";
import { useLocation, useNavigate } from "react-router-dom";

Expand Down Expand Up @@ -108,11 +108,14 @@ export const DashboardGovernanceActions = () => {
);

// White Magic :)
const filterOutAlreadyVotedProposals = () => {
if (!votes) return proposals;
const shouldFilter =
voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter;

const filteredProposals = useMemo(() => {
if (!shouldFilter || !proposals || !votes) return proposals;

return proposals
?.map((proposalCategory) => {
.map((proposalCategory) => {
const filteredActions = proposalCategory.actions.filter((action) => {
const hasVote = votes.some((voteCategory) =>
voteCategory.actions.some(
Expand All @@ -121,7 +124,6 @@ export const DashboardGovernanceActions = () => {
voteAction.proposal.index === action.index,
),
);

return !hasVote;
});

Expand All @@ -131,9 +133,7 @@ export const DashboardGovernanceActions = () => {
};
})
.filter((category) => category.actions.length > 0);
};

const filteredProposals = filterOutAlreadyVotedProposals();
}, [proposals, votes, shouldFilter]);

const { state } = useLocation();
const [content, setContent] = useState<number>(
Expand Down