From acd2e4daed9a85b7821a20b95a3392e42a7bb989 Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Wed, 19 Jun 2024 17:37:34 -0300
Subject: [PATCH] Fixed content not being colored on genericModal

---
 .../src/modals/genericModal/index.tsx         | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx
index 3ed4379bc..78b00e16e 100644
--- a/src/frontend/src/modals/genericModal/index.tsx
+++ b/src/frontend/src/modals/genericModal/index.tsx
@@ -90,23 +90,7 @@ export default function GenericModal({
     setWordsHighlight(filteredWordsHighlight);
   }
 
-  useEffect(() => {
-    if (type === TypeModal.PROMPT && inputValue && inputValue != "") {
-      checkVariables(inputValue);
-    }
-  }, [inputValue, type]);
-
-  useEffect(() => {
-    if (typeof value === "string") setInputValue(value);
-  }, [value, modalOpen]);
-  let coloredContent = inputValue || "";
-  // Check if coloredContent is a string
-  // calling toString on undefined will throw an error
-  // so we need to check if it is a string first
-  if (typeof coloredContent !== "string") {
-    coloredContent = "";
-  }
-  coloredContent
+  const coloredContent = (typeof inputValue === "string" ? inputValue : "")
     .replace(/</g, "&lt;")
     .replace(/>/g, "&gt;")
     .replace(regexHighlight, (match, p1, p2) => {
@@ -123,6 +107,17 @@ export default function GenericModal({
       return match;
     })
     .replace(/\n/g, "<br />");
+
+  useEffect(() => {
+    if (type === TypeModal.PROMPT && inputValue && inputValue != "") {
+      checkVariables(inputValue);
+    }
+  }, [inputValue, type]);
+
+  useEffect(() => {
+    if (typeof value === "string") setInputValue(value);
+  }, [value, modalOpen]);
+
   function getClassByNumberLength(): string {
     let sumOfCaracteres: number = 0;
     wordsHighlight.forEach((element) => {
@@ -188,7 +183,9 @@ export default function GenericModal({
       open={modalOpen}
       setOpen={setModalOpen}
     >
-      <BaseModal.Trigger disable={disabled} asChild>{children}</BaseModal.Trigger>
+      <BaseModal.Trigger disable={disabled} asChild>
+        {children}
+      </BaseModal.Trigger>
       <BaseModal.Header
         description={(() => {
           switch (myModalTitle) {