Merge pull request #3968 from IntersectMBO/develop

v2.0.32

Author: bosko-m

govtool/backend/src/VVA/API.hs

@@ -296,22 +296,22 @@ getVotes (unHexText -> dRepId) selectedTypes sortMode mSearch = do
   CacheEnv {dRepGetVotesCache} <- asks vvaCache
   (votes, proposals) <- cacheRequest dRepGetVotesCache dRepId $ DRep.getVotes dRepId []
 
-  let voteMapByTxHash = Map.fromList $ 
-        map (\vote -> (pack $ Prelude.takeWhile (/= '#') (unpack $ Types.voteGovActionId vote), vote)) votes
+  let voteMapById = Map.fromList $
+        map (\vote -> (Types.voteGovActionId vote, vote)) votes
 
   processedProposals <- filter (isProposalSearchedFor mSearch) <$> 
                         mapSortAndFilterProposals selectedTypes sortMode proposals
 
-  return $
+  return
     [ VoteResponse
       { voteResponseVote = voteToResponse vote
       , voteResponseProposal = proposalResponse
       }
     | proposalResponse <- processedProposals
-    , let txHash = unHexText (proposalResponseTxHash proposalResponse)
-    , Just vote <- [Map.lookup txHash voteMapByTxHash]
+    , let govActionId = unHexText (proposalResponseTxHash proposalResponse) <> "#" <> pack (show $ proposalResponseIndex proposalResponse)
+    , Just vote <- [Map.lookup govActionId voteMapById]
     ]
-
+    
 drepInfo :: App m => HexText -> m DRepInfoResponse
 drepInfo (unHexText -> dRepId) = do
   CacheEnv {dRepInfoCache} <- asks vvaCache

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

@@ -60,7 +60,8 @@ export const DashboardGovernanceActionDetails = () => {
   );
 
   useEffect(() => {
-    if (data?.proposal && typeof isMetadataValid !== "boolean") {
+    const extendedProposalIndex = extendedProposal ? extendedProposal.index : -1;
+    if (data?.proposal && data?.proposal.index !== extendedProposalIndex) {
       setExtendedProposal(data.proposal);
     }
   }, [data?.proposal, isMetadataValid]);

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

@@ -99,7 +99,7 @@ export const DashboardGovernanceActions = () => {
     filters: stableFilters,
     sorting: stableSorting,
     searchPhrase: debouncedSearchText,
-    enabled: true,
+    enabled: voter?.isRegisteredAsDRep || voter?.isRegisteredAsSoleVoter,
   });
   const { data: votes, areDRepVotesLoading } = useGetDRepVotesQuery(
     queryFilters,

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

@@ -48,7 +48,7 @@ export const GovernanceActionsToVote = ({
                 data={item.actions.slice(0, 6).map((action) => (
                   <div
                     className="keen-slider__slide"
-                    key={action.id}
+                    key={`${action.txHash}${action.index}`}
                     style={{
                       overflow: "visible",
                       width: "auto",

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

@@ -33,16 +33,23 @@ export const useGetProposalsQuery = ({
     return allProposals.flatMap((proposal) => proposal.elements);
   };
 
-    const { data, isLoading } = useQuery(
-        [QUERY_KEYS.useGetProposalsKey, filters, searchPhrase, sorting, dRepID],
-        fetchProposals,
-        {
-            enabled,
-            refetchOnWindowFocus: true,
-            keepPreviousData: true,
-            staleTime: 2000,
-        },
-    );
+  const { data, isLoading } = useQuery(
+    [
+      QUERY_KEYS.useGetProposalsKey,
+      filters,
+      searchPhrase,
+      sorting,
+      dRepID,
+      voter?.isRegisteredAsDRep,
+      voter?.isRegisteredAsSoleVoter,
+    ],
+    fetchProposals,
+    {
+      enabled,
+      refetchOnWindowFocus: true,
+      keepPreviousData: true,
+    },
+  );
 
   const proposals = Object.values(groupByType(data) ?? []);
 

govtool/frontend/src/pages/DRepDirectoryContent.tsx

@@ -50,15 +50,24 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
 }) => {
   const { dRepID: myDRepId, pendingTransaction, stakeKey } = useCardano();
   const { t } = useTranslation();
-  const { debouncedSearchText, ...dataActionsBarProps } = useDataActionsBar();
+
+  const {
+    searchText,
+    debouncedSearchText,
+    setSearchText,
+    ...dataActionsBarProps
+  } = useDataActionsBar();
+
   const { chosenFilters, chosenSorting, setChosenFilters, setChosenSorting } =
     dataActionsBarProps;
 
   const [inProgressDelegationDRepData, setInProgressDelegationDRepData] =
     useState<DRepData | undefined>(undefined);
 
+  // Set initial filters and sort
   useEffect(() => {
     setChosenFilters([DRepStatus.Active]);
+    setSearchText(""); // <--- Clear the search field on mount
   }, []);
 
   useEffect(() => {
@@ -198,6 +207,8 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
         </Typography>
         <DataActionsBar
           {...dataActionsBarProps}
+          searchText={searchText}
+          setSearchText={setSearchText}
           filterOptions={DREP_DIRECTORY_FILTERS}
           filtersTitle={t("dRepDirectory.filterTitle")}
           sortOptions={DREP_DIRECTORY_SORTING}