From e5d9875356f6506ea82eb017f9284d8ad1220e90 Mon Sep 17 00:00:00 2001
From: janrembold <janrembold@gmx.net>
Date: Mon, 22 Apr 2024 09:55:54 +0200
Subject: [PATCH 1/2] fix: move translated topic name to tag

---
 .../sessionsListItem/SessionListItemComponent.tsx           | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/sessionsListItem/SessionListItemComponent.tsx b/src/components/sessionsListItem/SessionListItemComponent.tsx
index 856a8c908..fce844922 100644
--- a/src/components/sessionsListItem/SessionListItemComponent.tsx
+++ b/src/components/sessionsListItem/SessionListItemComponent.tsx
@@ -95,7 +95,6 @@ export const SessionListItemComponent = ({
 			ALIAS_MESSAGE_TYPES.MASTER_KEY_LOST
 	);
 	const [plainTextLastMessage, setPlainTextLastMessage] = useState(null);
-	const topicSession = activeSession.item?.topic as TopicSessionInterface;
 
 	const { autoSelectPostcode } =
 		consultingType?.registration ||
@@ -384,7 +383,6 @@ export const SessionListItemComponent = ({
 						</div>
 					) : (
 						<div className="sessionsListItem__consultingType">
-							{topic?.name ? `${topic.name} ` : ''}
 							{activeSession.item.consultingType !== 1 &&
 							!isAsker &&
 							!activeSession.isLive &&
@@ -393,7 +391,7 @@ export const SessionListItemComponent = ({
 								: null}
 						</div>
 					)}
-					{topicSession?.id !== undefined && topicSession.name && (
+					{topic?.name && (
 						<div
 							className="sessionsListItem__topic"
 							style={{
@@ -401,7 +399,7 @@ export const SessionListItemComponent = ({
 									tenantData?.theming?.primaryColor
 							}}
 						>
-							{topicSession?.name}
+							{topic.name}
 						</div>
 					)}
 					<div className="sessionsListItem__date">

From ed0cadf5ccb36ddffbf09e8a19bbc88f1b32f145 Mon Sep 17 00:00:00 2001
From: janrembold <janrembold@gmx.net>
Date: Mon, 22 Apr 2024 10:23:31 +0200
Subject: [PATCH 2/2] fix: remove zipcode slash logic and consulting type check

---
 .../sessionsListItem/SessionListItemComponent.tsx        | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/components/sessionsListItem/SessionListItemComponent.tsx b/src/components/sessionsListItem/SessionListItemComponent.tsx
index fce844922..ca288065b 100644
--- a/src/components/sessionsListItem/SessionListItemComponent.tsx
+++ b/src/components/sessionsListItem/SessionListItemComponent.tsx
@@ -347,10 +347,6 @@ export const SessionListItemComponent = ({
 		sessionTopic = activeSession.user.username;
 	}
 
-	const showConsultingType =
-		consultingType && !tenantData?.settings?.featureTopicsEnabled;
-	const zipCodeSlash = showConsultingType ? '/ ' : '';
-
 	return (
 		<div
 			onClick={handleOnClick}
@@ -383,11 +379,10 @@ export const SessionListItemComponent = ({
 						</div>
 					) : (
 						<div className="sessionsListItem__consultingType">
-							{activeSession.item.consultingType !== 1 &&
-							!isAsker &&
+							{!isAsker &&
 							!activeSession.isLive &&
 							!autoSelectPostcode
-								? zipCodeSlash + activeSession.item.postcode
+								? activeSession.item.postcode
 								: null}
 						</div>
 					)}