From a649cca2dfdd9027dc8658543b30019c10de009c Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Sun, 31 Mar 2024 02:45:45 +0200
Subject: [PATCH] Fixed merge issue

---
 .../components/chatView/chatMessage/index.tsx | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
index 7a9704e7c..0cbe2ecd3 100644
--- a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
+++ b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
@@ -11,7 +11,7 @@ import CodeTabsComponent from "../../../../../components/codeTabsComponent";
 import IconComponent from "../../../../../components/genericIconComponent";
 import useFlowStore from "../../../../../stores/flowStore";
 import { chatMessagePropsType } from "../../../../../types/components";
-import { classNames } from "../../../../../utils/utils";
+import { classNames, cn } from "../../../../../utils/utils";
 import FileCard from "../fileComponent";
 
 export default function ChatMessage({
@@ -108,30 +108,28 @@ export default function ChatMessage({
           chat.isSend ? "" : " "
         )}
       >
-        <div className={classNames("form-modal-chatbot-icon")}>
-          {!chat.isSend ? (
-            <div className="form-modal-chat-image">
-              <div className="form-modal-chat-bot-icon ">
-                <img
-                  src={Robot}
-                  className="form-modal-chat-icon-img"
-                  alt="robot_image"
-                />
-              </div>
-              <span className="truncate text-xs">{chat.sender_name}</span>
-            </div>
-          ) : (
-            <div className="form-modal-chat-image">
-              <div className="form-modal-chat-user-icon ">
-                <img
-                  src={MaleTechnology}
-                  className="form-modal-chat-icon-img"
-                  alt="male_technology"
-                />
-              </div>
-              <span className="truncate text-xs">{chat.sender_name}</span>
-            </div>
+        <div
+          className={classNames(
+            "mr-3 mt-1 flex max-w-16 flex-col items-center gap-1 overflow-hidden px-3 pb-3"
           )}
+        >
+          <div className="flex flex-col items-center gap-1">
+            <div
+              className={cn(
+                "relative flex h-8 w-8 items-center justify-center overflow-hidden rounded-md p-5 text-2xl",
+                !chat.isSend ? "bg-chat-bot-icon" : "bg-chat-user-icon"
+              )}
+            >
+              <img
+                src={!chat.isSend ? Robot : MaleTechnology}
+                className="absolute scale-[60%]"
+                alt={!chat.isSend ? "robot_image" : "male_technology"}
+              />
+            </div>
+            <span className="max-w-16 truncate text-xs">
+              {chat.sender_name}
+            </span>
+          </div>
         </div>
         {!chat.isSend ? (
           <div className="form-modal-chat-text-position min-w-96 flex-grow">