diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
index 6bdf01c7d..b2684379f 100644
--- a/govtool/frontend/package-lock.json
+++ b/govtool/frontend/package-lock.json
@@ -13,7 +13,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",
@@ -3368,13 +3368,26 @@
}
},
"node_modules/@intersect.mbo/govtool-outcomes-pillar-ui": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.0.7.tgz",
- "integrity": "sha512-I214XRhLfrQUWmfy8XfoCZDjtz7kWB2qf5/Fh5Jh/QfJ95H+AkO4R3jWvCAwN3apjKy5nhgWchCgD09464EovQ==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.0.0.tgz",
+ "integrity": "sha512-rsg/F1q713hMQI7bc+rEHy5odIYl4KR9Za/U3X0jUE0trk/X6sVjwiSM0HPBQhervJOWKN8OtEzCaNstjk1zRg==",
"license": "ISC",
"dependencies": {
- "rollup-plugin-livereload": "^2.0.5",
- "rollup-plugin-serve": "^1.1.1"
+ "@fontsource/poppins": "^5.0.14",
+ "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
+ "axios": "^1.7.9",
+ "bech32": "^2.0.0",
+ "buffer": "^6.0.3",
+ "react-query": "^3.39.3"
+ },
+ "peerDependencies": {
+ "@emotion/react": "^11.11.4",
+ "@emotion/styled": "^11.11.5",
+ "@mui/material": "^5.15.18",
+ "react": "^18.3.1",
+ "react-dom": "^18.3.1",
+ "react-router-dom": "^6.23.1",
+ "sass": "^1.77.2"
}
},
"node_modules/@intersect.mbo/intersectmbo.org-icons-set": {
@@ -10222,9 +10235,9 @@
}
},
"node_modules/axios": {
- "version": "1.7.8",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz",
- "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==",
+ "version": "1.7.9",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+ "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.6",
@@ -10614,6 +10627,7 @@
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=8"
},
@@ -11143,6 +11157,7 @@
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"anymatch": "~3.1.2",
"braces": "~3.0.2",
@@ -11167,6 +11182,7 @@
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"license": "ISC",
+ "peer": true,
"dependencies": {
"is-glob": "^4.0.1"
},
@@ -17127,6 +17143,7 @@
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"binary-extensions": "^2.0.0"
},
@@ -20470,51 +20487,6 @@
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
"license": "MIT"
},
- "node_modules/livereload": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz",
- "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==",
- "license": "MIT",
- "dependencies": {
- "chokidar": "^3.5.0",
- "livereload-js": "^3.3.1",
- "opts": ">= 1.2.0",
- "ws": "^7.4.3"
- },
- "bin": {
- "livereload": "bin/livereload.js"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
- "node_modules/livereload-js": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.4.1.tgz",
- "integrity": "sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==",
- "license": "MIT"
- },
- "node_modules/livereload/node_modules/ws": {
- "version": "7.5.10",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
- "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
- "license": "MIT",
- "engines": {
- "node": ">=8.3.0"
- },
- "peerDependencies": {
- "bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
- },
- "peerDependenciesMeta": {
- "bufferutil": {
- "optional": true
- },
- "utf-8-validate": {
- "optional": true
- }
- }
- },
"node_modules/loader-runner": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -22483,15 +22455,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/opener": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
- "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
- "license": "(WTFPL OR MIT)",
- "bin": {
- "opener": "bin/opener-bin.js"
- }
- },
"node_modules/optionator": {
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -22509,12 +22472,6 @@
"node": ">= 0.8.0"
}
},
- "node_modules/opts": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz",
- "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==",
- "license": "BSD-2-Clause"
- },
"node_modules/os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
@@ -26842,6 +26799,7 @@
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"picomatch": "^2.2.1"
},
@@ -26854,6 +26812,7 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=8.6"
},
@@ -27499,40 +27458,6 @@
"fsevents": "~2.3.2"
}
},
- "node_modules/rollup-plugin-livereload": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.5.tgz",
- "integrity": "sha512-vqQZ/UQowTW7VoiKEM5ouNW90wE5/GZLfdWuR0ELxyKOJUIaj+uismPZZaICU4DnWPVjnpCDDxEqwU7pcKY/PA==",
- "license": "MIT",
- "dependencies": {
- "livereload": "^0.9.1"
- },
- "engines": {
- "node": ">=8.3"
- }
- },
- "node_modules/rollup-plugin-serve": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/rollup-plugin-serve/-/rollup-plugin-serve-1.1.1.tgz",
- "integrity": "sha512-H0VarZRtFR0lfiiC9/P8jzCDvtFf1liOX4oSdIeeYqUCKrmFA7vNiQ0rg2D+TuoP7leaa/LBR8XBts5viF6lnw==",
- "license": "MIT",
- "dependencies": {
- "mime": "^2",
- "opener": "1"
- }
- },
- "node_modules/rollup-plugin-serve/node_modules/mime": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
- "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
- "license": "MIT",
- "bin": {
- "mime": "cli.js"
- },
- "engines": {
- "node": ">=4.0.0"
- }
- },
"node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-musl": {
"version": "4.27.4",
"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
index ad0c21fde..90dd255c8 100644
--- 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
index 38fa605a5..4e72a1346 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -107,6 +107,18 @@ export default () => {
element={}
/>
)}
+ {isGovernanceOutcomesPillarEnabled && !isEnabled && (
+ <>
+ }
+ />
+ }
+ />
+
+ )}
}>
} />
{isProposalDiscussionForumEnabled && (
diff --git a/govtool/frontend/src/components/molecules/WalletInfoCard.tsx b/govtool/frontend/src/components/molecules/WalletInfoCard.tsx
index 8e2d92f11..b1c9b8c50 100644
--- 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
index 67ea88b42..a20c5a46b 100644
--- 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 = ({
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
index a5d5e91bb..ebdc1885e 100644
--- 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 (
{
- const { isProposalDiscussionForumEnabled } = useFeatureFlag();
+ const { isProposalDiscussionForumEnabled, isGovernanceOutcomesPillarEnabled } = useFeatureFlag();
const containerRef = useRef(null);
const [shouldBlur, setShouldBlur] = useState(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 (
= 1.2.0"
- ws "^7.4.3"
-
loader-runner@^4.2.0:
version "4.3.0"
resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
@@ -10443,11 +10432,6 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
dependencies:
mime-db "1.52.0"
-mime@^2:
- version "2.6.0"
- resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"
- integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-
mime@1.6.0:
version "1.6.0"
resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
@@ -10925,11 +10909,6 @@ open@^8.4.0:
is-docker "^2.1.1"
is-wsl "^2.2.0"
-opener@1:
- version "1.5.2"
- resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
- integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
optionator@^0.8.1:
version "0.8.3"
resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
@@ -10954,11 +10933,6 @@ optionator@^0.9.3:
type-check "^0.4.0"
word-wrap "^1.2.5"
-"opts@>= 1.2.0":
- version "2.0.2"
- resolved "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz"
- integrity sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==
-
os-homedir@^1.0.1:
version "1.0.2"
resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
@@ -12660,21 +12634,6 @@ rimraf@^3.0.0, rimraf@^3.0.2, rimraf@3.0.2:
dependencies:
glob "^7.1.3"
-rollup-plugin-livereload@^2.0.5:
- version "2.0.5"
- resolved "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.5.tgz"
- integrity sha512-vqQZ/UQowTW7VoiKEM5ouNW90wE5/GZLfdWuR0ELxyKOJUIaj+uismPZZaICU4DnWPVjnpCDDxEqwU7pcKY/PA==
- dependencies:
- livereload "^0.9.1"
-
-rollup-plugin-serve@^1.1.1:
- version "1.1.1"
- resolved "https://registry.npmjs.org/rollup-plugin-serve/-/rollup-plugin-serve-1.1.1.tgz"
- integrity sha512-H0VarZRtFR0lfiiC9/P8jzCDvtFf1liOX4oSdIeeYqUCKrmFA7vNiQ0rg2D+TuoP7leaa/LBR8XBts5viF6lnw==
- dependencies:
- mime "^2"
- opener "1"
-
rollup-plugin-terser@^7.0.0:
version "7.0.2"
resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"
@@ -15145,11 +15104,6 @@ write-file-atomic@^4.0.2:
imurmurhash "^0.1.4"
signal-exit "^3.0.7"
-ws@^7.4.3:
- version "7.5.10"
- resolved "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz"
- integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
-
ws@^7.4.6:
version "7.5.10"
resolved "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz"