Merge branch 'develop' into fix/3560-allow-empty-image-in-drep-form

Signed-off-by: Artur W. <[email protected]>

Author: Ciabas

.github/scripts/remove_oldest_report.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ -d "gh-pages/$REPORT_NAME" ]; then
+    cd gh-pages/$REPORT_NAME
+    # Find the oldest numerical directory
+    oldest_dir=$(find . -maxdepth 1 -type d -regex './[0-9]+' | sort -n | head -1)
+    if [ -n "$oldest_dir" ]; then
+        echo "Removing oldest report directory: $oldest_dir"
+        rm -rf "$oldest_dir"
+    else
+        echo "No report directories found to remove"
+    fi
+    cd ../../
+else
+    echo "Report directory does not exist yet"
+fi

.github/workflows/test_backend.yml

@@ -115,6 +115,12 @@ jobs:
           path: gh-pages
           repository: ${{vars.GH_PAGES}}
           ssh-key: ${{ secrets.DEPLOY_KEY }}
+        
+      - name: Remove oldest report to save space
+        if: ${{success()}}
+        run: |
+          chmod +x .github/scripts/remove_oldest_report.sh
+            .github/scripts/remove_oldest_report.sh
 
       - name: Register report
         id: register-project

.github/workflows/test_integration_playwright.yml

@@ -33,7 +33,7 @@ on:
   workflow_run:
     workflows: ["Build and deploy GovTool test stack"]
     types: [completed]
-    branches: 
+    branches:
       - test
       - infra/test-chores
 
@@ -153,12 +153,19 @@ jobs:
           repository: ${{vars.GH_PAGES}}
           ssh-key: ${{ secrets.DEPLOY_KEY }}
 
+      - name: Remove oldest report to save space
+        if: ${{success()}}
+        run: |
+          chmod +x .github/scripts/remove_oldest_report.sh
+           .github/scripts/remove_oldest_report.sh
+
       - name: Register report
         id: register-project
         if: ${{success()}}
         run: |
           chmod +x .github/scripts/register_report.sh
           .github/scripts/register_report.sh
+          
       - if: steps.register-project.outputs.project_exists != 'true'
         uses: JamesIves/github-pages-deploy-action@v4
         with:

CHANGELOG.md

@@ -15,14 +15,16 @@ changes.
 ### Fixed
 
 - Fix an issue where the submit button remained disabled after removing an invalid value from the IMAGE input field on DRrep form [Issue 3560](https://github.com/IntersectMBO/govtool/issues/3560)
+- Fix app crash on unhandled wallet error [Issue 3123](https://github.com/IntersectMBO/govtool/issues/3123)
+- Preserve new lines in markdown text [Issue 2712](https://github.com/IntersectMBO/govtool/issues/2712)
+- Add scroll to markdown tables [Issue 3615](https://github.com/IntersectMBO/govtool/issues/3615)
 
 ### Changed
 
 ### Removed
 
 ## [v2.0.21](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.21) 2025-05-09
 
-
 ### Added
 
 - Add support for the tables in markdown [Issue 3581](https://github.com/IntersectMBO/govtool/issues/3581)

govtool/frontend/package-lock.json

@@ -57,7 +57,6 @@
     "react-query": "^3.39.3",
     "react-router-dom": "^6.13.0",
     "rehype-katex": "^7.0.1",
-    "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "remark-math": "^6.0.0",
     "storybook-addon-manual-mocks": "^1.0.3",

govtool/frontend/package.json

@@ -5,7 +5,6 @@ import Markdown from "react-markdown";
 import remarkMath from "remark-math";
 import remarkGfm from "remark-gfm";
 import rehypeKatex from "rehype-katex";
-import remarkBreaks from "remark-breaks";
 import "katex/dist/katex.min.css";
 import "./tableMarkdown.css";
 
@@ -120,29 +119,42 @@ export const GovernanceActionCardElement = ({
         fontWeight: 400,
         lineHeight: "24px",
         maxWidth: "auto",
-        whiteSpace: "pre-wrap",
       }}
     >
       {children}
     </Typography>
   );
 
   const markdownComponents = {
-    p: (props: PropsWithChildren) => {
-      const { children } = props;
-      return renderMarkdownText({ children });
-    },
+    p: ({ children }: PropsWithChildren) => renderMarkdownText({ children }),
+    br: () => <br />,
   };
 
-  const renderMarkdown = () => (
-    <Markdown
-      components={markdownComponents}
-      remarkPlugins={[remarkMath, remarkBreaks, remarkGfm]}
-      rehypePlugins={[rehypeKatex]}
-    >
-      {text.toString()}
-    </Markdown>
-  );
+  const renderMarkdown = () => {
+    const formattedText = text
+      .toString()
+      .replace(/\r\n|\r/g, "\n")
+      .replace(
+        /\n\n+/g,
+        (match) =>
+          `\n\n${Array(match.length - 1)
+            .fill("&nbsp;  \n")
+            .join("")}\n`,
+      )
+      .split("\n")
+      .map((line) => `${line}  `)
+      .join("\n");
+
+    return (
+      <Markdown
+        components={markdownComponents}
+        remarkPlugins={[remarkMath, remarkGfm]}
+        rehypePlugins={[rehypeKatex]}
+      >
+        {formattedText}
+      </Markdown>
+    );
+  };
 
   const renderCopyButton = () =>
     isCopyButton && (

govtool/frontend/src/components/molecules/GovernanceActionCardElement.tsx

@@ -1,7 +1,10 @@
 table {
+  display: block;
+  overflow-x: auto;
   margin: 32px 0;
   border-spacing: 0;
   border-collapse: collapse;
+  max-width: 100%;
 }
 
 table thead {

govtool/frontend/src/components/molecules/tableMarkdown.css

@@ -67,7 +67,7 @@ export const StatusModal = forwardRef<HTMLDivElement>((_, ref) => {
             whiteSpace: "pre-line",
           }}
         >
-          {state?.message}{" "}
+          {typeof state?.message === "string" && state?.message}
           {state?.link && (
             <Link
               onClick={() => openInNewTab(state?.link || "")}

govtool/frontend/src/components/organisms/Modal/StatusModal.tsx

@@ -20,7 +20,10 @@ export const useWalletErrorModal = () => {
     buttonText,
     dataTestId,
   }: WalletErrorModalProps) => {
-    const errorMessage = (error && typeof error === 'object' && 'info' in error) ? error.info : error;
+    const errorMessage =
+      error && typeof error === "object" && "info" in error
+        ? error.info
+        : JSON.stringify(error, Object.getOwnPropertyNames(error));
 
     openModal({
       type: "statusModal",