Merge pull request #63 from bennetrr/main

fix: Toast Exception
bennetrr · Aug 11, 2024 · fc21688 · fc21688
2 parents d4e351d + 1553e9e
commit fc21688
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
@@ -14,12 +14,11 @@ const App: React.FC = observer(() => {
 
   return (
     <>
-      <Toast ref={toast} />
-
       <ToastProvider value={toast.current}>
         <RouterProvider router={appRouter} />
       </ToastProvider>
 
+      <Toast ref={toast} />
       <ConfirmDialog />
       <ConfirmPopup />
     </>

diff --git a/src/frontend/src/utils/ToastContext.ts b/src/frontend/src/utils/ToastContext.ts
@@ -4,12 +4,4 @@ import { Toast } from 'primereact/toast';
 const ToastContext = createContext<Toast | null>(null);
 export const ToastProvider = ToastContext.Provider;
 
-export function useToast(): Toast {
-  const toast = useContext(ToastContext);
-
-  if (!toast) {
-    throw new Error('Toast not initialized!');
-  }
-
-  return toast;
-}
+export const useToast: (() => Toast) = () => useContext(ToastContext) as Toast;