feat: 🎸 reference consultingType from chatitem

CaritasDeutschland · Apr 14, 2021 · a3d1d38 · a3d1d38
1 parent b6aa3ec
commit a3d1d38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/components/message/FurtherSteps.tsx b/src/components/message/FurtherSteps.tsx
@@ -35,6 +35,7 @@ import {
 } from '../../globalState';
 import { VoluntaryInfoOverlay } from './VoluntaryInfoOverlay';
 import { isVoluntaryInfoSet } from './messageHelpers';
+import { getChatItemForSession } from '../session/sessionHelpers';
 
 const addEmailButton: ButtonItem = {
 	label: translate('furtherSteps.emailNotification.button'),
@@ -67,6 +68,7 @@ export const FurtherSteps = (props: FurtherStepsProps) => {
 	>();
 
 	const [showAddVoluntaryInfo, setShowAddVoluntaryInfo] = useState<boolean>();
+	const chatItem = getChatItemForSession(activeSession);
 
 	useEffect(() => {
 		const sessionData =
@@ -180,7 +182,7 @@ export const FurtherSteps = (props: FurtherStepsProps) => {
 	const handleVoluntarySuccess = (generatedRegistrationData) => {
 		let updatedUserData = userData;
 		updatedUserData.consultingTypes[
-			activeSession.session.consultingType
+			chatItem.consultingType
 		].sessionData = generatedRegistrationData;
 		setUserData(updatedUserData);
 		setShowAddVoluntaryInfo(false);

diff --git a/src/components/message/MessageItemComponent.tsx b/src/components/message/MessageItemComponent.tsx
@@ -94,8 +94,7 @@ export const MessageItemComponent = (props: MessageItemComponentProps) => {
 	useEffect(() => {
 		if (hasUserAuthority(AUTHORITIES.ASKER_DEFAULT, userData)) {
 			const sessionData =
-				userData.consultingTypes[activeSession.session.consultingType]
-					?.sessionData;
+				userData.consultingTypes[chatItem.consultingType]?.sessionData;
 			setShowAddVoluntaryInfo(
 				!isVoluntaryInfoSet(sessionData, props.resortData)
 			);
@@ -154,7 +153,7 @@ export const MessageItemComponent = (props: MessageItemComponentProps) => {
 		if (isFurtherStepsMessage) {
 			return (
 				<FurtherSteps
-					consultingType={activeSession.agency.consultingType}
+					consultingType={chatItem.consultingType}
 					resortData={props.resortData}
 				/>
 			);
@@ -165,7 +164,7 @@ export const MessageItemComponent = (props: MessageItemComponentProps) => {
 					handleVoluntaryInfoSet={() =>
 						setShowAddVoluntaryInfo(false)
 					}
-					consultingType={activeSession.agency.consultingType}
+					consultingType={chatItem.consultingType}
 					resortData={props.resortData}
 				/>
 			);

diff --git a/src/components/session/SessionItemComponent.tsx b/src/components/session/SessionItemComponent.tsx
@@ -241,14 +241,11 @@ export const SessionItemComponent = (props: SessionItemProps) => {
 		}
 	};
 
-	const activeConsultingType =
-		activeSession.session?.consultingType ||
-		activeSession.chat.consultingType;
 	const resortData: ResortData = Object.entries(
 		registrationResortsData
 	).filter(
 		(resort) =>
-			resort[1].consultingType === activeConsultingType?.toString()
+			resort[1].consultingType === chatItem.consultingType?.toString()
 	)[0][1];
 
 	return (