Merge pull request #3248 from IntersectMBO/fix/3242-bug-incorrect-redirect-after-voting-on-governance-action

fix(#3242): bug incorrect redirect after voting on governance action

Author: MSzalowski

CHANGELOG.md

@@ -14,13 +14,14 @@ changes.
 
 ### Fixed
 
+- Fix post-vote navigation to governance action list [Issue 3242](https://github.com/IntersectMBO/govtool/issues/3242)
+
 ### Changed
 
 ### Removed
 
 ## [v2.0.17](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.17) 2025-03-18
 
-
 ### Added
 
 ### Fixed

govtool/backend/src/VVA/API.hs

@@ -283,18 +283,20 @@ getVotes (unHexText -> dRepId) selectedTypes sortMode mSearch = do
   CacheEnv {dRepGetVotesCache} <- asks vvaCache
   (votes, proposals) <- cacheRequest dRepGetVotesCache dRepId $ DRep.getVotes dRepId []
 
-  let voteMap = Map.fromList $ map (\vote@Types.Vote {..} -> (voteProposalId, vote)) votes
-
-  processedProposals <- filter (isProposalSearchedFor mSearch) <$> mapSortAndFilterProposals selectedTypes sortMode proposals
-
+  let voteMapByTxHash = Map.fromList $ 
+        map (\vote -> (pack $ Prelude.takeWhile (/= '#') (unpack $ Types.voteGovActionId vote), vote)) votes
+  
+  processedProposals <- filter (isProposalSearchedFor mSearch) <$> 
+                        mapSortAndFilterProposals selectedTypes sortMode proposals
+  
   return $
     [ VoteResponse
       { voteResponseVote = voteToResponse vote
       , voteResponseProposal = proposalResponse
       }
-    | proposalResponse@ProposalResponse{proposalResponseId} <- processedProposals
-    , let proposalIdInt = read (unpack proposalResponseId) :: Int
-    , Just vote <- [Map.lookup (toInteger proposalIdInt) voteMap]
+    | proposalResponse <- processedProposals
+    , let txHash = unHexText (proposalResponseTxHash proposalResponse)
+    , Just vote <- [Map.lookup txHash voteMapByTxHash]
     ]
 
 drepInfo :: App m => HexText -> m DRepInfoResponse

govtool/backend/src/VVA/DRep.hs

@@ -115,24 +115,22 @@ getVotes ::
   m ([Vote], [Proposal])
 getVotes drepId selectedProposals = withPool $ \conn -> do
   results <- liftIO $ SQL.query conn getVotesSql (SQL.Only drepId)
-  
+
   if null results
     then return ([], [])
     else do
       let proposalsToSelect = if null selectedProposals
                               then [ govActionId | (_, govActionId, _, _, _, _, _, _, _) <- results]
                               else selectedProposals
-      
       allProposals <- mapM (Proposal.getProposals . Just . (:[])) proposalsToSelect
-      
       let proposals = concat allProposals
 
       let proposalMap = M.fromList $ map (\x -> (proposalId x, x)) proposals
 
       timeZone <- liftIO getCurrentTimeZone
 
       let votes = 
-            [ Vote proposalId' drepId' vote' url' docHash' epochNo' (localTimeToUTC timeZone date') voteTxHash'
+            [ Vote proposalId' govActionId' drepId' vote' url' docHash' epochNo' (localTimeToUTC timeZone date') voteTxHash'
             | (proposalId', govActionId', drepId', vote', url', docHash', epochNo', date', voteTxHash') <- results
             , govActionId' `elem` proposalsToSelect
             ]

govtool/backend/src/VVA/Types.hs

@@ -61,14 +61,15 @@ instance Exception AppError
 
 data Vote
   = Vote
-      { voteProposalId :: Integer
-      , voteDrepId     :: Text
-      , voteVote       :: Text
-      , voteUrl        :: Maybe Text
-      , voteDocHash    :: Maybe Text
-      , voteEpochNo    :: Integer
-      , voteDate       :: UTCTime
-      , voteTxHash     :: Text
+      { voteProposalId  :: Integer
+      , voteGovActionId :: Text
+      , voteDrepId      :: Text
+      , voteVote        :: Text
+      , voteUrl         :: Maybe Text
+      , voteDocHash     :: Maybe Text
+      , voteEpochNo     :: Integer
+      , voteDate        :: UTCTime
+      , voteTxHash      :: Text
       }
 
 data DRepInfo

govtool/frontend/src/components/organisms/DashboardGovernanceActions.tsx

@@ -10,6 +10,7 @@ import {
 } from "@consts";
 import { useCardano, useDataActionsBar, useFeatureFlag } from "@context";
 import {
+  useGetDRepVotesQuery,
   useGetProposalsQuery,
   useGetVoterInfo,
   useScreenDimension,
@@ -89,6 +90,31 @@ export const DashboardGovernanceActions = () => {
     searchPhrase: debouncedSearchText,
     enabled: !isAdjusting,
   });
+  const { data: votes, areDRepVotesLoading } = useGetDRepVotesQuery(
+    queryFilters,
+    chosenSorting,
+    debouncedSearchText,
+  );
+
+  // TODO: Black magic - that filtering should be done on the backend
+  const filteredProposals = proposals
+    ?.map((proposalCategory) => {
+      const filteredActions = proposalCategory.actions.filter((action) => {
+        const hasVote = votes?.some((voteCategory) =>
+          voteCategory.actions.some(
+            (voteAction) => voteAction.proposal.txHash === action.txHash,
+          ),
+        );
+
+        return !hasVote;
+      });
+
+      return {
+        ...proposalCategory,
+        actions: filteredActions,
+      };
+    })
+    .filter((category) => category.actions.length > 0);
 
   const { state } = useLocation();
   const [content, setContent] = useState<number>(
@@ -189,14 +215,14 @@ export const DashboardGovernanceActions = () => {
                 onDashboard
                 searchPhrase={debouncedSearchText}
                 sorting={chosenSorting}
-                proposals={proposals}
+                proposals={filteredProposals}
               />
             </CustomTabPanel>
             <CustomTabPanel value={content} index={1}>
               <DashboardGovernanceActionsVotedOn
-                filters={chosenFilters}
                 searchPhrase={debouncedSearchText}
-                sorting={chosenSorting}
+                votes={votes}
+                areDRepVotesLoading={areDRepVotesLoading}
               />
             </CustomTabPanel>
           </>

govtool/frontend/src/components/organisms/DashboardGovernanceActionsVotedOn.tsx

@@ -2,38 +2,34 @@ import { useMemo } from "react";
 import { Box, Typography, CircularProgress } from "@mui/material";
 
 import { useCardano } from "@context";
-import {
-  useGetDRepVotesQuery,
-  useScreenDimension,
-  useTranslation,
-} from "@hooks";
+import { useScreenDimension, useTranslation } from "@hooks";
 import { GovernanceVotedOnCard } from "@molecules";
 import { Slider } from "@organisms";
 import { getFullGovActionId, getProposalTypeLabel } from "@utils";
+import { VotedProposal } from "@/models";
 
 type DashboardGovernanceActionsVotedOnProps = {
-  filters: string[];
   searchPhrase?: string;
-  sorting: string;
+  votes: {
+    title: string;
+    actions: VotedProposal[];
+  }[];
+  areDRepVotesLoading: boolean;
 };
 
 export const DashboardGovernanceActionsVotedOn = ({
-  filters,
   searchPhrase,
-  sorting,
+  votes,
+  areDRepVotesLoading,
 }: DashboardGovernanceActionsVotedOnProps) => {
-  const { data, areDRepVotesLoading } = useGetDRepVotesQuery(
-    filters,
-    sorting,
-    searchPhrase,
-  );
   const { isMobile } = useScreenDimension();
   const { pendingTransaction } = useCardano();
   const { t } = useTranslation();
 
+  // TODO: Filtering here is some kind of craziness. It should be done on the backend.
   const filteredData = useMemo(() => {
-    if (data.length && searchPhrase) {
-      return data
+    if (votes.length && searchPhrase) {
+      return votes
         .map((entry) => ({
           ...entry,
           actions: entry.actions.filter((action) =>
@@ -44,16 +40,16 @@ export const DashboardGovernanceActionsVotedOn = ({
         }))
         .filter((entry) => entry.actions?.length > 0);
     }
-    return data;
-  }, [data, searchPhrase, pendingTransaction.vote]);
+    return votes;
+  }, [votes, searchPhrase, pendingTransaction.vote]);
 
   return areDRepVotesLoading ? (
     <Box py={4} display="flex" justifyContent="center">
       <CircularProgress />
     </Box>
   ) : (
     <>
-      {!data.length ? (
+      {!votes.length ? (
         <Typography py={4} fontWeight="300">
           {t("govActions.youHaventVotedYet")}
         </Typography>

govtool/frontend/src/hooks/queries/useGetDRepVotesQuery.ts

@@ -30,6 +30,8 @@ export const useGetDRepVotesQuery = (
         },
       }),
     enabled: !!dRepID,
+    refetchOnWindowFocus: true,
+    keepPreviousData: true,
   });
 
   const groupedByType = data?.reduce((groups, item) => {

govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts

@@ -12,7 +12,7 @@ export const useGetProposalsQuery = ({
   sorting,
   enabled,
 }: GetProposalsArguments) => {
-  const { dRepID, pendingTransaction } = useCardano();
+  const { dRepID } = useCardano();
   const { voter } = useGetVoterInfo();
 
   const fetchProposals = async (): Promise<ProposalData[]> => {
@@ -34,17 +34,12 @@ export const useGetProposalsQuery = ({
   };
 
   const { data, isLoading } = useQuery(
-    [
-      QUERY_KEYS.useGetProposalsKey,
-      filters,
-      searchPhrase,
-      sorting,
-      dRepID,
-      pendingTransaction.vote?.transactionHash,
-    ],
+    [QUERY_KEYS.useGetProposalsKey, filters, searchPhrase, sorting, dRepID],
     fetchProposals,
     {
       enabled,
+      refetchOnWindowFocus: true,
+      keepPreviousData: true,
     },
   );
 

govtool/frontend/src/types/global.d.ts

@@ -14,6 +14,7 @@ declare global {
 
   type ActionTypeFromAPI = {
     id: string;
+    txHash: string;
     type: string;
     details: string;
     expiryDate: string;
@@ -36,7 +37,7 @@ declare global {
 
   type ToVoteDataType = {
     title: string;
-    actions: ActionTypeToDsiplay[];
+    actions: ProposalData[];
   }[];
 
   type NestedKeys<T> = T extends Record<string, unknown>