Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions govtool/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion govtool/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
96 changes: 52 additions & 44 deletions govtool/frontend/src/components/organisms/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -22,6 +25,9 @@ export const Drawer = () => {
position: "sticky",
top: 0,
width: `${DRAWER_WIDTH}px`,

overflowY: "auto",
maxHeight: "100vh",
}}
>
<NavLink
Expand Down Expand Up @@ -51,54 +57,56 @@ export const Drawer = () => {
<DrawerLink
{...navItem}
onClick={
navItem.newTabLink
? () => openInNewTab(navItem.newTabLink)
: undefined
}
navItem.newTabLink
? () => openInNewTab(navItem.newTabLink)
: undefined
}
/>
{navItem.childNavItems && (
<Grid
columns={1}
container
display="flex"
flex={1}
flexDirection="column"
mt={2}
pl={3}
rowGap={2}
>
{navItem.childNavItems.map((childItem) => {
if (
!isProposalDiscussionForumEnabled &&
childItem.dataTestId === "proposal-discussion-link"
) {
return null;
}
<Grid
columns={1}
container
display="flex"
flex={1}
flexDirection="column"
mt={2}
pl={3}
rowGap={2}
>
{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 (
<DrawerLink
key={childItem.label}
{...childItem}
onClick={
childItem.newTabLink
? () => openInNewTab(childItem.newTabLink!)
: undefined
}
/>
);
})}
</Grid>
)}
return (
<DrawerLink
key={childItem.label}
{...childItem}
onClick={
childItem.newTabLink
? () => openInNewTab(childItem.newTabLink!)
: undefined
}
/>
);
})}
</Grid>
)}
</Grid>
))}
))}
</Grid>
<Box p={2}>
{voter?.isRegisteredAsDRep && <DRepInfoCard />}
Expand Down
2 changes: 1 addition & 1 deletion govtool/frontend/src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
"proposeAGovernanceAction": "Propose a Governance Action"
},
"budgetDiscussion": {
"title": "Budget Discussion"
"title": "Budget Proposals"
},
"govActions": {
"about": "About",
Expand Down
8 changes: 4 additions & 4 deletions govtool/frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]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/[email protected]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"
Expand Down