Merge pull request #3256 from IntersectMBO/develop

Author: MSzalowski

CHANGELOG.md

@@ -18,8 +18,22 @@ changes.
 
 ### Removed
 
-## [v2.0.17](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.17) 2025-03-18
+## [v2.0.18](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.18) 2025-03-20
+
+
+### Added
+
+- Add redirection to outcomes when proposal is not found [Issue 3230](https://github.com/IntersectMBO/govtool/issues/3230)
+
+### 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
 

govtool/backend/Dockerfile

@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.17/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.18/x/vva-be/build/vva-be/vva-be /usr/local/bin

govtool/backend/Dockerfile.qovery

@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.17/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.18/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

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/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.17
+version:            2.0.18
 
 -- A short (one-line) description of the package.
 -- synopsis:

govtool/frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.17",
+  "version": "2.0.18",
   "type": "module",
   "scripts": {
     "build": "vite build",

govtool/frontend/package.json

@@ -1,12 +1,14 @@
+import { useEffect } from "react";
 import {
   useNavigate,
   useLocation,
   useParams,
   generatePath,
 } from "react-router-dom";
 import { Box, CircularProgress, Link, Typography } from "@mui/material";
+import { AxiosError } from "axios";
 
-import { ICONS, PATHS } from "@consts";
+import { ICONS, OUTCOMES_PATHS, PATHS } from "@consts";
 import { useCardano } from "@context";
 import {
   useGetProposalQuery,
@@ -42,13 +44,24 @@ export const DashboardGovernanceActionDetails = () => {
   const shortenedGovActionId =
     txHash && getShortenedGovActionId(txHash, +index);
 
-  const { data, isLoading } = useGetProposalQuery(
+  const { data, isLoading, error } = useGetProposalQuery(
     fullProposalId ?? "",
     !state?.proposal || !state?.vote,
   );
   const proposal = (data ?? state)?.proposal;
   const vote = (data ?? state)?.vote;
 
+  useEffect(() => {
+    const isProposalNotFound =
+      (error as AxiosError)?.response?.data ===
+      `Proposal with id: ${fullProposalId} not found`;
+    if (isProposalNotFound && fullProposalId) {
+      navigate(
+        OUTCOMES_PATHS.governanceActionOutcomes.replace(":id", fullProposalId),
+      );
+    }
+  }, [error]);
+
   return (
     <Box
       px={isMobile ? 2 : 4}