Skip to content

Commit a5972e4

Browse files
MSzalowskiMSzalowski
authored
Merge pull request #2663 from IntersectMBO/staging
GovTool - v2.0.7
2 parents 6373db3 + 89908a0 commit a5972e4

File tree

29 files changed

+488
-105
lines changed

29 files changed

+488
-105
lines changed

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,25 @@ changes.
2626

2727
-
2828

29+
## [v2.0.7](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.7) 2025-01-20
30+
31+
### Added
32+
33+
-
34+
35+
### Fixed
36+
37+
- Fix calculating DRep activity
38+
- Fix fetching Governance Actions being navigated from dashboard
39+
40+
### Changed
41+
42+
- Bump @intersect.mbo/pdf-ui to v0.5.7
43+
44+
### Removed
45+
46+
-
47+
2948
## [v2.0.6](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.6) 2025-01-16
3049

3150
### 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.6/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.7/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.6/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.7/x/vva-be/build/vva-be/vva-be /usr/local/bin
88

99
# Expose the necessary port
1010
EXPOSE 9876

‎govtool/backend/sql/list-dreps.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SELECT DISTINCT ON (dh.raw)
4444
encode(va.data_hash, 'hex'),
4545
dr_deposit.deposit,
4646
DRepDistr.amount,
47-
(DRepActivity.epoch_no - GREATEST(MAX(COALESCE(block.epoch_no, block_first_register.epoch_no)), lve.epoch_no)) <= DRepActivity.drep_activity AS active,
47+
(DRepActivity.epoch_no - GREATEST(COALESCE(block.epoch_no, block_first_register.epoch_no), lve.epoch_no, newestRegister.epoch_no)) <= DRepActivity.drep_activity AS active,
4848
encode(dr_voting_anchor.tx_hash, 'hex') AS tx_hash,
4949
newestRegister.time AS last_register_time,
5050
COALESCE(latestDeposit.deposit, 0),

‎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.6
3+
version: 2.0.7
44

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

‎govtool/frontend/.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ VITE_GTM_ID=""
77
VITE_IS_DEV=true
88
VITE_USERSNAP_SPACE_API_KEY=""
99
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
10+
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED='true'
1011
VITE_PDF_API_URL=""
1112
VITE_IPFS_GATEWAY=""
1213
VITE_IPFS_PROJECT_ID=""

‎govtool/frontend/package-lock.json‎

Lines changed: 111 additions & 12 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: 3 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.6",
4+
"version": "2.0.7",
55
"type": "module",
66
"scripts": {
77
"build": "vite build",
@@ -27,8 +27,9 @@
2727
"@emotion/styled": "^11.11.0",
2828
"@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
2929
"@hookform/resolvers": "^3.3.1",
30+
"@intersect.mbo/govtool-outcomes-pillar-ui": "^1.0.0-beta.1",
3031
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
31-
"@intersect.mbo/pdf-ui": "^0.5.6",
32+
"@intersect.mbo/pdf-ui": "^0.5.7",
3233
"@mui/icons-material": "^5.14.3",
3334
"@mui/material": "^5.14.4",
3435
"@rollup/plugin-babel": "^6.0.4",

‎govtool/frontend/src/App.tsx‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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 } from "@consts";
5+
import { PATHS, PDF_PATHS, OUTCOMES_PATHS, USER_PATHS } from "@consts";
66
import { useCardano, useFeatureFlag, useModal } from "@context";
77
import { useWalletConnectionListener } from "@hooks";
88
import {
@@ -39,9 +39,13 @@ import {
3939
import { PublicRoute } from "./pages/PublicRoute";
4040
import { TopBanners } from "./components/organisms/TopBanners";
4141
import { DashboardHome } from "./pages/DashboardHome";
42+
import { GovernanceActionOutComesPillar } from "./pages/GovernanceActionOutComes";
4243

4344
export default () => {
44-
const { isProposalDiscussionForumEnabled } = useFeatureFlag();
45+
const {
46+
isProposalDiscussionForumEnabled,
47+
isGovernanceOutcomesPillarEnabled,
48+
} = useFeatureFlag();
4549
const { enable, isEnabled } = useCardano();
4650
const navigate = useNavigate();
4751
const { modal, openModal, modals } = useModal();
@@ -111,6 +115,18 @@ export default () => {
111115
element={<ProposalDiscussionPillar />}
112116
/>
113117
)}
118+
{isGovernanceOutcomesPillarEnabled && (
119+
<>
120+
<Route
121+
path={`${OUTCOMES_PATHS.governanceActionsOutcomes}/*`}
122+
element={<GovernanceActionOutComesPillar />}
123+
/>
124+
<Route
125+
path={USER_PATHS.governanceActionsVotedByMe}
126+
element={<GovernanceActionOutComesPillar />}
127+
/>
128+
</>
129+
)}
114130
<Route
115131
path={PATHS.dashboardGovernanceActions}
116132
element={<DashboardGovernanceActions />}

0 commit comments

Comments
 (0)