From 8ea84699a0828ba96c41d897592db8fa9ab40c18 Mon Sep 17 00:00:00 2001
From: Hans Kristian Flaatten <hans.kristian.flaatten@nav.no>
Date: Thu, 5 Feb 2026 09:59:17 +0100
Subject: [PATCH 1/4] feat: enhance SponsorCard with selection and email
 functionality

- Added selection checkbox and email button to SponsorCard component.
- Updated styles for selected state in SponsorCard.
- Introduced priority tags display for sponsors.
- Refactored invoice status and assignee display logic.

feat: create SponsorContactEditor for managing contact information

- Implemented SponsorContactEditor component to add, update, and remove contact persons.
- Added billing information management within the editor.
- Integrated notification system for success and error handling during updates.

feat: add bulk update and delete functionality for sponsors

- Implemented bulkUpdate and bulkDelete mutations in sponsor router.
- Created schemas for bulk update and delete operations.
- Enhanced error handling and logging for bulk operations.
---
 .../admin/api/sponsors/email/send/route.ts    |  85 +++
 .../admin/sponsors/crm/SponsorCRMClient.tsx   | 136 +++-
 src/app/(admin)/admin/sponsors/crm/page.tsx   |  16 +-
 src/components/admin/SponsorContactTable.tsx  | 543 +++-------------
 .../admin/SponsorIndividualEmailModal.tsx     | 171 +++++
 .../admin/sponsor-crm/SponsorBoardColumn.tsx  |  11 +
 .../admin/sponsor-crm/SponsorBulkActions.tsx  | 330 ++++++++++
 .../admin/sponsor-crm/SponsorCRMForm.tsx      | 605 +++++++++++-------
 .../admin/sponsor-crm/SponsorCard.tsx         | 163 +++--
 .../admin/sponsor/SponsorContactEditor.tsx    | 367 +++++++++++
 src/server/routers/sponsor.ts                 | 212 +++++-
 src/server/schemas/sponsorForConference.ts    |  19 +
 12 files changed, 1888 insertions(+), 770 deletions(-)
 create mode 100644 src/app/(admin)/admin/api/sponsors/email/send/route.ts
 create mode 100644 src/components/admin/SponsorIndividualEmailModal.tsx
 create mode 100644 src/components/admin/sponsor-crm/SponsorBulkActions.tsx
 create mode 100644 src/components/admin/sponsor/SponsorContactEditor.tsx

diff --git a/src/app/(admin)/admin/api/sponsors/email/send/route.ts b/src/app/(admin)/admin/api/sponsors/email/send/route.ts
new file mode 100644
index 00000000..33e84ae2
--- /dev/null
+++ b/src/app/(admin)/admin/api/sponsors/email/send/route.ts
@@ -0,0 +1,85 @@
+import { auth, NextAuthRequest } from '@/lib/auth'
+import {
+  setupEmailRoute,
+  convertPortableTextToHTML,
+  renderEmailTemplate,
+  createEmailSuccessResponse,
+  createEmailErrorResponse,
+} from '@/lib/email/route-helpers'
+import { resend, retryWithBackoff } from '@/lib/email/config'
+import { getSponsor } from '@/lib/sponsor/sanity'
+
+export const POST = auth(async (req: NextAuthRequest) => {
+  try {
+    const body = await req.json()
+    const { sponsorId } = body
+
+    if (!sponsorId) {
+      return createEmailErrorResponse('sponsorId is required', 400)
+    }
+
+    const { context, error } = await setupEmailRoute(req, body, {
+      sponsors: true,
+      sponsorContact: true,
+    })
+
+    if (error) return error
+
+    const { conference, messagePortableText, subject } = context!
+
+    // Fetch sponsor contacts
+    const { sponsor, error: sponsorError } = await getSponsor(sponsorId, true)
+    if (sponsorError || !sponsor) {
+      return createEmailErrorResponse(
+        sponsorError?.message || 'Sponsor not found',
+        404,
+      )
+    }
+
+    const contacts = 'contact_persons' in sponsor ? sponsor.contact_persons : []
+    const recipients = contacts
+      ?.filter((c) => c.email)
+      .map((c) => ({ email: c.email, name: c.name }))
+
+    if (!recipients || recipients.length === 0) {
+      return createEmailErrorResponse(
+        'Sponsor has no contact persons with email addresses',
+        400,
+      )
+    }
+
+    const { htmlContent, error: htmlError } =
+      await convertPortableTextToHTML(messagePortableText)
+    if (htmlError) return htmlError
+
+    const emailTemplate = renderEmailTemplate({
+      conference,
+      subject,
+      htmlContent: htmlContent!,
+    })
+
+    const result = await retryWithBackoff(async () => {
+      return await resend.emails.send({
+        from: `${conference.organizer || 'Cloud Native Days'} <${conference.sponsor_email}>`,
+        to: recipients.map((r) => r.email),
+        subject,
+        react: emailTemplate,
+      })
+    })
+
+    if (result.error) {
+      return createEmailErrorResponse(result.error.message, 500)
+    }
+
+    return createEmailSuccessResponse({
+      emailId: result.data?.id,
+      recipientCount: recipients.length,
+    })
+  } catch (err) {
+    console.error('[SponsorIndividualEmail] Unexpected error:', err)
+    return createEmailErrorResponse(
+      err instanceof Error ? err.message : 'Failed to send email',
+      500,
+    )
+  }
+})
diff --git a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
index 3ea5d52f..bfb967dd 100644
--- a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
+++ b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
@@ -9,25 +9,38 @@ import { useState, useEffect } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { SponsorCRMForm } from '@/components/admin/sponsor-crm/SponsorCRMForm'
 import { ImportHistoricSponsorsButton } from '@/components/admin/sponsor-crm/ImportHistoricSponsorsButton'
+import { SponsorIndividualEmailModal } from '@/components/admin/SponsorIndividualEmailModal'
 import {
   BoardViewSwitcher,
   type BoardView,
 } from '@/components/admin/sponsor-crm/BoardViewSwitcher'
 import { SponsorBoardColumn } from '@/components/admin/sponsor-crm/SponsorBoardColumn'
+import { SponsorBulkActions } from '@/components/admin/sponsor-crm/SponsorBulkActions'
 import { FilterDropdown, FilterOption } from '@/components/admin/FilterDropdown'
-import { XMarkIcon } from '@heroicons/react/20/solid'
+import { XMarkIcon, CheckIcon } from '@heroicons/react/20/solid'
+import { Conference } from '@/lib/conference/types'
 
 interface SponsorCRMClientProps {
   conferenceId: string
+  conference: Conference
+  domain: string
 }
 
-export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
+export function SponsorCRMClient({
+  conferenceId,
+  conference,
+  domain,
+}: SponsorCRMClientProps) {
   const router = useRouter()
   const searchParams = useSearchParams()
 
   const [selectedSponsor, setSelectedSponsor] =
     useState<SponsorForConferenceExpanded | null>(null)
+  const [emailSponsor, setEmailSponsor] =
+    useState<SponsorForConferenceExpanded | null>(null)
+  const [selectedIds, setSelectedIds] = useState<string[]>([])
   const [isFormOpen, setIsFormOpen] = useState(false)
+  const [isEmailModalOpen, setIsEmailModalOpen] = useState(false)
   const [currentView, setCurrentView] = useState<BoardView>('pipeline')
 
   // Parse filters from URL
@@ -82,6 +95,37 @@ export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
     setIsFormOpen(false)
   }
 
+  const handleOpenEmail = (sponsor: SponsorForConferenceExpanded) => {
+    setEmailSponsor(sponsor)
+    setIsEmailModalOpen(true)
+  }
+
+  const handleCloseEmail = () => {
+    setEmailSponsor(null)
+    setIsEmailModalOpen(false)
+  }
+
+  const handleToggleSelect = (id: string) => {
+    setSelectedIds((prev) =>
+      prev.includes(id) ? prev.filter((i) => i !== id) : [...prev, id],
+    )
+  }
+
+  const handleClearSelection = () => {
+    setSelectedIds([])
+  }
+
+  const handleSelectAllFiltered = () => {
+    const allFilteredIds = filteredSponsors.map((s) => s._id)
+    setSelectedIds(allFilteredIds)
+  }
+
+  // Clear selection when filters change to avoid accidental bulk updates on hidden items
+  useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect -- Clear selection when view/filters change
+    handleClearSelection()
+  }, [tiersFilter.length, assignedToFilter, tagsFilter?.length, currentView])
+
   // CMD+O / CTRL+O keyboard shortcut to open new sponsor form
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
@@ -238,19 +282,50 @@ export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
 
   const columns = getColumns()
 
