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, ">")
.replace(regexHighlight, (match, p1, p2) => {
@@ -123,6 +107,17 @@ export default function GenericModal({
return match;
})
.replace(/\n/g, "
");
+
+ 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}
>
- {children}
+
+ {children}
+
{
switch (myModalTitle) {