diff --git a/public/locale/en.json b/public/locale/en.json
index f86d78fa3aa..3ba6ba86831 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -349,6 +349,7 @@
   "assigned_to": "Assigned to",
   "assigned_volunteer": "Assigned Volunteer",
   "async_operation_warning": "This operation may take some time. Please check back later.",
+  "attach_file": "Attach File",
   "atypical_presentation_details": "Atypical presentation details",
   "audio__allow_permission": "Please allow microphone permission in site settings",
   "audio__allow_permission_button": "Click here to know how to allow",
@@ -913,6 +914,7 @@
   "medicines_administered": "Medicine(s) administered",
   "medicines_administered_error": "Error administering medicine(s)",
   "member_id_required": "Member Id is required",
+  "mention": "Mention",
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
@@ -965,6 +967,7 @@
   "no_linked_facilities": "No Linked Facilities",
   "no_log_update_delta": "No changes since previous log update",
   "no_log_updates": "No log updates found",
+  "no_matching_users": "No matching users found",
   "no_medical_history_available": "No Medical History Available",
   "no_notices_for_you": "No notices for you.",
   "no_patients_found": "No Patients Found",
@@ -985,6 +988,7 @@
   "normal": "Normal",
   "not_eligible": "Not Eligible",
   "not_specified": "Not Specified",
+  "note": "Note",
   "notes": "Notes",
   "notes_placeholder": "Type your Notes",
   "notice_board": "Notice Board",
@@ -1161,6 +1165,7 @@
   "reload": "Reload",
   "remove": "Remove",
   "rename": "Rename",
+  "replies": "Replies",
   "reply": "Reply",
   "report": "Report",
   "req_atleast_one_digit": "Require at least one digit",
@@ -1347,6 +1352,7 @@
   "type_d_cylinders": "D Type Cylinders",
   "type_to_search": "Type to search",
   "type_your_comment": "Type your comment",
+  "type_your_message": "Type your message here...",
   "type_your_reason_here": "Type your reason here",
   "unable_to_get_current_position": "Unable to get current position.",
   "unconfirmed": "Unconfirmed",
@@ -1391,6 +1397,7 @@
   "use_existing_abha_address": "Use Existing ABHA Address",
   "user_deleted_successfuly": "User Deleted Successfuly",
   "user_management": "User Management",
+  "user_mentions": "User Mentions",
   "username": "Username",
   "users": "Users",
   "vacant": "Vacant",
diff --git a/src/components/Common/DiscussionNotesEditor.tsx b/src/components/Common/DiscussionNotesEditor.tsx
index be0ca45dea6..f9e9e284740 100644
--- a/src/components/Common/DiscussionNotesEditor.tsx
+++ b/src/components/Common/DiscussionNotesEditor.tsx
@@ -1,8 +1,11 @@
-import React, { useCallback, useEffect, useRef, useState } from "react";
+import { t } from "i18next";
+import React, { useEffect, useRef, useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
-import { Submit } from "@/components/Common/ButtonV2";
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
+
 import { FilePreviewCard } from "@/components/Common/FilePreviewCard";
 import MentionsDropdown from "@/components/Common/MentionDropdown";
 import NotePreview from "@/components/Common/NotePreview";
@@ -65,7 +68,6 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
       "xls",
       "xlsx",
       "ods",
-      "pdf",
     ],
   });
 
