Merge branch 'typescript' of https://github.com/pektezol/LeastPortalsHub into typescript

2 files changed, 6 insertions, 2 deletions

diff --git a/frontend/src/hooks/UseConfirm.tsx b/frontend/src/hooks/UseConfirm.tsx
index 80a0d51..9a7853b 100644
--- a/frontend/src/hooks/UseConfirm.tsx
+++ b/frontend/src/hooks/UseConfirm.tsx
@@ -3,9 +3,9 @@ import ConfirmDialog from '../components/ConfirmDialog';
 
 const useConfirm = () => {
     const [isOpen, setIsOpen] = useState(false);
-    const [resolvePromise, setResolvePromise] = useState<((value: boolean) => void) | null>(null);
         const [title, setTitle] = useState<string>("");
         const [subtitle, setSubtitle] = useState<string>("");
+    const [resolvePromise, setResolvePromise] = useState<((value: boolean) => void) | null>(null);
 
     const confirm = ( titleN: string, subtitleN: string ) => {
         setIsOpen(true);
diff --git a/frontend/src/hooks/UseMessage.tsx b/frontend/src/hooks/UseMessage.tsx
index ebc4276..602cf65 100644
--- a/frontend/src/hooks/UseMessage.tsx
+++ b/frontend/src/hooks/UseMessage.tsx
@@ -3,10 +3,10 @@ import MessageDialog from "../components/MessageDialog";
 
 const useMessage = () => {
     const [isOpen, setIsOpen] = useState(false);
-        const [resolvePromise, setResolvePromise] = useState<((value: boolean) => void) | null>(null);
 
     const [title, setTitle] = useState<string>("");
     const [subtitle, setSubtitle] = useState<string>("");
+    const [resolvePromise, setResolvePromise] = useState<(() => void) | null>(null);
 
     const message = (title: string, subtitle: string) => {
         setIsOpen(true);
@@ -19,6 +19,10 @@ const useMessage = () => {
 
     const handleClose = () => {
         setIsOpen(false);
+        if (resolvePromise) {
+            resolvePromise();
+            setResolvePromise(null);
+        }
     };
 
     const MessageDialogComponent = isOpen && (