Resolve merge conflicts in chats/page.tsx

This commit is contained in:
2026-06-26 17:16:18 +02:00
parent fb99b49686
commit 2b8f2e7b59
+1 -8
View File
@@ -162,7 +162,7 @@ export default function ChatsPage() {
const [searchingUsers, setSearchingUsers] = useState(false) const [searchingUsers, setSearchingUsers] = useState(false)
const [unreadMap, setUnreadMap] = useState<Map<string, number>>(new Map()) const [unreadMap, setUnreadMap] = useState<Map<string, number>>(new Map())
const [previewAvatarUrl, setPreviewAvatarUrl] = useState<string | null>(null) const [previewAvatarUrl, setPreviewAvatarUrl] = useState<string | null>(null)
<<<<<<< HEAD const [previewImageUrl, setPreviewImageUrl] = useState<string | null>(null)
const [scheduleDialogOpen, setScheduleDialogOpen] = useState(false) const [scheduleDialogOpen, setScheduleDialogOpen] = useState(false)
const [scheduleTitle, setScheduleTitle] = useState("") const [scheduleTitle, setScheduleTitle] = useState("")
const [scheduleDate, setScheduleDate] = useState("") const [scheduleDate, setScheduleDate] = useState("")
@@ -170,9 +170,6 @@ export default function ChatsPage() {
const [scheduleDuration, setScheduleDuration] = useState("30") const [scheduleDuration, setScheduleDuration] = useState("30")
const [scheduleType, setScheduleType] = useState<string>("meeting") const [scheduleType, setScheduleType] = useState<string>("meeting")
const [scheduleSaving, setScheduleSaving] = useState(false) const [scheduleSaving, setScheduleSaving] = useState(false)
=======
const [previewImageUrl, setPreviewImageUrl] = useState<string | null>(null)
>>>>>>> 21868fe336a205bcd2ef4a16283753f8dd3052bc
const fileInputRef = useRef<HTMLInputElement>(null) const fileInputRef = useRef<HTMLInputElement>(null)
const textareaRef = useRef<HTMLTextAreaElement>(null) const textareaRef = useRef<HTMLTextAreaElement>(null)
const emojiPickerRef = useRef<HTMLDivElement>(null) const emojiPickerRef = useRef<HTMLDivElement>(null)
@@ -1349,9 +1346,6 @@ const formatPreviewContent = (content: string) => {
</ScrollArea> </ScrollArea>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
<<<<<<< Updated upstream
=======
<VoiceCallModal open={isCallModalOpen} onClose={() => setIsCallModalOpen(false)} /> <VoiceCallModal open={isCallModalOpen} onClose={() => setIsCallModalOpen(false)} />
{/* Schedule from Chat Dialog */} {/* Schedule from Chat Dialog */}
<Dialog open={scheduleDialogOpen} onOpenChange={setScheduleDialogOpen}> <Dialog open={scheduleDialogOpen} onOpenChange={setScheduleDialogOpen}>
@@ -1446,7 +1440,6 @@ const formatPreviewContent = (content: string) => {
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
>>>>>>> Stashed changes
</div> </div>
) )
} }