Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/mail/app/api/driver/google.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,9 @@ export const driver = async (config: IConfig): Promise<MailManager> => {
format: "metadata",
metadataHeaders: ["From", "Subject", "Date"],
});
const labelIds = [...new Set(msg.data.messages?.flatMap(message => message.labelIds || []))];
const message = msg.data.messages?.[0];
const parsed = parse(message as any);
const parsed = parse({ ...message, labelIds });
return {
...parsed,
body: "",
Expand Down
7 changes: 5 additions & 2 deletions apps/mail/components/mail/mail-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
import { EmptyState, type FolderType } from '@/components/mail/empty-state';
import { preloadThread, useThreads } from '@/hooks/use-threads';
import { cn, defaultPageSize, formatDate } from '@/lib/utils';
import { useHotKey, useKeyState } from '@/hooks/use-hot-key';
import { useSearchValue } from '@/hooks/use-search-value';
import { markAsRead, markAsUnread } from '@/actions/mail';
import { useFormatter, useTranslations } from 'next-intl';
import { ScrollArea } from '@/components/ui/scroll-area';
import { useMail } from '@/components/mail/use-mail';
import type { VirtuosoHandle } from 'react-virtuoso';
import { useHotKey, useKeyState } from '@/hooks/use-hot-key';
import { useSession } from '@/lib/auth-client';
import { Badge } from '@/components/ui/badge';
import { useNotes } from '@/hooks/use-notes';
Expand Down Expand Up @@ -449,7 +449,10 @@ export const MailList = memo(({ isCompact }: MailListProps) => {

return (
<>
<div ref={parentRef} className={cn('h-full w-full', getSelectMode() === 'range' && 'select-none')}>
<div
ref={parentRef}
className={cn('h-full w-full', getSelectMode() === 'range' && 'select-none')}
>
<Virtuoso
ref={scrollRef}
style={{ height: '100%' }}
Expand Down