3028: Fixed Code Complexity and Correct Translations

digitalfabrik · Feb 18, 2025 · 07c4bbc · 07c4bbc
1 parent 252b95a
commit 07c4bbc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/translations/translations.json b/translations/translations.json
@@ -268,14 +268,14 @@
   },
   "chat": {
     "de": {
-      "botIcon": "Chat Bot",
+      "botIcon": "Chatbot",
       "button": "Chat (beta)",
       "conversationTitle": "Bitte gib deine Frage in das Textfeld ein.",
       "conversationText": "Du kannst alles fragen, von lokalen Informationen bis hin zu spezifischen Anfragen bezüglich deiner Situation.",
       "dataSecurity": "Datenschutz und Sicherheit: Deine Privatsphäre ist uns sehr wichtig. Alle Gespräche werden vertraulich behandelt und deine Daten werden sicher verarbeitet. Mehr Informationen zum Datenschutz findest du in unseren Datenschutzrichtlinien.",
       "errorMessage": "Es ist ein Fehler bei der Kommunikation aufgetreten.",
       "header": "{{appName}} Chat Support",
-      "humanIcon": "(menschlicher) Berater",
+      "humanIcon": "Berater*in",
       "initialMessage": "Deine Chatanfrage wurde gesendet. Die Berater*in beantwortet deine Nachricht so schnell wie möglich.",
       "inputLabel": "Meine Frage:",
       "inputPlaceholder": "Ich möchte wissen...",
@@ -382,14 +382,14 @@
       "user": "Εσείς"
     },
     "en": {
-      "chatIcon": "Chat Bot",
+      "chatIcon": "Chatbot",
       "button": "Chat (beta)",
       "conversationTitle": "Please enter your question in the text field.",
       "conversationText": "You can ask anything from local information to specific requests regarding your situation.",
       "dataSecurity": "Data protection and security: Your privacy is very important to us. All conversations are treated confidentially and your data is processed securely. You can find more information on data protection in our privacy policy.",
       "errorMessage": "An error has occurred during communication.",
       "header": "{{appName}} Chat Support",
-      "humanIcon": "(human) Advisor",
+      "humanIcon": "Advisor",
       "initialMessage": "Your chat request has been sent. The advisor will answer your message as soon as possible.",
       "inputLabel": "My question:",
       "inputPlaceholder": "I would like to know...",

diff --git a/web/src/components/ChatConversation.tsx b/web/src/components/ChatConversation.tsx
@@ -37,6 +37,14 @@ type TypingIndicatorProps = {
   isVisible: boolean
 }
 
+const shouldShowIcon = (index: number, message: ChatMessageModel, messages: ChatMessageModel[]): boolean => {
+  const previousMessage = messages[index - 1]
+  return (
+    previousMessage?.userIsAuthor !== message.userIsAuthor ||
+    previousMessage.isAutomaticAnswer !== message.isAutomaticAnswer
+  )
+}
+
 const TypingIndicator = ({ isVisible }: TypingIndicatorProps): ReactElement | null =>
   isVisible ? (
     <TypingIndicatorWrapper>
@@ -81,14 +89,7 @@ const ChatConversation = ({ messages, hasError, className }: ChatConversationPro
         <>
           {!hasError && <InitialMessage>{t('initialMessage')}</InitialMessage>}
           {messages.map((message, index) => (
-            <ChatMessage
-              message={message}
-              key={message.id}
-              showIcon={
-                messages[index - 1]?.userIsAuthor !== message.userIsAuthor ||
-                messages[index - 1]?.isAutomaticAnswer !== message.isAutomaticAnswer
-              }
-            />
+            <ChatMessage message={message} key={message.id} showIcon={shouldShowIcon(index, message, messages)} />
           ))}
           <TypingIndicator isVisible={typingIndicatorVisible} />
           <div ref={messagesEndRef} />