Merge pull request #2938 from IntersectMBO/develop

IntersectMBO · Feb 10, 2025 · bfbc9ff · bfbc9ff
2 parents ceea391 + 9713fb5
commit bfbc9ff
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 181 deletions.
diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -27,7 +27,7 @@
     "@emotion/styled": "^11.11.0",
     "@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
     "@hookform/resolvers": "^3.3.1",
-    "@intersect.mbo/govtool-outcomes-pillar-ui": "^1.0.0-beta.1",
+    "@intersect.mbo/govtool-outcomes-pillar-ui": "1.0.0",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
     "@intersect.mbo/pdf-ui": "^0.5.11",
     "@mui/icons-material": "^5.14.3",

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
@@ -107,6 +107,18 @@ export default () => {
             element={<ProposalDiscussionPillar />}
           />
         )}
+        {isGovernanceOutcomesPillarEnabled && !isEnabled && (
+          <>
+            <Route
+              path={`${OUTCOMES_PATHS.governanceActionsOutcomes}/*`}
+              element={<GovernanceActionOutComesPillar />}
+            />
+            <Route
+              path={USER_PATHS.governanceActionsVotedByMe}
+              element={<GovernanceActionOutComesPillar />}
+            />
+          </>
+        )}
         <Route element={<Dashboard />}>
           <Route path={PATHS.dashboard} element={<DashboardHome />} />
           {isProposalDiscussionForumEnabled && (

diff --git a/govtool/frontend/src/components/molecules/WalletInfoCard.tsx b/govtool/frontend/src/components/molecules/WalletInfoCard.tsx
@@ -1,7 +1,7 @@
 import { useLocation, useNavigate } from "react-router-dom";
 import { Box, Button, Typography } from "@mui/material";
 
-import { PDF_PATHS, PATHS, gray } from "@consts";
+import { PDF_PATHS, PATHS, gray, OUTCOMES_PATHS } from "@consts";
 import { useCardano } from "@context";
 import { useTranslation } from "@hooks";
 import { Card } from "./Card";
@@ -18,7 +18,11 @@ export const WalletInfoCard = () => {
       PDF_PATHS.proposalDiscussion.replace("/", ""),
     );
 
-    if (!isProposalDiscussionForum) {
+    const isGovernanceOutcomesPillar = window.location.pathname.includes(
+      OUTCOMES_PATHS.governanceActionsOutcomes.replace("/", ""),
+    );
+
+    if (!isProposalDiscussionForum && !isGovernanceOutcomesPillar) {
       navigate(
         pathname.includes("/connected")
           ? `${pathname.replace("/connected", "")}${hash ?? ""}`

diff --git a/govtool/frontend/src/components/molecules/WalletOption.tsx b/govtool/frontend/src/components/molecules/WalletOption.tsx
@@ -2,7 +2,7 @@ import { FC, useCallback } from "react";
 import { To, useNavigate, useLocation } from "react-router-dom";
 import { Box, CircularProgress, Typography } from "@mui/material";
 
-import { PATHS, PDF_PATHS } from "@consts";
+import { OUTCOMES_PATHS, PATHS, PDF_PATHS } from "@consts";
 import { useCardano } from "@context";
 import { theme } from "@/theme";
 
@@ -36,10 +36,14 @@ export const WalletOptionButton: FC<WalletOption> = ({
       PDF_PATHS.proposalDiscussion.replace("/", ""),
     );
 
+    const isGovernanceOutcomesPillar = window.location.pathname.includes(
+      OUTCOMES_PATHS.governanceActionsOutcomes.replace("/", ""),
+    );
+
     const result = await enable(name);
 
     if (result?.stakeKey) {
-      if (isProposalDiscussionForum) return;
+      if (isProposalDiscussionForum || isGovernanceOutcomesPillar) return;
       navigate(
         // eslint-disable-next-line no-unneeded-ternary
         pathToNavigate

diff --git a/govtool/frontend/src/components/organisms/DrawerMobile.tsx b/govtool/frontend/src/components/organisms/DrawerMobile.tsx
@@ -18,7 +18,10 @@ export const DrawerMobile = ({
   isDrawerOpen,
   setIsDrawerOpen,
 }: DrawerMobileProps) => {
-  const { isProposalDiscussionForumEnabled } = useFeatureFlag();
+  const {
+    isProposalDiscussionForumEnabled,
+    isGovernanceOutcomesPillarEnabled,
+  } = useFeatureFlag();
   const { screenWidth } = useScreenDimension();
   const { openModal } = useModal();
   const { t } = useTranslation();
@@ -88,6 +91,13 @@ export const DrawerMobile = ({
                 ) {
                   return null;
                 }
+
+                if (
+                  !isGovernanceOutcomesPillarEnabled &&
+                  navItem.dataTestId === "governance-actions-outcomes-link"
+                ) {
+                  return null;
+                }
                 return (
                   <Grid item key={navItem.label}>
                     <Link

diff --git a/govtool/frontend/src/components/organisms/TopNav.tsx b/govtool/frontend/src/components/organisms/TopNav.tsx
@@ -14,7 +14,7 @@ import { DrawerMobile } from "./DrawerMobile";
 const POSITION_TO_BLUR = 50;
 
 export const TopNav = ({ isConnectButton = true }) => {
-  const { isProposalDiscussionForumEnabled } = useFeatureFlag();
+  const { isProposalDiscussionForumEnabled, isGovernanceOutcomesPillarEnabled } = useFeatureFlag();
   const containerRef = useRef<HTMLDivElement>(null);
   const [shouldBlur, setShouldBlur] = useState<boolean>(false);
   const { openModal } = useModal();
@@ -121,6 +121,13 @@ export const TopNav = ({ isConnectButton = true }) => {
                 ) {
                   return null;
                 }
+
+                if (
+                  !isGovernanceOutcomesPillarEnabled &&
+                  navItem.dataTestId === "governance-actions-outcomes-link"
+                ) {
+                  return null;
+                }
                 return (
                   <Grid item key={navItem.label}>
                     <Link