From ef3a42ac575b4ae154cf66ddedef44539caa379c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deborah=20K=C3=B6pfer?= <koepferd@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:17:34 +0200
Subject: [PATCH 1/3] fix(preselectionDrawer.tsx): case of no topic id being
 passed

DIAKONIE-399
---
 .../preselectionDrawer/preselectionDrawer.tsx | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx b/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
index dc88c4b6a..535e90dd8 100644
--- a/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
+++ b/src/extensions/components/registration/preselectionDrawer/preselectionDrawer.tsx
@@ -155,28 +155,30 @@ export const PreselectionDrawer = () => {
 							/>
 						) : (
 							<>
-								<Typography
-									sx={{
-										color: 'white',
-										fontWeight: '600',
-										mt: '24px'
-									}}
-								>
-									{t('registration.topic.summary')}
-								</Typography>
+								{preselectedTopic || hasTopicError ? (
+									<Typography
+										sx={{
+											color: 'white',
+											fontWeight: '600',
+											mt: '24px'
+										}}
+									>
+										{t('registration.topic.summary')}
+									</Typography>
+								) : null}
 								{hasTopicError ? (
 									<PreselectionError
 										errorMessage={t(
 											'registration.errors.tid'
 										)}
 									/>
-								) : (
+								) : preselectedAgency ? (
 									<Typography
 										sx={{ color: 'white', mt: '8px' }}
 									>
-										{preselectedTopic.name}
+										{preselectedTopic?.name}
 									</Typography>
-								)}
+								) : null}
 								<Typography
 									sx={{
 										color: 'white',

From d4d402b29ed93e77f21019eb245f831b3cbd95ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deborah=20K=C3=B6pfer?= <koepferd@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:46:16 +0200
Subject: [PATCH 2/3] ci(update-dependency): download-artifact

---
 .github/workflows/dockerImage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
index 1fdf6ed68..3ca7ecbb3 100644
--- a/.github/workflows/dockerImage.yml
+++ b/.github/workflows/dockerImage.yml
@@ -86,7 +86,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Download buildfiles artifact
-              uses: actions/download-artifact@v2
+              uses: actions/download-artifact@v3
               with:
                   name: buildfiles
                   path: build

From 87f0c7c6bec49be39e5c7927b8a60a77151eb703 Mon Sep 17 00:00:00 2001
From: Leandro13Silva13 <115784444+Leandro13Silva13@users.noreply.github.com>
Date: Tue, 17 Sep 2024 09:52:54 +0200
Subject: [PATCH 3/3] Update dockerImage.yml

---
 .github/workflows/dockerImage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
index 3ca7ecbb3..46ae1adbf 100644
--- a/.github/workflows/dockerImage.yml
+++ b/.github/workflows/dockerImage.yml
@@ -58,7 +58,7 @@ jobs:
                   echo "127.0.0.1 localhost" | sudo tee -a /etc/hosts
                   echo "fs.inotify.max_user_watches=524288" | sudo tee -a /etc/sysctl.conf
                   npm run test:build
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                   name: buildfiles
                   path: build/**/*
@@ -86,7 +86,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Download buildfiles artifact
-              uses: actions/download-artifact@v3
+              uses: actions/download-artifact@v4
               with:
                   name: buildfiles
                   path: build