Skip to content

Commit fb7292e

Browse files
authored
Merge pull request #3735 from IntersectMBO/staging
v2.0.24
2 parents e5d0209 + 40f2739 commit fb7292e

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

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": "v1.4.3",
3131
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
32-
"@intersect.mbo/pdf-ui": "0.7.0-beta-35",
32+
"@intersect.mbo/pdf-ui": "0.7.0-beta-36",
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/MaintenanceEndingBanner/MaintenanceEndingBanner.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
44
import { Trans, useTranslation } from "react-i18next";
55
import { useMaintenanceEndingBannerContext } from "./MaintenanceEndingBannerContext";
66

7-
const EXPANDED_HEIGHT = 135;
8-
const COLLAPSED_HEIGHT = 50;
9-
107
export const MaintenanceEndingBanner = () => {
118
const { ref, isExpanded, toggleExpanded } =
129
useMaintenanceEndingBannerContext();
@@ -16,7 +13,7 @@ export const MaintenanceEndingBanner = () => {
1613
<Box
1714
ref={ref}
1815
sx={{
19-
backgroundColor: "#9c2224",
16+
backgroundColor: isExpanded ? "#212A3D" : "#9c2224",
2017
width: "100%",
2118
overflow: "hidden",
2219
transition: "all 0.3s ease-in-out",
@@ -64,8 +61,8 @@ export const MaintenanceEndingBanner = () => {
6461
{/* Expandable Content */}
6562
<Box
6663
sx={{
67-
height: isExpanded ? EXPANDED_HEIGHT - COLLAPSED_HEIGHT : "0px",
68-
transition: "max-height 0.3s ease-in-out",
64+
maxHeight: isExpanded ? '300px' : "0px", // 300px is a safe value for transition effect
65+
transition: "max-height 0.4s ease-in-out",
6966
overflow: "hidden",
7067
}}
7168
>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,10 +755,10 @@
755755
"title": "This tool is connected to {{networkName}}",
756756
"bootstrappingWarning": "Govtool is in the Bootstrapping phase. Some features are not available. <docs>Learn more</docs>",
757757
"maintenanceEnding": {
758-
"title": "⚠️ Funding for GovTool is at risk",
759-
"description1": "GovTool was not included in the current Cardano budget.",
760-
"description2": "Without new support, active development and <0>maintenance will end in June 2025.</0>",
761-
"description3": "Learn what this means and what’s next:",
758+
"title": "⚠️ GovTool needs your support",
759+
"description1": "GovTool wasn’t included in the current Cardano budget.",
760+
"description2": "A 100k ada maintenance grant will sustain essential infrastructure and bug fixes through 2025 — but future development depends on renewed community backing.",
761+
"description3": "Find out what this means and how you can help:",
762762
"linkText": "The future of GovTool"
763763
}
764764
},

tests/govtool-frontend/playwright/tests/4-proposal-visibility/proposalVisibility.spec.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,19 @@ test("4H. Should verify none of the displayed governance actions have expired",
199199
const govActionsPage = new GovernanceActionsPage(page);
200200
await govActionsPage.goto();
201201

202-
const proposalCards = await govActionsPage.getAllProposals();
203-
204-
for (const proposalCard of proposalCards) {
205-
const expiryDateEl = proposalCard.getByTestId("expiry-date");
206-
const expiryDateTxt = await expiryDateEl.innerText();
207-
const expiryDate = extractExpiryDateFromText(expiryDateTxt);
208-
const today = new Date();
209-
expect(today <= expiryDate).toBeTruthy();
210-
}
202+
await functionWaitedAssert(
203+
async () => {
204+
const proposalCards = await govActionsPage.getAllProposals();
205+
for (const proposalCard of proposalCards) {
206+
const expiryDateEl = proposalCard.getByTestId("expiry-date");
207+
const expiryDateTxt = await expiryDateEl.innerText();
208+
const expiryDate = extractExpiryDateFromText(expiryDateTxt);
209+
const today = new Date();
210+
expect(today <= expiryDate).toBeTruthy();
211+
}
212+
},
213+
{ name: "verify none expired governance actions" }
214+
);
211215
});
212216

213217
test("4K. Should display correct vote counts on governance details page for disconnect state", async ({

0 commit comments

Comments
 (0)