From dc4d1ccd65539602199f9fefd8f1357610929cbc Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Wed, 28 Jun 2023 11:43:21 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(ApiModal):=20remove=20unnece?=
 =?UTF-8?q?ssary=20div=20tag=20to=20fix=20layout=20issue=20=F0=9F=90=9B=20?=
 =?UTF-8?q?fix(codeAreaModal):=20fix=20closePopUp=20function=20call=20plac?=
 =?UTF-8?q?ement=20to=20ensure=20proper=20functionality=20=F0=9F=90=9B=20f?=
 =?UTF-8?q?ix(genericModal):=20set=20closeEdit=20value=20to=20"generic"=20?=
 =?UTF-8?q?to=20fix=20issue=20with=20closing=20the=20modal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/modals/ApiModal/index.tsx      | 8 +++++---
 src/frontend/src/modals/codeAreaModal/index.tsx | 3 +--
 src/frontend/src/modals/genericModal/index.tsx  | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/frontend/src/modals/ApiModal/index.tsx b/src/frontend/src/modals/ApiModal/index.tsx
index a41b361e8..76c07c5aa 100644
--- a/src/frontend/src/modals/ApiModal/index.tsx
+++ b/src/frontend/src/modals/ApiModal/index.tsx
@@ -374,8 +374,7 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                     />
                                                   ) : t.data.node.template[n]
                                                       .multiline ? (
-                                                    <div>
-                                                      <ShadTooltip
+                                                        <ShadTooltip
                                                         delayDuration={1000}
                                                         content={buildContent(
                                                           t.data.node.template[
@@ -383,6 +382,8 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                           ].value
                                                         )}
                                                       >
+                                                    <div>
+
                                                         <TextAreaComponent
                                                           disabled={false}
                                                           editNode={true}
@@ -403,8 +404,9 @@ export default function ApiModal({ flow }: { flow: FlowType }) {
                                                             );
                                                           }}
                                                         />
-                                                      </ShadTooltip>
                                                     </div>
+                                                    </ShadTooltip>
+
                                                   ) : (
                                                     <InputComponent
                                                       editNode={true}
diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx
index 0f9a26f33..ec6d3d07c 100644
--- a/src/frontend/src/modals/codeAreaModal/index.tsx
+++ b/src/frontend/src/modals/codeAreaModal/index.tsx
@@ -40,9 +40,8 @@ export default function CodeAreaModal({
     setOpen(x);
     if (x === false) {
       setTimeout(() => {
-        closePopUp();
         setCloseEdit("editcode");
-        
+        closePopUp();
       }, 300);
     }
   }
diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx
index 6f89e24a6..8223cb3f8 100644
--- a/src/frontend/src/modals/genericModal/index.tsx
+++ b/src/frontend/src/modals/genericModal/index.tsx
@@ -38,11 +38,12 @@ export default function GenericModal({
   const [myValue, setMyValue] = useState(value);
   const { dark } = useContext(darkContext);
   const { setErrorData, setSuccessData } = useContext(alertContext);
-  const { closePopUp } = useContext(PopUpContext);
+  const { closePopUp, setCloseEdit } = useContext(PopUpContext);
   const ref = useRef();
   function setModalOpen(x: boolean) {
     setOpen(x);
     if (x === false) {
+      setCloseEdit("generic");
       closePopUp();
     }
   }