From 8fe3a14ec256f6eb2990fffcc092b1eea8911885 Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Fri, 19 Apr 2024 13:54:31 +0200
Subject: [PATCH 1/2] fix(aboutAOUnit): newlines missing in AO description
 (#1656)

Backport of: #1655
Fixes: https://dhis2.atlassian.net/browse/DHIS2-15914

Set white-space to pre-line to preserve newlines
---
 src/components/AboutAOUnit/AboutAOUnit.js              | 1 +
 src/components/AboutAOUnit/styles/AboutAOUnit.style.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/components/AboutAOUnit/AboutAOUnit.js b/src/components/AboutAOUnit/AboutAOUnit.js
index 76002a453..0d734efc1 100644
--- a/src/components/AboutAOUnit/AboutAOUnit.js
+++ b/src/components/AboutAOUnit/AboutAOUnit.js
@@ -193,6 +193,7 @@ const AboutAOUnit = forwardRef(({ type, id, renderId }, ref) => {
                         <div className="content">
                             <p
                                 className={cx('detailLine', {
+                                    description: true,
                                     noDescription: !data.ao.displayDescription,
                                 })}
                             >
diff --git a/src/components/AboutAOUnit/styles/AboutAOUnit.style.js b/src/components/AboutAOUnit/styles/AboutAOUnit.style.js
index fdabe3898..f95205a83 100644
--- a/src/components/AboutAOUnit/styles/AboutAOUnit.style.js
+++ b/src/components/AboutAOUnit/styles/AboutAOUnit.style.js
@@ -48,6 +48,10 @@ export default css`
         flex-shrink: 0;
     }
 
+    .description {
+        white-space: pre-line;
+    }
+
     .noDescription {
         color: ${colors.grey600};
     }

From 6e4b817cf7dd88ab93ba7d11cb9940803c1095a9 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Fri, 19 Apr 2024 11:58:05 +0000
Subject: [PATCH 2/2] chore(release): cut 24.10.6 [skip ci]

## [24.10.6](https://github.com/dhis2/analytics/compare/v24.10.5...v24.10.6) (2024-04-19)

### Bug Fixes

* **aboutAOUnit:** newlines missing in AO description ([#1656](https://github.com/dhis2/analytics/issues/1656)) ([8fe3a14](https://github.com/dhis2/analytics/commit/8fe3a14ec256f6eb2990fffcc092b1eea8911885)), closes [#1655](https://github.com/dhis2/analytics/issues/1655)
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 246346ee2..5b5733bf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [24.10.6](https://github.com/dhis2/analytics/compare/v24.10.5...v24.10.6) (2024-04-19)
+
+
+### Bug Fixes
+
+* **aboutAOUnit:** newlines missing in AO description ([#1656](https://github.com/dhis2/analytics/issues/1656)) ([8fe3a14](https://github.com/dhis2/analytics/commit/8fe3a14ec256f6eb2990fffcc092b1eea8911885)), closes [#1655](https://github.com/dhis2/analytics/issues/1655)
+
 ## [24.10.5](https://github.com/dhis2/analytics/compare/v24.10.4...v24.10.5) (2024-04-03)
 
 
diff --git a/package.json b/package.json
index 5dcd314e8..3d33e06ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "24.10.5",
+    "version": "24.10.6",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {