diff --git a/src/components/message/MessageItemComponent.tsx b/src/components/message/MessageItemComponent.tsx index 1c78cb20e..147d32f33 100644 --- a/src/components/message/MessageItemComponent.tsx +++ b/src/components/message/MessageItemComponent.tsx @@ -179,7 +179,7 @@ export const MessageItemComponent = ({ activeSession.type !== SESSION_LIST_TYPES.ENQUIRY && chatItem.feedbackGroupId && hasUserAuthority(AUTHORITIES.USE_FEEDBACK, userData) && - !activeSession.isFeedbackSession; + !activeSession?.isFeedbackSession; const videoCallMessage: VideoCallMessageDTO = alias?.videoCallMessageDTO; const isFurtherStepsMessage = @@ -264,7 +264,7 @@ export const MessageItemComponent = ({ hasRenderedMessage={hasRenderedMessage} /> ))} - {activeSession.isFeedbackSession && ( + {activeSession?.isFeedbackSession && ( { if ( hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData) || hasUserAuthority(AUTHORITIES.ANONYMOUS_DEFAULT, userData) || - activeSession.isFeedbackSession || + activeSession?.isFeedbackSession || props.isReadStatusDisabled ) { return null; diff --git a/src/components/messageSubmitInterface/messageSubmitInterfaceComponent.tsx b/src/components/messageSubmitInterface/messageSubmitInterfaceComponent.tsx index d0b0bf799..392d51ab4 100644 --- a/src/components/messageSubmitInterface/messageSubmitInterfaceComponent.tsx +++ b/src/components/messageSubmitInterface/messageSubmitInterfaceComponent.tsx @@ -713,7 +713,7 @@ export const MessageSubmitInterfaceComponent = ( hasUserAuthority(AUTHORITIES.USE_FEEDBACK, userData) && !hasUserAuthority(AUTHORITIES.VIEW_ALL_PEER_SESSIONS, userData) && activeSession.session.feedbackGroupId && - !activeSession.isFeedbackSession; + !activeSession?.isFeedbackSession; return (