From c711aa19dcddce4bae00bf33a318759b523926da Mon Sep 17 00:00:00 2001
From: janrembold <janrembold@gmx.net>
Date: Tue, 23 Jan 2024 11:29:17 +0100
Subject: [PATCH] fix: updated review comments

---
 src/components/groupChat/CreateChatView.tsx | 16 ++++++----------
 src/components/groupChat/GroupChatInfo.tsx  | 11 ++++++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/components/groupChat/CreateChatView.tsx b/src/components/groupChat/CreateChatView.tsx
index 2f90f53c1..09bd9dc67 100644
--- a/src/components/groupChat/CreateChatView.tsx
+++ b/src/components/groupChat/CreateChatView.tsx
@@ -264,7 +264,7 @@ export const CreateGroupChatView = (props) => {
 		arePrefilledValuesChanged
 	]);
 
-	const handleEditGroupChatBackButton = () => {
+	const handleBackButton = () => {
 		if (isEditGroupChatMode) {
 			const pathInfo =
 				(prevPathIsGroupChatInfo ? '/groupChatInfo' : '') +
@@ -272,11 +272,7 @@ export const CreateGroupChatView = (props) => {
 			history.push(
 				`${listPath}/${activeSession.item.groupId}/${activeSession.item.id}${pathInfo}`
 			);
-		}
-	};
-
-	const handleCreateGroupChatBackButton = () => {
-		if (!isEditGroupChatMode) {
+		} else {
 			history.push('/sessions/consultant/sessionView');
 		}
 	};
@@ -552,7 +548,7 @@ export const CreateGroupChatView = (props) => {
 				<div className="createChat__header createChat__header--edit">
 					<div className="createChat__header__inner">
 						<span
-							onClick={handleEditGroupChatBackButton}
+							onClick={handleBackButton}
 							className="createChat__header__backButton"
 						>
 							<BackIcon />
@@ -569,7 +565,7 @@ export const CreateGroupChatView = (props) => {
 				<div className="createChat__header">
 					<div className="createChat__header__inner">
 						<span
-							onClick={handleEditGroupChatBackButton}
+							onClick={handleBackButton}
 							className="createChat__header__backButton"
 						>
 							<BackIcon />
@@ -672,7 +668,7 @@ export const CreateGroupChatView = (props) => {
 						<>
 							<Button
 								item={buttonSetCancel}
-								buttonHandle={handleEditGroupChatBackButton}
+								buttonHandle={handleBackButton}
 							/>
 							<Button
 								item={buttonSetSave}
@@ -684,7 +680,7 @@ export const CreateGroupChatView = (props) => {
 						<>
 							<Button
 								item={buttonSetCancel}
-								buttonHandle={handleCreateGroupChatBackButton}
+								buttonHandle={handleBackButton}
 							/>
 							<Button
 								item={buttonSetCreate}
diff --git a/src/components/groupChat/GroupChatInfo.tsx b/src/components/groupChat/GroupChatInfo.tsx
index 1e6c78333..4a7a7aeab 100644
--- a/src/components/groupChat/GroupChatInfo.tsx
+++ b/src/components/groupChat/GroupChatInfo.tsx
@@ -2,8 +2,10 @@ import * as React from 'react';
 import { useEffect, useContext, useState, useCallback } from 'react';
 import { Link, Redirect, useParams, useHistory } from 'react-router-dom';
 import {
+	AUTHORITIES,
 	SessionTypeContext,
 	UserDataContext,
+	hasUserAuthority,
 	useTenant
 } from '../../globalState';
 import { isUserModerator, SESSION_LIST_TAB } from '../session/sessionHelpers';
@@ -189,10 +191,6 @@ export const GroupChatInfo = () => {
 		rcUserId: getValueFromCookie('rc_uid')
 	});
 
-	const isCurrentUserConsultant = userData?.userRoles?.includes(
-		'group-chat-consultant'
-	);
-
 	const preparedSettings: Array<{ label: string; value: string }> = [
 		{
 			label: translate('groupChat.info.settings.topic'),
@@ -235,7 +233,10 @@ export const GroupChatInfo = () => {
 		}
 	];
 
-	if (isCurrentUserConsultant && activeSession.item.hintMessage) {
+	if (
+		hasUserAuthority(AUTHORITIES.CONSULTANT_DEFAULT, userData) &&
+		activeSession.item.hintMessage
+	) {
 		preparedSettings.push({
 			label: translate('groupChat.info.settings.hintMessage'),
 			value: activeSession.item.hintMessage