+  if (!conferenceId) {
+    return (
+      <div className="flex h-64 items-center justify-center rounded-xl border-2 border-dashed border-gray-200 dark:border-gray-700">
+        <p className="text-gray-500">No conference selected</p>
+      </div>
+    )
+  }
+
   return (
     <div className="mt-8 space-y-4">
       {/* Form Modal */}
-      <SponsorCRMForm
-        conferenceId={conferenceId}
-        sponsor={selectedSponsor}
-        isOpen={isFormOpen}
-        onClose={handleCloseForm}
-        onSuccess={() => {
-          utils.sponsor.crm.list.invalidate()
-        }}
-        existingSponsorsInCRM={sponsors.map((s) => s.sponsor._id)}
-      />
+      {isFormOpen && (
+        <SponsorCRMForm
+          conferenceId={conferenceId}
+          conference={conference}
+          domain={domain}
+          sponsor={selectedSponsor}
+          isOpen={isFormOpen}
+          onClose={handleCloseForm}
+          onSuccess={() => {
+            utils.sponsor.crm.list.invalidate()
+          }}
+          existingSponsorsInCRM={sponsors.map((s) => s.sponsor._id)}
+        />
+      )}
+
+      {/* Email Modal */}
+      {emailSponsor && conference && (
+        <SponsorIndividualEmailModal
+          isOpen={isEmailModalOpen}
+          onClose={handleCloseEmail}
+          sponsorForConference={emailSponsor}
+          domain={domain}
+          fromEmail={conference.sponsor_email || ''}
+          conference={{
+            title: conference.title || '',
+            city: conference.city || '',
+            country: conference.country || '',
+            start_date: conference.start_date || '',
+            domains: conference.domains || [domain],
+            social_links: conference.social_links,
+          }}
+        />
+      )}
 
       {/* Filters and View Switcher */}
       <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
@@ -330,14 +405,23 @@ export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
 
           {/* Clear Filters */}
           {activeFilterCount > 0 && (
-            <button
-              onClick={clearAllFilters}
-              className="inline-flex items-center gap-1 rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600"
-            >
-              <XMarkIcon className="h-4 w-4" />
-              Clear {activeFilterCount}{' '}
-              {activeFilterCount === 1 ? 'filter' : 'filters'}
-            </button>
+            <div className="flex items-center gap-2">
+              <button
+                onClick={clearAllFilters}
+                className="inline-flex cursor-pointer items-center gap-1 rounded-md bg-gray-100 px-2.5 py-1.5 text-sm font-medium text-gray-700 hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600"
+              >
+                <XMarkIcon className="h-4 w-4" />
+                Clear {activeFilterCount}{' '}
+                {activeFilterCount === 1 ? 'filter' : 'filters'}
+              </button>
+              <button
+                onClick={handleSelectAllFiltered}
+                className="inline-flex cursor-pointer items-center gap-1 rounded-md bg-indigo-50 px-2.5 py-1.5 text-sm font-medium text-indigo-700 hover:bg-indigo-100 dark:bg-indigo-900/30 dark:text-indigo-300 dark:hover:bg-indigo-900/50"
+              >
+                <CheckIcon className="h-4 w-4" />
+                Select all filtered ({filteredSponsors.length})
+              </button>
+            </div>
           )}
         </div>
 
@@ -355,6 +439,15 @@ export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
         </div>
       </div>
 
+      {/* Bulk Actions Bar */}
+      <SponsorBulkActions
+        selectedIds={selectedIds}
+        onClearSelection={handleClearSelection}
+        onSuccess={() => {
+          utils.sponsor.crm.list.invalidate()
+        }}
+      />
+
       {/* Board Columns */}
       <div
         className={`grid grid-cols-1 gap-4 ${currentView === 'pipeline' ? 'lg:grid-cols-5' : currentView === 'invoice' ? 'lg:grid-cols-5' : 'lg:grid-cols-4'}`}
@@ -368,8 +461,11 @@ export function SponsorCRMClient({ conferenceId }: SponsorCRMClientProps) {
               title={column.label}
               sponsors={columnSponsors}
               isLoading={isLoading}
+              selectedIds={selectedIds}
               onSponsorClick={handleOpenForm}
               onSponsorDelete={handleDelete}
+              onSponsorEmail={handleOpenEmail}
+              onSponsorToggleSelect={handleToggleSelect}
               onAddClick={() => handleOpenForm()}
               emptyMessage="No sponsors"
             />
diff --git a/src/app/(admin)/admin/sponsors/crm/page.tsx b/src/app/(admin)/admin/sponsors/crm/page.tsx
index 72b9d9ff..7f1584c1 100644
--- a/src/app/(admin)/admin/sponsors/crm/page.tsx
+++ b/src/app/(admin)/admin/sponsors/crm/page.tsx
@@ -2,10 +2,18 @@ import { getConferenceForCurrentDomain } from '@/lib/conference/sanity'
 import { ErrorDisplay, AdminPageHeader } from '@/components/admin'
 import { SponsorCRMClient } from './SponsorCRMClient'
 import { BuildingOffice2Icon } from '@heroicons/react/24/outline'
+import { headers } from 'next/headers'
 
 export default async function AdminSponsorsCRM() {
+  const headerList = await headers()
+  const domain = headerList.get('host') || 'localhost:3000'
+
   const { conference, error: conferenceError } =
-    await getConferenceForCurrentDomain({})
+    await getConferenceForCurrentDomain({
+      sponsors: true,
+      sponsorContact: true,
+      sponsorTiers: true,
+    })
 
   if (conferenceError || !conference) {
     return (
@@ -27,7 +35,11 @@ export default async function AdminSponsorsCRM() {
         backLink={{ href: '/admin/sponsors', label: 'Back to Dashboard' }}
       />
 
-      <SponsorCRMClient conferenceId={conference._id} />
+      <SponsorCRMClient
+        conferenceId={conference._id}
+        conference={conference}
+        domain={domain}
+      />
     </div>
   )
 }
diff --git a/src/components/admin/SponsorContactTable.tsx b/src/components/admin/SponsorContactTable.tsx
index d5717338..b35039f0 100644
--- a/src/components/admin/SponsorContactTable.tsx
+++ b/src/components/admin/SponsorContactTable.tsx
@@ -1,21 +1,26 @@
 'use client'
 
+import { useState, useEffect, Fragment } from 'react'
 import { SponsorWithContactInfo, ContactPerson } from '@/lib/sponsor/types'
 import {
   EnvelopeIcon,
   BuildingOffice2Icon,
   ClipboardIcon,
   PencilIcon,
-  CheckIcon as CheckIconOutline,
   XMarkIcon,
-  PlusIcon,
 } from '@heroicons/react/24/outline'
 import { CheckIcon } from '@heroicons/react/24/solid'
-import { useState, useEffect } from 'react'
-import { ContactRoleSelect } from '@/components/common/ContactRoleSelect'
 import { api } from '@/lib/trpc/client'
 import { useNotification } from './NotificationProvider'
 import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+import { SponsorContactEditor } from './sponsor/SponsorContactEditor'
+import {
+  Dialog,
+  DialogPanel,
+  DialogTitle,
+  Transition,
+  TransitionChild,
+} from '@headlessui/react'
 
 interface SponsorContactTableProps {
   sponsors: SponsorWithContactInfo[]
@@ -63,235 +68,33 @@ interface ContactRow {
   isFirstContactForSponsor: boolean
 }
 
-interface EditingContact {
-  name: string
-  email: string
-  phone: string
-  role: string
-  billing?: {
-    email: string
-    reference: string
-    comments: string
-  }
-}
-
 export function SponsorContactTable({
   sponsors: initialSponsors,
 }: SponsorContactTableProps) {
   const [sponsors, setSponsors] =
     useState<SponsorWithContactInfo[]>(initialSponsors)
-  const [editingRowId, setEditingRowId] = useState<string | null>(null)
-  const [editingContact, setEditingContact] = useState<EditingContact>({
-    name: '',
-    email: '',
-    phone: '',
-    role: '',
-    billing: {
-      email: '',
-      reference: '',
-      comments: '',
-    },
-  })
-  const [savingRowId, setSavingRowId] = useState<string | null>(null)
-  const { showNotification } = useNotification()
+  const [editingSponsor, setEditingSponsor] =
+    useState<SponsorWithContactInfo | null>(null)
   const utils = api.useUtils()
 
   useEffect(() => {
     setSponsors(initialSponsors)
   }, [initialSponsors])
 
-  const resetEditingState = () => {
-    setEditingRowId(null)
-    setEditingContact({
-      name: '',
-      email: '',
-      phone: '',
-      role: '',
-      billing: {
-        email: '',
-        reference: '',
-        comments: '',
-      },
-    })
-  }
-
-  const updateSponsorMutation = api.sponsor.update.useMutation({
-    onSuccess: async (updatedSponsor) => {
-      setSponsors((prevSponsors) =>
-        prevSponsors.map((sponsor) =>
-          sponsor._id === updatedSponsor._id ? updatedSponsor : sponsor,
-        ),
-      )
-
-      await utils.sponsor.list.invalidate()
-
-      showNotification({
-        type: 'success',
-        title: 'Contact updated',
-        message: 'Sponsor contact information has been successfully updated.',
-      })
-      setSavingRowId(null)
-      resetEditingState()
-    },
-    onError: (error: { message: string }) => {
-      showNotification({
-        type: 'error',
-        title: 'Update failed',
-        message:
-          error.message ||
-          'Failed to update contact information. Please try again.',
-      })
-      setSavingRowId(null)
-    },
-  })
-
-  const handleStartEdit = (row: ContactRow) => {
-    const rowId = `${row.sponsor._id}-${row.contact._key}`
-    setEditingRowId(rowId)
-    setEditingContact({
-      name: row.contact.name || '',
-      email: row.contact.email || '',
-      phone: row.contact.phone || '',
-      role: row.contact.role || '',
-      billing: {
-        email: row.sponsor.billing?.email || '',
-        reference: row.sponsor.billing?.reference || '',
-        comments: row.sponsor.billing?.comments || '',
-      },
-    })
-  }
-
-  const handleCancelEdit = () => {
-    resetEditingState()
+  const handleStartEdit = (sponsor: SponsorWithContactInfo) => {
+    setEditingSponsor(sponsor)
   }
 
-  const handleAddContact = (sponsorId: string) => {
-    const newRowId = `${sponsorId}-new-contact-${Date.now()}`
-    setEditingRowId(newRowId)
-    setEditingContact({
-      name: '',
-      email: '',
-      phone: '',
-      role: '',
-      billing: {
-        email: '',
-        reference: '',
-        comments: '',
-      },
-    })
+  const handleCloseEdit = () => {
+    setEditingSponsor(null)
   }
 
-  const handleSaveEdit = async (row: ContactRow) => {
-    const rowId = `${row.sponsor._id}-${row.contact._key}`
-
-    if (
-      editingContact.role === 'Billing Reference' &&
-      !editingContact.billing?.email
-    ) {
-      showNotification({
-        type: 'warning',
-        title: 'Billing email required',
-        message:
-          'Please provide a billing email for Billing Reference contacts.',
-      })
-      return
-    }
-
-    setSavingRowId(rowId)
-
-    try {
-      let updatedContactPersons: ContactPerson[]
-
-      if (
-        row.contact._key === 'no-contact' ||
-        row.contact._key === 'new-contact-temp'
-      ) {
-        const newContact: ContactPerson = {
-          // eslint-disable-next-line react-hooks/purity -- Unique key generation for new contact
-          _key: `contact-${Date.now()}`,
-          name: editingContact.name,
-          email: editingContact.email,
-          phone: editingContact.phone || undefined,
-          role: editingContact.role || undefined,
-        }
-
-        if (row.contact._key === 'no-contact') {
-          updatedContactPersons = [newContact]
-        } else {
-          updatedContactPersons = [
-            ...(row.sponsor.contact_persons || []),
-            newContact,
-          ]
-        }
-      } else {
-        updatedContactPersons =
-          row.sponsor.contact_persons?.map((contact) =>
-            contact._key === row.contact._key
-              ? {
-                  ...contact,
-                  name: editingContact.name,
-                  email: editingContact.email,
-                  phone: editingContact.phone || undefined,
-                  role: editingContact.role || undefined,
-                }
-              : contact,
-          ) || []
-      }
-
-      const isBillingReference = editingContact.role === 'Billing Reference'
-      let billingData = undefined
-
-      if (isBillingReference && editingContact.billing?.email?.trim()) {
-        billingData = {
-          email: editingContact.billing.email.trim(),
-          reference: editingContact.billing.reference?.trim() || undefined,
-          comments: editingContact.billing.comments?.trim() || undefined,
-        }
-      } else if (
-        !isBillingReference &&
-        row.sponsor.billing &&
-        row.sponsor.billing.email
-      ) {
-        billingData = {
-          email: row.sponsor.billing.email,
-          reference: row.sponsor.billing.reference || undefined,
-          comments: row.sponsor.billing.comments || undefined,
-        }
-      }
-
-      const updateData: {
-        name: string
-        website: string
-        logo: string
-        org_number?: string
-        contact_persons: ContactPerson[]
-        billing?: {
-          email: string
-          reference?: string
-          comments?: string
-        }
-      } = {
-        name: row.sponsor.name,
-        website: row.sponsor.website,
-        logo: row.sponsor.logo,
-        contact_persons: updatedContactPersons,
-      }
-
-      if (row.sponsor.org_number) {
-        updateData.org_number = row.sponsor.org_number
-      }
-
-      if (billingData && billingData.email && billingData.email.trim()) {
-        updateData.billing = billingData
-      }
-
-      await updateSponsorMutation.mutateAsync({
-        id: row.sponsor._id,
-        data: updateData,
-      })
-    } catch {
-      // Silently fail - error will be shown by mutation's onError handler
-    }
+  const handleUpdateSuccess = (updatedSponsor: SponsorWithContactInfo) => {
+    setSponsors((prev) =>
+      prev.map((s) => (s._id === updatedSponsor._id ? updatedSponsor : s)),
+    )
+    handleCloseEdit()
+    utils.sponsor.list.invalidate()
   }
 
   const contactRows: ContactRow[] = []
@@ -305,23 +108,6 @@ export function SponsorContactTable({
           isFirstContactForSponsor: index === 0,
         })
       })
-
-      if (
-        editingRowId &&
-        editingRowId.startsWith(`${sponsor._id}-new-contact-`)
-      ) {
-        contactRows.push({
-          sponsor,
-          contact: {
-            _key: 'new-contact-temp',
-            name: '',
-            email: '',
-            phone: '',
-            role: '',
-          },
-          isFirstContactForSponsor: false,
-        })
-      }
     } else {
       contactRows.push({
         sponsor,
@@ -351,43 +137,101 @@ export function SponsorContactTable({
 
   return (
     <div className="overflow-x-auto">
+      {/* Editor Modal */}
+      <Transition appear show={!!editingSponsor} as={Fragment}>
+        <Dialog as="div" className="relative z-50" onClose={handleCloseEdit}>
+          <TransitionChild
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 bg-black/25 backdrop-blur-xs dark:bg-black/50" />
+          </TransitionChild>
+
+          <div className="fixed inset-0 overflow-y-auto">
+            <div className="flex min-h-full items-center justify-center p-4 text-center">
+              <TransitionChild
+                as={Fragment}
+                enter="ease-out duration-300"
+                enterFrom="opacity-0 scale-95"
+                enterTo="opacity-100 scale-100"
+                leave="ease-in duration-200"
+                leaveFrom="opacity-100 scale-100"
+                leaveTo="opacity-0 scale-95"
+              >
+                <DialogPanel className="w-full max-w-2xl transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all dark:bg-gray-900">
+                  <div className="mb-4 flex items-center justify-between">
+                    <DialogTitle
+                      as="h3"
+                      className="font-space-grotesk text-xl font-bold text-gray-900 dark:text-white"
+                    >
+                      Manage Contacts: {editingSponsor?.name}
+                    </DialogTitle>
+                    <button
+                      onClick={handleCloseEdit}
+                      className="rounded-full p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-500 dark:hover:bg-gray-800 dark:hover:text-gray-300"
+                    >
+                      <XMarkIcon className="h-6 w-6" />
+                    </button>
+                  </div>
+
+                  {editingSponsor && (
+                    <div className="mt-2">
+                      <SponsorContactEditor
+                        sponsor={editingSponsor}
+                        onSuccess={handleUpdateSuccess}
+                        onCancel={handleCloseEdit}
+                      />
+                    </div>
+                  )}
+                </DialogPanel>
+              </TransitionChild>
+            </div>
+          </div>
+        </Dialog>
+      </Transition>
+
       <div className="overflow-hidden shadow-sm ring-1 ring-gray-200 md:rounded-lg dark:ring-gray-700">
         <table className="min-w-full divide-y divide-gray-300 dark:divide-gray-700">
           <thead className="bg-gray-50 dark:bg-gray-800">
             <tr>
               <th
                 scope="col"
-                className="min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
+                className="px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
               >
                 Sponsor
               </th>
               <th
                 scope="col"
-                className="min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
+                className="px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
               >
                 Contact Name
               </th>
               <th
                 scope="col"
-                className="min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
+                className="px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
               >
                 Contact Email
               </th>
               <th
                 scope="col"
-                className="hidden min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase sm:table-cell dark:text-gray-400"
+                className="hidden px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase sm:table-cell dark:text-gray-400"
               >
                 Phone
               </th>
               <th
                 scope="col"
-                className="hidden min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase md:table-cell dark:text-gray-400"
+                className="hidden px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase md:table-cell dark:text-gray-400"
               >
                 Role
               </th>
               <th
                 scope="col"
-                className="min-w-0 px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
+                className="px-4 py-3 text-left text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400"
               >
                 Billing Info
               </th>
@@ -401,15 +245,6 @@ export function SponsorContactTable({
           </thead>
           <tbody className="divide-y divide-gray-200 bg-white dark:divide-gray-700 dark:bg-gray-900">
             {contactRows.map((row, index) => {
-              const rowId =
-                row.contact._key === 'new-contact-temp' &&
-                editingRowId?.startsWith(`${row.sponsor._id}-new-contact-`)
-                  ? editingRowId
-                  : `${row.sponsor._id}-${row.contact._key}`
-              const isEditing = editingRowId === rowId
-              const isSaving =
-                savingRowId === rowId || updateSponsorMutation.isPending
-
               return (
                 <tr
                   key={`${row.sponsor._id}-${row.contact._key}-${index}`}
@@ -417,7 +252,7 @@ export function SponsorContactTable({
                 >
                   <td className="px-4 py-3">
                     <div className="min-w-0">
-                      <div className="truncate text-sm font-medium text-gray-900 dark:text-white">
+                      <div className="text-sm font-medium text-gray-900 dark:text-white">
                         {row.sponsor.name}
                       </div>
                       {row.sponsor.org_number && (
@@ -428,24 +263,7 @@ export function SponsorContactTable({
                     </div>
                   </td>
                   <td className="px-4 py-3">
-                    {isEditing ? (
-                      <input
-                        type="text"
-                        value={editingContact.name}
-                        onChange={(e) =>
-                          setEditingContact({
-                            ...editingContact,
-                            name: e.target.value,
-                          })
-                        }
-                        className="w-full rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                        placeholder="Contact name"
-                      />
-                    ) : row.contact._key === 'new-contact-temp' ? (
-                      <div className="text-sm text-gray-500 italic dark:text-gray-400">
-                        Add new contact
-                      </div>
-                    ) : row.contact.name ? (
+                    {row.contact.name ? (
                       <div className="text-sm text-gray-900 dark:text-white">
                         {row.contact.name}
                       </div>
@@ -456,24 +274,7 @@ export function SponsorContactTable({
                     )}
                   </td>
                   <td className="px-4 py-3">
-                    {isEditing ? (
-                      <input
-                        type="email"
-                        value={editingContact.email}
-                        onChange={(e) =>
-                          setEditingContact({
-                            ...editingContact,
-                            email: e.target.value,
-                          })
-                        }
-                        className="w-full rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                        placeholder="Email address"
-                      />
-                    ) : row.contact._key === 'new-contact-temp' ? (
-                      <div className="text-sm text-gray-500 italic dark:text-gray-400">
-                        -
-                      </div>
-                    ) : row.contact.email ? (
+                    {row.contact.email ? (
                       <div className="flex items-center">
                         <a
                           href={`mailto:${row.contact.email}`}
@@ -491,24 +292,7 @@ export function SponsorContactTable({
                     )}
                   </td>
                   <td className="hidden px-4 py-3 sm:table-cell">
-                    {isEditing ? (
-                      <input
-                        type="tel"
-                        value={editingContact.phone}
-                        onChange={(e) =>
-                          setEditingContact({
-                            ...editingContact,
-                            phone: e.target.value,
-                          })
-                        }
-                        className="w-full rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                        placeholder="Phone number"
-                      />
-                    ) : row.contact._key === 'new-contact-temp' ? (
-                      <div className="text-sm text-gray-500 italic dark:text-gray-400">
-                        -
-                      </div>
-                    ) : row.contact.phone ? (
+                    {row.contact.phone ? (
                       <a
                         href={`tel:${row.contact.phone}`}
                         className="text-sm text-gray-900 hover:text-blue-600 dark:text-white dark:hover:text-blue-400"
@@ -523,23 +307,7 @@ export function SponsorContactTable({
                     )}
                   </td>
                   <td className="hidden px-4 py-3 md:table-cell">
-                    {isEditing ? (
-                      <ContactRoleSelect
-                        value={editingContact.role}
-                        onChange={(value) =>
-                          setEditingContact({
-                            ...editingContact,
-                            role: value,
-                          })
-                        }
-                        className="w-full"
-                        placeholder="Select role..."
-                      />
-                    ) : row.contact._key === 'new-contact-temp' ? (
-                      <div className="text-sm text-gray-500 italic dark:text-gray-400">
-                        -
-                      </div>
-                    ) : row.contact.role ? (
+                    {row.contact.role ? (
                       <div className="text-sm text-gray-900 dark:text-white">
                         {row.contact.role}
                       </div>
@@ -552,61 +320,7 @@ export function SponsorContactTable({
                   <td className="px-4 py-3">
                     {row.isFirstContactForSponsor && (
                       <div className="space-y-1">
-                        {isEditing &&
-                        editingContact.role === 'Billing Reference' ? (
-                          <>
-                            <div className="mb-2 text-xs font-medium text-gray-700 dark:text-gray-300">
-                              Edit Billing Information
-                            </div>
-                            <div className="space-y-2">
-                              <input
-                                type="email"
-                                value={editingContact.billing?.email || ''}
-                                onChange={(e) =>
-                                  setEditingContact({
-                                    ...editingContact,
-                                    billing: {
-                                      ...editingContact.billing!,
-                                      email: e.target.value,
-                                    },
-                                  })
-                                }
-                                className="w-full rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                                placeholder="Billing email"
-                              />
-                              <input
-                                type="text"
-                                value={editingContact.billing?.reference || ''}
-                                onChange={(e) =>
-                                  setEditingContact({
-                                    ...editingContact,
-                                    billing: {
-                                      ...editingContact.billing!,
-                                      reference: e.target.value,
-                                    },
-                                  })
-                                }
-                                className="w-full rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                                placeholder="Billing reference"
-                              />
-                              <textarea
-                                value={editingContact.billing?.comments || ''}
-                                onChange={(e) =>
-                                  setEditingContact({
-                                    ...editingContact,
-                                    billing: {
-                                      ...editingContact.billing!,
-                                      comments: e.target.value,
-                                    },
-                                  })
-                                }
-                                className="w-full resize-none rounded border border-gray-300 px-2 py-1 text-sm focus:border-blue-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:text-white"
-                                placeholder="Comments"
-                                rows={2}
-                              />
-                            </div>
-                          </>
-                        ) : row.sponsor.billing && row.sponsor.billing.email ? (
+                        {row.sponsor.billing && row.sponsor.billing.email ? (
                           <>
                             <div className="flex items-center text-sm text-gray-900 dark:text-white">
                               <EnvelopeIcon className="mr-2 h-4 w-4 shrink-0 text-gray-400 dark:text-gray-500" />
@@ -642,74 +356,13 @@ export function SponsorContactTable({
                   </td>
                   <td className="px-4 py-3">
                     <div className="flex items-center gap-1">
-                      {isEditing ? (
-                        <>
-                          <button
-                            onClick={() => handleSaveEdit(row)}
-                            disabled={isSaving}
-                            className="inline-flex items-center rounded p-1 text-green-600 hover:bg-green-50 disabled:opacity-50 dark:text-green-400 dark:hover:bg-green-900/20"
-                            title={
-                              isSaving ? 'Saving changes...' : 'Save changes'
-                            }
-                          >
-                            {isSaving ? (
-                              <svg
-                                className="h-4 w-4 animate-spin text-green-600 dark:text-green-400"
-                                xmlns="http://www.w3.org/2000/svg"
-                                fill="none"
-                                viewBox="0 0 24 24"
-                              >
-                                <circle
-                                  className="opacity-25"
-                                  cx="12"
-                                  cy="12"
-                                  r="10"
-                                  stroke="currentColor"
-                                  strokeWidth="2"
-                                ></circle>
-                                <path
-                                  className="opacity-75"
-                                  fill="currentColor"
-                                  d="m4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                                ></path>
-                              </svg>
-                            ) : (
-                              <CheckIconOutline className="h-4 w-4" />
-                            )}
-                          </button>
-                          <button
-                            onClick={handleCancelEdit}
-                            disabled={isSaving}
-                            className="inline-flex items-center rounded p-1 text-gray-600 hover:bg-gray-50 disabled:opacity-50 dark:text-gray-400 dark:hover:bg-gray-700"
-                            title="Cancel editing"
-                          >
-                            <XMarkIcon className="h-4 w-4" />
-                          </button>
-                        </>
-                      ) : (
-                        <>
-                          <button
-                            onClick={() => handleStartEdit(row)}
-                            className="inline-flex items-center rounded p-1 text-blue-600 hover:bg-blue-50 dark:text-blue-400 dark:hover:bg-blue-900/20"
-                            title={
-                              row.contact._key === 'no-contact'
-                                ? 'Add contact'
-                                : 'Edit contact'
-                            }
-                          >
-                            <PencilIcon className="h-4 w-4" />
-                          </button>
-                          {row.contact._key !== 'no-contact' && (
-                            <button
-                              onClick={() => handleAddContact(row.sponsor._id)}
-                              className="inline-flex items-center rounded p-1 text-green-600 hover:bg-green-50 dark:text-green-400 dark:hover:bg-green-900/20"
-                              title="Add another contact"
-                            >
-                              <PlusIcon className="h-4 w-4" />
-                            </button>
-                          )}
-                        </>
-                      )}
+                      <button
+                        onClick={() => handleStartEdit(row.sponsor)}
+                        className="inline-flex items-center rounded p-1 text-blue-600 hover:bg-blue-50 dark:text-blue-400 dark:hover:bg-blue-900/20"
+                        title="Manage contacts"
+                      >
+                        <PencilIcon className="h-4 w-4" />
+                      </button>
                     </div>
                   </td>
                 </tr>
diff --git a/src/components/admin/SponsorIndividualEmailModal.tsx b/src/components/admin/SponsorIndividualEmailModal.tsx
new file mode 100644
index 00000000..99a088b7
--- /dev/null
+++ b/src/components/admin/SponsorIndividualEmailModal.tsx
@@ -0,0 +1,171 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import { useNotification } from './NotificationProvider'
+import { EmailModal } from './EmailModal'
+import { SponsorForConferenceExpanded } from '@/lib/sponsor-crm/types'
+import { SponsorWithContactInfo } from '@/lib/sponsor/types'
+import { BroadcastTemplate } from '@/components/email/BroadcastTemplate'
+import { convertStringToPortableTextBlocks } from '@/lib/proposal'
+import { PortableTextBlock } from '@portabletext/editor'
+import { PortableTextBlock as PortableTextBlockForHTML } from '@portabletext/types'
+import { formatConferenceDateLong } from '@/lib/time'
+import { createLocalhostWarning } from '@/lib/localhost-warning'
+import { api } from '@/lib/trpc/client'
+
+interface SponsorIndividualEmailModalProps {
+  isOpen: boolean
+  onClose: () => void
+  sponsorForConference: SponsorForConferenceExpanded
+  domain: string
+  fromEmail: string
+  conference: {
+    title: string
+    city: string
+    country: string
+    start_date: string
+    domains: string[]
+    social_links?: string[]
+  }
+}
+
+export function SponsorIndividualEmailModal({
+  isOpen,
+  onClose,
+  sponsorForConference,
+  domain,
+  fromEmail,
+  conference,
+}: SponsorIndividualEmailModalProps) {
+  const { showNotification } = useNotification()
+  const [initialMessage, setInitialMessage] = useState<PortableTextBlock[]>([])
+  const [fullSponsor, setFullSponsor] = useState<SponsorWithContactInfo | null>(
+    null,
+  )
+
+  const { data: sponsorData, isLoading: isLoadingSponsor } =
+    api.sponsor.getById.useQuery(
+      { id: sponsorForConference.sponsor._id, includeContactInfo: true },
+      { enabled: isOpen },
+    )
+
+  useEffect(() => {
+    if (sponsorData) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- Initialize sponsor data when fetched
+      setFullSponsor(sponsorData as SponsorWithContactInfo)
+    }
+  }, [sponsorData])
+
+  useEffect(() => {
+    if (isOpen) {
+      const greeting = `Dear ${sponsorForConference.sponsor.name} team,\n\n`
+      const portableTextBlocks = convertStringToPortableTextBlocks(greeting)
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- Initialize message template on modal open
+      setInitialMessage(portableTextBlocks)
+    }
+  }, [isOpen, sponsorForConference.sponsor.name])
+
+  const defaultSubject = `Regarding your sponsorship for ${conference.title}`
+
+  const handleSend = async ({
+    subject,
+    message,
+  }: {
+    subject: string
+    message: PortableTextBlock[]
+  }) => {
+    const messageJSON = JSON.stringify(message as PortableTextBlockForHTML[])
+
+    const response = await fetch('/admin/api/sponsors/email/send', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        sponsorId: sponsorForConference.sponsor._id,
+        subject,
+        message: messageJSON,
+      }),
+    })
+
+    if (!response.ok) {
+      const errorData = await response.json()
+      throw new Error(errorData.error || 'Failed to send email')
+    }
+
+    const result = await response.json()
+
+    showNotification({
+      type: 'success',
+      title: 'Email sent successfully',
+      message: `Email sent to ${result.recipientCount} contact${result.recipientCount > 1 ? 's' : ''} for ${sponsorForConference.sponsor.name}`,
+    })
+  }
+
+  const localhostWarning = createLocalhostWarning(domain, 'sponsors')
+
+  const createPreview = ({
+    subject,
+    messageHTML,
+  }: {
+    subject: string
+    messageHTML: string
+  }) => {
+    return (
+      <BroadcastTemplate
+        subject={subject}
+        eventName={conference.title}
+        eventLocation={`${conference.city}, ${conference.country}`}
+        eventDate={formatConferenceDateLong(conference.start_date)}
+        eventUrl={`https://${conference.domains[0]}`}
+        socialLinks={conference.social_links || []}
+        content={<div dangerouslySetInnerHTML={{ __html: messageHTML }} />}
+      />
+    )
+  }
+
+  const contacts = fullSponsor?.contact_persons || []
+  const recipientDisplay =
+    contacts.length > 0 ? (
+      <div className="flex flex-wrap gap-2">
+        {contacts.map((contact, index) => (
+          <span
+            key={index}
+            className="font-inter rounded-full bg-brand-sky-mist px-3 py-1 text-sm text-brand-slate-gray dark:bg-gray-700 dark:text-gray-300"
+          >
+            {contact.name} &lt;{contact.email}&gt;
+          </span>
+        ))}
+      </div>
+    ) : isLoadingSponsor ? (
+      <span className="animate-pulse text-sm text-gray-500">
+        Loading contacts...
+      </span>
+    ) : (
+      <span className="text-sm text-red-500">No contact persons found</span>
+    )
+
+  return (
+    <EmailModal
+      isOpen={isOpen}
+      onClose={onClose}
+      title="Compose Sponsor Email"
+      recipientInfo={recipientDisplay}
+      contextInfo={`Sponsor: ${sponsorForConference.sponsor.name}`}
+      onSend={handleSend}
+      submitButtonText="Send Email"
+      storageKey={`sponsor-individual-email-${sponsorForConference._id}`}
+      warningContent={localhostWarning}
+      previewComponent={createPreview}
+      fromAddress={fromEmail}
+      initialValues={{
+        subject: defaultSubject,
+        message: initialMessage,
+      }}
+      placeholder={{
+        subject: 'Enter email subject...',
+        message: 'Enter your message here...',
+      }}
+    />
+  )
+}
diff --git a/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx b/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
index 0ebea9b3..65b88522 100644
--- a/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
+++ b/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
@@ -10,8 +10,11 @@ interface SponsorBoardColumnProps {
   title: string
   sponsors: SponsorForConferenceExpanded[]
   isLoading?: boolean
+  selectedIds?: string[]
   onSponsorClick: (sponsor: SponsorForConferenceExpanded) => void
   onSponsorDelete: (sponsorId: string) => void
+  onSponsorEmail?: (sponsor: SponsorForConferenceExpanded) => void
+  onSponsorToggleSelect?: (id: string) => void
   onAddClick: () => void
   emptyMessage?: string
 }
@@ -20,8 +23,11 @@ export function SponsorBoardColumn({
   title,
   sponsors,
   isLoading = false,
+  selectedIds = [],
   onSponsorClick,
   onSponsorDelete,
+  onSponsorEmail,
+  onSponsorToggleSelect,
   onAddClick,
   emptyMessage = 'No sponsors',
 }: SponsorBoardColumnProps) {
@@ -79,8 +85,13 @@ export function SponsorBoardColumn({
               <SponsorCard
                 key={sponsor._id}
                 sponsor={sponsor}
+                isSelected={selectedIds.includes(sponsor._id)}
+                onToggleSelect={() => onSponsorToggleSelect?.(sponsor._id)}
                 onEdit={() => onSponsorClick(sponsor)}
                 onDelete={() => onSponsorDelete(sponsor._id)}
+                onEmail={
+                  onSponsorEmail ? () => onSponsorEmail(sponsor) : undefined
+                }
               />
             ))}
 
diff --git a/src/components/admin/sponsor-crm/SponsorBulkActions.tsx b/src/components/admin/sponsor-crm/SponsorBulkActions.tsx
new file mode 100644
index 00000000..1b5811e9
--- /dev/null
+++ b/src/components/admin/sponsor-crm/SponsorBulkActions.tsx
@@ -0,0 +1,330 @@
+'use client'
+
+import { useState } from 'react'
+import {
+  SponsorStatus,
+  ContractStatus,
+  InvoiceStatus,
+  SponsorTag,
+} from '@/lib/sponsor-crm/types'
+import { STATUSES, TAGS } from './form/constants'
+import { api } from '@/lib/trpc/client'
+import { useNotification } from '@/components/admin/NotificationProvider'
+import {
+  XMarkIcon,
+  ChevronDownIcon,
+  UserPlusIcon,
+  TagIcon,
+  ArrowPathIcon,
+  TrashIcon,
+} from '@heroicons/react/24/outline'
+import {
+  Menu,
+  MenuButton,
+  MenuItem,
+  MenuItems,
+  Transition,
+} from '@headlessui/react'
+import clsx from 'clsx'
+
+interface SponsorBulkActionsProps {
+  selectedIds: string[]
+  onClearSelection: () => void
+  onSuccess: () => void
+}
+
+interface BulkUpdateParams {
+  status?: SponsorStatus
+  contract_status?: ContractStatus
+  invoice_status?: InvoiceStatus
+  assigned_to?: string | null
+  tags?: SponsorTag[]
+  add_tags?: SponsorTag[]
+  remove_tags?: SponsorTag[]
+}
+
+export function SponsorBulkActions({
+  selectedIds,
+  onClearSelection,
+  onSuccess,
+}: SponsorBulkActionsProps) {
+  const { showNotification } = useNotification()
+  const utils = api.useUtils()
+  const [isProcessing, setIsProcessing] = useState(false)
+
+  const bulkUpdateMutation = api.sponsor.crm.bulkUpdate.useMutation({
+    onSuccess: (result) => {
+      showNotification({
+        type: 'success',
+        title: 'Bulk update successful',
+        message: `Updated ${result.updatedCount} of ${result.totalCount} selected sponsors.`,
+      })
+      utils.sponsor.crm.list.invalidate()
+      onSuccess()
+      onClearSelection()
+      setIsProcessing(false)
+    },
+    onError: (error) => {
+      showNotification({
+        type: 'error',
+        title: 'Bulk update failed',
+        message: error.message || 'An error occurred during bulk update.',
+      })
+      setIsProcessing(false)
+    },
+  })
+
+  const bulkDeleteMutation = api.sponsor.crm.bulkDelete.useMutation({
+    onSuccess: (result) => {
+      showNotification({
+        type: 'success',
+        title: 'Bulk delete successful',
+        message: `Deleted ${result.deletedCount} of ${result.totalCount} selected sponsors.`,
+      })
+      utils.sponsor.crm.list.invalidate()
+      onSuccess()
+      onClearSelection()
+      setIsProcessing(false)
+    },
+    onError: (error) => {
+      showNotification({
+        type: 'error',
+        title: 'Bulk delete failed',
+        message: error.message || 'An error occurred during bulk delete.',
+      })
+      setIsProcessing(false)
+    },
+  })
+
+  const { data: organizers = [] } = api.sponsor.crm.listOrganizers.useQuery()
+
+  const handleUpdate = async (updates: BulkUpdateParams) => {
+    setIsProcessing(true)
+    await bulkUpdateMutation.mutateAsync({
+      ids: selectedIds,
+      ...updates,
+    })
+  }
+
+  const handleDelete = async () => {
+    if (
+      !confirm(
+        `Are you sure you want to remove ${selectedIds.length} sponsors from the pipeline?`,
+      )
+    ) {
+      return
+    }
+    setIsProcessing(true)
+    await bulkDeleteMutation.mutateAsync({
+      ids: selectedIds,
+    })
+  }
+
+  if (selectedIds.length === 0) return null
+
+  return (
+    <div className="fixed bottom-8 left-1/2 z-40 w-full max-w-2xl -translate-x-1/2 px-4">
+      <div className="flex items-center justify-between rounded-full border border-gray-200 bg-white/90 p-2 pl-6 shadow-2xl backdrop-blur-md dark:border-gray-700 dark:bg-gray-900/90">
+        <div className="flex items-center gap-4">
+          <button
+            onClick={onClearSelection}
+            disabled={isProcessing}
+            className="cursor-pointer rounded-full p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-600 disabled:cursor-not-allowed disabled:opacity-50 dark:hover:bg-gray-800"
+          >
+            <XMarkIcon className="h-5 w-5" />
+          </button>
+          <div className="flex items-center gap-2">
+            <span className="text-sm font-semibold text-gray-900 dark:text-white">
+              {selectedIds.length} selected
+            </span>
+            {isProcessing && (
+              <div className="flex items-center gap-2 border-l border-gray-200 pl-2 dark:border-gray-700">
+                <svg
+                  className="h-4 w-4 animate-spin text-indigo-600 dark:text-indigo-400"
+                  viewBox="0 0 24 24"
+                >
+                  <circle
+                    className="opacity-25"
+                    cx="12"
+                    cy="12"
+                    r="10"
+                    stroke="currentColor"
+                    strokeWidth="4"
+                    fill="none"
+                  />
+                  <path
+                    className="opacity-75"
+                    fill="currentColor"
+                    d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                  />
+                </svg>
+                <span className="animate-pulse text-xs font-medium text-gray-500">
+                  Processing...
+                </span>
+              </div>
+            )}
+          </div>
+        </div>
+
+        <div className="flex items-center gap-1 pr-1">
+          {/* Status Menu */}
+          <Menu as="div" className="relative">
+            <MenuButton
+              className="inline-flex cursor-pointer items-center gap-1 rounded-full px-3 py-1.5 text-xs font-medium text-gray-700 hover:bg-gray-100 disabled:opacity-50 dark:text-gray-300 dark:hover:bg-gray-800"
+              disabled={isProcessing}
+            >
+              <ArrowPathIcon className="h-4 w-4" />
+              Status
+              <ChevronDownIcon className="h-3 w-3" />
+            </MenuButton>
+            <Transition
+              enter="transition ease-out duration-100"
+              enterFrom="transform opacity-0 scale-95"
+              enterTo="transform opacity-100 scale-100"
+              leave="transition ease-in duration-75"
+              leaveFrom="transform opacity-100 scale-100"
+              leaveTo="transform opacity-0 scale-95"
+            >
+              <MenuItems className="absolute right-0 bottom-full mb-2 w-48 origin-bottom-right rounded-xl bg-white p-1 shadow-lg ring-1 ring-black/5 focus:outline-none dark:bg-gray-800 dark:ring-white/10">
+                {STATUSES.map((status) => (
+                  <MenuItem key={status.value}>
+                    {({ focus }) => (
+                      <button
+                        onClick={() => handleUpdate({ status: status.value })}
+                        className={clsx(
+                          'flex w-full cursor-pointer items-center rounded-lg px-3 py-2 text-xs font-medium text-gray-700 dark:text-gray-300',
+                          focus && 'bg-gray-100 dark:bg-gray-700',
+                        )}
+                      >
+                        {status.label}
+                      </button>
+                    )}
+                  </MenuItem>
+                ))}
+              </MenuItems>
+            </Transition>
+          </Menu>
+
+          {/* Assignee Menu */}
+          <Menu as="div" className="relative">
+            <MenuButton
+              className="inline-flex cursor-pointer items-center gap-1 rounded-full px-3 py-1.5 text-xs font-medium text-gray-700 hover:bg-gray-100 disabled:opacity-50 dark:text-gray-300 dark:hover:bg-gray-800"
+              disabled={isProcessing}
+            >
+              <UserPlusIcon className="h-4 w-4" />
+              Assign
+              <ChevronDownIcon className="h-3 w-3" />
+            </MenuButton>
+            <Transition
+              enter="transition ease-out duration-100"
+              enterFrom="transform opacity-0 scale-95"
+              enterTo="transform opacity-100 scale-100"
+              leave="transition ease-in duration-75"
+              leaveFrom="transform opacity-100 scale-100"
+              leaveTo="transform opacity-0 scale-95"
+            >
+              <MenuItems className="absolute right-0 bottom-full mb-2 w-48 origin-bottom-right rounded-xl bg-white p-1 shadow-lg ring-1 ring-black/5 focus:outline-none dark:bg-gray-800 dark:ring-white/10">
+                <MenuItem>
+                  {({ focus }) => (
+                    <button
+                      onClick={() => handleUpdate({ assigned_to: null })}
+                      className={clsx(
+                        'flex w-full cursor-pointer items-center rounded-lg px-3 py-2 text-xs font-medium text-gray-700 dark:text-gray-300',
+                        focus && 'bg-gray-100 dark:bg-gray-700',
+                      )}
+                    >
+                      Unassign
+                    </button>
+                  )}
+                </MenuItem>
+                <div className="my-1 h-px bg-gray-200 dark:bg-gray-700" />
+                {organizers.map((org) => (
+                  <MenuItem key={org._id}>
+                    {({ focus }) => (
+                      <button
+                        onClick={() => handleUpdate({ assigned_to: org._id })}
+                        className={clsx(
+                          'flex w-full cursor-pointer items-center rounded-lg px-3 py-2 text-xs font-medium text-gray-700 dark:text-gray-300',
+                          focus && 'bg-gray-100 dark:bg-gray-700',
+                        )}
+                      >
+                        {org.name}
+                      </button>
+                    )}
+                  </MenuItem>
+                ))}
+              </MenuItems>
+            </Transition>
+          </Menu>
+
+          {/* Tags Menu */}
+          <Menu as="div" className="relative">
+            <MenuButton
+              className="inline-flex cursor-pointer items-center gap-1 rounded-full px-3 py-1.5 text-xs font-medium text-gray-700 hover:bg-gray-100 disabled:opacity-50 dark:text-gray-300 dark:hover:bg-gray-800"
+              disabled={isProcessing}
+            >
+              <TagIcon className="h-4 w-4" />
+              Tags
+              <ChevronDownIcon className="h-3 w-3" />
+            </MenuButton>
+            <Transition
+              enter="transition ease-out duration-100"
+              enterFrom="transform opacity-0 scale-95"
+              enterTo="transform opacity-100 scale-100"
+              leave="transition ease-in duration-75"
+              leaveFrom="transform opacity-100 scale-100"
+              leaveTo="transform opacity-0 scale-95"
+            >
+              <MenuItems className="absolute right-0 bottom-full mb-2 w-56 origin-bottom-right rounded-xl bg-white p-1 shadow-lg ring-1 ring-black/5 focus:outline-none dark:bg-gray-800 dark:ring-white/10">
+                <div className="px-3 py-2 text-[10px] font-bold tracking-wider text-gray-500 uppercase">
+                  Add Tags
+                </div>
+                {TAGS.map((tag) => (
+                  <MenuItem key={tag.value}>
+                    {({ focus }) => (
+                      <button
+                        onClick={() => handleUpdate({ add_tags: [tag.value] })}
+                        className={clsx(
+                          'flex w-full cursor-pointer items-center rounded-lg px-3 py-2 text-xs font-medium text-gray-700 dark:text-gray-300',
+                          focus && 'bg-gray-100 dark:bg-gray-700',
+                        )}
+                      >
+                        {tag.label}
+                      </button>
+                    )}
+                  </MenuItem>
+                ))}
+                <div className="my-1 h-px bg-gray-200 dark:bg-gray-700" />
+                <MenuItem>
+                  {({ focus }) => (
+                    <button
+                      onClick={() => handleUpdate({ tags: [] })}
+                      className={clsx(
+                        'flex w-full cursor-pointer items-center rounded-lg px-3 py-2 text-xs font-medium text-red-600 hover:bg-red-50 dark:text-red-400 dark:hover:bg-red-900/20',
+                        focus && 'bg-red-50 dark:bg-red-900/20',
+                      )}
+                    >
+                      Clear All Tags
+                    </button>
+                  )}
+                </MenuItem>
+              </MenuItems>
+            </Transition>
+          </Menu>
+
+          <div className="mx-1 h-6 w-px bg-gray-200 dark:bg-gray-700" />
+
+          {/* Delete Button */}
+          <button
+            onClick={handleDelete}
+            disabled={isProcessing}
+            className="cursor-pointer rounded-full p-2 text-red-600 hover:bg-red-50 disabled:opacity-50 dark:text-red-400 dark:hover:bg-red-900/20"
+            title="Delete selected sponsors"
+          >
+            <TrashIcon className="h-5 w-5" />
+          </button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/admin/sponsor-crm/SponsorCRMForm.tsx b/src/components/admin/sponsor-crm/SponsorCRMForm.tsx
index 7dbd72aa..180ca0f1 100644
--- a/src/components/admin/sponsor-crm/SponsorCRMForm.tsx
+++ b/src/components/admin/sponsor-crm/SponsorCRMForm.tsx
@@ -18,7 +18,12 @@ import type {
   SponsorTag,
 } from '@/lib/sponsor-crm/types'
 import { sortSponsorTiersByValue } from '@/lib/sponsor/utils'
-import { XMarkIcon } from '@heroicons/react/24/outline'
+import {
+  XMarkIcon,
+  ChevronLeftIcon,
+  UserGroupIcon,
+  EnvelopeIcon,
+} from '@heroicons/react/24/outline'
 import clsx from 'clsx'
 import {
   StatusListbox,
@@ -35,9 +40,15 @@ import {
   TAGS,
 } from './form/constants'
 import { useNotification } from '@/components/admin/NotificationProvider'
+import { SponsorContactEditor } from '../sponsor/SponsorContactEditor'
+import { SponsorWithContactInfo } from '@/lib/sponsor/types'
+import { SponsorIndividualEmailModal } from '../SponsorIndividualEmailModal'
+import { Conference } from '@/lib/conference/types'
 
 interface SponsorCRMFormProps {
   conferenceId: string
+  conference: Conference
+  domain: string
   sponsor: SponsorForConferenceExpanded | null
   isOpen: boolean
   onClose: () => void
@@ -47,12 +58,16 @@ interface SponsorCRMFormProps {
 
 export function SponsorCRMForm({
   conferenceId,
+  conference,
+  domain,
   sponsor,
   isOpen,
   onClose,
   onSuccess,
   existingSponsorsInCRM = [],
 }: SponsorCRMFormProps) {
+  const [view, setView] = useState<'pipeline' | 'contacts'>('pipeline')
+  const [isEmailModalOpen, setIsEmailModalOpen] = useState(false)
   const { showNotification } = useNotification()
 
   const [formData, setFormData] = useState({
@@ -70,9 +85,17 @@ export function SponsorCRMForm({
   })
 
   const { data: allSponsors = [] } = api.sponsor.list.useQuery({
-    includeContactInfo: false,
+    includeContactInfo: true,
   })
 
+  // Get the full sponsor object if editing, including contacts
+  const editingFullSponsor =
+    sponsor && allSponsors.length > 0
+      ? (allSponsors.find(
+          (s) => s._id === sponsor.sponsor._id,
+        ) as SponsorWithContactInfo)
+      : null
+
   const availableSponsors = sponsor
     ? allSponsors
     : allSponsors.filter((s) => !existingSponsorsInCRM.includes(s._id))
@@ -97,6 +120,16 @@ export function SponsorCRMForm({
     { enabled: isOpen },
   )
 
+  const handleClose = () => {
+    setView('pipeline')
+    onClose()
+  }
+
+  const handleSuccess = () => {
+    onSuccess()
+    handleClose()
+  }
+
   const createMutation = api.sponsor.crm.create.useMutation({
     onSuccess: async () => {
       // Invalidate all sponsor queries to ensure fresh data
@@ -107,8 +140,7 @@ export function SponsorCRMForm({
         message: 'Sponsor added to pipeline',
         type: 'success',
       })
-      onSuccess()
-      onClose()
+      handleSuccess()
     },
     onError: (error) => {
       showNotification({
@@ -129,8 +161,7 @@ export function SponsorCRMForm({
         message: 'Sponsor updated successfully',
         type: 'success',
       })
-      onSuccess()
-      onClose()
+      handleSuccess()
     },
     onError: (error) => {
       showNotification({
@@ -148,9 +179,11 @@ export function SponsorCRMForm({
 
   useEffect(() => {
     if (isOpen) {
-      // Reset mutation states when modal opens
+      // Reset mutation states and view when modal opens
       resetCreateMutation()
       resetUpdateMutation()
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- Reset view to pipeline when opening
+      setView('pipeline')
 
       if (sponsor) {
         // eslint-disable-next-line react-hooks/set-state-in-effect -- Initialize form from sponsor data
@@ -187,7 +220,7 @@ export function SponsorCRMForm({
 
   // CMD+S / CTRL+S keyboard shortcut to save the form
   useEffect(() => {
-    if (!isOpen) return
+    if (!isOpen || view === 'contacts') return
 
     const handleKeyDown = (e: KeyboardEvent) => {
       if ((e.metaKey || e.ctrlKey) && e.key === 's') {
@@ -202,7 +235,7 @@ export function SponsorCRMForm({
 
     window.addEventListener('keydown', handleKeyDown)
     return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [isOpen, createMutation.isPending, updateMutation.isPending])
+  }, [isOpen, view, createMutation.isPending, updateMutation.isPending])
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -252,241 +285,343 @@ export function SponsorCRMForm({
   }
 
   return (
-    <Transition show={isOpen} as={Fragment}>
-      <Dialog as="div" className="relative z-50" onClose={onClose}>
-        <TransitionChild
-          as={Fragment}
-          enter="ease-out duration-300"
-          enterFrom="opacity-0"
-          enterTo="opacity-100"
-          leave="ease-in duration-200"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-        >
-          <div className="fixed inset-0 bg-gray-500/75 transition-opacity dark:bg-gray-900/75" />
-        </TransitionChild>
-
-        <div className="fixed inset-0 z-10 overflow-y-auto">
-          <div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-            <TransitionChild
-              as={Fragment}
-              enter="ease-out duration-300"
-              enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-              enterTo="opacity-100 translate-y-0 sm:scale-100"
-              leave="ease-in duration-200"
-              leaveFrom="opacity-100 translate-y-0 sm:scale-100"
-              leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-            >
-              <DialogPanel className="max-h-[90vh] w-full max-w-3xl transform overflow-hidden rounded-2xl border border-brand-frosted-steel bg-brand-glacier-white p-4 shadow-2xl transition-all dark:border-gray-700 dark:bg-gray-900">
-                <div className="absolute top-0 right-0 pt-4 pr-4">
-                  <button
-                    onClick={onClose}
-                    className="rounded-md text-gray-400 hover:text-gray-500 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none dark:text-gray-500 dark:hover:text-gray-400"
-                  >
-                    <span className="sr-only">Close</span>
-                    <XMarkIcon className="h-6 w-6" />
-                  </button>
-                </div>
-
-                <DialogTitle className="text-lg leading-6 font-semibold text-gray-900 dark:text-white">
-                  {sponsor ? 'Edit Sponsor' : 'Add Sponsor to Pipeline'}
-                </DialogTitle>
-
-                <form onSubmit={handleSubmit} className="mt-3">
-                  <div className="space-y-3">
-                    {/* Sponsor Selection */}
-                    <SponsorCombobox
-                      value={formData.sponsorId}
-                      onChange={(value) =>
-                        setFormData({ ...formData, sponsorId: value })
-                      }
-                      availableSponsors={availableSponsors}
-                      disabled={!!sponsor}
-                    />
-
-                    {/* Tier Selection */}
-                    <TierRadioGroup
-                      tiers={regularTiers}
-                      value={formData.tierId}
-                      onChange={(value) =>
-                        setFormData({ ...formData, tierId: value })
-                      }
-                    />
-
-                    {/* Addons Selection */}
-                    <AddonsCheckboxGroup
-                      addons={addonTiers}
-                      value={formData.addonIds}
-                      onChange={(value) =>
-                        setFormData({ ...formData, addonIds: value })
-                      }
-                    />
-
-                    {/* Status, Contract Status, and Invoice Status */}
-                    <div className="grid grid-cols-1 gap-3 sm:grid-cols-3">
-                      <div>
-                        <StatusListbox
-                          label="Status *"
-                          value={formData.status}
-                          onChange={(value) =>
-                            setFormData({ ...formData, status: value })
-                          }
-                          options={STATUSES}
-                        />
-                      </div>
-
-                      <div>
-                        <StatusListbox
-                          label="Contract Status *"
-                          value={formData.contractStatus}
-                          onChange={(value) =>
-                            setFormData({ ...formData, contractStatus: value })
-                          }
-                          options={CONTRACT_STATUSES}
-                        />
-                      </div>
-
-                      <div>
-                        <StatusListbox
-                          label="Invoice Status *"
-                          value={formData.invoiceStatus}
-                          onChange={(value) =>
-                            setFormData({ ...formData, invoiceStatus: value })
-                          }
-                          options={INVOICE_STATUSES}
-                          disabled={
-                            !formData.contractValue ||
-                            parseFloat(formData.contractValue) === 0
-                          }
-                          helperText={
-                            !formData.contractValue ||
-                            parseFloat(formData.contractValue) === 0
-                              ? '(No cost)'
-                              : undefined
-                          }
-                        />
+    <>
+      <Transition show={isOpen} as={Fragment}>
+        <Dialog as="div" className="relative z-50" onClose={handleClose}>
+          <TransitionChild
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 bg-gray-500/75 transition-opacity dark:bg-gray-900/75" />
+          </TransitionChild>
+
+          <div className="fixed inset-0 z-10 overflow-y-auto">
+            <div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+              <TransitionChild
+                as={Fragment}
+                enter="ease-out duration-300"
+                enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+                enterTo="opacity-100 translate-y-0 sm:scale-100"
+                leave="ease-in duration-200"
+                leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+                leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+              >
+                <DialogPanel className="relative max-h-[90vh] w-full max-w-3xl transform overflow-hidden rounded-2xl border border-brand-frosted-steel bg-brand-glacier-white p-6 shadow-2xl transition-all dark:border-gray-700 dark:bg-gray-900">
+                  <div className="flex items-start justify-between">
+                    <div className="text-left">
+                      <div className="flex items-center gap-2">
+                        {view === 'contacts' && (
+                          <button
+                            onClick={() => setView('pipeline')}
+                            className="-ml-1.5 cursor-pointer rounded-full p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-indigo-600 dark:hover:bg-gray-800 dark:hover:text-indigo-400"
+                            title="Back to Pipeline"
+                          >
+                            <ChevronLeftIcon className="h-6 w-6" />
+                          </button>
+                        )}
+                        <DialogTitle className="text-lg leading-6 font-semibold text-gray-900 dark:text-white">
+                          {view === 'contacts'
+                            ? 'Manage Contacts'
+                            : sponsor
+                              ? 'Edit Sponsor'
+                              : 'Add Sponsor to Pipeline'}
+                        </DialogTitle>
                       </div>
+                      {sponsor && view === 'pipeline' && (
+                        <p className="mt-1 text-sm text-gray-500 dark:text-gray-400">
+                          {sponsor.sponsor.name}
+                        </p>
+                      )}
                     </div>
 
-                    {/* Assigned To and Contract Value */}
-                    <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-                      <OrganizerCombobox
-                        value={formData.assignedTo}
-                        onChange={(value) =>
-                          setFormData({ ...formData, assignedTo: value })
-                        }
-                        organizers={organizers}
-                      />
+                    <div className="flex items-center gap-2">
+                      {sponsor && (
+                        <button
+                          type="button"
+                          onClick={() => setIsEmailModalOpen(true)}
+                          className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-gray-800 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-700"
+                          title="Email sponsor contacts"
+                        >
+                          <EnvelopeIcon className="h-4 w-4" />
+                          <span className="hidden sm:inline">Email</span>
+                        </button>
+                      )}
+                      {sponsor && view === 'pipeline' && (
+                        <button
+                          type="button"
+                          onClick={() => setView('contacts')}
+                          className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-gray-800 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-700"
+                          title="Manage contact persons"
+                        >
+                          <UserGroupIcon className="h-4 w-4" />
+                          <span className="hidden sm:inline">Contacts</span>
+                        </button>
+                      )}
+                      <button
+                        onClick={handleClose}
+                        className="cursor-pointer rounded-md text-gray-400 hover:text-gray-500 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none dark:text-gray-500 dark:hover:text-gray-400"
+                      >
+                        <span className="sr-only">Close</span>
+                        <XMarkIcon className="h-6 w-6" />
+                      </button>
+                    </div>
+                  </div>
 
-                      <ContractValueInput
-                        value={formData.contractValue}
-                        currency={formData.contractCurrency}
-                        onValueChange={(value) =>
-                          setFormData({ ...formData, contractValue: value })
-                        }
-                        onCurrencyChange={(value) =>
-                          setFormData({ ...formData, contractCurrency: value })
-                        }
+                  <div className="mt-3 text-left">
+                    {view === 'contacts' && editingFullSponsor ? (
+                      <SponsorContactEditor
+                        sponsor={editingFullSponsor}
+                        onSuccess={() => {
+                          utils.sponsor.list.invalidate()
+                          setView('pipeline') // Return to pipeline view on save
+                        }}
+                        onCancel={() => setView('pipeline')}
                       />
-                    </div>
+                    ) : (
+                      <form onSubmit={handleSubmit}>
+                        <div className="space-y-3">
+                          {/* Sponsor Selection - Only show when adding new */}
+                          {!sponsor && (
+                            <SponsorCombobox
+                              value={formData.sponsorId}
+                              onChange={(value) =>
+                                setFormData({ ...formData, sponsorId: value })
+                              }
+                              availableSponsors={availableSponsors}
+                              disabled={!!sponsor}
+                            />
+                          )}
+
+                          {/* Tier Selection */}
+                          <TierRadioGroup
+                            tiers={regularTiers}
+                            value={formData.tierId}
+                            onChange={(value) =>
+                              setFormData({ ...formData, tierId: value })
+                            }
+                          />
+
+                          {/* Addons Selection */}
+                          <AddonsCheckboxGroup
+                            addons={addonTiers}
+                            value={formData.addonIds}
+                            onChange={(value) =>
+                              setFormData({ ...formData, addonIds: value })
+                            }
+                          />
+
+                          {/* Status, Contract Status, and Invoice Status */}
+                          <div className="grid grid-cols-1 gap-3 sm:grid-cols-3">
+                            <div>
+                              <StatusListbox
+                                label="Status *"
+                                value={formData.status}
+                                onChange={(value) =>
+                                  setFormData({ ...formData, status: value })
+                                }
+                                options={STATUSES}
+                              />
+                            </div>
+
+                            <div>
+                              <StatusListbox
+                                label="Contract Status *"
+                                value={formData.contractStatus}
+                                onChange={(value) =>
+                                  setFormData({
+                                    ...formData,
+                                    contractStatus: value,
+                                  })
+                                }
+                                options={CONTRACT_STATUSES}
+                              />
+                            </div>
+
+                            <div>
+                              <StatusListbox
+                                label="Invoice Status *"
+                                value={formData.invoiceStatus}
+                                onChange={(value) =>
+                                  setFormData({
+                                    ...formData,
+                                    invoiceStatus: value,
+                                  })
+                                }
+                                options={INVOICE_STATUSES}
+                                disabled={
+                                  !formData.contractValue ||
+                                  parseFloat(formData.contractValue) === 0
+                                }
+                                helperText={
+                                  !formData.contractValue ||
+                                  parseFloat(formData.contractValue) === 0
+                                    ? '(No cost)'
+                                    : undefined
+                                }
+                              />
+                            </div>
+                          </div>
+
+                          {/* Assigned To and Contract Value */}
+                          <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+                            <OrganizerCombobox
+                              value={formData.assignedTo}
+                              onChange={(value) =>
+                                setFormData({ ...formData, assignedTo: value })
+                              }
+                              organizers={organizers}
+                            />
+
+                            <ContractValueInput
+                              value={formData.contractValue}
+                              currency={formData.contractCurrency}
+                              onValueChange={(value) =>
+                                setFormData({
+                                  ...formData,
+                                  contractValue: value,
+                                })
+                              }
+                              onCurrencyChange={(value) =>
+                                setFormData({
+                                  ...formData,
+                                  contractCurrency: value,
+                                })
+                              }
+                            />
+                          </div>
+
+                          {/* Tags */}
+                          <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+                            <div>
+                              <label className="block text-left text-sm/6 font-medium text-gray-900 dark:text-white">
+                                Tags
+                              </label>
+                              <div className="mt-1.5">
+                                <FilterDropdown
+                                  label="Select tags"
+                                  activeCount={formData.tags.length}
+                                  keepOpen
+                                  fixedWidth
+                                  forceDropUp
+                                >
+                                  {TAGS.map((tag) => (
+                                    <FilterOption
+                                      key={tag.value}
+                                      checked={formData.tags.includes(
+                                        tag.value,
+                                      )}
+                                      onClick={() => {
+                                        if (formData.tags.includes(tag.value)) {
+                                          setFormData({
+                                            ...formData,
+                                            tags: formData.tags.filter(
+                                              (t) => t !== tag.value,
+                                            ),
+                                          })
+                                        } else {
+                                          setFormData({
+                                            ...formData,
+                                            tags: [...formData.tags, tag.value],
+                                          })
+                                        }
+                                      }}
+                                      keepOpen
+                                    >
+                                      {tag.label}
+                                    </FilterOption>
+                                  ))}
+                                </FilterDropdown>
+                              </div>
+                            </div>
+                          </div>
+
+                          {/* Notes */}
+                          <div>
+                            <label className="block text-left text-sm/6 font-medium text-gray-900 dark:text-white">
+                              Notes
+                            </label>
+                            <textarea
+                              value={formData.notes}
+                              onChange={(e) =>
+                                setFormData({
+                                  ...formData,
+                                  notes: e.target.value,
+                                })
+                              }
+                              rows={2}
+                              className="mt-1.5 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10"
+                            />
+                          </div>
+                        </div>
 
-                    {/* Tags */}
-                    <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-                      <div>
-                        <label className="block text-left text-sm/6 font-medium text-gray-900 dark:text-white">
-                          Tags
-                        </label>
-                        <div className="mt-1.5">
-                          <FilterDropdown
-                            label="Select tags"
-                            activeCount={formData.tags.length}
-                            keepOpen
-                            fixedWidth
-                            forceDropUp
+                        <div className="mt-4 flex flex-row-reverse gap-3">
+                          <button
+                            type="submit"
+                            disabled={
+                              createMutation.isPending ||
+                              updateMutation.isPending
+                            }
+                            className={clsx(
+                              'inline-flex cursor-pointer items-center justify-center gap-2 rounded-md px-3 py-2 text-sm font-semibold text-white shadow-sm',
+                              createMutation.isPending ||
+                                updateMutation.isPending
+                                ? 'bg-gray-400 dark:bg-gray-600'
+                                : 'bg-indigo-600 hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400',
+                            )}
                           >
-                            {TAGS.map((tag) => (
-                              <FilterOption
-                                key={tag.value}
-                                checked={formData.tags.includes(tag.value)}
-                                onClick={() => {
-                                  if (formData.tags.includes(tag.value)) {
-                                    setFormData({
-                                      ...formData,
-                                      tags: formData.tags.filter(
-                                        (t) => t !== tag.value,
-                                      ),
-                                    })
-                                  } else {
-                                    setFormData({
-                                      ...formData,
-                                      tags: [...formData.tags, tag.value],
-                                    })
-                                  }
-                                }}
-                                keepOpen
-                              >
-                                {tag.label}
-                              </FilterOption>
-                            ))}
-                          </FilterDropdown>
+                            {createMutation.isPending ||
+                            updateMutation.isPending ? (
+                              'Saving...'
+                            ) : (
+                              <>
+                                {sponsor ? 'Update' : 'Add'}
+                                <kbd className="ml-1 rounded bg-white/20 px-1.5 py-0.5 font-mono text-xs">
+                                  ⌘S
+                                </kbd>
+                              </>
+                            )}
+                          </button>
+                          <button
+                            type="button"
+                            onClick={handleClose}
+                            className="inline-flex cursor-pointer justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-white/10 dark:text-white dark:ring-white/10 dark:hover:bg-white/20"
+                          >
+                            Cancel
+                          </button>
                         </div>
-                      </div>
-                    </div>
-
-                    {/* Notes */}
-                    <div>
-                      <label className="block text-left text-sm/6 font-medium text-gray-900 dark:text-white">
-                        Notes
-                      </label>
-                      <textarea
-                        value={formData.notes}
-                        onChange={(e) =>
-                          setFormData({ ...formData, notes: e.target.value })
-                        }
-                        rows={2}
-                        className="mt-1.5 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10"
-                      />
-                    </div>
-                  </div>
-
-                  <div className="mt-4 flex flex-row-reverse gap-3">
-                    <button
-                      type="submit"
-                      disabled={
-                        createMutation.isPending || updateMutation.isPending
-                      }
-                      className={clsx(
-                        'inline-flex items-center justify-center gap-2 rounded-md px-3 py-2 text-sm font-semibold text-white shadow-sm',
-                        createMutation.isPending || updateMutation.isPending
-                          ? 'bg-gray-400 dark:bg-gray-600'
-                          : 'bg-indigo-600 hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400',
-                      )}
-                    >
-                      {createMutation.isPending || updateMutation.isPending ? (
-                        'Saving...'
-                      ) : (
-                        <>
-                          {sponsor ? 'Update' : 'Add'}
-                          <kbd className="rounded bg-white/20 px-1.5 py-0.5 font-mono text-xs">
-                            ⌘S
-                          </kbd>
-                        </>
-                      )}
-                    </button>
-                    <button
-                      type="button"
-                      onClick={onClose}
-                      className="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-white/10 dark:text-white dark:ring-white/10 dark:hover:bg-white/20"
-                    >
-                      Cancel
-                    </button>
+                      </form>
+                    )}
                   </div>
-                </form>
-              </DialogPanel>
-            </TransitionChild>
+                </DialogPanel>
+              </TransitionChild>
+            </div>
           </div>
-        </div>
-      </Dialog>
-    </Transition>
+        </Dialog>
+      </Transition>
+
+      {/* Email Modal */}
+      {sponsor && (
+        <SponsorIndividualEmailModal
+          isOpen={isEmailModalOpen}
+          onClose={() => setIsEmailModalOpen(false)}
+          sponsorForConference={sponsor}
+          domain={domain}
+          fromEmail={conference?.sponsor_email || ''}
+          conference={{
+            title: conference?.title || '',
+            city: conference?.city || '',
+            country: conference?.country || '',
+            start_date: conference?.start_date || '',
+            domains: conference?.domains || [domain],
+            social_links: conference?.social_links,
+          }}
+        />
+      )}
+    </>
   )
 }
diff --git a/src/components/admin/sponsor-crm/SponsorCard.tsx b/src/components/admin/sponsor-crm/SponsorCard.tsx
index 345ab1e6..535d5a7f 100644
--- a/src/components/admin/sponsor-crm/SponsorCard.tsx
+++ b/src/components/admin/sponsor-crm/SponsorCard.tsx
@@ -3,7 +3,11 @@
 import type { SponsorForConferenceExpanded } from '@/lib/sponsor-crm/types'
 import { SponsorLogo } from '@/components/SponsorLogo'
 import { SpeakerAvatars } from '@/components/SpeakerAvatars'
-import { PencilIcon, TrashIcon } from '@heroicons/react/24/outline'
+import {
+  PencilIcon,
+  TrashIcon,
+  EnvelopeIcon,
+} from '@heroicons/react/24/outline'
 import {
   getInvoiceStatusColor,
   formatInvoiceStatusLabel,
@@ -13,11 +17,21 @@ import clsx from 'clsx'
 
 interface SponsorCardProps {
   sponsor: SponsorForConferenceExpanded
+  isSelected?: boolean
+  onToggleSelect?: (e: React.MouseEvent) => void
   onEdit: () => void
   onDelete: () => void
+  onEmail?: () => void
 }
 
-export function SponsorCard({ sponsor, onEdit, onDelete }: SponsorCardProps) {
+export function SponsorCard({
+  sponsor,
+  isSelected = false,
+  onToggleSelect,
+  onEdit,
+  onDelete,
+  onEmail,
+}: SponsorCardProps) {
   const { value, currency } = calculateSponsorValue(sponsor)
 
   const handleDeleteClick = (e: React.MouseEvent) => {
@@ -30,23 +44,90 @@ export function SponsorCard({ sponsor, onEdit, onDelete }: SponsorCardProps) {
     onEdit()
   }
 
+  const handleEmailClick = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    onEmail?.()
+  }
+
+  const handleSelectClick = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    onToggleSelect?.(e)
+  }
+
   return (
     <div
-      className="group relative cursor-pointer rounded border border-gray-200 bg-white p-2 transition-all hover:border-brand-cloud-blue hover:shadow-md dark:border-gray-700 dark:bg-gray-800 dark:hover:border-blue-500"
+      className={clsx(
+        'group relative cursor-pointer rounded border p-2 transition-all hover:border-brand-cloud-blue hover:shadow-md dark:border-gray-700 dark:bg-gray-800 dark:hover:border-blue-500',
+        isSelected
+          ? 'border-indigo-500 bg-indigo-50/30 shadow-sm ring-1 ring-indigo-500 dark:border-indigo-400 dark:bg-indigo-900/20'
+          : 'border-gray-200 bg-white',
+      )}
       onClick={onEdit}
     >
+      {/* Selection Checkbox */}
+      <div
+        className={clsx(
+          'absolute top-1 left-1 z-20 transition-opacity',
+          isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100',
+        )}
+        onClick={handleSelectClick}
+      >
+        <input
+          type="checkbox"
+          checked={isSelected}
+          onChange={() => {}} // Handled by parent click
+          className="h-4 w-4 cursor-pointer rounded border-gray-300 text-indigo-600 focus:ring-indigo-600 dark:border-gray-600 dark:bg-gray-700"
+        />
+      </div>
+
+      {/* Assignee Avatar - Top Left (Offset if checkbox is visible) */}
+      {sponsor.assigned_to && (
+        <div
+          className={clsx(
+            'absolute top-1 left-1 z-10 origin-top-left scale-75 transition-transform',
+            (isSelected || true) && 'translate-x-5', // Move avatar right to make room for checkbox
+          )}
+        >
+          <SpeakerAvatars
+            speakers={[
+              {
+                _id: sponsor.assigned_to._id,
+                _rev: '',
+                _createdAt: '',
+                _updatedAt: '',
+                name: sponsor.assigned_to.name,
+                email: sponsor.assigned_to.email,
+                image: sponsor.assigned_to.image,
+              },
+            ]}
+            size="sm"
+            maxVisible={1}
+            showTooltip={true}
+          />
+        </div>
+      )}
+
       {/* Action Buttons */}
       <div className="absolute top-1 right-1 flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
+        {onEmail && (
+          <button
+            onClick={handleEmailClick}
+            className="cursor-pointer rounded bg-white/90 p-0.5 shadow-sm hover:bg-blue-50 dark:bg-gray-700/90 dark:hover:bg-gray-600"
+            title="Email Sponsor"
+          >
+            <EnvelopeIcon className="h-3 w-3 text-brand-cloud-blue dark:text-blue-400" />
+          </button>
+        )}
         <button
           onClick={handleEditClick}
-          className="rounded bg-white/90 p-0.5 shadow-sm hover:bg-gray-50 dark:bg-gray-700/90 dark:hover:bg-gray-600"
+          className="cursor-pointer rounded bg-white/90 p-0.5 shadow-sm hover:bg-gray-50 dark:bg-gray-700/90 dark:hover:bg-gray-600"
           title="Edit"
         >
           <PencilIcon className="h-3 w-3 text-brand-cloud-blue dark:text-blue-400" />
         </button>
         <button
           onClick={handleDeleteClick}
-          className="rounded bg-white/90 p-0.5 shadow-sm hover:bg-red-50 dark:bg-gray-700/90 dark:hover:bg-red-900"
+          className="cursor-pointer rounded bg-white/90 p-0.5 shadow-sm hover:bg-red-50 dark:bg-gray-700/90 dark:hover:bg-red-900"
           title="Delete"
         >
           <TrashIcon className="h-3 w-3 text-red-600 dark:text-red-400" />
@@ -63,6 +144,29 @@ export function SponsorCard({ sponsor, onEdit, onDelete }: SponsorCardProps) {
         />
       </div>
 
+      {/* Priority Tags */}
+      {sponsor.tags?.some((t) =>
+        ['high-priority', 'needs-follow-up', 'returning-sponsor'].includes(t),
+      ) && (
+        <div className="mb-1.5 flex flex-wrap gap-1">
+          {sponsor.tags.includes('high-priority') && (
+            <span className="inline-flex items-center rounded-full bg-red-100 px-1.5 py-0.5 text-[10px] font-bold text-red-700 uppercase dark:bg-red-900/30 dark:text-red-400">
+              High Priority
+            </span>
+          )}
+          {sponsor.tags.includes('needs-follow-up') && (
+            <span className="inline-flex items-center rounded-full bg-amber-100 px-1.5 py-0.5 text-[10px] font-bold text-amber-700 uppercase dark:bg-amber-900/30 dark:text-amber-400">
+              Needs Follow-up
+            </span>
+          )}
+          {sponsor.tags.includes('returning-sponsor') && (
+            <span className="inline-flex items-center rounded-full bg-emerald-100 px-1.5 py-0.5 text-[10px] font-bold text-emerald-700 uppercase dark:bg-emerald-900/30 dark:text-emerald-400">
+              Returning
+            </span>
+          )}
+        </div>
+      )}
+
       {/* Value & Tier */}
       <div className="mb-1 flex items-center justify-between gap-1 text-xs">
         {value > 0 && (
@@ -82,9 +186,9 @@ export function SponsorCard({ sponsor, onEdit, onDelete }: SponsorCardProps) {
         )}
       </div>
 
-      {/* Invoice Status & Assignee */}
-      {value > 0 ? (
-        <div className="flex items-center justify-between gap-1">
+      {/* Invoice Status */}
+      {value > 0 && (
+        <div className="flex items-center gap-1">
           <span
             className={clsx(
               'inline-flex flex-1 items-center justify-center rounded px-1.5 py-0.5 text-xs font-medium',
@@ -93,49 +197,6 @@ export function SponsorCard({ sponsor, onEdit, onDelete }: SponsorCardProps) {
           >
             {formatInvoiceStatusLabel(sponsor.invoice_status)}
           </span>
-          {sponsor.assigned_to && (
-            <div className="scale-75">
-              <SpeakerAvatars
-                speakers={[
-                  {
-                    _id: sponsor.assigned_to._id,
-                    _rev: '',
-                    _createdAt: '',
-                    _updatedAt: '',
-                    name: sponsor.assigned_to.name,
-                    email: sponsor.assigned_to.email,
-                    image: sponsor.assigned_to.image,
-                  },
-                ]}
-                size="sm"
-                maxVisible={1}
-                showTooltip={true}
-              />
-            </div>
-          )}
-        </div>
-      ) : (
-        <div className="flex items-center justify-end gap-1">
-          {sponsor.assigned_to && (
-            <div className="scale-75">
-              <SpeakerAvatars
-                speakers={[
-                  {
-                    _id: sponsor.assigned_to._id,
-                    _rev: '',
-                    _createdAt: '',
-                    _updatedAt: '',
-                    name: sponsor.assigned_to.name,
-                    email: sponsor.assigned_to.email,
-                    image: sponsor.assigned_to.image,
-                  },
-                ]}
-                size="sm"
-                maxVisible={1}
-                showTooltip={true}
-              />
-            </div>
-          )}
         </div>
       )}
     </div>
diff --git a/src/components/admin/sponsor/SponsorContactEditor.tsx b/src/components/admin/sponsor/SponsorContactEditor.tsx
new file mode 100644
index 00000000..b9fcc2f8
--- /dev/null
+++ b/src/components/admin/sponsor/SponsorContactEditor.tsx
@@ -0,0 +1,367 @@
+'use client'
+
+import { useState } from 'react'
+import { SponsorWithContactInfo, ContactPerson } from '@/lib/sponsor/types'
+import {
+  EnvelopeIcon,
+  PhoneIcon,
+  UserIcon,
+  PlusIcon,
+  TrashIcon,
+  CreditCardIcon,
+  CheckIcon,
+} from '@heroicons/react/24/outline'
+import { ContactRoleSelect } from '@/components/common/ContactRoleSelect'
+import { api } from '@/lib/trpc/client'
+import { useNotification } from '../NotificationProvider'
+
+interface SponsorContactEditorProps {
+  sponsor: SponsorWithContactInfo
+  onSuccess?: (updatedSponsor: SponsorWithContactInfo) => void
+  onCancel?: () => void
+  className?: string
+}
+
+export function SponsorContactEditor({
+  sponsor,
+  onSuccess,
+  onCancel,
+  className = '',
+}: SponsorContactEditorProps) {
+  const [contacts, setContacts] = useState<ContactPerson[]>(
+    sponsor.contact_persons || [],
+  )
+  const [billing, setBilling] = useState({
+    email: sponsor.billing?.email || '',
+    reference: sponsor.billing?.reference || '',
+    comments: sponsor.billing?.comments || '',
+  })
+  const { showNotification } = useNotification()
+  const utils = api.useUtils()
+
+  const updateSponsorMutation = api.sponsor.update.useMutation({
+    onSuccess: async (updatedSponsor) => {
+      await utils.sponsor.list.invalidate()
+      showNotification({
+        type: 'success',
+        title: 'Contacts updated',
+        message: `Successfully updated contact information for ${sponsor.name}.`,
+      })
+      onSuccess?.(updatedSponsor as SponsorWithContactInfo)
+    },
+    onError: (error) => {
+      showNotification({
+        type: 'error',
+        title: 'Update failed',
+        message: error.message || 'Failed to update contact information.',
+      })
+    },
+  })
+
+  const handleAddContact = () => {
+    setContacts([
+      ...contacts,
+      {
+        _key: `contact-${Date.now()}`,
+        name: '',
+        email: '',
+        phone: '',
+        role: '',
+      },
+    ])
+  }
+
+  const handleUpdateContact = (
+    index: number,
+    updates: Partial<ContactPerson>,
+  ) => {
+    const newContacts = [...contacts]
+    newContacts[index] = { ...newContacts[index], ...updates }
+    setContacts(newContacts)
+  }
+
+  const handleRemoveContact = (index: number) => {
+    setContacts(contacts.filter((_, i) => i !== index))
+  }
+
+  const handleSave = async () => {
+    // Validation
+    const invalidContacts = contacts.filter((c) => !c.name || !c.email)
+    if (invalidContacts.length > 0) {
+      showNotification({
+        type: 'warning',
+        title: 'Incomplete contacts',
+        message: 'Please provide at least a name and email for all contacts.',
+      })
+      return
+    }
+
+    if (billing.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(billing.email)) {
+      showNotification({
+        type: 'warning',
+        title: 'Invalid billing email',
+        message: 'Please provide a valid billing email address.',
+      })
+      return
+    }
+
+    const updateData = {
+      name: sponsor.name,
+      website: sponsor.website,
+      logo: sponsor.logo,
+      logo_bright: sponsor.logo_bright,
+      org_number: sponsor.org_number,
+      contact_persons: contacts.map((c) => ({
+        ...c,
+        phone: c.phone || undefined,
+        role: c.role || undefined,
+      })),
+      billing: billing.email
+        ? {
+            email: billing.email.trim(),
+            reference: billing.reference?.trim() || undefined,
+            comments: billing.comments?.trim() || undefined,
+          }
+        : undefined,
+    }
+
+    await updateSponsorMutation.mutateAsync({
+      id: sponsor._id,
+      data: updateData,
+    })
+  }
+
+  return (
+    <div className={`space-y-6 ${className}`}>
+      {/* Contact Persons Section */}
+      <div className="space-y-4">
+        <div className="flex items-center justify-between">
+          <h3 className="font-space-grotesk text-lg font-semibold text-gray-900 dark:text-white">
+            Contact Persons
+          </h3>
+          <button
+            type="button"
+            onClick={handleAddContact}
+            className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-white px-2.5 py-1.5 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-gray-800 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-700"
+          >
+            <PlusIcon className="h-4 w-4" />
+            Add Contact
+          </button>
+        </div>
+
+        {contacts.length === 0 ? (
+          <div className="rounded-lg border-2 border-dashed border-gray-200 p-6 text-center dark:border-gray-700">
+            <UserIcon className="mx-auto h-8 w-8 text-gray-400" />
+            <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">
+              No contact persons listed. Click "Add Contact" to get started.
+            </p>
+          </div>
+        ) : (
+          <div className="space-y-3">
+            {contacts.map((contact, index) => (
+              <div
+                key={contact._key}
+                className="group relative rounded-xl border border-gray-200 bg-gray-50/50 p-4 transition-all hover:bg-gray-100/50 hover:shadow-sm dark:border-gray-700 dark:bg-gray-800/50 dark:hover:bg-gray-700/50 dark:hover:shadow-none"
+              >
+                <button
+                  type="button"
+                  onClick={() => handleRemoveContact(index)}
+                  className="absolute top-2 right-2 cursor-pointer rounded-md p-1.5 text-gray-400 opacity-0 transition-all group-hover:opacity-100 hover:bg-red-50 hover:text-red-600 dark:hover:bg-red-900/20 dark:hover:text-red-400"
+                  title="Remove contact"
+                >
+                  <TrashIcon className="h-4 w-4" />
+                </button>
+
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+                  <div>
+                    <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                      Full Name
+                    </label>
+                    <div className="mt-1 flex items-center gap-2">
+                      <UserIcon className="h-4 w-4 text-gray-400" />
+                      <input
+                        type="text"
+                        value={contact.name}
+                        onChange={(e) =>
+                          handleUpdateContact(index, { name: e.target.value })
+                        }
+                        className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                        placeholder="e.g. Jane Doe"
+                      />
+                    </div>
+                  </div>
+
+                  <div>
+                    <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                      Email Address
+                    </label>
+                    <div className="mt-1 flex items-center gap-2">
+                      <EnvelopeIcon className="h-4 w-4 text-gray-400" />
+                      <input
+                        type="email"
+                        value={contact.email}
+                        onChange={(e) =>
+                          handleUpdateContact(index, { email: e.target.value })
+                        }
+                        className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                        placeholder="e.g. jane@company.com"
+                      />
+                    </div>
+                  </div>
+
+                  <div>
+                    <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                      Phone Number
+                    </label>
+                    <div className="mt-1 flex items-center gap-2">
+                      <PhoneIcon className="h-4 w-4 text-gray-400" />
+                      <input
+                        type="tel"
+                        value={contact.phone || ''}
+                        onChange={(e) =>
+                          handleUpdateContact(index, { phone: e.target.value })
+                        }
+                        className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                        placeholder="e.g. +47 999 88 777"
+                      />
+                    </div>
+                  </div>
+
+                  <div>
+                    <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                      Role / Position
+                    </label>
+                    <div className="mt-1">
+                      <ContactRoleSelect
+                        value={contact.role || ''}
+                        onChange={(value) =>
+                          handleUpdateContact(index, { role: value })
+                        }
+                        className="block w-full cursor-pointer border-0 bg-transparent p-0 text-sm focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                        placeholder="Select role..."
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+
+      {/* Billing Information Section */}
+      <div className="space-y-4 border-t border-gray-200 pt-4 dark:border-gray-700">
+        <h3 className="font-space-grotesk text-lg font-semibold text-gray-900 dark:text-white">
+          Billing Information
+        </h3>
+        <div className="group relative rounded-xl border border-gray-200 bg-gray-50/50 p-4 transition-all hover:bg-gray-100/50 hover:shadow-sm dark:border-gray-700 dark:bg-gray-800/50 dark:hover:bg-gray-700/50 dark:hover:shadow-none">
+          <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            <div className="col-span-1">
+              <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                Billing Email
+              </label>
+              <div className="mt-1 flex items-center gap-2">
+                <CreditCardIcon className="h-4 w-4 text-gray-400" />
+                <input
+                  type="email"
+                  value={billing.email}
+                  onChange={(e) =>
+                    setBilling({ ...billing, email: e.target.value })
+                  }
+                  className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                  placeholder="e.g. finance@company.com"
+                />
+              </div>
+            </div>
+
+            <div className="col-span-1">
+              <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                Billing Reference
+              </label>
+              <div className="mt-1">
+                <input
+                  type="text"
+                  value={billing.reference}
+                  onChange={(e) =>
+                    setBilling({ ...billing, reference: e.target.value })
+                  }
+                  className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                  placeholder="e.g. PO Number or Dept ID"
+                />
+              </div>
+            </div>
+
+            <div className="col-span-full">
+              <label className="block text-xs font-medium text-gray-500 uppercase dark:text-gray-400">
+                Billing Comments
+              </label>
+              <div className="mt-1">
+                <textarea
+                  value={billing.comments}
+                  onChange={(e) =>
+                    setBilling({ ...billing, comments: e.target.value })
+                  }
+                  className="block w-full cursor-text border-0 bg-transparent p-0 text-sm text-gray-900 placeholder:text-gray-400 focus:ring-0 dark:text-white dark:placeholder:text-gray-500"
+                  placeholder="Any special instructions for invoicing..."
+                  rows={2}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Action Buttons */}
+      <div className="flex justify-end gap-3 border-t border-gray-200 pt-4 dark:border-gray-700">
+        {(onCancel && (
+          <button
+            type="button"
+            onClick={onCancel}
+            disabled={updateSponsorMutation.isPending}
+            className="cursor-pointer rounded-md px-4 py-2 text-sm font-semibold text-gray-900 dark:text-white"
+          >
+            Cancel
+          </button>
+        )) ||
+          null}
+        <button
+          type="button"
+          onClick={handleSave}
+          disabled={updateSponsorMutation.isPending}
+          className="inline-flex cursor-pointer items-center gap-2 rounded-md bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:opacity-50 dark:bg-indigo-500 dark:hover:bg-indigo-400"
+        >
+          {updateSponsorMutation.isPending ? (
+            <>
+              <svg
+                className="h-4 w-4 animate-spin text-white"
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+              >
+                <circle
+                  className="opacity-25"
+                  cx="12"
+                  cy="12"
+                  r="10"
+                  stroke="currentColor"
+                  strokeWidth="4"
+                ></circle>
+                <path
+                  className="opacity-75"
+                  fill="currentColor"
+                  d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                ></path>
+              </svg>
+              Saving...
+            </>
+          ) : (
+            <>
+              <CheckIcon className="h-4 w-4" />
+              Save Contact Information
+            </>
+          )}
+        </button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/server/routers/sponsor.ts b/src/server/routers/sponsor.ts
index a62c3c33..152ff434 100644
--- a/src/server/routers/sponsor.ts
+++ b/src/server/routers/sponsor.ts
@@ -38,7 +38,11 @@ import type {
 } from '@/lib/sponsor/types'
 import type {
   SponsorTag,
+  SponsorForConference,
   SponsorForConferenceInput,
+  SponsorStatus,
+  ContractStatus,
+  InvoiceStatus,
 } from '@/lib/sponsor-crm/types'
 import {
   createSponsorForConference,
@@ -62,11 +66,14 @@ import {
   UpdateInvoiceStatusSchema,
   CopySponsorsSchema,
   ImportAllHistoricSponsorsSchema,
+  BulkUpdateSponsorCRMSchema,
+  BulkDeleteSponsorCRMSchema,
 } from '@/server/schemas/sponsorForConference'
 import {
   listActivitiesForSponsor,
   listActivitiesForConference,
 } from '@/lib/sponsor-crm/activities'
+import { formatStatusName } from '@/components/admin/sponsor-crm/utils'
 
 async function getAllSponsorTiers(conferenceId?: string): Promise<{
   sponsorTiers?: SponsorTierExisting[]
@@ -139,26 +146,33 @@ export const sponsorRouter = router({
     }
   }),
 
-  getById: adminProcedure.input(IdParamSchema).query(async ({ input }) => {
-    const { sponsor, error } = await getSponsor(input.id)
+  getById: adminProcedure
+    .input(
+      IdParamSchema.extend({ includeContactInfo: z.boolean().default(false) }),
+    )
+    .query(async ({ input }) => {
+      const { sponsor, error } = await getSponsor(
+        input.id,
+        input.includeContactInfo,
+      )
 
-    if (error) {
-      throw new TRPCError({
-        code: 'INTERNAL_SERVER_ERROR',
-        message: 'Failed to fetch sponsor',
-        cause: error,
-      })
-    }
+      if (error) {
+        throw new TRPCError({
+          code: 'INTERNAL_SERVER_ERROR',
+          message: 'Failed to fetch sponsor',
+          cause: error,
+        })
+      }
 
-    if (!sponsor) {
-      throw new TRPCError({
-        code: 'NOT_FOUND',
-        message: 'Sponsor not found',
-      })
-    }
+      if (!sponsor) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Sponsor not found',
+        })
+      }
 
-    return sponsor
-  }),
+      return sponsor
+    }),
 
   create: adminProcedure
     .input(SponsorInputSchema)
@@ -860,6 +874,170 @@ export const sponsorRouter = router({
         return sponsorForConference
       }),
 
+    bulkUpdate: adminProcedure
+      .input(BulkUpdateSponsorCRMSchema)
+      .mutation(async ({ input, ctx }) => {
+        const userId = ctx.speaker._id
+        if (!userId) {
+          throw new TRPCError({
+            code: 'UNAUTHORIZED',
+            message: 'User ID not found in session',
+          })
+        }
+
+        try {
+          // Fetch all target sponsors in one query
+          const sponsors = await clientWrite.fetch<SponsorForConference[]>(
+            `*[_type == "sponsorForConference" && _id in $ids]`,
+            { ids: input.ids },
+          )
+
+          const transaction = clientWrite.transaction()
+          let updatedCount = 0
+
+          interface CRMUpdates {
+            status?: SponsorStatus
+            contract_status?: ContractStatus
+            invoice_status?: InvoiceStatus
+            assigned_to?: { _type: 'reference'; _ref: string } | null
+            tags?: SponsorTag[]
+          }
+
+          for (const existing of sponsors) {
+            const updates: CRMUpdates = {}
+            if (input.status !== undefined) updates.status = input.status
+            if (input.contract_status !== undefined)
+              updates.contract_status = input.contract_status
+            if (input.invoice_status !== undefined)
+              updates.invoice_status = input.invoice_status
+            if (input.assigned_to !== undefined) {
+              updates.assigned_to =
+                input.assigned_to === null
+                  ? null
+                  : { _type: 'reference', _ref: input.assigned_to }
+            }
+
+            // Handle tags
+            let currentTags = existing.tags || []
+            let tagsChanged = false
+
+            if (input.tags !== undefined) {
+              currentTags = input.tags as SponsorTag[]
+              tagsChanged = true
+            }
+            if (input.add_tags) {
+              const newTags = [...new Set([...currentTags, ...input.add_tags])]
+              if (newTags.length !== currentTags.length) {
+                currentTags = newTags as SponsorTag[]
+                tagsChanged = true
+              }
+            }
+            if (input.remove_tags) {
+              const newTags = currentTags.filter(
+                (t) => !input.remove_tags?.includes(t),
+              )
+              if (newTags.length !== currentTags.length) {
+                currentTags = newTags as SponsorTag[]
+                tagsChanged = true
+              }
+            }
+
+            if (tagsChanged) {
+              updates.tags = currentTags
+            }
+
+            if (Object.keys(updates).length > 0) {
+              transaction.patch(existing._id, { set: updates })
+              updatedCount++
+
+              // Prepare activity logs
+              if (input.status && input.status !== existing.status) {
+                const activityId = `activity-status-${existing._id}-${Date.now()}`
+                transaction.create({
+                  _id: activityId,
+                  _type: 'sponsorActivity',
+                  sponsor_for_conference: {
+                    _type: 'reference',
+                    _ref: existing._id,
+                  },
+                  activity_type: 'stage_change',
+                  description: `Status changed from ${formatStatusName(existing.status)} to ${formatStatusName(input.status)}`,
+                  metadata: {
+                    old_value: existing.status,
+                    new_value: input.status,
+                    timestamp: getCurrentDateTime(),
+                  },
+                  created_by: { _type: 'reference', _ref: userId },
+                  created_at: getCurrentDateTime(),
+                })
+              }
+
+              if (
+                input.assigned_to !== undefined &&
+                input.assigned_to !== (existing.assigned_to?._ref || null)
+              ) {
+                const activityId = `activity-assign-${existing._id}-${Date.now()}`
+                transaction.create({
+                  _id: activityId,
+                  _type: 'sponsorActivity',
+                  sponsor_for_conference: {
+                    _type: 'reference',
+                    _ref: existing._id,
+                  },
+                  activity_type: 'note',
+                  description: input.assigned_to
+                    ? `Assigned via bulk update`
+                    : 'Unassigned via bulk update',
+                  created_by: { _type: 'reference', _ref: userId },
+                  created_at: getCurrentDateTime(),
+                })
+              }
+            }
+          }
+
+          if (updatedCount > 0) {
+            await transaction.commit()
+          }
+
+          return {
+            success: true,
+            updatedCount,
+            totalCount: input.ids.length,
+          }
+        } catch (error) {
+          console.error('Bulk update error:', error)
+          throw new TRPCError({
+            code: 'INTERNAL_SERVER_ERROR',
+            message: 'Failed to perform bulk update',
+            cause: error,
+          })
+        }
+      }),
+
+    bulkDelete: adminProcedure
+      .input(BulkDeleteSponsorCRMSchema)
+      .mutation(async ({ input }) => {
+        try {
+          const transaction = clientWrite.transaction()
+          for (const id of input.ids) {
+            transaction.delete(id)
+          }
+          await transaction.commit()
+          return {
+            success: true,
+            deletedCount: input.ids.length,
+            totalCount: input.ids.length,
+          }
+        } catch (error) {
+          console.error('Bulk delete error:', error)
+          throw new TRPCError({
+            code: 'INTERNAL_SERVER_ERROR',
+            message: 'Failed to perform bulk delete',
+            cause: error,
+          })
+        }
+      }),
+
     delete: adminProcedure
       .input(SponsorForConferenceIdSchema)
       .mutation(async ({ input }) => {
diff --git a/src/server/schemas/sponsorForConference.ts b/src/server/schemas/sponsorForConference.ts
index 25b3f17a..cdc5430f 100644
--- a/src/server/schemas/sponsorForConference.ts
+++ b/src/server/schemas/sponsorForConference.ts
@@ -112,6 +112,25 @@ export const CopySponsorsSchema = z.object({
   targetConferenceId: z.string().min(1, 'Target conference ID is required'),
 })
 
+export const BulkUpdateSponsorCRMSchema = z.object({
+  ids: z
+    .array(z.string().min(1))
+    .min(1, 'At least one sponsor must be selected'),
+  status: SponsorStatusSchema.optional(),
+  contract_status: ContractStatusSchema.optional(),
+  invoice_status: InvoiceStatusSchema.optional(),
+  assigned_to: z.string().nullable().optional(),
+  tags: z.array(SponsorTagSchema).optional(),
+  add_tags: z.array(SponsorTagSchema).optional(),
+  remove_tags: z.array(SponsorTagSchema).optional(),
+})
+
+export const BulkDeleteSponsorCRMSchema = z.object({
+  ids: z
+    .array(z.string().min(1))
+    .min(1, 'At least one sponsor must be selected'),
+})
+
 export const ImportAllHistoricSponsorsSchema = z.object({
   targetConferenceId: z.string().min(1, 'Target conference ID is required'),
 })

From 05180e673ff1b68cd211fd9119763aa76e6b58df Mon Sep 17 00:00:00 2001
From: Hans Kristian Flaatten <hans.kristian.flaatten@nav.no>
Date: Thu, 5 Feb 2026 10:07:02 +0100
Subject: [PATCH 2/4] feat: implement bulk update and delete functionality for
 sponsor CRM records

---
 .../lib/sponsor/sponsorForConference.test.ts  |  52 ++++++
 src/lib/sponsor-crm/bulk.ts                   | 167 ++++++++++++++++++
 src/server/routers/sponsor.ts                 | 134 +-------------
 3 files changed, 225 insertions(+), 128 deletions(-)
 create mode 100644 src/lib/sponsor-crm/bulk.ts

diff --git a/__tests__/lib/sponsor/sponsorForConference.test.ts b/__tests__/lib/sponsor/sponsorForConference.test.ts
index 674e4f6f..5f3862d0 100644
--- a/__tests__/lib/sponsor/sponsorForConference.test.ts
+++ b/__tests__/lib/sponsor/sponsorForConference.test.ts
@@ -4,6 +4,8 @@ import {
   SponsorForConferenceUpdateSchema,
   SponsorTagSchema,
   ImportAllHistoricSponsorsSchema,
+  BulkUpdateSponsorCRMSchema,
+  BulkDeleteSponsorCRMSchema,
 } from '@/server/schemas/sponsorForConference'
 
 describe('SponsorForConferenceInputSchema', () => {
@@ -180,3 +182,53 @@ describe('ImportAllHistoricSponsorsSchema', () => {
     expect(result.success).toBe(false)
   })
 })
+
+describe('BulkUpdateSponsorCRMSchema', () => {
+  it('passes with valid ids and status', () => {
+    const result = BulkUpdateSponsorCRMSchema.safeParse({
+      ids: ['id-1', 'id-2'],
+      status: 'negotiating',
+    })
+    expect(result.success).toBe(true)
+  })
+
+  it('passes with add_tags', () => {
+    const result = BulkUpdateSponsorCRMSchema.safeParse({
+      ids: ['id-1'],
+      add_tags: ['high-priority', 'returning-sponsor'],
+    })
+    expect(result.success).toBe(true)
+  })
+
+  it('fails with empty ids array', () => {
+    const result = BulkUpdateSponsorCRMSchema.safeParse({
+      ids: [],
+      status: 'closed-won',
+    })
+    expect(result.success).toBe(false)
+  })
+
+  it('fails with invalid status', () => {
+    const result = BulkUpdateSponsorCRMSchema.safeParse({
+      ids: ['id-1'],
+      status: 'invalid',
+    })
+    expect(result.success).toBe(false)
+  })
+})
+
+describe('BulkDeleteSponsorCRMSchema', () => {
+  it('passes with valid ids', () => {
+    const result = BulkDeleteSponsorCRMSchema.safeParse({
+      ids: ['id-1', 'id-2'],
+    })
+    expect(result.success).toBe(true)
+  })
+
+  it('fails with empty ids', () => {
+    const result = BulkDeleteSponsorCRMSchema.safeParse({
+      ids: [],
+    })
+    expect(result.success).toBe(false)
+  })
+})
diff --git a/src/lib/sponsor-crm/bulk.ts b/src/lib/sponsor-crm/bulk.ts
new file mode 100644
index 00000000..68e2c26a
--- /dev/null
+++ b/src/lib/sponsor-crm/bulk.ts
@@ -0,0 +1,167 @@
+import { clientWrite } from '@/lib/sanity/client'
+import {
+  SponsorForConference,
+  SponsorStatus,
+  ContractStatus,
+  InvoiceStatus,
+  SponsorTag,
+} from './types'
+import { formatStatusName } from '@/components/admin/sponsor-crm/utils'
+import { getCurrentDateTime } from '@/lib/time'
+
+export interface BulkUpdateParams {
+  ids: string[]
+  status?: SponsorStatus
+  contract_status?: ContractStatus
+  invoice_status?: InvoiceStatus
+  assigned_to?: string | null
+  tags?: SponsorTag[]
+  add_tags?: SponsorTag[]
+  remove_tags?: SponsorTag[]
+}
+
+/**
+ * Performs bulk updates on sponsor CRM records using a single transaction.
+ * Also logs relevant activities for status and assignee changes.
+ */
+export async function bulkUpdateSponsors(
+  params: BulkUpdateParams,
+  userId: string,
+): Promise<{ success: true; updatedCount: number; totalCount: number }> {
+  const { ids, ...input } = params
+
+  // Fetch all target sponsors in one query
+  const sponsors = await clientWrite.fetch<SponsorForConference[]>(
+    `*[_type == "sponsorForConference" && _id in $ids]`,
+    { ids },
+  )
+
+  const transaction = clientWrite.transaction()
+  let updatedCount = 0
+
+  interface CRMUpdates {
+    status?: SponsorStatus
+    contract_status?: ContractStatus
+    invoice_status?: InvoiceStatus
+    assigned_to?: { _type: 'reference'; _ref: string } | null
+    tags?: SponsorTag[]
+  }
+
+  for (const existing of sponsors) {
+    const updates: CRMUpdates = {}
+    if (input.status !== undefined) updates.status = input.status
+    if (input.contract_status !== undefined)
+      updates.contract_status = input.contract_status
+    if (input.invoice_status !== undefined)
+      updates.invoice_status = input.invoice_status
+    if (input.assigned_to !== undefined) {
+      updates.assigned_to =
+        input.assigned_to === null
+          ? null
+          : { _type: 'reference', _ref: input.assigned_to }
+    }
+
+    // Handle tags
+    let currentTags = existing.tags || []
+    let tagsChanged = false
+
+    if (input.tags !== undefined) {
+      currentTags = input.tags
+      tagsChanged = true
+    }
+    if (input.add_tags) {
+      const newTags = [...new Set([...currentTags, ...input.add_tags])]
+      if (newTags.length !== currentTags.length) {
+        currentTags = newTags
+        tagsChanged = true
+      }
+    }
+    if (input.remove_tags) {
+      const newTags = currentTags.filter((t) => !input.remove_tags?.includes(t))
+      if (newTags.length !== currentTags.length) {
+        currentTags = newTags
+        tagsChanged = true
+      }
+    }
+
+    if (tagsChanged) {
+      updates.tags = currentTags
+    }
+
+    if (Object.keys(updates).length > 0) {
+      transaction.patch(existing._id, { set: updates })
+      updatedCount++
+
+      // Prepare activity logs
+      if (input.status && input.status !== existing.status) {
+        const activityId = `activity-status-${existing._id}-${Date.now()}`
+        transaction.create({
+          _id: activityId,
+          _type: 'sponsorActivity',
+          sponsor_for_conference: {
+            _type: 'reference',
+            _ref: existing._id,
+          },
+          activity_type: 'stage_change',
+          description: `Status changed from ${formatStatusName(existing.status)} to ${formatStatusName(input.status)}`,
+          metadata: {
+            old_value: existing.status,
+            new_value: input.status,
+            timestamp: getCurrentDateTime(),
+          },
+          created_by: { _type: 'reference', _ref: userId },
+          created_at: getCurrentDateTime(),
+        })
+      }
+
+      if (
+        input.assigned_to !== undefined &&
+        input.assigned_to !== (existing.assigned_to?._ref || null)
+      ) {
+        const activityId = `activity-assign-${existing._id}-${Date.now()}`
+        transaction.create({
+          _id: activityId,
+          _type: 'sponsorActivity',
+          sponsor_for_conference: {
+            _type: 'reference',
+            _ref: existing._id,
+          },
+          activity_type: 'note',
+          description: input.assigned_to
+            ? `Assigned via bulk update`
+            : 'Unassigned via bulk update',
+          created_by: { _type: 'reference', _ref: userId },
+          created_at: getCurrentDateTime(),
+        })
+      }
+    }
+  }
+
+  if (updatedCount > 0) {
+    await transaction.commit()
+  }
+
+  return {
+    success: true,
+    updatedCount,
+    totalCount: ids.length,
+  }
+}
+
+/**
+ * Deletes multiple sponsor CRM records in a single transaction.
+ */
+export async function bulkDeleteSponsors(
+  ids: string[],
+): Promise<{ success: true; deletedCount: number; totalCount: number }> {
+  const transaction = clientWrite.transaction()
+  for (const id of ids) {
+    transaction.delete(id)
+  }
+  await transaction.commit()
+  return {
+    success: true,
+    deletedCount: ids.length,
+    totalCount: ids.length,
+  }
+}
diff --git a/src/server/routers/sponsor.ts b/src/server/routers/sponsor.ts
index 152ff434..311603ba 100644
--- a/src/server/routers/sponsor.ts
+++ b/src/server/routers/sponsor.ts
@@ -73,6 +73,10 @@ import {
   listActivitiesForSponsor,
   listActivitiesForConference,
 } from '@/lib/sponsor-crm/activities'
+import {
+  bulkUpdateSponsors,
+  bulkDeleteSponsors,
+} from '@/lib/sponsor-crm/bulk'
 import { formatStatusName } from '@/components/admin/sponsor-crm/utils'
 
 async function getAllSponsorTiers(conferenceId?: string): Promise<{
@@ -886,124 +890,7 @@ export const sponsorRouter = router({
         }
 
         try {
-          // Fetch all target sponsors in one query
-          const sponsors = await clientWrite.fetch<SponsorForConference[]>(
-            `*[_type == "sponsorForConference" && _id in $ids]`,
-            { ids: input.ids },
-          )
-
-          const transaction = clientWrite.transaction()
-          let updatedCount = 0
-
-          interface CRMUpdates {
-            status?: SponsorStatus
-            contract_status?: ContractStatus
-            invoice_status?: InvoiceStatus
-            assigned_to?: { _type: 'reference'; _ref: string } | null
-            tags?: SponsorTag[]
-          }
-
-          for (const existing of sponsors) {
-            const updates: CRMUpdates = {}
-            if (input.status !== undefined) updates.status = input.status
-            if (input.contract_status !== undefined)
-              updates.contract_status = input.contract_status
-            if (input.invoice_status !== undefined)
-              updates.invoice_status = input.invoice_status
-            if (input.assigned_to !== undefined) {
-              updates.assigned_to =
-                input.assigned_to === null
-                  ? null
-                  : { _type: 'reference', _ref: input.assigned_to }
-            }
-
-            // Handle tags
-            let currentTags = existing.tags || []
-            let tagsChanged = false
-
-            if (input.tags !== undefined) {
-              currentTags = input.tags as SponsorTag[]
-              tagsChanged = true
-            }
-            if (input.add_tags) {
-              const newTags = [...new Set([...currentTags, ...input.add_tags])]
-              if (newTags.length !== currentTags.length) {
-                currentTags = newTags as SponsorTag[]
-                tagsChanged = true
-              }
-            }
-            if (input.remove_tags) {
-              const newTags = currentTags.filter(
-                (t) => !input.remove_tags?.includes(t),
-              )
-              if (newTags.length !== currentTags.length) {
-                currentTags = newTags as SponsorTag[]
-                tagsChanged = true
-              }
-            }
-
-            if (tagsChanged) {
-              updates.tags = currentTags
-            }
-
-            if (Object.keys(updates).length > 0) {
-              transaction.patch(existing._id, { set: updates })
-              updatedCount++
-
-              // Prepare activity logs
-              if (input.status && input.status !== existing.status) {
-                const activityId = `activity-status-${existing._id}-${Date.now()}`
-                transaction.create({
-                  _id: activityId,
-                  _type: 'sponsorActivity',
-                  sponsor_for_conference: {
-                    _type: 'reference',
-                    _ref: existing._id,
-                  },
-                  activity_type: 'stage_change',
-                  description: `Status changed from ${formatStatusName(existing.status)} to ${formatStatusName(input.status)}`,
-                  metadata: {
-                    old_value: existing.status,
-                    new_value: input.status,
-                    timestamp: getCurrentDateTime(),
-                  },
-                  created_by: { _type: 'reference', _ref: userId },
-                  created_at: getCurrentDateTime(),
-                })
-              }
-
-              if (
-                input.assigned_to !== undefined &&
-                input.assigned_to !== (existing.assigned_to?._ref || null)
-              ) {
-                const activityId = `activity-assign-${existing._id}-${Date.now()}`
-                transaction.create({
-                  _id: activityId,
-                  _type: 'sponsorActivity',
-                  sponsor_for_conference: {
-                    _type: 'reference',
-                    _ref: existing._id,
-                  },
-                  activity_type: 'note',
-                  description: input.assigned_to
-                    ? `Assigned via bulk update`
-                    : 'Unassigned via bulk update',
-                  created_by: { _type: 'reference', _ref: userId },
-                  created_at: getCurrentDateTime(),
-                })
-              }
-            }
-          }
-
-          if (updatedCount > 0) {
-            await transaction.commit()
-          }
-
-          return {
-            success: true,
-            updatedCount,
-            totalCount: input.ids.length,
-          }
+          return await bulkUpdateSponsors(input, userId)
         } catch (error) {
           console.error('Bulk update error:', error)
           throw new TRPCError({
@@ -1018,16 +905,7 @@ export const sponsorRouter = router({
       .input(BulkDeleteSponsorCRMSchema)
       .mutation(async ({ input }) => {
         try {
-          const transaction = clientWrite.transaction()
-          for (const id of input.ids) {
-            transaction.delete(id)
-          }
-          await transaction.commit()
-          return {
-            success: true,
-            deletedCount: input.ids.length,
-            totalCount: input.ids.length,
-          }
+          return await bulkDeleteSponsors(input.ids)
         } catch (error) {
           console.error('Bulk delete error:', error)
           throw new TRPCError({

From efd134d8196c30b731472c3b002d7112fbf2c8ef Mon Sep 17 00:00:00 2001
From: Hans Kristian Flaatten <hans.kristian.flaatten@nav.no>
Date: Thu, 5 Feb 2026 10:18:49 +0100
Subject: [PATCH 3/4] feat: add optional website and logo fields to sponsor
 interfaces and schemas; implement nanoid for unique contact keys; enhance
 email sending error handling

---
 package.json                                  |  1 +
 pnpm-lock.yaml                                |  3 +
 .../admin/api/sponsors/email/send/route.ts    |  7 ++
 .../admin/sponsors/crm/SponsorCRMClient.tsx   | 26 +++++++-
 .../(admin)/admin/tickets/discount/page.tsx   |  4 +-
 src/components/admin/DiscountCodeManager.tsx  |  4 +-
 src/components/admin/SponsorAddModal.tsx      |  8 +--
 .../admin/SponsorDiscountEmailModal.tsx       |  4 +-
 .../admin/SponsorIndividualEmailModal.tsx     | 64 +++++++++++--------
 .../admin/SponsorTierManagement.tsx           |  2 +-
 .../admin/sponsor-crm/SponsorCard.tsx         |  3 +-
 .../admin/sponsor/SponsorContactEditor.tsx    |  3 +-
 src/lib/sponsor-crm/bulk.ts                   | 24 +++++--
 src/lib/sponsor/types.ts                      | 16 ++---
 src/server/routers/sponsor.ts                 | 10 +--
 src/server/schemas/sponsor.ts                 |  8 ++-
 16 files changed, 121 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index 944b380b..35fb10a4 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "html2canvas-pro": "^1.6.6",
     "jose": "^6.1.3",
     "jsonld": "^9.0.0",
+    "nanoid": "^5.1.6",
     "next": "^16.1.6",
     "next-auth": "5.0.0-beta.30",
     "next-sanity": "^12.0.15",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5edb089c..994c1c51 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -104,6 +104,9 @@ importers:
       jsonld:
         specifier: ^9.0.0
         version: 9.0.0
+      nanoid:
+        specifier: ^5.1.6
+        version: 5.1.6
       next:
         specifier: ^16.1.6
         version: 16.1.6(@babel/core@7.29.0)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
diff --git a/src/app/(admin)/admin/api/sponsors/email/send/route.ts b/src/app/(admin)/admin/api/sponsors/email/send/route.ts
index 33e84ae2..a0c080f8 100644
--- a/src/app/(admin)/admin/api/sponsors/email/send/route.ts
+++ b/src/app/(admin)/admin/api/sponsors/email/send/route.ts
@@ -58,6 +58,13 @@ export const POST = auth(async (req: NextAuthRequest) => {
       htmlContent: htmlContent!,
     })
 
+    if (!conference.sponsor_email) {
+      return createEmailErrorResponse(
+        'Missing sponsor_email in conference configuration',
+        500,
+      )
+    }
+
     const result = await retryWithBackoff(async () => {
       return await resend.emails.send({
         from: `${conference.organizer || 'Cloud Native Days'} <${conference.sponsor_email}>`,
diff --git a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
index bfb967dd..48b69488 100644
--- a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
+++ b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
@@ -17,7 +17,7 @@ import {
 import { SponsorBoardColumn } from '@/components/admin/sponsor-crm/SponsorBoardColumn'
 import { SponsorBulkActions } from '@/components/admin/sponsor-crm/SponsorBulkActions'
 import { FilterDropdown, FilterOption } from '@/components/admin/FilterDropdown'
-import { XMarkIcon, CheckIcon } from '@heroicons/react/20/solid'
+import { XMarkIcon, CheckIcon, PlusIcon } from '@heroicons/react/20/solid'
 import { Conference } from '@/lib/conference/types'
 
 interface SponsorCRMClientProps {
@@ -59,11 +59,19 @@ export function SponsorCRMClient({
     tiers: tiersFilter.length > 0 ? tiersFilter : undefined,
   })
 
-  // Fetch tiers and organizers for filters
+  // Fetch tiers for filters
   const { data: tiers = [] } = api.sponsor.tiers.listByConference.useQuery({
     conferenceId,
   })
-  const { data: organizers = [] } = api.sponsor.crm.listOrganizers.useQuery()
+
+  // Use organizers from conference data
+  const organizers =
+    conference.organizers?.map((o) => ({
+      _id: o._id,
+      name: o.name,
+      email: o.email,
+      avatar: o.image,
+    })) || []
 
   const utils = api.useUtils()
 
@@ -90,6 +98,11 @@ export function SponsorCRMClient({
     setIsFormOpen(true)
   }
 
+  const handleCreateNew = () => {
+    setSelectedSponsor(null)
+    setIsFormOpen(true)
+  }
+
   const handleCloseForm = () => {
     setSelectedSponsor(null)
     setIsFormOpen(false)
@@ -426,6 +439,13 @@ export function SponsorCRMClient({
         </div>
 
         <div className="flex items-center gap-2">
+          <button
+            onClick={handleCreateNew}
+            className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-gray-800 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-700"
+          >
+            <PlusIcon className="-ml-0.5 h-5 w-5" aria-hidden="true" />
+            Create New
+          </button>
           <ImportHistoricSponsorsButton
             conferenceId={conferenceId}
             onSuccess={() => {
diff --git a/src/app/(admin)/admin/tickets/discount/page.tsx b/src/app/(admin)/admin/tickets/discount/page.tsx
index f98edded..e1edbb7e 100644
--- a/src/app/(admin)/admin/tickets/discount/page.tsx
+++ b/src/app/(admin)/admin/tickets/discount/page.tsx
@@ -13,8 +13,8 @@ import Link from 'next/link'
 interface SponsorWithTierInfo {
   id: string
   name: string
-  website: string
-  logo: string
+  website?: string
+  logo?: string
   tier: {
     title: string
     tagline: string
diff --git a/src/components/admin/DiscountCodeManager.tsx b/src/components/admin/DiscountCodeManager.tsx
index 758770be..6b897b62 100644
--- a/src/components/admin/DiscountCodeManager.tsx
+++ b/src/components/admin/DiscountCodeManager.tsx
@@ -25,8 +25,8 @@ import type { EventDiscountWithUsage } from '@/lib/discounts/types'
 interface SponsorWithTierInfo {
   id: string
   name: string
-  website: string
-  logo: string
+  website?: string
+  logo?: string
   tier: {
     title: string
     tagline: string
diff --git a/src/components/admin/SponsorAddModal.tsx b/src/components/admin/SponsorAddModal.tsx
index 98711449..c80a9cf0 100644
--- a/src/components/admin/SponsorAddModal.tsx
+++ b/src/components/admin/SponsorAddModal.tsx
@@ -427,15 +427,11 @@ export default function SponsorAddModal({
     if (!formData.tierId) return false
 
     if (isCreatingNew) {
-      return (
-        formData.name.trim() && formData.website.trim() && formData.logo.trim()
-      )
+      return !!formData.name.trim()
     }
 
     if (editingSponsor || selectedExistingSponsor) {
-      return (
-        formData.name.trim() && formData.website.trim() && formData.logo.trim()
-      )
+      return !!formData.name.trim()
     }
 
     return false
diff --git a/src/components/admin/SponsorDiscountEmailModal.tsx b/src/components/admin/SponsorDiscountEmailModal.tsx
index bbb049f9..ee1a0956 100644
--- a/src/components/admin/SponsorDiscountEmailModal.tsx
+++ b/src/components/admin/SponsorDiscountEmailModal.tsx
@@ -13,8 +13,8 @@ import { createLocalhostWarning } from '@/lib/localhost-warning'
 interface SponsorWithTierInfo {
   id: string
   name: string
-  website: string
-  logo: string
+  website?: string
+  logo?: string
   tier: {
     title: string
     tagline: string
diff --git a/src/components/admin/SponsorIndividualEmailModal.tsx b/src/components/admin/SponsorIndividualEmailModal.tsx
index 99a088b7..85dcdcda 100644
--- a/src/components/admin/SponsorIndividualEmailModal.tsx
+++ b/src/components/admin/SponsorIndividualEmailModal.tsx
@@ -74,32 +74,46 @@ export function SponsorIndividualEmailModal({
     subject: string
     message: PortableTextBlock[]
   }) => {
-    const messageJSON = JSON.stringify(message as PortableTextBlockForHTML[])
-
-    const response = await fetch('/admin/api/sponsors/email/send', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        sponsorId: sponsorForConference.sponsor._id,
-        subject,
-        message: messageJSON,
-      }),
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json()
-      throw new Error(errorData.error || 'Failed to send email')
+    try {
+      const messageJSON = JSON.stringify(message as PortableTextBlockForHTML[])
+
+      const response = await fetch('/admin/api/sponsors/email/send', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          sponsorId: sponsorForConference.sponsor._id,
+          subject,
+          message: messageJSON,
+        }),
+      })
+
+      if (!response.ok) {
+        const errorData = await response.json()
+        showNotification({
+          type: 'error',
+          title: 'Email failed',
+          message: errorData.error || 'Failed to send email',
+        })
+        return
+      }
+
+      const result = await response.json()
+
+      showNotification({
+        type: 'success',
+        title: 'Email sent successfully',
+        message: `Sent to ${result.recipientCount} contact${result.recipientCount > 1 ? 's' : ''} for ${sponsorForConference.sponsor.name}`,
+      })
+    } catch (err) {
+      showNotification({
+        type: 'error',
+        title: 'Network error',
+        message:
+          err instanceof Error ? err.message : 'An unexpected error occurred',
+      })
     }
-
-    const result = await response.json()
-
-    showNotification({
-      type: 'success',
-      title: 'Email sent successfully',
-      message: `Email sent to ${result.recipientCount} contact${result.recipientCount > 1 ? 's' : ''} for ${sponsorForConference.sponsor.name}`,
-    })
   }
 
   const localhostWarning = createLocalhostWarning(domain, 'sponsors')
diff --git a/src/components/admin/SponsorTierManagement.tsx b/src/components/admin/SponsorTierManagement.tsx
index 3e870f1a..646d3dae 100644
--- a/src/components/admin/SponsorTierManagement.tsx
+++ b/src/components/admin/SponsorTierManagement.tsx
@@ -339,7 +339,7 @@ export default function SponsorTierManagement({
                           {sponsor.logo && (
                             <button
                               onClick={() =>
-                                handleDownloadSvg(sponsor.name, sponsor.logo)
+                                handleDownloadSvg(sponsor.name, sponsor.logo!)
                               }
                               className="rounded-md bg-blue-50 p-1.5 text-blue-600 hover:bg-blue-100 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600 dark:bg-blue-900/50 dark:text-blue-400 dark:hover:bg-blue-900"
                               title="Download SVG logo"
diff --git a/src/components/admin/sponsor-crm/SponsorCard.tsx b/src/components/admin/sponsor-crm/SponsorCard.tsx
index 535d5a7f..916dca3f 100644
--- a/src/components/admin/sponsor-crm/SponsorCard.tsx
+++ b/src/components/admin/sponsor-crm/SponsorCard.tsx
@@ -85,7 +85,8 @@ export function SponsorCard({
         <div
           className={clsx(
             'absolute top-1 left-1 z-10 origin-top-left scale-75 transition-transform',
-            (isSelected || true) && 'translate-x-5', // Move avatar right to make room for checkbox
+            isSelected && 'translate-x-5', // Move avatar right when selected
+            'group-hover:translate-x-5', // Move avatar right on hover to make room for checkbox
           )}
         >
           <SpeakerAvatars
diff --git a/src/components/admin/sponsor/SponsorContactEditor.tsx b/src/components/admin/sponsor/SponsorContactEditor.tsx
index b9fcc2f8..244c6adf 100644
--- a/src/components/admin/sponsor/SponsorContactEditor.tsx
+++ b/src/components/admin/sponsor/SponsorContactEditor.tsx
@@ -12,6 +12,7 @@ import {
   CheckIcon,
 } from '@heroicons/react/24/outline'
 import { ContactRoleSelect } from '@/components/common/ContactRoleSelect'
+import { nanoid } from 'nanoid'
 import { api } from '@/lib/trpc/client'
 import { useNotification } from '../NotificationProvider'
 
@@ -62,7 +63,7 @@ export function SponsorContactEditor({
     setContacts([
       ...contacts,
       {
-        _key: `contact-${Date.now()}`,
+        _key: nanoid(),
         name: '',
         email: '',
         phone: '',
diff --git a/src/lib/sponsor-crm/bulk.ts b/src/lib/sponsor-crm/bulk.ts
index 68e2c26a..716c6bee 100644
--- a/src/lib/sponsor-crm/bulk.ts
+++ b/src/lib/sponsor-crm/bulk.ts
@@ -30,7 +30,7 @@ export async function bulkUpdateSponsors(
 ): Promise<{ success: true; updatedCount: number; totalCount: number }> {
   const { ids, ...input } = params
 
-  // Fetch all target sponsors in one query
+  // SECURITY: Only fetch and update documents of type sponsorForConference
   const sponsors = await clientWrite.fetch<SponsorForConference[]>(
     `*[_type == "sponsorForConference" && _id in $ids]`,
     { ids },
@@ -72,14 +72,14 @@ export async function bulkUpdateSponsors(
     if (input.add_tags) {
       const newTags = [...new Set([...currentTags, ...input.add_tags])]
       if (newTags.length !== currentTags.length) {
-        currentTags = newTags
+        currentTags = newTags as SponsorTag[]
         tagsChanged = true
       }
     }
     if (input.remove_tags) {
       const newTags = currentTags.filter((t) => !input.remove_tags?.includes(t))
       if (newTags.length !== currentTags.length) {
-        currentTags = newTags
+        currentTags = newTags as SponsorTag[]
         tagsChanged = true
       }
     }
@@ -93,7 +93,8 @@ export async function bulkUpdateSponsors(
       updatedCount++
 
       // Prepare activity logs
-      if (input.status && input.status !== existing.status) {
+      // FIXED: Use undefined check instead of truthiness to avoid skipping valid enum values
+      if (input.status !== undefined && input.status !== existing.status) {
         const activityId = `activity-status-${existing._id}-${Date.now()}`
         transaction.create({
           _id: activityId,
@@ -150,14 +151,29 @@ export async function bulkUpdateSponsors(
 
 /**
  * Deletes multiple sponsor CRM records in a single transaction.
+ * Also cleans up related activity documents to prevent orphaned data.
  */
 export async function bulkDeleteSponsors(
   ids: string[],
 ): Promise<{ success: true; deletedCount: number; totalCount: number }> {
+  // Find all related activity documents
+  const relatedActivityIds = await clientWrite.fetch<string[]>(
+    `*[_type == "sponsorActivity" && sponsor_for_conference._ref in $ids]._id`,
+    { ids },
+  )
+
   const transaction = clientWrite.transaction()
+
+  // Delete the sponsor-conference documents
   for (const id of ids) {
     transaction.delete(id)
   }
+
+  // Delete the related activity documents
+  for (const id of relatedActivityIds) {
+    transaction.delete(id)
+  }
+
   await transaction.commit()
   return {
     success: true,
diff --git a/src/lib/sponsor/types.ts b/src/lib/sponsor/types.ts
index a02f7d36..d2f273a5 100644
--- a/src/lib/sponsor/types.ts
+++ b/src/lib/sponsor/types.ts
@@ -53,8 +53,8 @@ export interface ConferenceSponsor {
   sponsor: {
     _id: string
     name: string
-    website: string
-    logo: string
+    website?: string
+    logo?: string
     logo_bright?: string
   }
   tier: {
@@ -73,8 +73,8 @@ export interface ConferenceSponsorWithContact {
   sponsor: {
     _id: string
     name: string
-    website: string
-    logo: string
+    website?: string
+    logo?: string
     logo_bright?: string
     org_number?: string
     contact_persons?: ContactPerson[]
@@ -108,8 +108,8 @@ export interface BillingInfo {
 
 export interface SponsorInput {
   name: string
-  website: string
-  logo: string
+  website?: string
+  logo?: string
   logo_bright?: string
   org_number?: string
   contact_persons?: ContactPerson[]
@@ -122,8 +122,8 @@ export interface SponsorExisting {
   _createdAt: string
   _updatedAt: string
   name: string
-  website: string
-  logo: string
+  website?: string
+  logo?: string
   logo_bright?: string
 }
 
diff --git a/src/server/routers/sponsor.ts b/src/server/routers/sponsor.ts
index 311603ba..f8ad2181 100644
--- a/src/server/routers/sponsor.ts
+++ b/src/server/routers/sponsor.ts
@@ -38,11 +38,7 @@ import type {
 } from '@/lib/sponsor/types'
 import type {
   SponsorTag,
-  SponsorForConference,
   SponsorForConferenceInput,
-  SponsorStatus,
-  ContractStatus,
-  InvoiceStatus,
 } from '@/lib/sponsor-crm/types'
 import {
   createSponsorForConference,
@@ -73,11 +69,7 @@ import {
   listActivitiesForSponsor,
   listActivitiesForConference,
 } from '@/lib/sponsor-crm/activities'
-import {
-  bulkUpdateSponsors,
-  bulkDeleteSponsors,
-} from '@/lib/sponsor-crm/bulk'
-import { formatStatusName } from '@/components/admin/sponsor-crm/utils'
+import { bulkUpdateSponsors, bulkDeleteSponsors } from '@/lib/sponsor-crm/bulk'
 
 async function getAllSponsorTiers(conferenceId?: string): Promise<{
   sponsorTiers?: SponsorTierExisting[]
diff --git a/src/server/schemas/sponsor.ts b/src/server/schemas/sponsor.ts
index 13a17b70..1115f53e 100644
--- a/src/server/schemas/sponsor.ts
+++ b/src/server/schemas/sponsor.ts
@@ -19,8 +19,12 @@ export const BillingInfoSchema = z.object({
 
 export const SponsorInputSchema = z.object({
   name: z.string().min(1, 'Sponsor name is required'),
-  website: z.string().url('Valid website URL is required'),
-  logo: z.string().min(1, 'Logo is required'),
+  website: z
+    .string()
+    .url('Valid website URL is required')
+    .optional()
+    .or(z.literal('')),
+  logo: z.string().optional().or(z.literal('')),
   logo_bright: z.string().nullable().optional().transform(nullToUndefined),
   org_number: z.string().nullable().optional().transform(nullToUndefined),
   contact_persons: z.array(ContactPersonSchema).optional(),

From c8bb69f6d5aca30b624d31a44acf2455627797d7 Mon Sep 17 00:00:00 2001
From: Hans Kristian Flaatten <hans.kristian.flaatten@nav.no>
Date: Thu, 5 Feb 2026 10:25:31 +0100
Subject: [PATCH 4/4] feat: enforce website field as required in sponsor
 schemas and forms; update related components for consistency

---
 .../admin/sponsors/crm/SponsorCRMClient.tsx   | 32 +++++++++++--------
 .../admin/sponsor-crm/SponsorBoardColumn.tsx  |  7 ++--
 .../admin/sponsor-crm/SponsorCard.tsx         | 12 ++++++-
 .../sponsor-crm/form/SponsorCombobox.tsx      | 14 ++++----
 src/lib/sponsor/types.ts                      |  8 ++---
 src/server/schemas/sponsor.ts                 |  6 +---
 6 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
index 48b69488..ad398c09 100644
--- a/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
+++ b/src/app/(admin)/admin/sponsors/crm/SponsorCRMClient.tsx
@@ -47,15 +47,14 @@ export function SponsorCRMClient({
   const tiersFilter =
     searchParams.get('tiers')?.split(',').filter(Boolean) || []
   const assignedToFilter = searchParams.get('assigned_to') || undefined
-  const tagsFilter = searchParams.get('tags')?.split(',').filter(Boolean) as
-    | SponsorTag[]
-    | undefined
+  const tagsFilter = (searchParams.get('tags')?.split(',').filter(Boolean) ||
+    []) as SponsorTag[]
 
   // Fetch with filters
   const { data: sponsors = [], isLoading } = api.sponsor.crm.list.useQuery({
     conferenceId,
     assigned_to: assignedToFilter,
-    tags: tagsFilter,
+    tags: tagsFilter.length > 0 ? tagsFilter : undefined,
     tiers: tiersFilter.length > 0 ? tiersFilter : undefined,
   })
 
@@ -137,15 +136,21 @@ export function SponsorCRMClient({
   useEffect(() => {
     // eslint-disable-next-line react-hooks/set-state-in-effect -- Clear selection when view/filters change
     handleClearSelection()
-  }, [tiersFilter.length, assignedToFilter, tagsFilter?.length, currentView])
+  }, [tiersFilter.length, assignedToFilter, tagsFilter.length, currentView])
 
-  // CMD+O / CTRL+O keyboard shortcut to open new sponsor form
+  // Keyboard shortcuts
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
+      // CMD+O / CTRL+O: Open form (edit selected or new)
       if ((e.metaKey || e.ctrlKey) && e.key === 'o') {
         e.preventDefault()
         handleOpenForm()
       }
+      // CMD+N / CTRL+N: Create new sponsor
+      if ((e.metaKey || e.ctrlKey) && e.key === 'n') {
+        e.preventDefault()
+        handleCreateNew()
+      }
     }
 
     window.addEventListener('keydown', handleKeyDown)
@@ -206,9 +211,9 @@ export function SponsorCRMClient({
   }
 
   const toggleTagFilter = (tag: SponsorTag) => {
-    const newTags = tagsFilter?.includes(tag)
+    const newTags = tagsFilter.includes(tag)
       ? tagsFilter.filter((t) => t !== tag)
-      : [...(tagsFilter || []), tag]
+      : [...tagsFilter, tag]
     updateFilters('tags', newTags.length > 0 ? newTags.join(',') : null)
   }
 
@@ -230,7 +235,7 @@ export function SponsorCRMClient({
 
   // Calculate active filter count
   const activeFilterCount =
-    tiersFilter.length + (assignedToFilter ? 1 : 0) + (tagsFilter?.length || 0)
+    tiersFilter.length + (assignedToFilter ? 1 : 0) + tagsFilter.length
 
   // Available tags
   const availableTags: SponsorTag[] = [
@@ -397,7 +402,7 @@ export function SponsorCRMClient({
           {/* Tags Filter */}
           <FilterDropdown
             label="Tags"
-            activeCount={tagsFilter?.length || 0}
+            activeCount={tagsFilter.length}
             position="left"
             width="wide"
           >
@@ -405,7 +410,7 @@ export function SponsorCRMClient({
               <FilterOption
                 key={tag}
                 onClick={() => toggleTagFilter(tag)}
-                checked={tagsFilter?.includes(tag) || false}
+                checked={tagsFilter.includes(tag)}
                 keepOpen
               >
                 {tag
@@ -441,9 +446,9 @@ export function SponsorCRMClient({
         <div className="flex items-center gap-2">
           <button
             onClick={handleCreateNew}
-            className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-gray-300 ring-inset hover:bg-gray-50 dark:bg-gray-800 dark:text-white dark:ring-gray-600 dark:hover:bg-gray-700"
+            className="inline-flex cursor-pointer items-center gap-1.5 rounded-md bg-indigo-600 px-2.5 py-1.5 text-xs font-medium text-white hover:bg-indigo-500 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none dark:bg-indigo-500 dark:hover:bg-indigo-400"
           >
-            <PlusIcon className="-ml-0.5 h-5 w-5" aria-hidden="true" />
+            <PlusIcon className="h-3.5 w-3.5" aria-hidden="true" />
             Create New
           </button>
           <ImportHistoricSponsorsButton
@@ -482,6 +487,7 @@ export function SponsorCRMClient({
               sponsors={columnSponsors}
               isLoading={isLoading}
               selectedIds={selectedIds}
+              isSelectionMode={selectedIds.length > 0}
               onSponsorClick={handleOpenForm}
               onSponsorDelete={handleDelete}
               onSponsorEmail={handleOpenEmail}
diff --git a/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx b/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
index 65b88522..c095e788 100644
--- a/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
+++ b/src/components/admin/sponsor-crm/SponsorBoardColumn.tsx
@@ -11,6 +11,7 @@ interface SponsorBoardColumnProps {
   sponsors: SponsorForConferenceExpanded[]
   isLoading?: boolean
   selectedIds?: string[]
+  isSelectionMode?: boolean
   onSponsorClick: (sponsor: SponsorForConferenceExpanded) => void
   onSponsorDelete: (sponsorId: string) => void
   onSponsorEmail?: (sponsor: SponsorForConferenceExpanded) => void
@@ -24,6 +25,7 @@ export function SponsorBoardColumn({
   sponsors,
   isLoading = false,
   selectedIds = [],
+  isSelectionMode = false,
   onSponsorClick,
   onSponsorDelete,
   onSponsorEmail,
@@ -86,6 +88,7 @@ export function SponsorBoardColumn({
                 key={sponsor._id}
                 sponsor={sponsor}
                 isSelected={selectedIds.includes(sponsor._id)}
+                isSelectionMode={isSelectionMode}
                 onToggleSelect={() => onSponsorToggleSelect?.(sponsor._id)}
                 onEdit={() => onSponsorClick(sponsor)}
                 onDelete={() => onSponsorDelete(sponsor._id)}
@@ -98,7 +101,7 @@ export function SponsorBoardColumn({
           {sponsors.length === 0 && (
             <button
               onClick={onAddClick}
-              className="w-full rounded-lg border-2 border-dashed border-gray-300 bg-transparent p-4 text-center text-sm text-gray-500 transition-all hover:border-brand-cloud-blue hover:text-brand-cloud-blue dark:border-gray-600 dark:text-gray-500 dark:hover:border-blue-500 dark:hover:text-blue-400"
+              className="w-full cursor-pointer rounded-lg border-2 border-dashed border-gray-300 bg-transparent p-4 text-center text-sm text-gray-500 transition-all hover:border-brand-cloud-blue hover:text-brand-cloud-blue dark:border-gray-600 dark:text-gray-500 dark:hover:border-blue-500 dark:hover:text-blue-400"
             >
               {emptyMessage}
             </button>
@@ -107,7 +110,7 @@ export function SponsorBoardColumn({
           {sponsors.length > 0 && (
             <button
               onClick={onAddClick}
-              className="group w-full rounded-lg border-2 border-dashed border-gray-300 bg-transparent p-3 text-center text-sm text-gray-500 transition-all hover:border-brand-cloud-blue hover:text-brand-cloud-blue dark:border-gray-600 dark:text-gray-500 dark:hover:border-blue-500 dark:hover:text-blue-400"
+              className="group w-full cursor-pointer rounded-lg border-2 border-dashed border-gray-300 bg-transparent p-3 text-center text-sm text-gray-500 transition-all hover:border-brand-cloud-blue hover:text-brand-cloud-blue dark:border-gray-600 dark:text-gray-500 dark:hover:border-blue-500 dark:hover:text-blue-400"
             >
               <PlusIcon className="mx-auto mb-1 h-5 w-5" />
               Add sponsor
diff --git a/src/components/admin/sponsor-crm/SponsorCard.tsx b/src/components/admin/sponsor-crm/SponsorCard.tsx
index 916dca3f..a45e6db2 100644
--- a/src/components/admin/sponsor-crm/SponsorCard.tsx
+++ b/src/components/admin/sponsor-crm/SponsorCard.tsx
@@ -18,6 +18,7 @@ import clsx from 'clsx'
 interface SponsorCardProps {
   sponsor: SponsorForConferenceExpanded
   isSelected?: boolean
+  isSelectionMode?: boolean
   onToggleSelect?: (e: React.MouseEvent) => void
   onEdit: () => void
   onDelete: () => void
@@ -27,6 +28,7 @@ interface SponsorCardProps {
 export function SponsorCard({
   sponsor,
   isSelected = false,
+  isSelectionMode = false,
   onToggleSelect,
   onEdit,
   onDelete,
@@ -54,6 +56,14 @@ export function SponsorCard({
     onToggleSelect?.(e)
   }
 
+  const handleCardClick = (e: React.MouseEvent) => {
+    if (isSelectionMode) {
+      onToggleSelect?.(e)
+    } else {
+      onEdit()
+    }
+  }
+
   return (
     <div
       className={clsx(
@@ -62,7 +72,7 @@ export function SponsorCard({
           ? 'border-indigo-500 bg-indigo-50/30 shadow-sm ring-1 ring-indigo-500 dark:border-indigo-400 dark:bg-indigo-900/20'
           : 'border-gray-200 bg-white',
       )}
-      onClick={onEdit}
+      onClick={handleCardClick}
     >
       {/* Selection Checkbox */}
       <div
diff --git a/src/components/admin/sponsor-crm/form/SponsorCombobox.tsx b/src/components/admin/sponsor-crm/form/SponsorCombobox.tsx
index 325caa6f..311d933b 100644
--- a/src/components/admin/sponsor-crm/form/SponsorCombobox.tsx
+++ b/src/components/admin/sponsor-crm/form/SponsorCombobox.tsx
@@ -59,11 +59,11 @@ export function SponsorCombobox({
   })
 
   const handleCreateNewSponsor = async () => {
-    if (!newSponsorData.name.trim()) return
+    if (!newSponsorData.name.trim() || !newSponsorData.website.trim()) return
 
     await createSponsorMutation.mutateAsync({
       name: newSponsorData.name,
-      website: newSponsorData.website || '',
+      website: newSponsorData.website,
       logo: '',
     })
   }
@@ -121,7 +121,7 @@ export function SponsorCombobox({
         <button
           type="button"
           onClick={() => setIsCreatingNew(true)}
-          className="mt-2 text-sm text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300"
+          className="mt-2 cursor-pointer text-sm text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300"
         >
           + Create new sponsor
         </button>
@@ -148,7 +148,7 @@ export function SponsorCombobox({
           </div>
           <div>
             <label className="block text-left text-sm font-medium text-gray-900 dark:text-white">
-              Website
+              Website *
             </label>
             <input
               type="url"
@@ -168,9 +168,11 @@ export function SponsorCombobox({
               type="button"
               onClick={handleCreateNewSponsor}
               disabled={
-                createSponsorMutation.isPending || !newSponsorData.name.trim()
+                createSponsorMutation.isPending ||
+                !newSponsorData.name.trim() ||
+                !newSponsorData.website.trim()
               }
-              className="inline-flex items-center justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 disabled:bg-gray-400 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:disabled:bg-gray-600"
+              className="inline-flex cursor-pointer items-center justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 disabled:bg-gray-400 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:disabled:bg-gray-600"
             >
               {createSponsorMutation.isPending ? 'Creating...' : 'Create'}
             </button>
diff --git a/src/lib/sponsor/types.ts b/src/lib/sponsor/types.ts
index d2f273a5..2b90f0f8 100644
--- a/src/lib/sponsor/types.ts
+++ b/src/lib/sponsor/types.ts
@@ -53,7 +53,7 @@ export interface ConferenceSponsor {
   sponsor: {
     _id: string
     name: string
-    website?: string
+    website: string
     logo?: string
     logo_bright?: string
   }
@@ -73,7 +73,7 @@ export interface ConferenceSponsorWithContact {
   sponsor: {
     _id: string
     name: string
-    website?: string
+    website: string
     logo?: string
     logo_bright?: string
     org_number?: string
@@ -108,7 +108,7 @@ export interface BillingInfo {
 
 export interface SponsorInput {
   name: string
-  website?: string
+  website: string
   logo?: string
   logo_bright?: string
   org_number?: string
@@ -122,7 +122,7 @@ export interface SponsorExisting {
   _createdAt: string
   _updatedAt: string
   name: string
-  website?: string
+  website: string
   logo?: string
   logo_bright?: string
 }
diff --git a/src/server/schemas/sponsor.ts b/src/server/schemas/sponsor.ts
index 1115f53e..c0abf645 100644
--- a/src/server/schemas/sponsor.ts
+++ b/src/server/schemas/sponsor.ts
@@ -19,11 +19,7 @@ export const BillingInfoSchema = z.object({
 
 export const SponsorInputSchema = z.object({
   name: z.string().min(1, 'Sponsor name is required'),
-  website: z
-    .string()
-    .url('Valid website URL is required')
-    .optional()
-    .or(z.literal('')),
+  website: z.string().url('Valid website URL is required'),
   logo: z.string().optional().or(z.literal('')),
   logo_bright: z.string().nullable().optional().transform(nullToUndefined),
   org_number: z.string().nullable().optional().transform(nullToUndefined),