@@ -167,17 +169,34 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
               <NotePreview initialNote={text} />
             </div>
           ) : (
-            <AutoExpandingTextarea
+            <Textarea
               id="discussion_notes_textarea"
               ref={editorRef}
-              placeholder="Type your message here..."
+              placeholder={t("type_your_message")}
               className={classNames(
-                "w-full resize-none border-none p-3 align-middle text-sm outline-none focus:outline-none focus:ring-0",
+                "w-full resize-none border-0 p-3 text-sm",
                 maxRows ? "overflow-y-auto" : "overflow-hidden",
               )}
               value={text}
-              onInput={handleInput}
-              maxRows={maxRows}
+              onChange={handleInput}
+              onInput={(e) => {
+                // auto expand textarea
+                const textarea = e.currentTarget;
+                textarea.style.height = "auto";
+                textarea.style.height = `${textarea.scrollHeight}px`;
+                if (maxRows) {
+                  const lineHeight = parseInt(
+                    window.getComputedStyle(textarea).lineHeight,
+                  );
+                  const maxHeight = lineHeight * maxRows;
+                  if (textarea.scrollHeight > maxHeight) {
+                    textarea.style.height = `${maxHeight}px`;
+                    textarea.style.overflowY = "auto";
+                  } else {
+                    textarea.style.overflowY = "hidden";
+                  }
+                }
+              }}
             />
           )}
           {fileUpload.files.length > 0 && (
@@ -196,46 +215,52 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
 
         {/* toolbar*/}
         <div className="flex items-center space-x-1 rounded-b-md border border-secondary-300 bg-secondary-100 pl-2 sm:space-x-2">
-          <label className="tooltip cursor-pointer rounded bg-secondary-200/50 p-1 text-secondary-700">
+          <label className="tooltip cursor-pointer rounded bg-secondary-200/50 px-1 text-secondary-800">
             <CareIcon icon="l-paperclip" className="text-lg" />
             <span className="tooltip-text tooltip-top -translate-x-4">
-              Attach File
+              {t("attach_file")}
             </span>
             <fileUpload.Input multiple />
           </label>
           <div className="mx-2 h-6 border-l border-secondary-400"></div>
-          <button
+          <Button
+            variant="ghost"
+            size="icon"
             onClick={() => fileUpload.handleCameraCapture()}
-            className="tooltip rounded bg-secondary-200/50 p-1"
+            className="tooltip rounded bg-secondary-200/50 px-1"
           >
             <CareIcon icon="l-camera" className="text-lg" />
             <span className="tooltip-text tooltip-top -translate-x-1/2">
-              Camera
+              {t("camera")}
             </span>
-          </button>
-          <button
+          </Button>
+          <Button
+            variant="ghost"
+            size="icon"
             onClick={() => fileUpload.handleAudioCapture()}
-            className="tooltip rounded bg-secondary-200/50 p-1"
+            className="tooltip rounded bg-secondary-200/50 px-1"
           >
             <CareIcon icon="l-microphone" className="text-lg" />
             <span className="tooltip-text tooltip-top -translate-x-1/2">
-              Audio
+              {t("audio__record")}
             </span>
-          </button>
+          </Button>
           <div className="mx-2 h-6 border-l border-secondary-400"></div>
-          <button
+          <Button
+            variant="ghost"
+            size="icon"
             onClick={handleMentionButtonClick}
-            className="tooltip rounded bg-secondary-200/50 p-1"
+            className="tooltip rounded bg-secondary-200/50 px-1"
           >
             <CareIcon icon="l-at" className="text-lg" />
             <span className="tooltip-text tooltip-top -translate-x-1/2">
-              Mention
+              {t("mention")}
             </span>
-          </button>
+          </Button>
 
           <div className="grow"></div>
 
-          <Submit
+          <Button
             id="add_doctor_note_button"
             onClick={async () => {
               if (!editorRef.current) return;
@@ -249,9 +274,10 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
             }}
             className="max-w-12"
             disabled={!isAuthorized || isPreviewMode}
+            variant="primary"
           >
             <CareIcon icon="l-message" className="text-lg" />
-          </Submit>
+          </Button>
         </div>
       </div>
 
@@ -259,7 +285,6 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
         <MentionsDropdown
           onSelect={insertMention}
           position={mentionPosition}
-          editorRef={editorRef}
           filter={mentionFilter}
           containerRef={editorRef}
         />
@@ -270,49 +295,4 @@ const DiscussionNotesEditor: React.FC<DiscussionNotesEditorProps> = ({
   );
 };
 
-interface AutoExpandingTextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
-  maxRows?: number;
-}
-
-const AutoExpandingTextarea = React.forwardRef<
-  HTMLTextAreaElement,
-  AutoExpandingTextareaProps
->(({ maxRows, ...props }, ref) => {
-  const adjustHeight = useCallback(
-    (textarea: HTMLTextAreaElement) => {
-      textarea.style.height = "auto";
-
-      const style = window.getComputedStyle(textarea);
-      const borderHeight =
-        parseInt(style.borderTopWidth) + parseInt(style.borderBottomWidth);
-      const paddingHeight =
-        parseInt(style.paddingTop) + parseInt(style.paddingBottom);
-
-      const lineHeight = parseInt(style.lineHeight);
-      const maxHeight = maxRows
-        ? lineHeight * maxRows + borderHeight + paddingHeight
-        : Infinity;
-
-      const newHeight = Math.min(
-        textarea.scrollHeight + borderHeight,
-        maxHeight,
-      );
-      textarea.style.height = `${newHeight}px`;
-    },
-    [maxRows],
-  );
-
-  useEffect(() => {
-    const textarea = (ref as React.RefObject<HTMLTextAreaElement>).current;
-    if (textarea) {
-      adjustHeight(textarea);
-    }
-  }, [props.value, adjustHeight]);
-
-  return <textarea ref={ref} {...props} />;
-});
-
-AutoExpandingTextarea.displayName = "AutoExpandingTextarea";
-
 export default DiscussionNotesEditor;
diff --git a/src/components/Common/FilePreviewCard.tsx b/src/components/Common/FilePreviewCard.tsx
index feac800a479..5f4ecba871a 100644
--- a/src/components/Common/FilePreviewCard.tsx
+++ b/src/components/Common/FilePreviewCard.tsx
@@ -1,3 +1,5 @@
+import { t } from "i18next";
+
 import CareIcon, { IconName } from "@/CAREUI/icons/CareIcon";
 
 import { FileUploadModel } from "@/components/Patient/models";
@@ -54,6 +56,8 @@ export function FilePreviewCard({
         onClick && "cursor-pointer",
       )}
       onClick={onClick}
+      role="button"
+      aria-label={t("file_preview")}
     >
       {!readonly && onRemove && typeof index === "number" && (
         <button
diff --git a/src/components/Common/MentionDropdown.tsx b/src/components/Common/MentionDropdown.tsx
index bcce137a3b9..11787379d4c 100644
--- a/src/components/Common/MentionDropdown.tsx
+++ b/src/components/Common/MentionDropdown.tsx
@@ -1,3 +1,4 @@
+import { t } from "i18next";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import { Avatar } from "@/components/Common/Avatar";
@@ -11,7 +12,6 @@ import { formatDisplayName } from "@/Utils/utils";
 interface MentionsDropdownProps {
   onSelect: (user: { id: string; username: string }) => void;
   position: { top: number; left: number };
-  editorRef: React.RefObject<HTMLTextAreaElement>;
   filter: string;
   containerRef: React.RefObject<HTMLTextAreaElement>;
 }
@@ -26,7 +26,6 @@ const KEYS = {
 const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
   onSelect,
   position,
-  editorRef,
   filter,
   containerRef,
 }) => {
@@ -58,10 +57,6 @@ const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
 
   const handleKeyDown = useCallback(
     (event: KeyboardEvent) => {
-      if (document.activeElement !== editorRef.current) {
-        return;
-      }
-
       if (event.key === KEYS.ENTER && filteredUsers.length > 0) {
         const selectedUser =
           selectedIndex !== null
@@ -86,15 +81,18 @@ const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
         });
       }
     },
-    [filteredUsers, selectedIndex, onSelect, editorRef],
+    [filteredUsers, selectedIndex, onSelect],
   );
 
   useEffect(() => {
-    document.addEventListener("keydown", handleKeyDown);
+    const container = containerRef.current;
+    if (!container) return;
+
+    container.addEventListener("keydown", handleKeyDown);
     return () => {
-      document.removeEventListener("keydown", handleKeyDown);
+      container.removeEventListener("keydown", handleKeyDown);
     };
-  }, [handleKeyDown]);
+  }, [handleKeyDown, containerRef]);
 
   return (
     <div
@@ -104,7 +102,7 @@ const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
         left: `${dropdownPosition.left}px`,
       }}
       role="listbox"
