void
- /** Clicks inside this node (e.g. avatar trigger) do not close the panel. */
containerRef: RefObject
}
@@ -25,7 +22,7 @@ function AccountRow({
account,
onSelect,
}: {
- account: UserAccount
+ account: ApiMailAccount
onSelect: () => void
}) {
return (
@@ -37,7 +34,7 @@ function AccountRow({
- {/* Other accounts + actions */}
- {account.displayName} + {account.name}
{account.email}
{activeAccount.email} @@ -121,19 +120,18 @@ export function AccountSwitcherDropdown({
- Bonjour {activeAccount.firstName} ! + Bonjour {firstName} !
-
-
- {/* Footer links */}
${email.snippet}
` + const [showFullThread, setShowFullThread] = useState(false) - const threadForReplies = threadRoot ?? email - const priorCount = Math.max( - 0, - (threadForReplies.threadMessageIds?.length ?? 1) - 1 - ) + + const priorMessages = useMemo(() => { + if (!threadMessages) return [] + return threadMessages.filter((m) => m.id !== email.id) + }, [threadMessages, email.id]) + + const priorCount = priorMessages.length const showRepliesCta = isSingleMessageView && !showFullThread && priorCount > 0 const conversation = - isSingleMessageView && !showFullThread - ? [] - : (showFullThread ? threadForReplies.conversation : email.conversation) ?? [] + isSingleMessageView && !showFullThread ? [] : priorMessages const hasConversation = conversation.length > 0 - const isSpamMessage = email.spam === true - // Track which conversation messages are expanded (by index). - // By default all previous messages are collapsed, only the last (main) is expanded. const [expandedIds, setExpandedIds] = useState
- {/* Spacer for floating nav buttons on xs */}
-
-
diff --git a/components/gmail/email-view/email-view-header.tsx b/components/gmail/email-view/email-view-header.tsx
index bf2e811..336ff91 100644
--- a/components/gmail/email-view/email-view-header.tsx
+++ b/components/gmail/email-view/email-view-header.tsx
@@ -9,9 +9,8 @@ import {
TooltipTrigger,
} from "@/components/ui/tooltip"
import { cn } from "@/lib/utils"
-import type { Email } from "@/lib/email-data"
+import type { ApiMessageSummary } from "@/lib/api/types"
import type { FolderTreeNode, LabelRowItem } from "@/lib/sidebar-nav-data"
-import { openConversationPrint } from "@/lib/print-conversation"
import { MailLabelPillStrip } from "@/components/gmail/mail-label-pills"
import {
MAIL_ICON_BTN,
@@ -81,9 +80,10 @@ const LABEL_DISPLAY_NAMES: Record
-
-
- ) : null}
-
- {/* Conversation messages */}
- {/* Previous messages in conversation */}
- {hasConversation && conversation.map((msg) => {
- const isExpanded = expandedIds.has(msg.id)
-
- if (isExpanded) {
- return (
-
- toggleExpanded(msg.id)}
- onPrintConversation={() => openConversationPrint(email)}
- />
-
- )
- }
-
- return (
-
- toggleExpanded(msg.id)}
- />
+ {showRepliesCta ? (
+ ${email.preview}`}
- isSpam={email.spam === true}
- isLast={true}
- starred={isStarred}
- attachments={mainMessageAttachments}
- onToggleStar={() => onToggleStar(email.id)}
- onPrintConversation={() => openConversationPrint(email)}
- />
+ {hasConversation &&
+ conversation.map((msg) => {
+ const isExpanded = expandedIds.has(msg.id)
- {showReplyForwardBar ? (
+ if (isExpanded) {
+ return (
+
+
- )
- })}
+ ) : null}
- {/* Last / main message — always expanded */}
-
+ toggleExpanded(msg.id)}
+ onPrintConversation={handlePrint}
+ />
+
+ )
+ }
+
+ return (
+
+ toggleExpanded(msg.id)}
+ />
+
+ )
+ })}
+
+ startThreadCompose("reply")}
className={MAIL_REPLY_BUTTON_CLASS}
>
-
- ) : null}
+ ) : null}
- {inlineCompose ? (
-
+ {inlineCompose ? (
+
- ) : null}
-
+ ) : null}
-
+
{name}
-
@@ -72,7 +72,7 @@ export function CollapsedMessage({
/>
{message.preview}
+{message.snippet}
+
+ )
+}
diff --git a/lib/api/adapters.ts b/lib/api/adapters.ts
new file mode 100644
index 0000000..3a1a04d
--- /dev/null
+++ b/lib/api/adapters.ts
@@ -0,0 +1,158 @@
+import type { ApiContact } from './types'
+import type { FullContact, ContactAddress } from '@/lib/contacts/types'
+
+interface VCardFields {
+ fn?: string
+ emails: { value: string; type: string }[]
+ phones: { value: string; type: string }[]
+ org?: string
+ title?: string
+ bday?: string
+ note?: string
+ nickname?: string
+ addresses: { street?: string; city?: string; region?: string; postalCode?: string; country?: string; type: string }[]
+}
+
+function parseVCard(raw: string): VCardFields {
+ const fields: VCardFields = { emails: [], phones: [], addresses: [] }
+
+ const lines: string[] = []
+ for (const line of raw.split(/\r?\n/)) {
+ if (/^\s/.test(line) && lines.length > 0) {
+ lines[lines.length - 1] += line.trimStart()
+ } else {
+ lines.push(line)
+ }
+ }
+
+ for (const line of lines) {
+ const colonIdx = line.indexOf(':')
+ if (colonIdx === -1) continue
+ const rawKey = line.slice(0, colonIdx)
+ const value = line.slice(colonIdx + 1).trim()
+ if (!value) continue
+
+ const keyParts = rawKey.split(';')
+ const propName = keyParts[0].toUpperCase()
+ const params = keyParts.slice(1).join(';').toUpperCase()
+ const typeMatch = params.match(/TYPE=([^;,]+)/i)
+ const type = typeMatch?.[1]?.toLowerCase() ?? 'other'
+
+ switch (propName) {
+ case 'FN':
+ fields.fn = value
+ break
+ case 'EMAIL':
+ fields.emails.push({ value, type })
+ break
+ case 'TEL':
+ fields.phones.push({ value, type })
+ break
+ case 'ORG':
+ fields.org = value.split(';')[0]
+ break
+ case 'TITLE':
+ fields.title = value
+ break
+ case 'BDAY': {
+ fields.bday = value
+ break
+ }
+ case 'NOTE':
+ fields.note = value
+ break
+ case 'NICKNAME':
+ fields.nickname = value
+ break
+ case 'ADR': {
+ const parts = value.split(';')
+ fields.addresses.push({
+ street: parts[2] || undefined,
+ city: parts[3] || undefined,
+ region: parts[4] || undefined,
+ postalCode: parts[5] || undefined,
+ country: parts[6] || undefined,
+ type,
+ })
+ break
+ }
+ }
+ }
+
+ return fields
+}
+
+function parseBday(raw: string): { day?: number; month?: number; year?: number } | undefined {
+ const m = raw.match(/^(\d{4})-?(\d{2})-?(\d{2})$/)
+ if (m) {
+ return { year: Number(m[1]), month: Number(m[2]), day: Number(m[3]) }
+ }
+ const partial = raw.match(/^--(\d{2})-?(\d{2})$/)
+ if (partial) {
+ return { month: Number(partial[1]), day: Number(partial[2]) }
+ }
+ return undefined
+}
+
+function splitName(fullName: string): { firstName: string; lastName: string } {
+ const parts = fullName.trim().split(/\s+/)
+ if (parts.length <= 1) return { firstName: parts[0] ?? '', lastName: '' }
+ return { firstName: parts[0], lastName: parts.slice(1).join(' ') }
+}
+
+export function apiContactToFullContact(api: ApiContact): FullContact {
+ const vcard = api.raw_vcard ? parseVCard(api.raw_vcard) : null
+
+ const { firstName, lastName } = splitName(vcard?.fn ?? api.full_name ?? '')
+
+ const emails: { value: string; label: string }[] = vcard?.emails.length
+ ? vcard.emails.map((e) => ({ value: e.value, label: e.type }))
+ : api.email
+ ? [{ value: api.email, label: 'personal' }]
+ : []
+
+ const phones: { value: string; label: string }[] = vcard?.phones.length
+ ? vcard.phones.map((p) => ({ value: p.value, label: p.type }))
+ : api.phone
+ ? [{ value: api.phone, label: 'mobile' }]
+ : []
+
+ const addresses: ContactAddress[] | undefined = vcard?.addresses.length
+ ? vcard.addresses.map((a) => ({
+ street: a.street,
+ city: a.city,
+ region: a.region,
+ postalCode: a.postalCode,
+ country: a.country,
+ label: a.type,
+ }))
+ : undefined
+
+ const birthday = vcard?.bday ? parseBday(vcard.bday) : undefined
+
+ return {
+ id: api.uid,
+ firstName,
+ lastName,
+ emails,
+ phones,
+ addresses,
+ company: vcard?.org ?? api.org,
+ jobTitle: vcard?.title,
+ birthday,
+ notes: vcard?.note,
+ nicknames: vcard?.nickname ? [vcard.nickname] : undefined,
+ createdAt: Date.now(),
+ updatedAt: Date.now(),
+ }
+}
+
+export function fullContactToApiContact(contact: FullContact): Partial
+ {syncState === "offline" && (
+ <>
+
+