Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GovTool - v2.0.7 #2661

Merged
merged 21 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
17f64d6
feat: add support for governance actions outcomes
emmanuel-musau Jan 8, 2025
1470b17
chore: add a feature flag for the outcomes pillar
emmanuel-musau Jan 9, 2025
65df94b
chore: add the single governance action outcomes page path
emmanuel-musau Jan 10, 2025
dd91cda
Merge branch 'develop' of github.com:emmanuel-musau/govtool into feat…
emmanuel-musau Jan 13, 2025
b01bdcf
chore: sync current branch to develop
emmanuel-musau Jan 13, 2025
f5d2658
fix: correct URL path for dRep directory
kneerose Jan 16, 2025
5dd6f26
test: increase timeout for various DRep-related assertions
kneerose Jan 16, 2025
3a487d0
test: increase timeout for dRep in-progress assertion
kneerose Jan 16, 2025
bc0ef14
chore: Merge branch 'develop' govtool into feat/add-governance-action…
emmanuel-musau Jan 17, 2025
746402f
chore: add outcomes_enabled variable to example env
emmanuel-musau Jan 17, 2025
a201a04
Merge pull request #2614 from emmanuel-musau/feat/add-governance-acti…
MSzalowski Jan 17, 2025
c52f4ba
Merge pull request #2643 from IntersectMBO/fix/drep-path-timeout-incr…
kneerose Jan 20, 2025
a35c203
fix: drep activity calculation
MSzalowski Jan 20, 2025
18d5087
Merge pull request #2655 from IntersectMBO/fix/drep-active-status
MSzalowski Jan 20, 2025
68ba78a
chore: bump @intersect.mbo/pdf-ui to v0.5.7
MSzalowski Jan 20, 2025
60ebe5a
fix: lint errors
MSzalowski Jan 20, 2025
49f2067
Merge pull request #2656 from IntersectMBO/feat/bump-pillars-packages…
MSzalowski Jan 20, 2025
3be0b0b
fix: fetching governance actions
MSzalowski Jan 20, 2025
dc779f6
Merge pull request #2659 from IntersectMBO/fix/fetching-governance-ac…
MSzalowski Jan 20, 2025
888c206
chore: bump GovTool to v2.0.7
MSzalowski Jan 20, 2025
093bbce
Merge pull request #2660 from IntersectMBO/chore/bump-govtool-version…
MSzalowski Jan 20, 2025
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
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@ changes.

-

## [v2.0.7](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.7) 2025-01-20

### Added

-

### Fixed

- Fix calculating DRep activity
- Fix fetching Governance Actions being navigated from dashboard

### Changed

- Bump @intersect.mbo/pdf-ui to v0.5.7

### Removed

-

## [v2.0.6](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.6) 2025-01-16

### Added
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
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
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
2 changes: 1 addition & 1 deletion govtool/backend/Dockerfile.qovery
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
WORKDIR /src
COPY . .
RUN cabal build
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
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

# Expose the necessary port
EXPOSE 9876
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/sql/list-dreps.sql
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ SELECT DISTINCT ON (dh.raw)
encode(va.data_hash, 'hex'),
dr_deposit.deposit,
DRepDistr.amount,
(DRepActivity.epoch_no - GREATEST(MAX(COALESCE(block.epoch_no, block_first_register.epoch_no)), lve.epoch_no)) <= DRepActivity.drep_activity AS active,
(DRepActivity.epoch_no - GREATEST(COALESCE(block.epoch_no, block_first_register.epoch_no), lve.epoch_no, newestRegister.epoch_no)) <= DRepActivity.drep_activity AS active,
encode(dr_voting_anchor.tx_hash, 'hex') AS tx_hash,
newestRegister.time AS last_register_time,
COALESCE(latestDeposit.deposit, 0),
Expand Down
2 changes: 1 addition & 1 deletion govtool/backend/vva-be.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.6
name: vva-be
version: 2.0.6
version: 2.0.7

-- A short (one-line) description of the package.
-- synopsis:
Expand Down
1 change: 1 addition & 0 deletions govtool/frontend/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ VITE_GTM_ID=""
VITE_IS_DEV=true
VITE_USERSNAP_SPACE_API_KEY=""
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED='true'
VITE_PDF_API_URL=""
VITE_IPFS_GATEWAY=""
VITE_IPFS_PROJECT_ID=""
123 changes: 111 additions & 12 deletions govtool/frontend/package-lock.json

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

5 changes: 3 additions & 2 deletions govtool/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@govtool/frontend",
"private": true,
"version": "2.0.6",
"version": "2.0.7",
"type": "module",
"scripts": {
"build": "vite build",
Expand All @@ -27,8 +27,9 @@
"@emotion/styled": "^11.11.0",
"@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
"@hookform/resolvers": "^3.3.1",
"@intersect.mbo/govtool-outcomes-pillar-ui": "^1.0.0-beta.1",
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
"@intersect.mbo/pdf-ui": "^0.5.6",
"@intersect.mbo/pdf-ui": "^0.5.7",
"@mui/icons-material": "^5.14.3",
"@mui/material": "^5.14.4",
"@rollup/plugin-babel": "^6.0.4",
Expand Down
20 changes: 18 additions & 2 deletions govtool/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react";
import { Route, Routes, useNavigate } from "react-router-dom";

import { Modal, ScrollToTop } from "@atoms";
import { PATHS, PDF_PATHS } from "@consts";
import { PATHS, PDF_PATHS, OUTCOMES_PATHS, USER_PATHS } from "@consts";
import { useCardano, useFeatureFlag, useModal } from "@context";
import { useWalletConnectionListener } from "@hooks";
import {
Expand Down Expand Up @@ -39,9 +39,13 @@ import {
import { PublicRoute } from "./pages/PublicRoute";
import { TopBanners } from "./components/organisms/TopBanners";
import { DashboardHome } from "./pages/DashboardHome";
import { GovernanceActionOutComesPillar } from "./pages/GovernanceActionOutComes";

export default () => {
const { isProposalDiscussionForumEnabled } = useFeatureFlag();
const {
isProposalDiscussionForumEnabled,
isGovernanceOutcomesPillarEnabled,
} = useFeatureFlag();
const { enable, isEnabled } = useCardano();
const navigate = useNavigate();
const { modal, openModal, modals } = useModal();
Expand Down Expand Up @@ -111,6 +115,18 @@ export default () => {
element={<ProposalDiscussionPillar />}
/>
)}
{isGovernanceOutcomesPillarEnabled && (
<>
<Route
path={`${OUTCOMES_PATHS.governanceActionsOutcomes}/*`}
element={<GovernanceActionOutComesPillar />}
/>
<Route
path={USER_PATHS.governanceActionsVotedByMe}
element={<GovernanceActionOutComesPillar />}
/>
</>
)}
<Route
path={PATHS.dashboardGovernanceActions}
element={<DashboardGovernanceActions />}
Expand Down
Loading
Loading