fix: 🐛 testing feedback, condition fixes

CaritasDeutschland · Apr 22, 2021 · 5789d60 · 5789d60
1 parent c0c08c7
commit 5789d60
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/src/components/groupChat/JoinGroupChatView.tsx b/src/components/groupChat/JoinGroupChatView.tsx
@@ -202,7 +202,7 @@ export const JoinGroupChatView = () => {
 				/>
 				{groupChatRuleTexts[
 					getResortKeyForConsultingType(chatItem.consultingType)
-				].map((groupChatRuleText, i) => (
+				]?.map((groupChatRuleText, i) => (
 					<Text text={groupChatRuleText} type="standard" key={i} />
 				))}
 			</div>

diff --git a/src/components/session/SessionItemComponent.tsx b/src/components/session/SessionItemComponent.tsx
@@ -241,12 +241,14 @@ export const SessionItemComponent = (props: SessionItemProps) => {
 		}
 	};
 
-	const resortData: ResortData = Object.entries(
-		registrationResortsData
-	).filter(
+	const filteredResortsData = Object.entries(registrationResortsData).filter(
 		(resort) =>
 			resort[1].consultingType === chatItem.consultingType?.toString()
-	)[0][1];
+	);
+	let currentResortData: ResortData;
+	if (filteredResortsData) {
+		currentResortData = filteredResortsData[0][1];
+	}
 
 	return (
 		<div
@@ -279,7 +281,7 @@ export const SessionItemComponent = (props: SessionItemProps) => {
 							type={getTypeOfLocation()}
 							isOnlyEnquiry={isOnlyEnquiry}
 							isMyMessage={isMyMessage(message.userId)}
-							resortData={resortData}
+							resortData={currentResortData}
 							{...message}
 						/>
 					))}

diff --git a/src/components/session/SessionViewEmpty.tsx b/src/components/session/SessionViewEmpty.tsx
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { translate } from '../../resources/scripts/i18n/translate';
+import { Text } from '../text/Text';
 import './session.styles';
 
 export const SessionViewEmpty = () => {
 	return (
 		<div className="session session--empty">
-			<p>{translate('session.empty')}</p>
+			<Text text={translate('session.empty')} type="divider" />
 		</div>
 	);
 };
diff --git a/src/components/session/session.styles.scss b/src/components/session/session.styles.scss
@@ -129,12 +129,8 @@ $unreadButtonSize: 18px;
 	&--empty {
 		justify-content: center;
 		align-items: center;
-		padding-top: 80px !important;
 		display: none;
-		p {
-			padding-top: 10px;
-			color: $light-grey;
-		}
+
 		@include breakpoint($fromLarge) {
 			display: flex;
 		}

diff --git a/src/components/sessionsList/sessionsList.styles.scss b/src/components/sessionsList/sessionsList.styles.scss
@@ -189,11 +189,6 @@ $headerHeight: 80px;
 		}
 	}
 
-	&--empty {
-		margin-top: $grid-base-four;
-		text-align: center;
-	}
-
 	&__itemsWrapper {
 		overflow-x: hidden;
 
@@ -222,15 +217,22 @@ $headerHeight: 80px;
 	}
 }
 
-.sessionsList__headline {
-	align-self: center;
-	font-size: $font-size-h3;
-	font-weight: $font-weight-medium;
-	line-height: $line-height-tertiary;
-	margin-bottom: 0;
-	margin-right: $grid-base-seven;
+.sessionsList {
+	&__headline {
+		align-self: center;
+		font-size: $font-size-h3;
+		font-weight: $font-weight-medium;
+		line-height: $line-height-tertiary;
+		margin-bottom: 0;
+		margin-right: $grid-base-seven;
+
+		@include breakpoint($fromLarge) {
+			margin-left: 0;
+		}
+	}
 
-	@include breakpoint($fromLarge) {
-		margin-left: 0;
+	&--empty {
+		margin-top: $grid-base-four;
+		text-align: center;
 	}
 }