From 2b8f2e7b59980cac75c8fb3c2a26b42f7bdaafe4 Mon Sep 17 00:00:00 2001
From: caitlin <caitzhermanus@gmail.com>
Date: Fri, 26 Jun 2026 17:16:18 +0200
Subject: [PATCH] Resolve merge conflicts in chats/page.tsx

---
 src/app/(dashboard)/chats/page.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/app/(dashboard)/chats/page.tsx b/src/app/(dashboard)/chats/page.tsx
index 10a5d75..e647e45 100644
--- a/src/app/(dashboard)/chats/page.tsx
+++ b/src/app/(dashboard)/chats/page.tsx
@@ -162,7 +162,7 @@ export default function ChatsPage() {
   const [searchingUsers, setSearchingUsers] = useState(false)
   const [unreadMap, setUnreadMap] = useState<Map<string, number>>(new Map())
   const [previewAvatarUrl, setPreviewAvatarUrl] = useState<string | null>(null)
-<<<<<<< HEAD
+  const [previewImageUrl, setPreviewImageUrl] = useState<string | null>(null)
   const [scheduleDialogOpen, setScheduleDialogOpen] = useState(false)
   const [scheduleTitle, setScheduleTitle] = useState("")
   const [scheduleDate, setScheduleDate] = useState("")
@@ -170,9 +170,6 @@ export default function ChatsPage() {
   const [scheduleDuration, setScheduleDuration] = useState("30")
   const [scheduleType, setScheduleType] = useState<string>("meeting")
   const [scheduleSaving, setScheduleSaving] = useState(false)
-=======
-  const [previewImageUrl, setPreviewImageUrl] = useState<string | null>(null)
->>>>>>> 21868fe336a205bcd2ef4a16283753f8dd3052bc
   const fileInputRef = useRef<HTMLInputElement>(null)
   const textareaRef = useRef<HTMLTextAreaElement>(null)
   const emojiPickerRef = useRef<HTMLDivElement>(null)
@@ -1349,9 +1346,6 @@ const formatPreviewContent = (content: string) => {
           </ScrollArea>
         </DialogContent>
       </Dialog>
-<<<<<<< Updated upstream
-=======
-
       <VoiceCallModal open={isCallModalOpen} onClose={() => setIsCallModalOpen(false)} />
       {/* Schedule from Chat Dialog */}
       <Dialog open={scheduleDialogOpen} onOpenChange={setScheduleDialogOpen}>
@@ -1446,7 +1440,6 @@ const formatPreviewContent = (content: string) => {
           </DialogFooter>
         </DialogContent>
       </Dialog>
->>>>>>> Stashed changes
     </div>
   )
 }