diff --git a/frontend/app/context/ToastContext.tsx b/frontend/app/context/ToastContext.tsx
index 5c4f030..10953a4 100644
--- a/frontend/app/context/ToastContext.tsx
+++ b/frontend/app/context/ToastContext.tsx
@@ -1,6 +1,12 @@
 "use client";
 
-import { createContext, useContext, useState, useCallback, ReactNode } from "react";
+import {
+  createContext,
+  useContext,
+  useState,
+  useCallback,
+  ReactNode,
+} from "react";
 
 type ToastType = "success" | "error" | "info";
 
@@ -11,30 +17,83 @@ interface Toast {
 }
 
 interface ToastContextValue {
-  showToast: (message: string, type?: ToastType) => void;
+  showToast: (
+    message: string,
+    type?: ToastType
+  ) => void;
 }
 
-const ToastContext = createContext<ToastContextValue>({
-  showToast: () => {},
-});
+const ToastContext =
+  createContext<ToastContextValue>({
+    showToast: () => {},
+  });
+
 const MAX_TOASTS = 4;
+
+function createToast(
+  message: string,
+  type: ToastType
+): Toast {
+  return {
+    id: Date.now(),
+    message,
+    type,
+  };
+}
+
+function scheduleToastRemoval(
+  id: number,
+  removeToast: (id: number) => void
+) {
+  return window.setTimeout(() => {
+    removeToast(id);
+  }, 4000);
+}
+
 export function useToast() {
   return useContext(ToastContext);
 }
 
-export function ToastProvider({ children }: { children: ReactNode }) {
-  const [toasts, setToasts] = useState<Toast[]>([]);
+export function ToastProvider({
+  children,
+}: {
+  children: ReactNode;
+}) {
+  const [toasts, setToasts] =
+    useState<Toast[]>([]);
+
+  const removeToast = useCallback(
+    (id: number) => {
+      setToasts((prev) =>
+        prev.filter(
+          (toast) => toast.id !== id
+        )
+      );
+    },
+    []
+  );
 
   const showToast = useCallback(
-    (message: string, type: ToastType = "info") => {
-      const id = Date.now();
+    (
+      message: string,
+      type: ToastType = "info"
+    ) => {
+      const toast = createToast(
+        message,
+        type
+      );
+
+      const { id } = toast;
 
       setToasts((prev) => {
-        const duplicateExists = prev.some(
-          (toast) =>
-            toast.message === message &&
-            toast.type === type
-        );
+        const duplicateExists =
+          prev.some(
+            (existingToast) =>
+              existingToast.message ===
+                message &&
+              existingToast.type ===
+                type
+          );
 
         if (duplicateExists) {
           return prev;
@@ -42,46 +101,64 @@ export function ToastProvider({ children }: { children: ReactNode }) {
 
         const updated = [
           ...prev,
-          { id, message, type },
+          toast,
         ];
 
-        if (updated.length > MAX_TOASTS) {
+        if (
+          updated.length > MAX_TOASTS
+        ) {
           updated.shift();
         }
 
         return updated;
       });
 
-      setTimeout(() => {
-        setToasts((prev) =>
-          prev.filter((t) => t.id !== id)
-        );
-      }, 4000);
+      scheduleToastRemoval(
+        id,
+        removeToast
+      );
     },
-    []
+    [removeToast]
   );
 
-  const removeToast = (id: number) => {
-    setToasts((prev) => prev.filter((t) => t.id !== id));
-  };
-
   return (
-    <ToastContext.Provider value={{ showToast }}>
+    <ToastContext.Provider
+      value={{ showToast }}
+    >
       {children}
-      {/* Toast container — fixed top-right */}
+
       <div className="fixed top-4 right-4 z-50 flex flex-col gap-3 pointer-events-none">
         {toasts.map((toast) => (
           <div
             key={toast.id}
             className={`pointer-events-auto flex items-start gap-3 min-w-[280px] max-w-sm px-4 py-3 rounded-xl shadow-lg text-sm font-medium transition-all duration-300 animate-slide-in
-              ${toast.type === "success" ? "bg-emerald-600 text-white" : ""}
-              ${toast.type === "error" ? "bg-red-600 text-white" : ""}
-              ${toast.type === "info" ? "bg-slate-800 text-white" : ""}
+              ${
+                toast.type === "success"
+                  ? "bg-emerald-600 text-white"
+                  : ""
+              }
+              ${
+                toast.type === "error"
+                  ? "bg-red-600 text-white"
+                  : ""
+              }
+              ${
+                toast.type === "info"
+                  ? "bg-slate-800 text-white"
+                  : ""
+              }
             `}
           >
-            <span className="flex-1">{toast.message}</span>
+            <span className="flex-1">
+              {toast.message}
+            </span>
+
             <button
-              onClick={() => removeToast(toast.id)}
+              onClick={() =>
+                removeToast(
+                  toast.id
+                )
+              }
               className="ml-2 text-white opacity-70 hover:opacity-100 transition text-lg leading-none"
             >
               ×