Merge pull request #300 from CaritasDeutschland/hotfix-activeSessionS…

…ession-2 fix: elk stack log error fixed
Onlineberatung · Dec 17, 2021 · ec811ee · ec811ee
2 parents 2a998b5 + c245c0f
commit ec811ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/components/message/MessageItemComponent.tsx b/src/components/message/MessageItemComponent.tsx
@@ -176,7 +176,7 @@ export const MessageItemComponent = ({
 		(chatItem?.moderators && !chatItem?.moderators?.includes(userId));
 	const showForwardMessage = () =>
 		hasRenderedMessage &&
-		activeSession.type !== SESSION_LIST_TYPES.ENQUIRY &&
+		activeSession?.type !== SESSION_LIST_TYPES.ENQUIRY &&
 		chatItem?.feedbackGroupId &&
 		hasUserAuthority(AUTHORITIES.USE_FEEDBACK, userData) &&
 		!activeSession?.isFeedbackSession;

diff --git a/src/components/message/MessageUsername.tsx b/src/components/message/MessageUsername.tsx
@@ -65,7 +65,7 @@ export const MessageUsername = (props: MessageUsernameProps) => {
 		<>
 			{!props.alias &&
 			props.username &&
-			chatItem.type !== SESSION_LIST_TYPES.ENQUIRY ? (
+			chatItem?.type !== SESSION_LIST_TYPES.ENQUIRY ? (
 				<div
 					className={`messageItem__username messageItem__username--${props.type}`}
 				>

diff --git a/src/components/sessionHeader/SessionHeaderComponent.tsx b/src/components/sessionHeader/SessionHeaderComponent.tsx
@@ -59,7 +59,7 @@ export const SessionHeaderComponent = (props: SessionHeaderProps) => {
 	let activeSession = getActiveSession(activeSessionGroupId, sessionsData);
 	const isLiveChat = isAnonymousSession(activeSession?.session);
 	const chatItem = getChatItemForSession(activeSession);
-	const consultingType = useConsultingType(chatItem.consultingType);
+	const consultingType = useConsultingType(chatItem?.consultingType);
 
 	const username = getContact(activeSession).username;
 	const userSessionData = getContact(activeSession).sessionData;