diff --git a/CHANGELOG.md b/CHANGELOG.md index d239f4f08..123bbf2c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,13 +14,16 @@ changes. ### Fixed +- Fix scroll on a drawer on smaller resolution + ### Changed +- Change budget proposal nav item label + ### Removed ## [v2.0.19](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.19) 2025-03-31 - ### Added - Add budget discussion paths in the wrapper diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json index b38b2e2ad..fb299cceb 100644 --- a/govtool/frontend/package-lock.json +++ b/govtool/frontend/package-lock.json @@ -15,7 +15,7 @@ "@hookform/resolvers": "^3.3.1", "@intersect.mbo/govtool-outcomes-pillar-ui": "1.3.0", "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8", - "@intersect.mbo/pdf-ui": "0.7.0-beta-2", + "@intersect.mbo/pdf-ui": "0.7.0-beta-4", "@mui/icons-material": "^5.14.3", "@mui/material": "^5.14.4", "@rollup/plugin-babel": "^6.0.4", @@ -3423,9 +3423,9 @@ "license": "ISC" }, "node_modules/@intersect.mbo/pdf-ui": { - "version": "0.7.0-beta-2", - "resolved": "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-2.tgz", - "integrity": "sha512-GDx7qpzs6kOc9DYPYnFCsTaSLyiQTqQulX9RKM1IsbS/fvaVR5/P9xRScfpVDbix98eyoXWsoOwBHrHDGlJ4GA==", + "version": "0.7.0-beta-4", + "resolved": "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-4.tgz", + "integrity": "sha512-vUmyKnjjxKRDi82x2fY9v7z2T4Ez5C/R6KDPH3fBXRM4/jTlJZUPHn/letm6tNkCYcPbyV4/ipLXHIFunMeEEA==", "dependencies": { "@emurgo/cardano-serialization-lib-asmjs": "^12.0.0-beta.2", "@fontsource/poppins": "^5.0.14", diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json index 4ff55736a..d1e5456d5 100644 --- a/govtool/frontend/package.json +++ b/govtool/frontend/package.json @@ -29,7 +29,7 @@ "@hookform/resolvers": "^3.3.1", "@intersect.mbo/govtool-outcomes-pillar-ui": "1.3.0", "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8", - "@intersect.mbo/pdf-ui": "0.7.0-beta-2", + "@intersect.mbo/pdf-ui": "0.7.0-beta-4", "@mui/icons-material": "^5.14.3", "@mui/material": "^5.14.4", "@rollup/plugin-babel": "^6.0.4", diff --git a/govtool/frontend/src/components/organisms/Drawer.tsx b/govtool/frontend/src/components/organisms/Drawer.tsx index 0e7b6d9a3..2ed7256af 100644 --- a/govtool/frontend/src/components/organisms/Drawer.tsx +++ b/govtool/frontend/src/components/organisms/Drawer.tsx @@ -9,7 +9,10 @@ import { WalletInfoCard, DRepInfoCard } from "@molecules"; import { openInNewTab } from "@utils"; export const Drawer = () => { - const { isProposalDiscussionForumEnabled, isGovernanceOutcomesPillarEnabled } = useFeatureFlag(); + const { + isProposalDiscussionForumEnabled, + isGovernanceOutcomesPillarEnabled, + } = useFeatureFlag(); const { voter } = useGetVoterInfo(); return ( @@ -22,6 +25,9 @@ export const Drawer = () => { position: "sticky", top: 0, width: `${DRAWER_WIDTH}px`, + + overflowY: "auto", + maxHeight: "100vh", }} > { openInNewTab(navItem.newTabLink) - : undefined - } + navItem.newTabLink + ? () => openInNewTab(navItem.newTabLink) + : undefined + } /> {navItem.childNavItems && ( - - {navItem.childNavItems.map((childItem) => { - if ( - !isProposalDiscussionForumEnabled && - childItem.dataTestId === "proposal-discussion-link" - ) { - return null; - } + + {navItem.childNavItems.map((childItem) => { + if ( + !isProposalDiscussionForumEnabled && + childItem.dataTestId === "proposal-discussion-link" + ) { + return null; + } - if ( - !isGovernanceOutcomesPillarEnabled && - (childItem.dataTestId === "governance-actions-voted-by-me-link" || - childItem.dataTestId === "governance-actions-outcomes-link") - ) { - return null; - } + if ( + !isGovernanceOutcomesPillarEnabled && + (childItem.dataTestId === + "governance-actions-voted-by-me-link" || + childItem.dataTestId === + "governance-actions-outcomes-link") + ) { + return null; + } - return ( - openInNewTab(childItem.newTabLink!) - : undefined - } - /> - ); - })} - - )} + return ( + openInNewTab(childItem.newTabLink!) + : undefined + } + /> + ); + })} + + )} - ))} + ))} {voter?.isRegisteredAsDRep && } diff --git a/govtool/frontend/src/i18n/locales/en.json b/govtool/frontend/src/i18n/locales/en.json index a30ef20f0..78ba4d111 100644 --- a/govtool/frontend/src/i18n/locales/en.json +++ b/govtool/frontend/src/i18n/locales/en.json @@ -396,7 +396,7 @@ "proposeAGovernanceAction": "Propose a Governance Action" }, "budgetDiscussion": { - "title": "Budget Discussion" + "title": "Budget Proposals" }, "govActions": { "about": "About", diff --git a/govtool/frontend/yarn.lock b/govtool/frontend/yarn.lock index e2572d6ab..5eecd224d 100644 --- a/govtool/frontend/yarn.lock +++ b/govtool/frontend/yarn.lock @@ -1512,10 +1512,10 @@ resolved "https://registry.npmjs.org/@intersect.mbo/intersectmbo.org-icons-set/-/intersectmbo.org-icons-set-1.1.0.tgz" integrity sha512-sjKEtnK9eLYH/8kCD0YRQCms3byFA/tnSsei9NHTZbBYX9sBpeX6ErfR0sKYjOSxQOxl4FumX9D0X+vHIqxo8g== -"@intersect.mbo/pdf-ui@0.7.0-beta-2": - version "0.7.0-beta-2" - resolved "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-2.tgz" - integrity sha512-GDx7qpzs6kOc9DYPYnFCsTaSLyiQTqQulX9RKM1IsbS/fvaVR5/P9xRScfpVDbix98eyoXWsoOwBHrHDGlJ4GA== +"@intersect.mbo/pdf-ui@0.7.0-beta-4": + version "0.7.0-beta-4" + resolved "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-4.tgz" + integrity sha512-vUmyKnjjxKRDi82x2fY9v7z2T4Ez5C/R6KDPH3fBXRM4/jTlJZUPHn/letm6tNkCYcPbyV4/ipLXHIFunMeEEA== dependencies: "@emurgo/cardano-serialization-lib-asmjs" "^12.0.0-beta.2" "@fontsource/poppins" "^5.0.14"