IntersectMBO · bosko-m · May 15, 2025 · May 9, 2025 · May 9, 2025 · May 9, 2025
@@ -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
diff --git a/.github/workflows/test_backend.yml b/.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

diff --git a/.github/workflows/test_integration_playwright.yml b/.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:

@@ -18,8 +18,23 @@ changes.
 
 ### Removed
 
-## [v2.0.21](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.21) 2025-05-09
+## [v2.0.22](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.22) 2025-05-15
+
+
+### Added
+
+### 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
 

diff --git a/govtool/backend/Dockerfile b/govtool/backend/Dockerfile
@@ -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.21/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.22/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.qovery b/govtool/backend/Dockerfile.qovery
@@ -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.21/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.22/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

diff --git a/govtool/backend/vva-be.cabal b/govtool/backend/vva-be.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.21
+version:            2.0.22
 
 -- A short (one-line) description of the package.
 -- synopsis:

diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.21",
+  "version": "2.0.22",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -27,9 +27,9 @@
     "@emotion/styled": "^11.11.0",
     "@emurgo/cardano-serialization-lib-asmjs": "^14.1.1",
     "@hookform/resolvers": "^3.3.1",
-    "@intersect.mbo/govtool-outcomes-pillar-ui": "1.4.1",
+    "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.4.2",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
-    "@intersect.mbo/pdf-ui": "0.7.0-beta-26",
+    "@intersect.mbo/pdf-ui": "0.7.0-beta-29",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
     "@rollup/plugin-babel": "^6.0.4",
@@ -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",

diff --git a/govtool/frontend/src/components/molecules/GovernanceActionCardElement.tsx b/govtool/frontend/src/components/molecules/GovernanceActionCardElement.tsx
@@ -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,43 @@ 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
+        className="markdown"
+        components={markdownComponents}
+        remarkPlugins={[remarkMath, remarkGfm]}
+        rehypePlugins={[rehypeKatex]}
+      >
+        {formattedText}
+      </Markdown>
+    );
+  };
 
   const renderCopyButton = () =>
     isCopyButton && (

diff --git a/govtool/frontend/src/components/molecules/tableMarkdown.css b/govtool/frontend/src/components/molecules/tableMarkdown.css
@@ -1,23 +1,28 @@
-table {
-  margin: 32px 0;
-  border-spacing: 0;
-  border-collapse: collapse;
-}
+.markdown {
+  & table {
+    display: block;
+    overflow-x: auto;
+    margin: 32px 0;
+    border-spacing: 0;
+    border-collapse: collapse;
+    max-width: 100%;
 
-table thead {
-  background-color: #d6e2ff80;
-}
+    & thead {
+      background-color: #d6e2ff80;
+    }
 
-table th,
-table td {
-  padding: 6px 13px;
-  border: 1px solid #d6e2ff;
-}
+    & th,
+    & td {
+      padding: 6px 13px;
+      border: 1px solid #d6e2ff;
+    }
 
-table td > :last-child {
-  margin-bottom: 0;
-}
+    & td > :last-child {
+      margin-bottom: 0;
+    }
 
-table tr:nth-child(2n) {
-  background-color: #d6e2ff80;
+    & tr:nth-child(2n) {
+      background-color: #d6e2ff80;
+    }
+  }
 }
diff --git a/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx b/govtool/frontend/src/components/organisms/Modal/StatusModal.tsx
@@ -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 || "")}

diff --git a/govtool/frontend/src/components/organisms/UncontrolledImageInput.tsx b/govtool/frontend/src/components/organisms/UncontrolledImageInput.tsx
@@ -1,23 +1,31 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { useRef } from "react";
-import { useController } from "react-hook-form";
+import {
+  Control,
+  FieldPath,
+  FieldValues,
+  RegisterOptions,
+  useController,
+} from "react-hook-form";
 import { FormErrorMessage } from "../atoms";
 
-type UncontrolledImageInputProps = {
-  name: string;
-  control: any;
-  rules?: any;
+type UncontrolledImageInputProps<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
+> = {
+  name: TName;
+  control: Control<TFieldValues>;
+  rules?: RegisterOptions<TFieldValues, TName>;
   placeholder?: string;
   dataTestId?: string;
 };
 
-export const UncontrolledImageInput = ({
+export const UncontrolledImageInput = <T extends FieldValues>({
   name,
   control,
   rules,
   placeholder,
   dataTestId,
-}: UncontrolledImageInputProps) => {
+}: UncontrolledImageInputProps<T>) => {
   const {
     field: { onChange },
     fieldState,
@@ -49,8 +57,8 @@ export const UncontrolledImageInput = ({
           borderRadius: "50px",
           height: "50px",
           border: "1px solid",
-          borderColor: fieldState.error?.message ? "red" : "#6F99FF",
-          backgroundColor: fieldState.error?.message ? "#FAEAEB" : "white",
+          borderColor: fieldState.error ? "red" : "#6F99FF",
+          backgroundColor: fieldState.error ? "#FAEAEB" : "white",
           boxSizing: "border-box",
           margin: 0,
           display: "block",

diff --git a/govtool/frontend/src/consts/dRepActions/fields.ts b/govtool/frontend/src/consts/dRepActions/fields.ts
@@ -77,6 +77,6 @@ export const Rules = {
       value: IMAGE_REGEX,
       message: i18n.t("registration.fields.validations.image"),
     },
-    validate: isValidImageUrl,
+    validate: (value: unknown) => isValidImageUrl(value, { optional: true }),
   },
 };
diff --git a/govtool/frontend/src/hooks/useWalletErrorModal.tsx b/govtool/frontend/src/hooks/useWalletErrorModal.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",

@@ -389,7 +389,8 @@
       "tooLongUrl": "Url must be less than 128 bytes",
       "mustBeStakeAddress": "It must be reward address in bech32 format",
       "mustBeReceivingAddress": "Invalid payment address",
-      "couldNotGenerateImageSha": "Could not generate image sha"
+      "couldNotGenerateImageSha": "Could not generate image sha",
+      "invalidValueType": "Invalid value type"
     }
   },
   "proposalDiscussion": {