Skip to content

Commit 53795bc

Browse files
authored
Merge pull request #4017 from IntersectMBO/staging
v2.0.33.3
2 parents 17f4674 + 3d5e227 commit 53795bc

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

govtool/frontend/package-lock.json

Lines changed: 8 additions & 8 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
@@ -27,9 +27,9 @@
2727
"@emotion/styled": "^11.11.0",
2828
"@emurgo/cardano-serialization-lib-asmjs": "^14.1.1",
2929
"@hookform/resolvers": "^3.3.1",
30-
"@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.5",
30+
"@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.6",
3131
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
32-
"@intersect.mbo/pdf-ui": "1.0.11-beta",
32+
"@intersect.mbo/pdf-ui": "1.0.13-beta",
3333
"@mui/icons-material": "^5.14.3",
3434
"@mui/material": "^5.14.4",
3535
"@noble/ed25519": "^2.3.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export const DashboardGovernanceActionDetails = () => {
101101
useEffect(() => {
102102
const isProposalNotFound =
103103
error instanceof AxiosError &&
104-
error.response?.data.match(/Proposal with id: .* not found/);
104+
error.response?.data.message.match(/Proposal with id: .* not found/);
105105
if (isProposalNotFound && fullProposalId) {
106106
navigate(
107107
OUTCOMES_PATHS.governanceActionOutcomes.replace(":id", fullProposalId),

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,22 @@ export const MaintenanceEndingBanner = () => {
8888
variant="caption"
8989
fontWeight={600}
9090
color="common.white"
91-
href="https://gov.tools/governance_actions/9d213a57684d7ddf6f3350c80d042639ecbed5ccccc4a05bf54959a086593e7b#0"
91+
href="https://gov.tools/outcomes/governance_actions/9d213a57684d7ddf6f3350c80d042639ecbed5ccccc4a05bf54959a086593e7b#0"
9292
data-testid="govtool-info-link"
9393
target="_blank"
9494
rel="noopener noreferrer"
9595
/>,
9696
]}
9797
/>
9898
</Typography>
99+
<Typography
100+
fontWeight={600}
101+
variant="caption"
102+
color="common.white"
103+
mb={0.5}
104+
>
105+
{t("system.maintenanceEnding.description2")}
106+
</Typography>
99107
</Box>
100108
</Box>
101109
</Box>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,9 @@
795795
"title": "This tool is connected to {{networkName}}",
796796
"bootstrappingWarning": "Govtool is in the Bootstrapping phase. Some features are not available. <docs>Learn more</docs>",
797797
"maintenanceEnding": {
798-
"title": "🔥 GovTool needs your support - Info Action is submitted",
799-
"description1": "This Info Action outlines the revised GovTool plan and <0>your vote</0> is essential to continue active development and maintenance for the next 12 months, keeping community owned open governance tooling on Cardano."
798+
"title": "\uD83D\uDCA1 Next Step: Treasury Withdrawal based on your feedback is coming soon",
799+
"description1": "<0>The Info Action</0> has passed — thank you for your support!",
800+
"description2": "We’re now preparing a Treasury Withdrawal proposal that reflects the feedback gathered during the voting phase to ensure continued development and maintenance of GovTool as a community-owned governance interface on Cardano."
800801
}
801802
},
802803
"tooltips": {

govtool/frontend/src/pages/GovernanceActionDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export const GovernanceActionDetails = () => {
9595
useEffect(() => {
9696
const isProposalNotFound =
9797
error instanceof AxiosError &&
98-
error.response?.data.match(/Proposal with id: .* not found/);
98+
error.response?.data.message.match(/Proposal with id: .* not found/);
9999
if (isProposalNotFound && fullProposalId) {
100100
navigate(
101101
OUTCOMES_PATHS.governanceActionOutcomes.replace(":id", fullProposalId),

0 commit comments

Comments
 (0)