Skip to content

Commit ea4cbb2

Browse files
authored
Merge pull request #3313 from IntersectMBO/develop
chore: update @intersect.mbo/pdf-ui to 0.7.0-beta-4
2 parents 90a8493 + e2b8d55 commit ea4cbb2

File tree

6 files changed

+66
-55
lines changed

6 files changed

+66
-55
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ changes.
1414

1515
### Fixed
1616

17+
- Fix scroll on a drawer on smaller resolution
18+
1719
### Changed
1820

21+
- Change budget proposal nav item label
22+
1923
### Removed
2024

2125
## [v2.0.19](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.19) 2025-03-31
2226

23-
2427
### Added
2528

2629
- Add budget discussion paths in the wrapper

govtool/frontend/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

govtool/frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@hookform/resolvers": "^3.3.1",
3030
"@intersect.mbo/govtool-outcomes-pillar-ui": "1.3.0",
3131
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
32-
"@intersect.mbo/pdf-ui": "0.7.0-beta-2",
32+
"@intersect.mbo/pdf-ui": "0.7.0-beta-4",
3333
"@mui/icons-material": "^5.14.3",
3434
"@mui/material": "^5.14.4",
3535
"@rollup/plugin-babel": "^6.0.4",

govtool/frontend/src/components/organisms/Drawer.tsx

Lines changed: 52 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import { WalletInfoCard, DRepInfoCard } from "@molecules";
99
import { openInNewTab } from "@utils";
1010

1111
export const Drawer = () => {
12-
const { isProposalDiscussionForumEnabled, isGovernanceOutcomesPillarEnabled } = useFeatureFlag();
12+
const {
13+
isProposalDiscussionForumEnabled,
14+
isGovernanceOutcomesPillarEnabled,
15+
} = useFeatureFlag();
1316
const { voter } = useGetVoterInfo();
1417

1518
return (
@@ -22,6 +25,9 @@ export const Drawer = () => {
2225
position: "sticky",
2326
top: 0,
2427
width: `${DRAWER_WIDTH}px`,
28+
29+
overflowY: "auto",
30+
maxHeight: "100vh",
2531
}}
2632
>
2733
<NavLink
@@ -51,54 +57,56 @@ export const Drawer = () => {
5157
<DrawerLink
5258
{...navItem}
5359
onClick={
54-
navItem.newTabLink
55-
? () => openInNewTab(navItem.newTabLink)
56-
: undefined
57-
}
60+
navItem.newTabLink
61+
? () => openInNewTab(navItem.newTabLink)
62+
: undefined
63+
}
5864
/>
5965
{navItem.childNavItems && (
60-
<Grid
61-
columns={1}
62-
container
63-
display="flex"
64-
flex={1}
65-
flexDirection="column"
66-
mt={2}
67-
pl={3}
68-
rowGap={2}
69-
>
70-
{navItem.childNavItems.map((childItem) => {
71-
if (
72-
!isProposalDiscussionForumEnabled &&
73-
childItem.dataTestId === "proposal-discussion-link"
74-
) {
75-
return null;
76-
}
66+
<Grid
67+
columns={1}
68+
container
69+
display="flex"
70+
flex={1}
71+
flexDirection="column"
72+
mt={2}
73+
pl={3}
74+
rowGap={2}
75+
>
76+
{navItem.childNavItems.map((childItem) => {
77+
if (
78+
!isProposalDiscussionForumEnabled &&
79+
childItem.dataTestId === "proposal-discussion-link"
80+
) {
81+
return null;
82+
}
7783

78-
if (
79-
!isGovernanceOutcomesPillarEnabled &&
80-
(childItem.dataTestId === "governance-actions-voted-by-me-link" ||
81-
childItem.dataTestId === "governance-actions-outcomes-link")
82-
) {
83-
return null;
84-
}
84+
if (
85+
!isGovernanceOutcomesPillarEnabled &&
86+
(childItem.dataTestId ===
87+
"governance-actions-voted-by-me-link" ||
88+
childItem.dataTestId ===
89+
"governance-actions-outcomes-link")
90+
) {
91+
return null;
92+
}
8593

86-
return (
87-
<DrawerLink
88-
key={childItem.label}
89-
{...childItem}
90-
onClick={
91-
childItem.newTabLink
92-
? () => openInNewTab(childItem.newTabLink!)
93-
: undefined
94-
}
95-
/>
96-
);
97-
})}
98-
</Grid>
99-
)}
94+
return (
95+
<DrawerLink
96+
key={childItem.label}
97+
{...childItem}
98+
onClick={
99+
childItem.newTabLink
100+
? () => openInNewTab(childItem.newTabLink!)
101+
: undefined
102+
}
103+
/>
104+
);
105+
})}
106+
</Grid>
107+
)}
100108
</Grid>
101-
))}
109+
))}
102110
</Grid>
103111
<Box p={2}>
104112
{voter?.isRegisteredAsDRep && <DRepInfoCard />}

govtool/frontend/src/i18n/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
"proposeAGovernanceAction": "Propose a Governance Action"
397397
},
398398
"budgetDiscussion": {
399-
"title": "Budget Discussion"
399+
"title": "Budget Proposals"
400400
},
401401
"govActions": {
402402
"about": "About",

govtool/frontend/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,10 +1512,10 @@
15121512
resolved "https://registry.npmjs.org/@intersect.mbo/intersectmbo.org-icons-set/-/intersectmbo.org-icons-set-1.1.0.tgz"
15131513
integrity sha512-sjKEtnK9eLYH/8kCD0YRQCms3byFA/tnSsei9NHTZbBYX9sBpeX6ErfR0sKYjOSxQOxl4FumX9D0X+vHIqxo8g==
15141514

1515-
"@intersect.mbo/[email protected]2":
1516-
version "0.7.0-beta-2"
1517-
resolved "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-2.tgz"
1518-
integrity sha512-GDx7qpzs6kOc9DYPYnFCsTaSLyiQTqQulX9RKM1IsbS/fvaVR5/P9xRScfpVDbix98eyoXWsoOwBHrHDGlJ4GA==
1515+
"@intersect.mbo/[email protected]4":
1516+
version "0.7.0-beta-4"
1517+
resolved "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-0.7.0-beta-4.tgz"
1518+
integrity sha512-vUmyKnjjxKRDi82x2fY9v7z2T4Ez5C/R6KDPH3fBXRM4/jTlJZUPHn/letm6tNkCYcPbyV4/ipLXHIFunMeEEA==
15191519
dependencies:
15201520
"@emurgo/cardano-serialization-lib-asmjs" "^12.0.0-beta.2"
15211521
"@fontsource/poppins" "^5.0.14"

0 commit comments

Comments
 (0)