Merge pull request #144 from wri/release/fascinating-ficus

[RELEASE] Fascinating Ficus
wri · May 2, 2024 · 98848ec · 98848ec
2 parents 3b942e3 + fad1a8d
commit 98848ec
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/next.config.js b/next.config.js
@@ -19,7 +19,7 @@ const nextConfig = {
   publicRuntimeConfig: {
     TxNativePublicToken: process.env.TRANSIFEX_TOKEN
   },
-  images: { domains: ["s3-eu-west-1.amazonaws.com"] },
+  images: { domains: process.env.IMAGE_DOMAINS?.split(',') ?? ["s3-eu-west-1.amazonaws.com"] },
   // webpack5: true,
   webpack(config) {
     config.module.rules.push({

diff --git a/src/admin/apiProvider/utils/entryFormat.ts b/src/admin/apiProvider/utils/entryFormat.ts
@@ -14,6 +14,11 @@ export const formatEntryValue = (entry: any) => {
   if (isDateType(entry)) {
     return convertDateFormat(entry);
   }
+
+  if (typeof entry === "string") {
+    return entry.replaceAll("\n", "<br />");
+  }
+
   return entry;
 };
 

diff --git a/src/components/elements/Cards/ProjectCard/ProjectCard.tsx b/src/components/elements/Cards/ProjectCard/ProjectCard.tsx
@@ -75,7 +75,7 @@ const ProjectCard = ({ project, onDelete, title, children, className, ...rest }:
               {project.framework_key === "ppc"
                 ? t("Priceless Planet Coalition")
                 : project.framework_key === "terrafund"
-                ? t("Terrafund")
+                ? t("TerraFund")
                 : project.framework_key}
             </Text>
           </div>

diff --git a/src/pages/project/[uuid]/index.page.tsx b/src/pages/project/[uuid]/index.page.tsx
@@ -106,7 +106,7 @@ const ProjectDetailPage = () => {
         title={project.name}
         subtitles={[
           `${t("Organisation")}: ${project.organisation?.name}`,
-          isPPC ? t("Priceless Planet Coalition") : isTerrafund ? t("Terrafund") : reportingFramework.name
+          isPPC ? t("Priceless Planet Coalition") : isTerrafund ? t("TerraFund") : reportingFramework.name
         ]}
         hasBackButton={false}
       >

diff --git a/src/pages/reports/nursery-report/[uuid].page.tsx b/src/pages/reports/nursery-report/[uuid].page.tsx
@@ -76,7 +76,7 @@ const NurseryReportDetailPage = () => {
         title={reportTitle}
         subtitles={[
           `${t("Organisation")}: ${nurseryReport.organisation?.name}`,
-          nurseryReport.framework_key === "ppc" ? t("Priceless Planet Coalition") : t("Terrafund")
+          nurseryReport.framework_key === "ppc" ? t("Priceless Planet Coalition") : t("TerraFund")
         ]}
         hasBackButton={false}
       >

diff --git a/src/pages/reports/project-report/[uuid].tsx b/src/pages/reports/project-report/[uuid].tsx
@@ -88,7 +88,7 @@ const ProjectReportDetailPage = () => {
       <PageHeader
         className="h-[203px]"
         title={reportTitle}
-        subtitles={[report.project?.name, isPPC ? t("Priceless Planet Coalition") : t("Terrafund")]}
+        subtitles={[report.project?.name, isPPC ? t("Priceless Planet Coalition") : t("TerraFund")]}
         hasBackButton={false}
       >
         <If condition={report?.status === "started"}>

diff --git a/src/pages/reports/site-report/[uuid].page.tsx b/src/pages/reports/site-report/[uuid].page.tsx
@@ -87,7 +87,7 @@ const SiteReportDetailPage = () => {
         title={reportTitle}
         subtitles={[
           `${t("Organisation")}: ${siteReport.organisation?.name}`,
-          isPPC ? t("Priceless Planet Coalition") : t("Terrafund")
+          isPPC ? t("Priceless Planet Coalition") : t("TerraFund")
         ]}
         hasBackButton={false}
       >

diff --git a/src/pages/site/[uuid]/index.page.tsx b/src/pages/site/[uuid]/index.page.tsx
@@ -96,7 +96,7 @@ const SiteDetailPage = () => {
         title={site.name}
         subtitles={[
           `${t("Organisation")}: ${site.organisation?.name}`,
-          isPPC ? t("Priceless Planet Coalition") : t("Terrafund")
+          isPPC ? t("Priceless Planet Coalition") : t("TerraFund")
         ]}
         hasBackButton={false}
       >