Skip to content

Commit 90a8493

Browse files
MSzalowskiMSzalowski
authored
Merge pull request #3303 from IntersectMBO/develop
2 parents 99c2eef + 1d6d0ce commit 90a8493

File tree

21 files changed

+171
-68
lines changed

21 files changed

+171
-68
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ changes.
1818

1919
### Removed
2020

21+
## [v2.0.19](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.19) 2025-03-31
22+
23+
24+
### Added
25+
26+
- Add budget discussion paths in the wrapper
27+
28+
### Fixed
29+
30+
- Fix missing redirect to outcomes on wallet disconnected state [Issue 3230](https://github.com/IntersectMBO/govtool/issues/3230)
31+
32+
### Changed
33+
34+
### Removed
35+
2136
## [v2.0.18](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.18) 2025-03-26
2237

2338
### Added

‎govtool/backend/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.18/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.19/x/vva-be/build/vva-be/vva-be /usr/local/bin

‎govtool/backend/Dockerfile.qovery‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
44
WORKDIR /src
55
COPY . .
66
RUN cabal build
7-
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.18/x/vva-be/build/vva-be/vva-be /usr/local/bin
7+
RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.19/x/vva-be/build/vva-be/vva-be /usr/local/bin
88

99
# Expose the necessary port
1010
EXPOSE 9876

‎govtool/backend/vva-be.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.6
22
name: vva-be
3-
version: 2.0.18
3+
version: 2.0.19
44

55
-- A short (one-line) description of the package.
66
-- synopsis:

‎govtool/frontend/package-lock.json‎

Lines changed: 6 additions & 6 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@govtool/frontend",
33
"private": true,
4-
"version": "2.0.18",
4+
"version": "2.0.19",
55
"type": "module",
66
"scripts": {
77
"build": "vite build",
@@ -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.6.4",
32+
"@intersect.mbo/pdf-ui": "0.7.0-beta-2",
3333
"@mui/icons-material": "^5.14.3",
3434
"@mui/material": "^5.14.4",
3535
"@rollup/plugin-babel": "^6.0.4",

‎govtool/frontend/src/App.tsx‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ import { useCallback, useEffect } from "react";
22
import { Route, Routes, useNavigate } from "react-router-dom";
33

44
import { Modal, ScrollToTop } from "@atoms";
5-
import { PATHS, PDF_PATHS, OUTCOMES_PATHS, USER_PATHS } from "@consts";
5+
import {
6+
PATHS,
7+
PDF_PATHS,
8+
OUTCOMES_PATHS,
9+
USER_PATHS,
10+
BUDGET_DISCUSSION_PATHS,
11+
} from "@consts";
612
import { useCardano, useFeatureFlag, useModal } from "@context";
713
import { useWalletConnectionListener } from "@hooks";
814
import {
@@ -102,10 +108,16 @@ export default () => {
102108
element={<GovernanceActionDetails />}
103109
/>
104110
{isProposalDiscussionForumEnabled && !isEnabled && (
105-
<Route
106-
path={`${PDF_PATHS.proposalDiscussion}/*`}
107-
element={<ProposalDiscussionPillar />}
108-
/>
111+
<>
112+
<Route
113+
path={`${PDF_PATHS.proposalDiscussion}/*`}
114+
element={<ProposalDiscussionPillar />}
115+
/>
116+
<Route
117+
path={`${BUDGET_DISCUSSION_PATHS.budgetDiscussion}/*`}
118+
element={<ProposalDiscussionPillar />}
119+
/>
120+
</>
109121
)}
110122
{isGovernanceOutcomesPillarEnabled && !isEnabled && (
111123
<>
@@ -122,10 +134,16 @@ export default () => {
122134
<Route element={<Dashboard />}>
123135
<Route path={PATHS.dashboard} element={<DashboardHome />} />
124136
{isProposalDiscussionForumEnabled && (
125-
<Route
126-
path={`${PDF_PATHS.proposalDiscussion}/*`}
127-
element={<ProposalDiscussionPillar />}
128-
/>
137+
<>
138+
<Route
139+
path={`${PDF_PATHS.proposalDiscussion}/*`}
140+
element={<ProposalDiscussionPillar />}
141+
/>
142+
<Route
143+
path={`${BUDGET_DISCUSSION_PATHS.budgetDiscussion}/*`}
144+
element={<ProposalDiscussionPillar />}
145+
/>
146+
</>
129147
)}
130148
{isGovernanceOutcomesPillarEnabled && (
131149
<>

‎govtool/frontend/src/consts/navItems.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
PATHS,
99
PDF_PATHS,
1010
OUTCOMES_PATHS,
11+
BUDGET_DISCUSSION_PATHS,
1112
// TODO: This will be uncommented when the page has been bootstrapped in the outcomes Pillar
1213
// USER_PATHS
1314
} from "./paths";
@@ -24,6 +25,12 @@ export const NAV_ITEMS = [
2425
navTo: PATHS.dRepDirectory,
2526
label: i18n.t("dRepDirectory.title"),
2627
},
28+
{
29+
dataTestId: "budget-discussion-link",
30+
navTo: BUDGET_DISCUSSION_PATHS.budgetDiscussion,
31+
label: i18n.t("budgetDiscussion.title"),
32+
newTabLink: null,
33+
},
2734
{
2835
dataTestId: "proposed-governance-actions-link",
2936
navTo: PDF_PATHS.proposalDiscussion,
@@ -73,6 +80,14 @@ export const CONNECTED_NAV_ITEMS = [
7380
icon: ICONS.dRepDirectoryIcon,
7481
newTabLink: null,
7582
},
83+
{
84+
dataTestId: "budget-discussion-link",
85+
label: i18n.t("budgetDiscussion.title"),
86+
navTo: BUDGET_DISCUSSION_PATHS.budgetDiscussion,
87+
activeIcon: ICONS.dRepDirectoryActiveIcon,
88+
icon: ICONS.dRepDirectoryIcon,
89+
newTabLink: null,
90+
},
7691
{
7792
dataTestId: "governance-actions-link",
7893
label: i18n.t("govActions.title"),

‎govtool/frontend/src/consts/paths.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ export const PDF_PATHS = {
3232
proposalDiscussionPropose: "/proposal_discussion/propose",
3333
};
3434

35+
export const BUDGET_DISCUSSION_PATHS = {
36+
budgetDiscussion: "/budget_discussion",
37+
budgetDiscussionProposal: "/budget_discussion/:id",
38+
budgetDiscussionPropose: "/budget_discussion/propose",
39+
budgetDiscussionAction: "/budget_discussion/:proposalId",
40+
budgetDiscussionCategory: "/budget_discussion/category/:category",
41+
budgetDiscussionCategoryAction:
42+
"/budget_discussion/category/:category/:proposalId",
43+
};
44+
3545
export const USER_PATHS = {
3646
governanceActionsVotedByMe: "/my/votes_and_favorites",
3747
};

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@
395395
"title": "Proposals",
396396
"proposeAGovernanceAction": "Propose a Governance Action"
397397
},
398+
"budgetDiscussion": {
399+
"title": "Budget Discussion"
400+
},
398401
"govActions": {
399402
"about": "About",
400403
"abstract": "Abstract",

0 commit comments

Comments
 (0)