-      aria-label="User mentions"
+      aria-label={t("user_mentions")}
     >
       {loading ? (
         <div
@@ -112,7 +110,7 @@ const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
           role="status"
           aria-live="polite"
         >
-          <span className="inline-block animate-spin">⌛</span> Loading users...
+          <span className="inline-block animate-spin">⌛</span> {t("loading")}
         </div>
       ) : filteredUsers.length > 0 ? (
         filteredUsers.map((user, index) => (
@@ -148,7 +146,7 @@ const MentionsDropdown: React.FC<MentionsDropdownProps> = ({
           role="status"
           aria-live="polite"
         >
-          {filter ? "No matching users found" : "Type to search users"}
+          {filter ? t("no_matching_users") : t("type_to_search")}
         </div>
       )}
     </div>
diff --git a/src/components/Common/NotePreview.tsx b/src/components/Common/NotePreview.tsx
index 39667581c1e..7e18f4dd561 100644
--- a/src/components/Common/NotePreview.tsx
+++ b/src/components/Common/NotePreview.tsx
@@ -40,6 +40,12 @@ const NotePreview = ({
     position: { x: number; y: number };
   } | null>(null);
 
+  const SANITIZE_CONFIG = {
+    ALLOWED_TAGS: ["span", "br"],
+    ALLOWED_ATTR: ["class", "data-username"],
+    ALLOW_DATA_ATTR: false,
+  };
+
   const processText = (content: string) => {
     const withLineBreaks = content.replace(/\n/g, "<br />");
     // valid usernames : devdoctor, dev-doctor and dev_doctor
@@ -52,9 +58,7 @@ const NotePreview = ({
       return `<span class="cursor-pointer font-medium text-primary hover:underline" data-username="${username}">@${username}</span>`;
     });
 
-    return DOMPurify.sanitize(withMentions, {
-      ADD_ATTR: ["data-username"],
-    });
+    return DOMPurify.sanitize(withMentions, SANITIZE_CONFIG);
   };
 
   useEffect(() => {
diff --git a/src/components/Facility/DoctorNoteReplyPreviewCard.tsx b/src/components/Facility/DoctorNoteReplyPreviewCard.tsx
index ba417f93a74..cae9758bd9e 100644
--- a/src/components/Facility/DoctorNoteReplyPreviewCard.tsx
+++ b/src/components/Facility/DoctorNoteReplyPreviewCard.tsx
@@ -2,6 +2,8 @@ import React from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
+import { Button } from "@/components/ui/button";
+
 import { Avatar } from "@/components/Common/Avatar";
 import NotePreview from "@/components/Common/NotePreview";
 import { PatientNotesReplyModel } from "@/components/Facility/models";
@@ -57,18 +59,19 @@ const DoctorNoteReplyPreviewCard = ({
             </div>
           </div>
           {cancelReply && (
-            <button
-              type="button"
-              className="mr-2 cursor-pointer p-1 text-2xl"
+            <Button
+              variant="ghost"
+              size="icon"
               onClick={cancelReply}
+              className="mr-2 h-8 w-8 hover:bg-transparent"
               aria-label="Cancel reply"
               title="Cancel reply"
             >
               <CareIcon
                 icon="l-times"
-                className="m-1 rounded-full bg-secondary-400 p-1 text-white hover:bg-secondary-500"
+                className="h-5 w-5 rounded-full p-1 bg-secondary-400 text-white transition-colors duration-200 hover:bg-secondary-500"
               />
-            </button>
+            </Button>
           )}
         </div>
         <div className="max-h-14 overflow-hidden pb-2 pl-14 text-sm text-secondary-700">
diff --git a/src/components/Facility/PatientNoteCard.tsx b/src/components/Facility/PatientNoteCard.tsx
index 9ba44586311..29c55c1095a 100644
--- a/src/components/Facility/PatientNoteCard.tsx
+++ b/src/components/Facility/PatientNoteCard.tsx
@@ -164,6 +164,7 @@ const PatientNoteCard = ({
                         setIsEditing(true);
                       }}
                       className="bg-secondary-100 p-2"
+                      aria-label={t("edit")}
                     >
                       <CareIcon icon="l-pen" className="h-4 w-4" />
                     </ButtonV2>
@@ -175,6 +176,7 @@ const PatientNoteCard = ({
                       setReplyTo && setReplyTo(note);
                     }}
                     className="bg-secondary-100 p-2"
+                    aria-label={t("reply")}
                   >
                     <CareIcon icon="l-corner-up-left-alt" className="h-4 w-4" />
                   </ButtonV2>
diff --git a/src/components/Facility/PatientNotesDetailedView.tsx b/src/components/Facility/PatientNotesDetailedView.tsx
index f4628c474c4..16b243854c6 100644
--- a/src/components/Facility/PatientNotesDetailedView.tsx
+++ b/src/components/Facility/PatientNotesDetailedView.tsx
@@ -1,7 +1,10 @@
+import { t } from "i18next";
 import { useEffect, useRef, useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
+import { Button } from "@/components/ui/button";
+
 import CircularProgress from "@/components/Common/CircularProgress";
 import DiscussionNotesEditor from "@/components/Common/DiscussionNotesEditor";
 import DoctorNoteReplyPreviewCard from "@/components/Facility/DoctorNoteReplyPreviewCard";
@@ -112,14 +115,16 @@ const PatientNotesDetailedView = (props: Props) => {
         <div className="flex h-full flex-col">
           <div className="flex-shrink-0 border-b border-secondary-300 px-3 pt-2 pb-2">
             <div className="mb-2 flex items-center justify-between">
-              <h4 className="text-lg">Note</h4>
-              <button
+              <h4 className="text-lg">{t("note")}</h4>
+              <Button
+                variant="outline"
+                size="sm"
                 onClick={() => setThreadViewNote?.("")}
-                className="btn btn-default"
+                className="gap-2"
               >
-                <CareIcon icon="l-times" className="mr-1 text-lg" />
-                Close
-              </button>
+                <CareIcon icon="l-times" className="text-lg" />
+                {t("close")}
+              </Button>
             </div>
             <PatientNoteCard
               note={state}
@@ -130,11 +135,11 @@ const PatientNotesDetailedView = (props: Props) => {
 
           <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
             <div className="flex-shrink-0 border-b border-secondary-300 flex items-center justify-between px-4 py-2">
-              <h4 className="text-lg text-slate-600">Replies</h4>
+              <h4 className="text-lg text-slate-600">{t("replies")}</h4>
               {state.child_notes.length > 0 && (
                 <div className="text-sm text-secondary-500">
                   {state.child_notes.length}{" "}
-                  {state.child_notes.length > 1 ? "replies" : "reply"}
+                  {state.child_notes.length > 1 ? t("replies") : t("reply")}
                 </div>
               )}
             </div>
diff --git a/src/components/Facility/PatientNotesList.tsx b/src/components/Facility/PatientNotesList.tsx
index 4abd36c5a63..2830e92c808 100644
--- a/src/components/Facility/PatientNotesList.tsx
+++ b/src/components/Facility/PatientNotesList.tsx
@@ -66,6 +66,7 @@ const PatientNotesList = (props: PatientNotesListProps) => {
           {notes.map((note) => {
             const noteCard = (
               <PatientNoteCard
+                key={note.id}
                 note={note}
                 refetch={refetch}
                 disableEdit={disableEdit}
diff --git a/src/components/Facility/PatientNotesListComponent.tsx b/src/components/Facility/PatientNotesListComponent.tsx
index 568f8323504..bf60eb2cf68 100644
--- a/src/components/Facility/PatientNotesListComponent.tsx
+++ b/src/components/Facility/PatientNotesListComponent.tsx
@@ -82,7 +82,7 @@ const PatientNotesListComponent = (props: PatientNotesProps) => {
         setState((prevState) => ({
           ...prevState,
           notes:
-            state.cPage === 1
+            prevState.cPage === 1
               ? data.results
               : [...prevState.notes, ...data.results],
           totalPages: Math.ceil(data.count / RESULTS_PER_PAGE_LIMIT),
@@ -121,6 +121,8 @@ const PatientNotesListComponent = (props: PatientNotesProps) => {
       setState({ ...state, cPage: 1 });
       setNoteField("");
       setReplyTo(undefined);
+    } else {
+      Notification.Error({ msg: "Failed to add note. Please try again." });
     }
 
     return data?.id;
diff --git a/src/components/Facility/PatientNotesSlideover.tsx b/src/components/Facility/PatientNotesSlideover.tsx
index 24fd315ce6e..22fe5b91e9e 100644
--- a/src/components/Facility/PatientNotesSlideover.tsx
+++ b/src/components/Facility/PatientNotesSlideover.tsx
@@ -121,6 +121,8 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
       setNoteField("");
       setState({ ...state, cPage: 1 });
       setReplyTo(undefined);
+    } else {
+      Notification.Error({ msg: "Failed to add note. Please try again." });
     }
     return data?.id;
   };
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
new file mode 100644
index 00000000000..e06f1a65d8d
--- /dev/null
+++ b/src/components/ui/textarea.tsx
@@ -0,0 +1,22 @@
+import * as React from "react";
+
+import { cn } from "@/lib/utils";
+
+const Textarea = React.forwardRef<
+  HTMLTextAreaElement,
+  React.ComponentProps<"textarea">
+>(({ className, ...props }, ref) => {
+  return (
+    <textarea
+      className={cn(
+        "flex min-h-[60px] w-full rounded-md border border-primary/20 bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-secondary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-primary/40 dark:placeholder:text-secondary/70 dark:focus-visible:ring-primary/70",
+        className,
+      )}
+      ref={ref}
+      {...props}
+    />
+  );
+});
+Textarea.displayName = "Textarea";
+
+export { Textarea };
diff --git a/src/hooks/useFileManager.tsx b/src/hooks/useFileManager.tsx
index d670053e0d5..15e5a2073d7 100644
--- a/src/hooks/useFileManager.tsx
+++ b/src/hooks/useFileManager.tsx
@@ -224,7 +224,6 @@ export default function useFileManager(
 
   const urlCache = new Map<string, { url: string; timestamp: number }>();
   const CACHE_DURATION = 5 * 60 * 1000; // 5 min
-
   const cleanExpiredCache = () => {
     const now = Date.now();
     for (const [key, value] of urlCache.entries()) {
@@ -235,6 +234,10 @@ export default function useFileManager(
   };
 
   const getSignedUrl = async (file: FileUploadModel) => {
+    if (!file.id || !file.associating_id) {
+      throw new Error("Invalid file: missing id or associating_id");
+    }
+
     const cacheKey = `${file.id}-${file.associating_id}`;
     const cached = urlCache.get(cacheKey);
 
@@ -244,14 +247,23 @@ export default function useFileManager(
       return cached.url;
     }
 
-    const { data } = await request(routes.retrieveUpload, {
-      query: { file_type: fileType, associating_id: file.associating_id },
-      pathParams: { id: file.id || "" },
-    });
-    const url = data?.read_signed_url || "";
+    try {
+      const { data } = await request(routes.retrieveUpload, {
+        query: { file_type: fileType, associating_id: file.associating_id },
+        pathParams: { id: file.id },
+      });
 
-    urlCache.set(cacheKey, { url, timestamp: Date.now() });
-    return url;
+      if (!data?.read_signed_url) {
+        throw new Error("Failed to retrieve signed URL");
+      }
+
+      const url = data.read_signed_url;
+      urlCache.set(cacheKey, { url, timestamp: Date.now() });
+      return url;
+    } catch (error) {
+      Notification.Error({ msg: "Failed to get file URL" });
+      throw error;
+    }
   };
 
   const Dialogues = (