From 8cc835983bdb3651b530d7f7d1933ffb96d2b948 Mon Sep 17 00:00:00 2001
From: hamaguchi <93605959+LeandroHamaguchi@users.noreply.github.com>
Date: Sun, 5 Apr 2026 16:45:02 -0400
Subject: [PATCH 1/3] Add Volunteers Shortcuts: Implement
 VolunteersShortcutsModal for bulk actions and filtering. Enhance FilterBar
 with shortcut presets for missing contact information. Update TableToolbar to
 include shortcuts button for admin users. Refactor volunteers data handling
 to support new filters and shortcuts functionality.

---
 src/app/globals.css                           |  21 +
 .../volunteers/AddVolunteerModal.tsx          |   6 +-
 src/components/volunteers/FilterBar.tsx       | 138 +++-
 src/components/volunteers/TableToolbar.tsx    |  90 +--
 .../volunteers/VolunteersShortcutsModal.tsx   | 730 ++++++++++++++++++
 src/components/volunteers/VolunteersTable.tsx | 144 ++++
 .../volunteers/volunteersShortcutsUtils.ts    | 206 +++++
 src/lib/api/getVolunteersByMultipleColumns.ts |  82 +-
 src/lib/volunteerFilterShortcuts.ts           |  11 +
 .../volunteersShortcutsUtils.test.ts          | 169 ++++
 .../getVolunteersByMultipleColumns.test.ts    |  18 +
 11 files changed, 1527 insertions(+), 88 deletions(-)
 create mode 100644 src/components/volunteers/VolunteersShortcutsModal.tsx
 create mode 100644 src/components/volunteers/volunteersShortcutsUtils.ts
 create mode 100644 src/lib/volunteerFilterShortcuts.ts
 create mode 100644 tests/components/volunteersShortcutsUtils.test.ts

diff --git a/src/app/globals.css b/src/app/globals.css
index 9fe15a08..cb3f2488 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -37,4 +37,25 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
   }
+
+  /* Pointer on interactive controls (Tailwind preflight defaults buttons to default cursor). */
+  button:not(:disabled),
+  input[type="button"]:not(:disabled),
+  input[type="submit"]:not(:disabled),
+  input[type="reset"]:not(:disabled),
+  [role="button"]:not([aria-disabled="true"]) {
+    cursor: pointer;
+  }
+
+  button:disabled,
+  input[type="button"]:disabled,
+  input[type="submit"]:disabled,
+  input[type="reset"]:disabled,
+  [role="button"][aria-disabled="true"] {
+    cursor: not-allowed;
+  }
+
+  ::file-selector-button {
+    cursor: pointer;
+  }
 }
diff --git a/src/components/volunteers/AddVolunteerModal.tsx b/src/components/volunteers/AddVolunteerModal.tsx
index 3c1bab3b..af9eb0a4 100644
--- a/src/components/volunteers/AddVolunteerModal.tsx
+++ b/src/components/volunteers/AddVolunteerModal.tsx
@@ -252,11 +252,11 @@ function CohortField({
             onRemove={() => removeAt(i)}
           />
         ))}
-        <div className="flex flex-1 min-w-[min(100%,12rem)] flex-wrap items-center gap-2">
+        <div className="flex flex-wrap items-center gap-2">
           <select
             value={term}
             onChange={(e) => setTerm(e.target.value as CohortTerm)}
-            className="rounded-md border border-gray-200 bg-gray-50/80 py-1.5 pl-2 pr-7 text-sm text-gray-900 outline-none focus:border-purple-400 focus:ring-1 focus:ring-purple-500/30"
+            className="w-23 shrink-0 rounded-md border border-gray-200 bg-gray-50/80 py-1.5 pl-1.5 pr-6 text-sm text-gray-900 outline-none focus:border-purple-400 focus:ring-1 focus:ring-purple-500/30"
             aria-label="Cohort term"
           >
             {COHORT_TERMS.map((t) => (
@@ -277,7 +277,7 @@ function CohortField({
                 addDraft();
               }
             }}
-            className="w-24 rounded-md border border-gray-200 bg-gray-50/80 py-1.5 px-2 text-sm tabular-nums outline-none focus:border-purple-400 focus:ring-1 focus:ring-purple-500/30"
+            className="w-16 shrink-0 rounded-md border border-gray-200 bg-gray-50/80 py-1.5 px-1.5 text-center text-sm tabular-nums outline-none focus:border-purple-400 focus:ring-1 focus:ring-purple-500/30"
             aria-label="Cohort year"
           />
           <button
diff --git a/src/components/volunteers/FilterBar.tsx b/src/components/volunteers/FilterBar.tsx
index 4b794486..b23ae832 100644
--- a/src/components/volunteers/FilterBar.tsx
+++ b/src/components/volunteers/FilterBar.tsx
@@ -1,11 +1,22 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { FilterTuple } from "@/lib/api/getVolunteersByMultipleColumns";
-import { ChevronDown, Plus, X, ShieldCheck, AlertTriangle } from "lucide-react";
+import {
+  ChevronDown,
+  Plus,
+  X,
+  ShieldCheck,
+  AlertTriangle,
+  Filter,
+} from "lucide-react";
 import { SortingState } from "@tanstack/react-table";
 import clsx from "clsx";
 import { FILTERABLE_COLUMNS } from "./volunteerColumns";
 import { FilterModal, filterModalAlignRight } from "./FilterModal";
 import { DEFAULT_OPT_IN_FILTER } from "./useVolunteersData";
+import {
+  BLANK_FIELD_FILTER_VALUE,
+  CONTACT_INCOMPLETE_FIELD,
+} from "@/lib/volunteerFilterShortcuts";
 
 function isDefaultFilter(filter: FilterTuple): boolean {
   return (
@@ -20,6 +31,30 @@ function columnFilterCount(filters: FilterTuple[]): number {
   return filters.filter((f) => f.field !== DEFAULT_OPT_IN_FILTER.field).length;
 }
 
+function isShortcutPresetFilter(f: FilterTuple): boolean {
+  if (f.field === CONTACT_INCOMPLETE_FIELD) return true;
+  if (
+    (f.field === "email" || f.field === "phone") &&
+    f.values[0] === BLANK_FIELD_FILTER_VALUE
+  ) {
+    return true;
+  }
+  return false;
+}
+
+function shortcutPresetLabel(f: FilterTuple): string | null {
+  if (f.field === "email" && f.values[0] === BLANK_FIELD_FILTER_VALUE) {
+    return "Missing email";
+  }
+  if (f.field === "phone" && f.values[0] === BLANK_FIELD_FILTER_VALUE) {
+    return "Missing phone";
+  }
+  if (f.field === CONTACT_INCOMPLETE_FIELD) {
+    return "Missing email or phone";
+  }
+  return null;
+}
+
 type OptInWarningVariant = "remove" | "include-no";
 
 const VARIANT_CONTENT: Record<
@@ -162,6 +197,9 @@ export const FilterBar = ({
   if (filters.length === 0 && sorting.length === 0) return null;
 
   const handleEditClick = (e: React.MouseEvent, index: number): void => {
+    const target = filters[index];
+    if (target && isShortcutPresetFilter(target)) return;
+
     setIsAddingNew(false);
     setNewAnchorRect(null);
     if (editingIndex === index) {
@@ -314,6 +352,15 @@ export const FilterBar = ({
             const isCurrentlyEditing = editingIndex === index;
             const Icon = colDef?.icon;
             const isDefault = isDefaultFilter(filter);
+            const presetShortcut = shortcutPresetLabel(filter);
+            const isPreset = isShortcutPresetFilter(filter);
+
+            const chipStyle = clsx(
+              "flex h-9 items-center gap-2 rounded-lg border text-sm font-medium transition-colors",
+              isDefault
+                ? "border-emerald-200/90 bg-emerald-50 text-emerald-900"
+                : "border-gray-200 bg-white text-gray-900"
+            );
 
             return (
               <div
@@ -323,36 +370,67 @@ export const FilterBar = ({
                   isCurrentlyEditing ? "z-50" : "z-10"
                 )}
               >
-                <button
-                  type="button"
-                  onClick={(e) => handleEditClick(e, index)}
-                  aria-expanded={isCurrentlyEditing}
-                  aria-haspopup="dialog"
-                  title={
-                    isDefault
-                      ? "Default privacy filter — click to edit or remove"
-                      : `Filter by ${colDef?.label ?? filter.field} — click to edit`
-                  }
-                  className={clsx(
-                    "flex h-9 cursor-pointer items-center gap-2 rounded-lg border px-2.5 text-sm font-medium transition-colors",
-                    "focus:outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-300 focus-visible:ring-offset-1",
-                    isDefault
-                      ? "border-emerald-200/90 bg-emerald-50 text-emerald-900 hover:bg-emerald-100"
-                      : "border-gray-200 bg-white text-gray-900 hover:border-gray-300 hover:bg-white"
-                  )}
-                >
-                  {isDefault ? (
-                    <ShieldCheck className="h-3.5 w-3.5 shrink-0 text-gray-600" />
-                  ) : (
-                    Icon && (
+                {isPreset ? (
+                  <div
+                    className={clsx(
+                      chipStyle,
+                      "cursor-default pr-0.5 focus-within:ring-2 focus-within:ring-gray-300 focus-within:ring-offset-1"
+                    )}
+                    title="Shortcut filter from Shortcuts panel"
+                  >
+                    {Icon ? (
+                      <Icon className="ml-2.5 h-3.5 w-3.5 shrink-0 text-gray-600" />
+                    ) : (
+                      <Filter className="ml-2.5 h-3.5 w-3.5 shrink-0 text-gray-600" />
+                    )}
+                    <span className="max-w-44 truncate whitespace-nowrap sm:max-w-60">
+                      {presetShortcut}
+                    </span>
+                    <button
+                      type="button"
+                      onClick={() => {
+                        setFilters((prev) =>
+                          prev.filter((_, i) => i !== index)
+                        );
+                        setEditingIndex(null);
+                        setEditAnchorRect(null);
+                      }}
+                      className="mr-0.5 inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md text-gray-500 hover:bg-gray-100 hover:text-gray-800"
+                      aria-label="Remove filter"
+                      title="Remove filter"
+                    >
+                      <X className="h-3.5 w-3.5" strokeWidth={2} />
+                    </button>
+                  </div>
+                ) : (
+                  <button
+                    type="button"
+                    onClick={(e) => handleEditClick(e, index)}
+                    aria-expanded={isCurrentlyEditing}
+                    aria-haspopup="dialog"
+                    title={
+                      isDefault
+                        ? "Default privacy filter — click to edit or remove"
+                        : `Filter by ${colDef?.label ?? filter.field} — click to edit`
+                    }
+                    className={clsx(
+                      chipStyle,
+                      "cursor-pointer px-2.5 hover:border-gray-300 hover:bg-white",
+                      "focus:outline-none focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-300 focus-visible:ring-offset-1",
+                      isDefault && "hover:bg-emerald-100"
+                    )}
+                  >
+                    {isDefault ? (
+                      <ShieldCheck className="h-3.5 w-3.5 shrink-0 text-gray-600" />
+                    ) : Icon ? (
                       <Icon className="h-3.5 w-3.5 shrink-0 text-gray-600" />
-                    )
-                  )}
-                  <span className="max-w-48 truncate whitespace-nowrap sm:max-w-64">
-                    {isDefault ? "Opt-in (default)" : colDef?.label}
-                  </span>
-                  <ChevronDown className="h-3.5 w-3.5 shrink-0 text-gray-500" />
-                </button>
+                    ) : null}
+                    <span className="max-w-48 truncate whitespace-nowrap sm:max-w-64">
+                      {isDefault ? "Opt-in (default)" : colDef?.label}
+                    </span>
+                    <ChevronDown className="h-3.5 w-3.5 shrink-0 text-gray-500" />
+                  </button>
+                )}
 
                 <FilterModal
                   isOpen={isCurrentlyEditing}
diff --git a/src/components/volunteers/TableToolbar.tsx b/src/components/volunteers/TableToolbar.tsx
index 3a2c38a8..43fc0a52 100644
--- a/src/components/volunteers/TableToolbar.tsx
+++ b/src/components/volunteers/TableToolbar.tsx
@@ -16,6 +16,7 @@ import {
   Copy,
   ChevronLeft,
   ChevronRight,
+  Keyboard,
 } from "lucide-react";
 import { FilterTuple } from "@/lib/api/getVolunteersByMultipleColumns";
 import { FilterModal, filterModalAlignRight } from "./FilterModal";
@@ -37,6 +38,7 @@ interface TableToolbarProps {
   onDelete: () => void;
   onOpenAddVolunteer: () => void;
   onOpenImportCSV: () => void;
+  onOpenShortcuts: () => void;
   onOpenManageTags: () => void;
   hasEdits: boolean;
   isSaving: boolean;
@@ -68,6 +70,7 @@ export const TableToolbar = ({
   onDelete,
   onOpenAddVolunteer,
   onOpenImportCSV,
+  onOpenShortcuts,
   onOpenManageTags,
   hasEdits,
   isSaving,
@@ -153,9 +156,9 @@ export const TableToolbar = ({
   };
 
   const neutralBtn =
-    "inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg border border-gray-300 bg-white px-3 text-sm font-medium text-gray-800 transition-colors hover:border-purple-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2";
+    "inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg border border-gray-300 bg-white px-3 text-sm font-medium text-gray-800 transition-colors hover:border-purple-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2";
   const neutralBtnActive =
-    "inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg border border-purple-300 bg-purple-100 px-3 text-sm font-medium text-purple-800 transition-colors hover:bg-purple-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2";
+    "inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg border border-purple-300 bg-purple-100 px-3 text-sm font-medium text-purple-800 transition-colors hover:bg-purple-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2";
 
   return (
     <div className="flex flex-col gap-3 min-w-0 xl:flex-row xl:items-center xl:justify-between xl:gap-4">
@@ -186,7 +189,7 @@ export const TableToolbar = ({
               />
               <button
                 type="button"
-                className="absolute left-0 top-1/2 z-20 flex h-7 w-7 -translate-y-1/2 items-center justify-center rounded-full text-gray-400 transition-colors hover:bg-gray-100/90 hover:text-gray-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 focus-visible:ring-offset-0"
+                className="absolute left-0 top-1/2 z-20 flex h-7 w-7 -translate-y-1/2 cursor-pointer items-center justify-center rounded-full text-gray-400 transition-colors hover:bg-gray-100/90 hover:text-gray-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 focus-visible:ring-offset-0"
                 onClick={() => scrollTools("left")}
                 aria-label="Scroll tools left"
               >
@@ -202,7 +205,7 @@ export const TableToolbar = ({
               />
               <button
                 type="button"
-                className="absolute right-0 top-1/2 z-20 flex h-7 w-7 -translate-y-1/2 items-center justify-center rounded-full text-gray-400 transition-colors hover:bg-gray-100/90 hover:text-gray-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 focus-visible:ring-offset-0"
+                className="absolute right-0 top-1/2 z-20 flex h-7 w-7 -translate-y-1/2 cursor-pointer items-center justify-center rounded-full text-gray-400 transition-colors hover:bg-gray-100/90 hover:text-gray-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 focus-visible:ring-offset-0"
                 onClick={() => scrollTools("right")}
                 aria-label="Scroll tools right"
               >
@@ -316,25 +319,34 @@ export const TableToolbar = ({
 
             {role === "admin" && (
               <button
+                type="button"
+                onClick={onOpenShortcuts}
+                className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg bg-primary-purple px-3 py-2 text-sm font-medium text-gray-900 transition-colors hover:bg-secondary-purple focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
+              >
+                <Keyboard className="h-4 w-4 shrink-0" />
+                Shortcuts
+              </button>
+            )}
+
+            {role === "admin" && (
+              <button
+                type="button"
                 onClick={onOpenAddVolunteer}
-                className="group flex items-center justify-start gap-2 w-10 hover:w-36 focus-visible:w-36 overflow-hidden px-3 py-2 bg-accent-purple hover:bg-dark-accent-purple transition-all duration-200 rounded-lg text-sm font-medium text-white shadow-sm"
+                className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg bg-accent-purple px-3 py-2 text-sm font-medium text-white shadow-sm transition-colors hover:bg-dark-accent-purple focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
               >
-                <Plus className="w-4 h-4 shrink-0" />
-                <span className="whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100 transition-opacity">
-                  New Volunteer
-                </span>
+                <Plus className="h-4 w-4 shrink-0" />
+                New Volunteer
               </button>
             )}
 
             {role === "admin" && (
               <button
+                type="button"
                 onClick={onOpenImportCSV}
-                className="group flex items-center justify-start gap-2 w-10 hover:w-40 focus-visible:w-40 overflow-hidden px-3 py-2 bg-primary-purple hover:bg-secondary-purple transition-all duration-200 rounded-lg text-sm font-medium text-gray-900"
+                className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 transition-colors hover:border-purple-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
               >
-                <Import className="w-4 h-4 shrink-0" />
-                <span className="whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100 transition-opacity">
-                  Import from CSV
-                </span>
+                <Import className="h-4 w-4 shrink-0" />
+                Import from CSV
               </button>
             )}
 
@@ -342,42 +354,12 @@ export const TableToolbar = ({
               <button
                 type="button"
                 onClick={onOpenManageTags}
-                className="group flex items-center justify-start gap-2 w-10 hover:w-36 focus-visible:w-36 overflow-hidden px-3 py-2 bg-primary-purple hover:bg-secondary-purple transition-all duration-200 rounded-lg text-sm font-medium text-gray-900"
+                className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg border border-purple-300 bg-purple-50 px-3 py-2 text-sm font-medium text-purple-900 transition-colors hover:border-purple-400 hover:bg-purple-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
               >
-                <Tags className="w-4 h-4 shrink-0" />
-                <span className="whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100 transition-opacity">
-                  Manage tags
-                </span>
+                <Tags className="h-4 w-4 shrink-0" />
+                Manage tags
               </button>
             )}
-
-            {(role === "admin" && selectedCount > 0) || hasEdits ? (
-              <div className="flex items-center gap-2 ml-auto animate-in fade-in slide-in-from-right-2 duration-200">
-                {role === "admin" && selectedCount > 0 && (
-                  <button
-                    onClick={onDelete}
-                    disabled={isDeleting}
-                    className="group flex items-center justify-start gap-2 w-10 hover:w-34 focus-visible:w-34 overflow-hidden px-3 py-2 bg-red-200 hover:bg-red-300 transition-all duration-200 rounded-lg text-sm font-medium text-red-900 disabled:opacity-50"
-                  >
-                    <Trash2 className="w-4 h-4 shrink-0" />
-                    <span className="whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100 transition-opacity">
-                      {isDeleting ? "Deleting..." : "Delete"}
-                    </span>
-                  </button>
-                )}
-                {hasEdits && (
-                  <button
-                    onClick={onSave}
-                    className="group flex items-center justify-start gap-2 w-10 hover:w-32 focus-visible:w-32 overflow-hidden px-3 py-2 bg-green-200 hover:bg-green-300 transition-all duration-200 rounded-lg text-sm font-medium text-green-900"
-                  >
-                    <Save className="w-4 h-4 shrink-0" />
-                    <span className="whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100 transition-opacity">
-                      Save
-                    </span>
-                  </button>
-                )}
-              </div>
-            ) : null}
           </div>
         </div>
       </div>
@@ -409,7 +391,7 @@ export const TableToolbar = ({
               title={`Copy ${selectedCellCount} selected cells (opens format menu)`}
               aria-expanded={isCopyMenuOpen}
               aria-haspopup="menu"
-              className="relative inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-gray-300 bg-white text-gray-800 transition-colors hover:border-purple-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
+              className="relative inline-flex h-9 w-9 shrink-0 cursor-pointer items-center justify-center rounded-lg border border-gray-300 bg-white text-gray-800 transition-colors hover:border-purple-300 hover:bg-gray-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 focus-visible:ring-offset-2"
             >
               <span className="relative inline-flex">
                 <Copy className="h-4 w-4 shrink-0" aria-hidden />
@@ -491,7 +473,7 @@ export const TableToolbar = ({
                 disabled={!canUndo || isSaving}
                 title="Undo (⌘Z)"
                 aria-label="Undo last change"
-                className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 disabled:cursor-not-allowed disabled:opacity-30"
+                className="inline-flex h-9 w-9 shrink-0 cursor-pointer items-center justify-center rounded-lg text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 disabled:cursor-not-allowed disabled:opacity-30"
               >
                 <Undo2 className="h-4 w-4 shrink-0" aria-hidden />
               </button>
@@ -501,7 +483,7 @@ export const TableToolbar = ({
                 disabled={!canRedo || isSaving}
                 title="Redo (⌘⇧Z)"
                 aria-label="Redo last undone change"
-                className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-lg text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 disabled:cursor-not-allowed disabled:opacity-30"
+                className="inline-flex h-9 w-9 shrink-0 cursor-pointer items-center justify-center rounded-lg text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-200 disabled:cursor-not-allowed disabled:opacity-30"
               >
                 <Redo2 className="h-4 w-4 shrink-0" aria-hidden />
               </button>
@@ -515,7 +497,7 @@ export const TableToolbar = ({
               onClick={onViewChanges}
               disabled={!hasEdits || isSaving}
               aria-label={`View pending changes (${pendingChangesCount})`}
-              className="inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg bg-purple-100 px-3 text-sm font-medium text-purple-800 transition-colors hover:bg-purple-200/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 disabled:cursor-not-allowed disabled:opacity-50"
+              className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg bg-purple-100 px-3 text-sm font-medium text-purple-800 transition-colors hover:bg-purple-200/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-purple-300 disabled:cursor-not-allowed disabled:opacity-50"
             >
               <Eye className="h-4 w-4 shrink-0" />
               View Changes ({pendingChangesCount})
@@ -525,7 +507,7 @@ export const TableToolbar = ({
               onClick={onCancel}
               disabled={isSaving}
               aria-label="Cancel edits"
-              className="inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg bg-gray-100 px-3 text-sm font-medium text-gray-800 transition-colors hover:bg-gray-200/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-300 disabled:cursor-not-allowed disabled:opacity-50"
+              className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg bg-gray-100 px-3 text-sm font-medium text-gray-800 transition-colors hover:bg-gray-200/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-gray-300 disabled:cursor-not-allowed disabled:opacity-50"
             >
               <X className="h-4 w-4 shrink-0" />
               Cancel
@@ -535,7 +517,7 @@ export const TableToolbar = ({
               onClick={onSave}
               disabled={isSaving || !hasEdits}
               aria-label="Save changes"
-              className="inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg bg-green-200 px-3 text-sm font-medium text-green-900 transition-colors hover:bg-green-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-green-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+              className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg bg-green-200 px-3 text-sm font-medium text-green-900 transition-colors hover:bg-green-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-green-400 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
             >
               <Save className="h-4 w-4 shrink-0" />
               {isSaving ? "Saving..." : "Save Changes"}
@@ -558,7 +540,7 @@ export const TableToolbar = ({
                   ? "Deleting selected volunteers"
                   : `Delete ${selectedCount} selected volunteers`
               }
-              className="inline-flex h-9 shrink-0 items-center gap-2 whitespace-nowrap rounded-lg border-0 bg-red-500 px-3 text-sm font-medium text-white shadow-sm transition-colors hover:bg-red-600 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-300 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
+              className="inline-flex h-9 shrink-0 cursor-pointer items-center gap-2 whitespace-nowrap rounded-lg border-0 bg-red-500 px-3 text-sm font-medium text-white shadow-sm transition-colors hover:bg-red-600 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-red-300 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
             >
               <Trash2 className="h-4 w-4 shrink-0" />
               {isDeleting ? "Deleting..." : `Delete (${selectedCount})`}
diff --git a/src/components/volunteers/VolunteersShortcutsModal.tsx b/src/components/volunteers/VolunteersShortcutsModal.tsx
new file mode 100644
index 00000000..ee4c6e11
--- /dev/null
+++ b/src/components/volunteers/VolunteersShortcutsModal.tsx
@@ -0,0 +1,730 @@
+"use client";
+
+import React, { useEffect, useMemo, useState } from "react";
+import {
+  X,
+  Phone,
+  Mail,
+  UserPlus,
+  Copy,
+  SlidersHorizontal,
+  Users,
+  Filter,
+  ChevronDown,
+  ChevronRight,
+} from "lucide-react";
+import toast from "react-hot-toast";
+import type { Volunteer } from "./types";
+import { createVolunteerAction } from "@/lib/api/actions";
+import {
+  buildPhoneFormatBulkEdits,
+  collectVisibleEmailsCommaSeparated,
+  collectVisiblePhonesCommaSeparated,
+  findVolunteerDuplicateClusters,
+  parseBatchVolunteerLines,
+  volunteerLabelById,
+} from "./volunteersShortcutsUtils";
+
+type BulkShortcutField =
+  | "opt_in_communication"
+  | "pronouns"
+  | "pseudonym"
+  | "notes";
+
+type ShortcutSectionId =
+  | "formatPhones"
+  | "copyEmails"
+  | "copyPhones"
+  | "bulkField"
+  | "duplicates"
+  | "missingContact"
+  | "batchCreate";
+
+const INITIAL_SECTION_OPEN: Record<ShortcutSectionId, boolean> = {
+  formatPhones: false,
+  copyEmails: false,
+  copyPhones: false,
+  bulkField: false,
+  duplicates: false,
+  missingContact: false,
+  batchCreate: false,
+};
+
+type SectionIcon = React.ComponentType<{ className?: string }>;
+
+function CollapsibleShortcutsSection({
+  sectionId,
+  title,
+  icon: Icon,
+  isOpen,
+  onToggle,
+  contentClassName = "gap-2",
+  children,
+}: {
+  sectionId: ShortcutSectionId;
+  title: string;
+  icon: SectionIcon;
+  isOpen: boolean;
+  onToggle: () => void;
+  contentClassName?: string;
+  children: React.ReactNode;
+}): React.JSX.Element {
+  const labelId = `shortcuts-section-${sectionId}`;
+  return (
+    <section
+      className="rounded-lg border border-gray-100"
+      aria-labelledby={labelId}
+    >
+      <button
+        type="button"
+        id={labelId}
+        aria-expanded={isOpen}
+        className="flex w-full items-center justify-between gap-3 rounded-lg p-4 text-left transition-colors hover:bg-gray-50/80"
+        onClick={onToggle}
+      >
+        <span className="flex items-center gap-2 text-sm font-medium text-gray-900">
+          <Icon className="h-4 w-4 shrink-0 text-gray-500" aria-hidden />
+          {title}
+        </span>
+        {isOpen ? (
+          <ChevronDown className="h-4 w-4 shrink-0 text-gray-400" aria-hidden />
+        ) : (
+          <ChevronRight
+            className="h-4 w-4 shrink-0 text-gray-400"
+            aria-hidden
+          />
+        )}
+      </button>
+      {isOpen ? (
+        <div
+          className={`flex flex-col border-t border-gray-100 px-4 pb-4 pt-3 ${contentClassName}`}
+        >
+          {children}
+        </div>
+      ) : null}
+    </section>
+  );
+}
+
+export interface VolunteersShortcutsModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  isAdmin: boolean;
+  /** Rows currently shown in the table (filters, search, pagination). */
+  visibleVolunteers: Volunteer[];
+  /** Full volunteer list for global duplicate scan and row labels. */
+  allVolunteers: Volunteer[];
+  /** Checkbox-selected rows (may span current page only). */
+  selectedVolunteers: Volunteer[];
+  onBulkEdit: (
+    edits: Array<{ rowId: number; colId: string; value: unknown }>
+  ) => void;
+  onRefresh: () => void | Promise<void>;
+  onOpenImportCsv: () => void;
+  onJumpToVolunteerRow: (volunteerId: number) => void;
+  onApplyMissingEmailFilter: () => void;
+  onApplyMissingPhoneFilter: () => void;
+  onApplyMissingEmailOrPhoneFilter: () => void;
+  /** Same ordering as the table filter / cell editor (predefined + values in data). */
+  pronounOptions: string[];
+}
+
+export const VolunteersShortcutsModal = ({
+  isOpen,
+  onClose,
+  isAdmin,
+  visibleVolunteers,
+  allVolunteers,
+  selectedVolunteers,
+  onBulkEdit,
+  onRefresh,
+  onOpenImportCsv: _onOpenImportCsv,
+  onJumpToVolunteerRow,
+  onApplyMissingEmailFilter,
+  onApplyMissingPhoneFilter,
+  onApplyMissingEmailOrPhoneFilter,
+  pronounOptions,
+}: VolunteersShortcutsModalProps): React.JSX.Element | null => {
+  const [batchText, setBatchText] = useState("");
+  const [batchSubmitting, setBatchSubmitting] = useState(false);
+  const [batchResult, setBatchResult] = useState<{
+    ok: number;
+    fail: number;
+    errors: string[];
+  } | null>(null);
+
+  const [bulkField, setBulkField] = useState<BulkShortcutField>(
+    "opt_in_communication"
+  );
+  const [bulkOptIn, setBulkOptIn] = useState<"Yes" | "No">("Yes");
+  const [bulkPronouns, setBulkPronouns] = useState<string>("");
+  const [bulkText, setBulkText] = useState("");
+
+  const [duplicateScope, setDuplicateScope] = useState<"view" | "global">(
+    "view"
+  );
+
+  const [openSections, setOpenSections] =
+    useState<Record<ShortcutSectionId, boolean>>(INITIAL_SECTION_OPEN);
+
+  useEffect(() => {
+    if (!isOpen) return;
+    setOpenSections({ ...INITIAL_SECTION_OPEN });
+  }, [isOpen]);
+
+  const toggleSection = (id: ShortcutSectionId): void => {
+    setOpenSections((prev) => ({ ...prev, [id]: !prev[id] }));
+  };
+
+  useEffect(() => {
+    if (!isOpen || !pronounOptions.length) return;
+    setBulkPronouns((prev) => {
+      if (prev === "__clear__") return prev;
+      return pronounOptions.includes(prev) ? prev : pronounOptions[0]!;
+    });
+  }, [pronounOptions, isOpen]);
+
+  const resetBatch = (): void => {
+    setBatchText("");
+    setBatchResult(null);
+  };
+
+  const handleClose = (): void => {
+    resetBatch();
+    onClose();
+  };
+
+  const handleFormatPhones = (): void => {
+    const edits = buildPhoneFormatBulkEdits(visibleVolunteers);
+    if (edits.length === 0) {
+      toast(
+        "No 10- or 11-digit (NANP) phone numbers in the current view needed formatting."
+      );
+      return;
+    }
+    onBulkEdit(edits);
+    toast.success(
+      `Staged phone formatting for ${edits.length} row${edits.length === 1 ? "" : "s"}. Save to apply.`
+    );
+  };
+
+  const handleCopyEmails = async (): Promise<void> => {
+    const text = collectVisibleEmailsCommaSeparated(visibleVolunteers);
+    if (!text) {
+      toast("No emails in the current view.");
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(text);
+      toast.success("Emails copied to clipboard.");
+    } catch {
+      toast.error("Could not copy to clipboard.");
+    }
+  };
+
+  const handleCopyPhones = async (): Promise<void> => {
+    const text = collectVisiblePhonesCommaSeparated(visibleVolunteers);
+    if (!text) {
+      toast("No phone numbers in the current view.");
+      return;
+    }
+    try {
+      await navigator.clipboard.writeText(text);
+      toast.success("Phone numbers copied to clipboard.");
+    } catch {
+      toast.error("Could not copy to clipboard.");
+    }
+  };
+
+  const handleBatchCreate = async (): Promise<void> => {
+    const rows = parseBatchVolunteerLines(batchText);
+    if (rows.length === 0) {
+      toast("Add at least one line with a name or organization.");
+      return;
+    }
+
+    setBatchSubmitting(true);
+    setBatchResult(null);
+    let ok = 0;
+    let fail = 0;
+    const errors: string[] = [];
+
+    try {
+      for (let i = 0; i < rows.length; i++) {
+        const row = rows[i]!;
+        const result = await createVolunteerAction({
+          volunteer: {
+            name_org: row.name_org,
+            email: row.email,
+            phone: row.phone,
+            pronouns: null,
+            pseudonym: null,
+            opt_in_communication: false,
+            notes: null,
+          },
+          roles: [],
+          cohorts: [],
+        });
+        if (result.success) {
+          ok += 1;
+        } else {
+          fail += 1;
+          const label = row.name_org.slice(0, 40);
+          errors.push(`Line ${i + 1} (${label}): ${result.error}`);
+        }
+      }
+
+      setBatchResult({ ok, fail, errors: errors.slice(0, 12) });
+      if (ok > 0) {
+        toast.success(`Created ${ok} volunteer${ok === 1 ? "" : "s"}.`);
+        await onRefresh();
+      }
+      if (fail > 0) {
+        toast.error(`${fail} row${fail === 1 ? "" : "s"} failed.`);
+      }
+    } finally {
+      setBatchSubmitting(false);
+    }
+  };
+
+  const handleApplyBulkField = (): void => {
+    if (selectedVolunteers.length === 0) {
+      toast(
+        "Select one or more rows in the table (checkbox column), then try again."
+      );
+      return;
+    }
+
+    const edits: Array<{ rowId: number; colId: string; value: unknown }> = [];
+
+    if (bulkField === "opt_in_communication") {
+      for (const v of selectedVolunteers) {
+        edits.push({
+          rowId: v.id,
+          colId: "opt_in_communication",
+          value: bulkOptIn,
+        });
+      }
+    } else if (bulkField === "pronouns") {
+      if (pronounOptions.length === 0) {
+        toast.error("No pronoun options are available.");
+        return;
+      }
+      const val =
+        bulkPronouns === "__clear__"
+          ? null
+          : pronounOptions.includes(bulkPronouns)
+            ? bulkPronouns
+            : pronounOptions[0]!;
+      for (const v of selectedVolunteers) {
+        edits.push({ rowId: v.id, colId: "pronouns", value: val });
+      }
+    } else {
+      const trimmed = bulkText.trim();
+      const val = trimmed === "" ? null : trimmed;
+      for (const v of selectedVolunteers) {
+        edits.push({ rowId: v.id, colId: bulkField, value: val });
+      }
+    }
+
+    onBulkEdit(edits);
+    toast.success(
+      `Staged ${bulkField.replace(/_/g, " ")} for ${selectedVolunteers.length} row${selectedVolunteers.length === 1 ? "" : "s"}. Save to apply.`
+    );
+  };
+
+  const duplicateSource =
+    duplicateScope === "view" ? visibleVolunteers : allVolunteers;
+  const duplicateClusters = useMemo(
+    () => findVolunteerDuplicateClusters(duplicateSource),
+    [duplicateSource]
+  );
+  const labelVolunteers = allVolunteers;
+
+  if (!isOpen) return null;
+
+  const visibleCount = visibleVolunteers.length;
+  const selectedCount = selectedVolunteers.length;
+
+  return (
+    <>
+      <div
+        className="fixed inset-0 bg-black/25 z-40"
+        aria-hidden="true"
+        onClick={handleClose}
+      />
+      <div className="fixed inset-0 z-50 flex items-center justify-center p-4 pointer-events-none">
+        <div
+          role="dialog"
+          aria-modal="true"
+          aria-labelledby="shortcuts-modal-title"
+          className="bg-white rounded-xl shadow-xl border border-gray-100 w-full max-w-2xl max-h-[90vh] overflow-hidden flex flex-col pointer-events-auto"
+          onClick={(e) => e.stopPropagation()}
+        >
+          <div className="flex items-center justify-between p-5 border-b border-gray-100 shrink-0">
+            <h2
+              id="shortcuts-modal-title"
+              className="text-sm font-semibold text-gray-900"
+            >
+              Shortcuts
+            </h2>
+            <button
+              type="button"
+              onClick={handleClose}
+              className="text-gray-400 hover:text-gray-600 transition-colors"
+              aria-label="Close"
+            >
+              <X className="w-4 h-4" />
+            </button>
+          </div>
+
+          <div className="p-5 flex flex-col gap-5 overflow-y-auto">
+            <p className="text-xs text-gray-500">
+              Most clipboard actions use volunteers{" "}
+              <span className="font-medium text-gray-700">
+                currently visible in the table
+              </span>{" "}
+              ({visibleCount} row{visibleCount === 1 ? "" : "s"}), including
+              search and filters. Paginated rows not on this page are not
+              included unless noted.
+            </p>
+
+            <CollapsibleShortcutsSection
+              sectionId="formatPhones"
+              title="Format phone numbers"
+              icon={Phone}
+              isOpen={openSections.formatPhones}
+              onToggle={() => toggleSection("formatPhones")}
+            >
+              <p className="text-xs text-gray-600">
+                Normalizes 10- and 11-digit NANP numbers to{" "}
+                <span className="font-mono text-[11px]">(555) 123-4567</span> as
+                pending edits. Use <span className="font-medium">Save</span> in
+                the toolbar to write to the database.
+              </p>
+              <button
+                type="button"
+                onClick={handleFormatPhones}
+                disabled={visibleCount === 0}
+                className="mt-1 self-start rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50 disabled:pointer-events-none disabled:opacity-50"
+              >
+                Format phones in view
+              </button>
+            </CollapsibleShortcutsSection>
+
+            <CollapsibleShortcutsSection
+              sectionId="copyEmails"
+              title="Copy all emails"
+              icon={Mail}
+              isOpen={openSections.copyEmails}
+              onToggle={() => toggleSection("copyEmails")}
+            >
+              <p className="text-xs text-gray-600">
+                Copies non-empty emails from the current view, comma-separated.
+              </p>
+              <button
+                type="button"
+                onClick={() => void handleCopyEmails()}
+                disabled={visibleCount === 0}
+                className="mt-1 self-start rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50 disabled:pointer-events-none disabled:opacity-50"
+              >
+                Copy all emails
+              </button>
+            </CollapsibleShortcutsSection>
+
+            <CollapsibleShortcutsSection
+              sectionId="copyPhones"
+              title="Copy all phone numbers"
+              icon={Copy}
+              isOpen={openSections.copyPhones}
+              onToggle={() => toggleSection("copyPhones")}
+            >
+              <p className="text-xs text-gray-600">
+                Copies non-empty phone values from the current view,
+                comma-separated (as shown in the table).
+              </p>
+              <button
+                type="button"
+                onClick={() => void handleCopyPhones()}
+                disabled={visibleCount === 0}
+                className="mt-1 self-start rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50 disabled:pointer-events-none disabled:opacity-50"
+              >
+                Copy all phone numbers
+              </button>
+            </CollapsibleShortcutsSection>
+
+            {isAdmin && (
+              <CollapsibleShortcutsSection
+                sectionId="bulkField"
+                title="Set field on selected rows"
+                icon={SlidersHorizontal}
+                isOpen={openSections.bulkField}
+                onToggle={() => toggleSection("bulkField")}
+                contentClassName="gap-3"
+              >
+                <p className="text-xs text-gray-600">
+                  Select rows with the checkbox column, choose a field and
+                  value, then stage edits for all selected rows. Use{" "}
+                  <span className="font-medium">Save</span> to persist.
+                </p>
+                <p className="text-xs font-medium text-gray-700">
+                  Selected: {selectedCount} row{selectedCount === 1 ? "" : "s"}
+                </p>
+                <div className="flex flex-col gap-2 sm:flex-row sm:flex-wrap sm:items-end">
+                  <label className="flex flex-col gap-1 text-xs text-gray-600">
+                    Field
+                    <select
+                      value={bulkField}
+                      onChange={(e) =>
+                        setBulkField(e.target.value as BulkShortcutField)
+                      }
+                      className="rounded-lg border border-gray-300 bg-white px-2 py-1.5 text-sm text-gray-900"
+                    >
+                      <option value="opt_in_communication">
+                        Opt-in communication
+                      </option>
+                      <option value="pronouns">Pronouns</option>
+                      <option value="pseudonym">Pseudonym</option>
+                      <option value="notes">Notes</option>
+                    </select>
+                  </label>
+                  {bulkField === "opt_in_communication" && (
+                    <label className="flex flex-col gap-1 text-xs text-gray-600">
+                      Value
+                      <select
+                        value={bulkOptIn}
+                        onChange={(e) =>
+                          setBulkOptIn(e.target.value as "Yes" | "No")
+                        }
+                        className="rounded-lg border border-gray-300 bg-white px-2 py-1.5 text-sm text-gray-900"
+                      >
+                        <option value="Yes">Yes</option>
+                        <option value="No">No</option>
+                      </select>
+                    </label>
+                  )}
+                  {bulkField === "pronouns" && (
+                    <label className="flex flex-col gap-1 text-xs text-gray-600">
+                      Value
+                      <select
+                        value={
+                          bulkPronouns === "__clear__" ||
+                          pronounOptions.includes(bulkPronouns)
+                            ? bulkPronouns
+                            : (pronounOptions[0] ?? "")
+                        }
+                        onChange={(e) => setBulkPronouns(e.target.value)}
+                        disabled={pronounOptions.length === 0}
+                        className="rounded-lg border border-gray-300 bg-white px-2 py-1.5 text-sm text-gray-900 disabled:opacity-50"
+                      >
+                        {pronounOptions.map((p) => (
+                          <option key={p} value={p}>
+                            {p}
+                          </option>
+                        ))}
+                        <option value="__clear__">— Clear —</option>
+                      </select>
+                    </label>
+                  )}
+                  {(bulkField === "pseudonym" || bulkField === "notes") && (
+                    <label className="flex min-w-48 flex-1 flex-col gap-1 text-xs text-gray-600">
+                      Value (empty clears)
+                      <input
+                        type="text"
+                        value={bulkText}
+                        onChange={(e) => setBulkText(e.target.value)}
+                        className="rounded-lg border border-gray-300 px-2 py-1.5 text-sm text-gray-900"
+                      />
+                    </label>
+                  )}
+                  <button
+                    type="button"
+                    onClick={handleApplyBulkField}
+                    disabled={selectedCount === 0}
+                    className="rounded-lg bg-accent-purple px-3 py-2 text-sm font-medium text-white hover:bg-dark-accent-purple disabled:opacity-50"
+                  >
+                    Stage for selected
+                  </button>
+                </div>
+              </CollapsibleShortcutsSection>
+            )}
+
+            <CollapsibleShortcutsSection
+              sectionId="duplicates"
+              title="Find duplicates"
+              icon={Users}
+              isOpen={openSections.duplicates}
+              onToggle={() => toggleSection("duplicates")}
+              contentClassName="gap-3"
+            >
+              <p className="text-xs text-gray-600">
+                Same email (case-insensitive, trimmed) or same phone (digits
+                only, 7+ digits). A row link jumps to the correct pagination
+                page and scrolls that volunteer into view.
+              </p>
+              <div className="flex flex-wrap gap-3 text-xs">
+                <label className="inline-flex cursor-pointer items-center gap-2">
+                  <input
+                    type="radio"
+                    name="dup-scope"
+                    checked={duplicateScope === "view"}
+                    onChange={() => setDuplicateScope("view")}
+                    className="rounded-full border-gray-300 text-purple-600 focus:ring-purple-200"
+                  />
+                  Current view ({visibleCount} rows)
+                </label>
+                <label className="inline-flex cursor-pointer items-center gap-2">
+                  <input
+                    type="radio"
+                    name="dup-scope"
+                    checked={duplicateScope === "global"}
+                    onChange={() => setDuplicateScope("global")}
+                    className="rounded-full border-gray-300 text-purple-600 focus:ring-purple-200"
+                  />
+                  All volunteers ({allVolunteers.length} rows)
+                </label>
+              </div>
+              {duplicateClusters.length === 0 ? (
+                <p className="text-xs text-gray-500">
+                  No duplicate groups found.
+                </p>
+              ) : (
+                <ul className="flex max-h-48 flex-col gap-3 overflow-y-auto text-xs">
+                  {duplicateClusters.map((cluster) => (
+                    <li
+                      key={`${cluster.kind}-${cluster.key}`}
+                      className="rounded-md border border-gray-100 bg-gray-50/80 p-2"
+                    >
+                      <div className="font-medium text-gray-800">
+                        {cluster.kind === "email" ? "Email" : "Phone"}:{" "}
+                        <span className="break-all font-mono text-[11px]">
+                          {cluster.key}
+                        </span>
+                      </div>
+                      <ul className="mt-1.5 flex list-none flex-col gap-1 pl-0">
+                        {cluster.volunteerIds.map((id) => (
+                          <li key={id}>
+                            <button
+                              type="button"
+                              onClick={() => onJumpToVolunteerRow(id)}
+                              className="text-left text-purple-700 hover:text-purple-900 hover:underline"
+                            >
+                              {volunteerLabelById(labelVolunteers, id)} (id {id}
+                              )
+                            </button>
+                          </li>
+                        ))}
+                      </ul>
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </CollapsibleShortcutsSection>
+
+            <CollapsibleShortcutsSection
+              sectionId="missingContact"
+              title="Find volunteers with missing email or phone"
+              icon={Filter}
+              isOpen={openSections.missingContact}
+              onToggle={() => toggleSection("missingContact")}
+            >
+              <p className="text-xs text-gray-600">
+                Adds a server filter (combined with your existing opt-in filter
+                using AND). Closes this panel so you can work in the table.
+              </p>
+              <div className="flex flex-col gap-2 sm:flex-row sm:flex-wrap">
+                <button
+                  type="button"
+                  onClick={onApplyMissingEmailFilter}
+                  className="rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50"
+                >
+                  Filter: missing email
+                </button>
+                <button
+                  type="button"
+                  onClick={onApplyMissingPhoneFilter}
+                  className="rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50"
+                >
+                  Filter: missing phone
+                </button>
+                <button
+                  type="button"
+                  onClick={onApplyMissingEmailOrPhoneFilter}
+                  className="rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-800 hover:border-purple-300 hover:bg-gray-50"
+                >
+                  Filter: missing email or phone
+                </button>
+              </div>
+            </CollapsibleShortcutsSection>
+
+            <CollapsibleShortcutsSection
+              sectionId="batchCreate"
+              title="Create many volunteers at once"
+              icon={UserPlus}
+              isOpen={openSections.batchCreate}
+              onToggle={() => toggleSection("batchCreate")}
+            >
+              <p className="text-xs text-gray-600">
+                One volunteer per line, fields separated by{" "}
+                <span className="font-bold">commas</span>. Example:{" "}
+                <span className="font-mono font-medium italic text-[11px]">
+                  name, email, phone
+                </span>
+                . If the second value has no{" "}
+                <span className="font-mono">@</span>, it is stored as phone.
+                Avoid commas inside names. New volunteers have no roles or
+                cohorts until you edit them.
+              </p>
+              <textarea
+                value={batchText}
+                onChange={(e) => {
+                  setBatchText(e.target.value);
+                  setBatchResult(null);
+                }}
+                rows={6}
+                placeholder={
+                  "first, first@mail.com, 4371234567\nsecond, 6471239876\nthird"
+                }
+                className="mt-1 w-full rounded-lg border border-gray-300 px-3 py-2 font-mono text-[13px] text-gray-900 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-purple-200"
+                spellCheck={false}
+              />
+              <button
+                type="button"
+                onClick={() => void handleBatchCreate()}
+                disabled={batchSubmitting || !batchText.trim()}
+                className="self-start rounded-lg bg-accent-purple px-3 py-2 text-sm font-medium text-white hover:bg-dark-accent-purple disabled:opacity-50"
+              >
+                {batchSubmitting ? "Creating…" : "Create volunteers"}
+              </button>
+              {batchResult && (
+                <div className="space-y-1 text-xs text-gray-600">
+                  <p>
+                    <span className="font-medium text-green-700">
+                      {batchResult.ok} created
+                    </span>
+                    {batchResult.fail > 0 && (
+                      <>
+                        {" "}
+                        ·{" "}
+                        <span className="font-medium text-red-700">
+                          {batchResult.fail} failed
+                        </span>
+                      </>
+                    )}
+                  </p>
+                  {batchResult.errors.length > 0 && (
+                    <ul className="list-disc space-y-0.5 pl-4 text-red-700">
+                      {batchResult.errors.map((err, i) => (
+                        <li key={i}>{err}</li>
+                      ))}
+                    </ul>
+                  )}
+                </div>
+              )}
+            </CollapsibleShortcutsSection>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
diff --git a/src/components/volunteers/VolunteersTable.tsx b/src/components/volunteers/VolunteersTable.tsx
index 4228d52d..b1fec2ca 100644
--- a/src/components/volunteers/VolunteersTable.tsx
+++ b/src/components/volunteers/VolunteersTable.tsx
@@ -35,6 +35,7 @@ import { ManageTagsModal } from "./ManageTagsModal";
 import { ImportCSVModal } from "./ImportCSVModal";
 import { DeleteVolunteersConfirmModal } from "./DeleteVolunteersConfirmModal";
 import { VolunteersTableHelpModal } from "./VolunteersTableHelpModal";
+import { VolunteersShortcutsModal } from "./VolunteersShortcutsModal";
 import { getCurrentUser } from "@/lib/api/getCurrentUser";
 import { removeVolunteersAction } from "@/lib/api/actions";
 import {
@@ -46,6 +47,11 @@ import {
 import { useVolunteersData } from "./useVolunteersData";
 import { useVolunteerEdits } from "./useVolunteerEdits";
 import type { CopyCellFormat } from "./copySelectedCells";
+import {
+  BLANK_FIELD_FILTER_VALUE,
+  CONTACT_INCOMPLETE_FIELD,
+  CONTACT_INCOMPLETE_FILTER_VALUE,
+} from "@/lib/volunteerFilterShortcuts";
 
 type PendingCellChange = {
   colId: string;
@@ -112,6 +118,7 @@ const VolunteersTableContent = ({
   const [isDeleting, setIsDeleting] = useState(false);
   const [deleteModalOpen, setDeleteModalOpen] = useState(false);
   const [isChangesModalOpen, setIsChangesModalOpen] = useState(false);
+  const [isShortcutsOpen, setIsShortcutsOpen] = useState(false);
 
   const {
     data,
@@ -454,6 +461,121 @@ const VolunteersTableContent = ({
     });
   }, [selectedRowIds, data]);
 
+  const selectedVolunteers = useMemo(() => {
+    return selectedRowIds
+      .map((id) => data.find((v) => v.id === id))
+      .filter((v): v is Volunteer => v !== undefined);
+  }, [selectedRowIds, data]);
+
+  const applyMissingEmailFilter = useCallback(() => {
+    setGlobalOp("AND");
+    setFilters((prev) => {
+      const rest = prev.filter(
+        (f) => f.field !== "email" && f.field !== CONTACT_INCOMPLETE_FIELD
+      );
+      return [
+        ...rest,
+        {
+          field: "email",
+          miniOp: "OR",
+          values: [BLANK_FIELD_FILTER_VALUE],
+        },
+      ];
+    });
+    setIsShortcutsOpen(false);
+  }, [setFilters, setGlobalOp]);
+
+  const applyMissingPhoneFilter = useCallback(() => {
+    setGlobalOp("AND");
+    setFilters((prev) => {
+      const rest = prev.filter(
+        (f) => f.field !== "phone" && f.field !== CONTACT_INCOMPLETE_FIELD
+      );
+      return [
+        ...rest,
+        {
+          field: "phone",
+          miniOp: "OR",
+          values: [BLANK_FIELD_FILTER_VALUE],
+        },
+      ];
+    });
+    setIsShortcutsOpen(false);
+  }, [setFilters, setGlobalOp]);
+
+  const applyMissingEmailOrPhoneFilter = useCallback(() => {
+    setGlobalOp("AND");
+    setFilters((prev) => {
+      const rest = prev.filter(
+        (f) =>
+          f.field !== "email" &&
+          f.field !== "phone" &&
+          f.field !== CONTACT_INCOMPLETE_FIELD
+      );
+      return [
+        ...rest,
+        {
+          field: CONTACT_INCOMPLETE_FIELD,
+          miniOp: "OR",
+          values: [CONTACT_INCOMPLETE_FILTER_VALUE],
+        },
+      ];
+    });
+    setIsShortcutsOpen(false);
+  }, [setFilters, setGlobalOp]);
+
+  const jumpToVolunteerRow = useCallback(
+    (volunteerId: number) => {
+      setIsShortcutsOpen(false);
+
+      const prePagRows = table.getPrePaginationRowModel().rows;
+      const rowIndex = prePagRows.findIndex(
+        (r) => r.original.id === volunteerId
+      );
+
+      if (rowIndex === -1) {
+        toast.error(
+          "That volunteer is not in the current table results. Clear search or change filters, then try again."
+        );
+        return;
+      }
+
+      const { pageSize, pageIndex } = table.getState().pagination;
+      const targetPage = Math.floor(rowIndex / pageSize);
+      if (targetPage !== pageIndex) {
+        table.setPageIndex(targetPage);
+      }
+
+      const highlightRow = (el: Element): void => {
+        el.scrollIntoView({ behavior: "smooth", block: "center" });
+        if (el instanceof HTMLElement) {
+          el.classList.add("ring-2", "ring-purple-400", "ring-inset");
+          window.setTimeout(() => {
+            el.classList.remove("ring-2", "ring-purple-400", "ring-inset");
+          }, 2200);
+        }
+      };
+
+      const tryScroll = (attempt: number): void => {
+        const el = document.querySelector(
+          `[data-volunteer-row-id="${volunteerId}"]`
+        );
+        if (el) {
+          highlightRow(el);
+          return;
+        }
+        if (attempt >= 12) {
+          toast.error("Could not scroll to that row. Try again.");
+          return;
+        }
+        window.requestAnimationFrame(() => tryScroll(attempt + 1));
+      };
+
+      window.requestAnimationFrame(() => tryScroll(0));
+    },
+    [table]
+  );
+
   const requestDeleteVolunteers = (): void => {
     if (selectedRowIds.length === 0) return;
     setDeleteModalOpen(true);
@@ -573,6 +695,7 @@ const VolunteersTableContent = ({
             onDelete={requestDeleteVolunteers}
             onOpenAddVolunteer={() => setIsAddVolunteerOpen(true)}
             onOpenImportCSV={() => setIsImportCSVOpen(true)}
+            onOpenShortcuts={() => setIsShortcutsOpen(true)}
             onOpenManageTags={() => setIsManageTagsOpen(true)}
             hasEdits={hasEdits}
             isSaving={isSaving}
@@ -713,6 +836,7 @@ const VolunteersTableContent = ({
                   return rows.map((row, rowIndex) => (
                     <tr
                       key={row.id}
+                      data-volunteer-row-id={row.original.id}
                       data-state={row.getIsSelected() ? "selected" : undefined}
                       className={clsx(
                         "group transition-colors border-b border-gray-100 bg-white hover:bg-gray-50",
@@ -811,6 +935,26 @@ const VolunteersTableContent = ({
         }}
       />
 
+      <VolunteersShortcutsModal
+        isOpen={isShortcutsOpen}
+        onClose={() => setIsShortcutsOpen(false)}
+        isAdmin={isAdmin}
+        visibleVolunteers={data}
+        allVolunteers={allVolunteers}
+        selectedVolunteers={selectedVolunteers}
+        onBulkEdit={handleBulkEdit}
+        onRefresh={async () => {
+          setLoading(true);
+          await fetchInitialData();
+        }}
+        onOpenImportCsv={() => setIsImportCSVOpen(true)}
+        onJumpToVolunteerRow={jumpToVolunteerRow}
+        onApplyMissingEmailFilter={applyMissingEmailFilter}
+        onApplyMissingPhoneFilter={applyMissingPhoneFilter}
+        onApplyMissingEmailOrPhoneFilter={applyMissingEmailOrPhoneFilter}
+        pronounOptions={filterOptions["pronouns"] ?? []}
+      />
+
       <ImportCSVModal
         isOpen={isImportCSVOpen}
         onClose={() => setIsImportCSVOpen(false)}
diff --git a/src/components/volunteers/volunteersShortcutsUtils.ts b/src/components/volunteers/volunteersShortcutsUtils.ts
new file mode 100644
index 00000000..de28fd6f
--- /dev/null
+++ b/src/components/volunteers/volunteersShortcutsUtils.ts
@@ -0,0 +1,206 @@
+import type { Volunteer } from "./types";
+
+/**
+ * If the value is a 10-digit NANP number or 11 digits starting with 1,
+ * returns display string "(XXX) XXX-XXXX". Otherwise returns null (leave unchanged).
+ */
+export function formatPhoneIfNanp(
+  raw: string | null | undefined
+): string | null {
+  if (raw == null) return null;
+  const trimmed = String(raw).trim();
+  if (!trimmed) return null;
+  const digits = trimmed.replace(/\D/g, "");
+  if (digits.length === 10) {
+    return `(${digits.slice(0, 3)}) ${digits.slice(3, 6)}-${digits.slice(6)}`;
+  }
+  if (digits.length === 11 && digits.startsWith("1")) {
+    const d = digits.slice(1);
+    return `(${d.slice(0, 3)}) ${d.slice(3, 6)}-${d.slice(6)}`;
+  }
+  return null;
+}
+
+export function buildPhoneFormatBulkEdits(
+  volunteers: Volunteer[]
+): Array<{ rowId: number; colId: string; value: unknown }> {
+  const edits: Array<{ rowId: number; colId: string; value: unknown }> = [];
+  for (const v of volunteers) {
+    const formatted = formatPhoneIfNanp(v.phone);
+    if (formatted === null) continue;
+    const current = v.phone != null ? String(v.phone).trim() : "";
+    if (formatted === current) continue;
+    edits.push({ rowId: v.id, colId: "phone", value: formatted });
+  }
+  return edits;
+}
+
+export type ParsedBatchVolunteerLine = {
+  name_org: string;
+  email: string | null;
+  phone: string | null;
+};
+
+function fieldLooksLikeEmail(s: string): boolean {
+  return s.includes("@");
+}
+
+function parseBatchLine(trimmed: string): ParsedBatchVolunteerLine | null {
+  let parts: string[];
+  if (trimmed.includes("\t")) {
+    parts = trimmed
+      .split("\t")
+      .map((p) => p.trim())
+      .filter((p) => p.length > 0);
+  } else {
+    parts = trimmed
+      .split(",")
+      .map((p) => p.trim())
+      .filter((p) => p.length > 0);
+  }
+
+  if (parts.length === 0) return null;
+
+  const name_org = parts[0] ?? "";
+  if (!name_org) return null;
+
+  if (parts.length === 1) {
+    return { name_org, email: null, phone: null };
+  }
+
+  if (parts.length === 2) {
+    const second = parts[1] ?? "";
+    if (fieldLooksLikeEmail(second)) {
+      return { name_org, email: second, phone: null };
+    }
+    return { name_org, email: null, phone: second || null };
+  }
+
+  const email = parts[1] ?? "";
+  const phone = parts.slice(2).join(", ").trim() || null;
+  return {
+    name_org,
+    email: email || null,
+    phone,
+  };
+}
+
+/**
+ * One volunteer per non-empty line. Lines starting with # are skipped.
+ *
+ * Comma-separated (default): `name`, `name, email`, or `name, email, phone`.
+ * If a line contains a tab, columns are split on tabs instead (same three fields).
+ * Avoid commas inside the name; they are treated as column separators.
+ */
+export function parseBatchVolunteerLines(
+  text: string
+): ParsedBatchVolunteerLine[] {
+  const lines = text.split(/\r?\n/);
+  const rows: ParsedBatchVolunteerLine[] = [];
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+
+    const row = parseBatchLine(trimmed);
+    if (row) rows.push(row);
+  }
+
+  return rows;
+}
+
+export function collectVisibleEmailsCommaSeparated(
+  volunteers: Volunteer[]
+): string {
+  const emails = volunteers
+    .map((v) => v.email?.trim())
+    .filter((e): e is string => Boolean(e));
+  return emails.join(", ");
+}
+
+export function collectVisiblePhonesCommaSeparated(
+  volunteers: Volunteer[]
+): string {
+  const phones = volunteers
+    .map((v) => v.phone?.trim())
+    .filter((p): p is string => Boolean(p));
+  return phones.join(", ");
+}
+
+export function normalizeEmailDedupe(
+  email: string | null | undefined
+): string | null {
+  const t = email?.trim().toLowerCase();
+  return t ? t : null;
+}
+
+/** Digits only; used for duplicate detection. Requires at least 7 digits. */
+export function normalizePhoneDedupe(
+  phone: string | null | undefined
+): string | null {
+  if (phone == null) return null;
+  const digits = String(phone).replace(/\D/g, "");
+  return digits.length >= 7 ? digits : null;
+}
+
+export type DuplicateCluster = {
+  kind: "email" | "phone";
+  key: string;
+  volunteerIds: number[];
+};
+
+export function findVolunteerDuplicateClusters(
+  volunteers: Volunteer[]
+): DuplicateCluster[] {
+  const byEmail = new Map<string, number[]>();
+  const byPhone = new Map<string, number[]>();
+
+  for (const v of volunteers) {
+    const e = normalizeEmailDedupe(v.email);
+    if (e) {
+      const list = byEmail.get(e) ?? [];
+      list.push(v.id);
+      byEmail.set(e, list);
+    }
+    const p = normalizePhoneDedupe(v.phone);
+    if (p) {
+      const list = byPhone.get(p) ?? [];
+      list.push(v.id);
+      byPhone.set(p, list);
+    }
+  }
+
+  const out: DuplicateCluster[] = [];
+  for (const [key, ids] of byEmail) {
+    if (ids.length > 1) {
+      out.push({
+        kind: "email",
+        key,
+        volunteerIds: [...new Set(ids)].sort((a, b) => a - b),
+      });
+    }
+  }
+  for (const [key, ids] of byPhone) {
+    if (ids.length > 1) {
+      out.push({
+        kind: "phone",
+        key,
+        volunteerIds: [...new Set(ids)].sort((a, b) => a - b),
+      });
+    }
+  }
+
+  out.sort((a, b) => {
+    if (a.kind !== b.kind) return a.kind === "email" ? -1 : 1;
+    return a.key.localeCompare(b.key);
+  });
+  return out;
+}
+
+export function volunteerLabelById(
+  volunteers: Volunteer[],
+  id: number
+): string {
+  const v = volunteers.find((x) => x.id === id);
+  return v?.name_org?.trim() || `#${id}`;
+}
diff --git a/src/lib/api/getVolunteersByMultipleColumns.ts b/src/lib/api/getVolunteersByMultipleColumns.ts
index 55027700..3c8ca146 100644
--- a/src/lib/api/getVolunteersByMultipleColumns.ts
+++ b/src/lib/api/getVolunteersByMultipleColumns.ts
@@ -3,6 +3,11 @@
 import { createClient } from "../client/supabase/server";
 import type { Database } from "../client/supabase/types";
 import type { SupabaseClient } from "@supabase/supabase-js";
+import {
+  BLANK_FIELD_FILTER_VALUE,
+  CONTACT_INCOMPLETE_FIELD,
+  CONTACT_INCOMPLETE_FILTER_VALUE,
+} from "../volunteerFilterShortcuts";
 
 const OP = {
   AND: "AND",
@@ -37,6 +42,7 @@ const ALLOWED_FIELDS = [
   "prior_roles",
   "future_interests",
   "cohorts",
+  CONTACT_INCOMPLETE_FIELD,
 ];
 
 export type FilterTuple = {
@@ -88,6 +94,9 @@ export async function getVolunteersByMultipleColumns(
 
   try {
     const promises = cleanFiltersList.map(async (f) => {
+      if (f.field === CONTACT_INCOMPLETE_FIELD) {
+        return filterIdsContactIncomplete(client);
+      }
       if (
         f.field === "current_roles" ||
         f.field === "prior_roles" ||
@@ -173,7 +182,14 @@ export async function validateMultipleColumnFilter(
     if (!Array.isArray(f.values) || f.values.length === 0)
       return { valid: false, error: "Invalid filter values" };
 
-    if (f.field === "cohorts") {
+    if (f.field === CONTACT_INCOMPLETE_FIELD) {
+      if (
+        f.values.length !== 1 ||
+        f.values[0] !== CONTACT_INCOMPLETE_FILTER_VALUE
+      ) {
+        return { valid: false, error: "Invalid contact_incomplete filter" };
+      }
+    } else if (f.field === "cohorts") {
       const invalid = f.values.some(
         (v) =>
           !Array.isArray(v) ||
@@ -271,6 +287,63 @@ function ilikeSubstringPattern(term: string): string {
   return `%${term}%`;
 }
 
+/** True when value is null/undefined or only whitespace (matches table “empty” display). */
+function isBlankText(value: string | null | undefined): boolean {
+  return (value ?? "").trim() === "";
+}
+
+async function filterIdsBlankTextField(
+  client: SupabaseClient<Database>,
+  field: string
+): Promise<Set<number>> {
+  if (field === "email") {
+    const { data, error } = await client.from("Volunteers").select("id, email");
+    if (error) throw error;
+    const ids = new Set<number>();
+    for (const r of data ?? []) {
+      if (isBlankText(r.email)) ids.add(r.id);
+    }
+    return ids;
+  }
+  if (field === "phone") {
+    const { data, error } = await client.from("Volunteers").select("id, phone");
+    if (error) throw error;
+    const ids = new Set<number>();
+    for (const r of data ?? []) {
+      if (isBlankText(r.phone)) ids.add(r.id);
+    }
+    return ids;
+  }
+
+  const [nullRows, emptyRows] = await Promise.all([
+    client.from("Volunteers").select("id").is(field, null),
+    client.from("Volunteers").select("id").eq(field, ""),
+  ]);
+  if (nullRows.error) throw nullRows.error;
+  if (emptyRows.error) throw emptyRows.error;
+  const ids = new Set<number>();
+  for (const r of nullRows.data ?? []) ids.add(r.id);
+  for (const r of emptyRows.data ?? []) ids.add(r.id);
+  return ids;
+}
+
+/** Volunteers missing email and/or phone (null, empty, or whitespace-only). */
+async function filterIdsContactIncomplete(
+  client: SupabaseClient<Database>
+): Promise<Set<number>> {
+  const { data, error } = await client
+    .from("Volunteers")
+    .select("id, email, phone");
+  if (error) throw error;
+  const ids = new Set<number>();
+  for (const row of data ?? []) {
+    if (isBlankText(row.email) || isBlankText(row.phone)) {
+      ids.add(row.id);
+    }
+  }
+  return ids;
+}
+
 async function filterIdsByGeneral(
   client: SupabaseClient<Database>,
   field: string,
@@ -283,6 +356,13 @@ async function filterIdsByGeneral(
   let query = client.from("Volunteers").select("id");
 
   if (TEXT_SUBSTRING_MATCH_FIELDS.has(field)) {
+    if (
+      uniqueValues.length === 1 &&
+      uniqueValues[0] === BLANK_FIELD_FILTER_VALUE
+    ) {
+      return filterIdsBlankTextField(client, field);
+    }
+
     const patterns = values.map((v) => ilikeSubstringPattern(v));
     if (op === OP.OR) {
       if (patterns.length === 1) {
diff --git a/src/lib/volunteerFilterShortcuts.ts b/src/lib/volunteerFilterShortcuts.ts
new file mode 100644
index 00000000..98bad3b8
--- /dev/null
+++ b/src/lib/volunteerFilterShortcuts.ts
@@ -0,0 +1,11 @@
+/** Used in `FilterTuple.values` so the server matches null or empty string. */
+export const BLANK_FIELD_FILTER_VALUE = "__BLANK_FIELD__";
+
+/**
+ * Synthetic `FilterTuple.field` — volunteers with missing email or missing phone
+ * (null or empty string for either).
+ */
+export const CONTACT_INCOMPLETE_FIELD = "contact_incomplete";
+
+/** Only accepted value for {@link CONTACT_INCOMPLETE_FIELD}. */
+export const CONTACT_INCOMPLETE_FILTER_VALUE = "true";
diff --git a/tests/components/volunteersShortcutsUtils.test.ts b/tests/components/volunteersShortcutsUtils.test.ts
new file mode 100644
index 00000000..fc105cbe
--- /dev/null
+++ b/tests/components/volunteersShortcutsUtils.test.ts
@@ -0,0 +1,169 @@
+import { describe, expect, it } from "vitest";
+import {
+  buildPhoneFormatBulkEdits,
+  collectVisibleEmailsCommaSeparated,
+  collectVisiblePhonesCommaSeparated,
+  findVolunteerDuplicateClusters,
+  formatPhoneIfNanp,
+  normalizeEmailDedupe,
+  normalizePhoneDedupe,
+  parseBatchVolunteerLines,
+  volunteerLabelById,
+} from "@/components/volunteers/volunteersShortcutsUtils";
+import type { Volunteer } from "@/components/volunteers/types";
+
+function vol(overrides: Partial<Volunteer> & { id: number }): Volunteer {
+  const { id, ...rest } = overrides;
+  return {
+    id,
+    name_org: "Test",
+    email: null,
+    phone: null,
+    pronouns: null,
+    pseudonym: null,
+    opt_in_communication: false,
+    notes: null,
+    position: null,
+    created_at: "",
+    updated_at: "",
+    cohorts: [],
+    prior_roles: [],
+    current_roles: [],
+    future_interests: [],
+    ...rest,
+  };
+}
+
+describe("formatPhoneIfNanp", () => {
+  it("formats 10 digits", () => {
+    expect(formatPhoneIfNanp("4165550100")).toBe("(416) 555-0100");
+    expect(formatPhoneIfNanp("(416) 555-0100")).toBe("(416) 555-0100");
+  });
+
+  it("formats 11 digits with leading 1", () => {
+    expect(formatPhoneIfNanp("14165550100")).toBe("(416) 555-0100");
+  });
+
+  it("returns null for non-NANP lengths", () => {
+    expect(formatPhoneIfNanp("+44 20 7946 0958")).toBeNull();
+    expect(formatPhoneIfNanp("12345")).toBeNull();
+    expect(formatPhoneIfNanp("")).toBeNull();
+    expect(formatPhoneIfNanp(null)).toBeNull();
+  });
+});
+
+describe("buildPhoneFormatBulkEdits", () => {
+  it("skips rows that need no change", () => {
+    const edits = buildPhoneFormatBulkEdits([
+      vol({ id: 1, phone: "(416) 555-0100" }),
+      vol({ id: 2, phone: "4165550101" }),
+    ]);
+    expect(edits).toEqual([
+      { rowId: 2, colId: "phone", value: "(416) 555-0101" },
+    ]);
+  });
+});
+
+describe("collectVisibleEmailsCommaSeparated", () => {
+  it("joins non-empty emails", () => {
+    expect(
+      collectVisibleEmailsCommaSeparated([
+        vol({ id: 1, email: "a@x.com" }),
+        vol({ id: 2, email: null }),
+        vol({ id: 3, email: "b@y.org" }),
+      ])
+    ).toBe("a@x.com, b@y.org");
+  });
+});
+
+describe("collectVisiblePhonesCommaSeparated", () => {
+  it("joins non-empty phones", () => {
+    expect(
+      collectVisiblePhonesCommaSeparated([
+        vol({ id: 1, phone: "416-555-0100" }),
+        vol({ id: 2, phone: null }),
+        vol({ id: 3, phone: "647-555-0101" }),
+      ])
+    ).toBe("416-555-0100, 647-555-0101");
+  });
+});
+
+describe("findVolunteerDuplicateClusters", () => {
+  it("groups duplicate emails and phones", () => {
+    const clusters = findVolunteerDuplicateClusters([
+      vol({ id: 1, email: "A@X.COM", phone: "4165550100" }),
+      vol({ id: 2, email: "a@x.com", phone: "416-555-0100" }),
+      vol({ id: 3, email: "b@y.com", phone: null }),
+    ]);
+    const emailDup = clusters.find((c) => c.kind === "email");
+    const phoneDup = clusters.find((c) => c.kind === "phone");
+    expect(emailDup?.volunteerIds).toEqual([1, 2]);
+    expect(phoneDup?.volunteerIds).toEqual([1, 2]);
+  });
+});
+
+describe("normalizeEmailDedupe / normalizePhoneDedupe", () => {
+  it("normalizes email case and phone digits", () => {
+    expect(normalizeEmailDedupe("  A@B.C  ")).toBe("a@b.c");
+    expect(normalizeEmailDedupe("  ")).toBeNull();
+    expect(normalizePhoneDedupe("(416) 555-0100")).toBe("4165550100");
+    expect(normalizePhoneDedupe("12345")).toBeNull();
+  });
+});
+
+describe("volunteerLabelById", () => {
+  it("falls back to id", () => {
+    expect(volunteerLabelById([vol({ id: 5, name_org: "Pat" })], 5)).toBe(
+      "Pat"
+    );
+    expect(volunteerLabelById([], 99)).toBe("#99");
+  });
+});
+
+describe("parseBatchVolunteerLines", () => {
+  it("parses comma-separated lines like user examples", () => {
+    const input = [
+      "josh, josh@mail.com, 4372899292",
+      "another user, another@mail.com",
+      "another another",
+      "another one, mail.mail@mail.com",
+    ].join("\n");
+    expect(parseBatchVolunteerLines(input)).toEqual([
+      {
+        name_org: "josh",
+        email: "josh@mail.com",
+        phone: "4372899292",
+      },
+      {
+        name_org: "another user",
+        email: "another@mail.com",
+        phone: null,
+      },
+      { name_org: "another another", email: null, phone: null },
+      {
+        name_org: "another one",
+        email: "mail.mail@mail.com",
+        phone: null,
+      },
+    ]);
+  });
+
+  it("parses tab-separated lines and skips comments", () => {
+    expect(
+      parseBatchVolunteerLines("Alice\ta@b.c\t5551234567\n# skip\nBob\n")
+    ).toEqual([
+      {
+        name_org: "Alice",
+        email: "a@b.c",
+        phone: "5551234567",
+      },
+      { name_org: "Bob", email: null, phone: null },
+    ]);
+  });
+
+  it("treats two columns without @ as name and phone", () => {
+    expect(parseBatchVolunteerLines("Jane, 4165550100")).toEqual([
+      { name_org: "Jane", email: null, phone: "4165550100" },
+    ]);
+  });
+});
diff --git a/tests/lib/api/getVolunteersByMultipleColumns.test.ts b/tests/lib/api/getVolunteersByMultipleColumns.test.ts
index bf556e8f..661c52b0 100644
--- a/tests/lib/api/getVolunteersByMultipleColumns.test.ts
+++ b/tests/lib/api/getVolunteersByMultipleColumns.test.ts
@@ -61,6 +61,24 @@ describe("validateMultipleColumnFilter (unit)", () => {
       expect(result.error).toMatch(/Invalid filter field name/);
   });
 
+  it("accepts contact_incomplete shortcut filter", async () => {
+    const filtersList: FilterTuple[] = [
+      { field: "contact_incomplete", miniOp: "OR", values: ["true"] },
+    ];
+    const result = await validateMultipleColumnFilter(filtersList, "AND");
+    expect(result.valid).toBe(true);
+  });
+
+  it("rejects invalid contact_incomplete values", async () => {
+    const filtersList: FilterTuple[] = [
+      { field: "contact_incomplete", miniOp: "OR", values: ["no"] },
+    ];
+    const result = await validateMultipleColumnFilter(filtersList, "AND");
+    expect(result.valid).toBe(false);
+    if (!result.valid)
+      expect(result.error).toMatch(/Invalid contact_incomplete/);
+  });
+
   it("rejects invalid values array", async () => {
     const filtersList: FilterTuple[] = [
       { field: "prior_roles", miniOp: "OR", values: [] },

From 46c2b95370927542bad7b9e1a51666f57c8a1529 Mon Sep 17 00:00:00 2001
From: hamaguchi <93605959+LeandroHamaguchi@users.noreply.github.com>
Date: Sun, 5 Apr 2026 17:11:33 -0400
Subject: [PATCH 2/3] Remove unused onOpenImportCsv prop from
 VolunteersShortcutsModal and VolunteersTable components to streamline
 functionality.

---
 src/components/volunteers/VolunteersShortcutsModal.tsx | 2 --
 src/components/volunteers/VolunteersTable.tsx          | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/components/volunteers/VolunteersShortcutsModal.tsx b/src/components/volunteers/VolunteersShortcutsModal.tsx
index ee4c6e11..a5eff986 100644
--- a/src/components/volunteers/VolunteersShortcutsModal.tsx
+++ b/src/components/volunteers/VolunteersShortcutsModal.tsx
@@ -120,7 +120,6 @@ export interface VolunteersShortcutsModalProps {
     edits: Array<{ rowId: number; colId: string; value: unknown }>
   ) => void;
   onRefresh: () => void | Promise<void>;
-  onOpenImportCsv: () => void;
   onJumpToVolunteerRow: (volunteerId: number) => void;
   onApplyMissingEmailFilter: () => void;
   onApplyMissingPhoneFilter: () => void;
@@ -138,7 +137,6 @@ export const VolunteersShortcutsModal = ({
   selectedVolunteers,
   onBulkEdit,
   onRefresh,
-  onOpenImportCsv: _onOpenImportCsv,
   onJumpToVolunteerRow,
   onApplyMissingEmailFilter,
   onApplyMissingPhoneFilter,
diff --git a/src/components/volunteers/VolunteersTable.tsx b/src/components/volunteers/VolunteersTable.tsx
index b1fec2ca..b17c52af 100644
--- a/src/components/volunteers/VolunteersTable.tsx
+++ b/src/components/volunteers/VolunteersTable.tsx
@@ -947,7 +947,6 @@ const VolunteersTableContent = ({
           setLoading(true);
           await fetchInitialData();
         }}
-        onOpenImportCsv={() => setIsImportCSVOpen(true)}
         onJumpToVolunteerRow={jumpToVolunteerRow}
         onApplyMissingEmailFilter={applyMissingEmailFilter}
         onApplyMissingPhoneFilter={applyMissingPhoneFilter}

From f5339c453b4215487274145bd3ec04603f4bb7b2 Mon Sep 17 00:00:00 2001
From: hamaguchi <93605959+LeandroHamaguchi@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:32:31 -0400
Subject: [PATCH 3/3] updated shortcuts' descriptions

---
 .../volunteers/VolunteersShortcutsModal.tsx      | 16 +++++++++++-----
 src/components/volunteers/VolunteersTable.tsx    |  8 +++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/volunteers/VolunteersShortcutsModal.tsx b/src/components/volunteers/VolunteersShortcutsModal.tsx
index a5eff986..32c50532 100644
--- a/src/components/volunteers/VolunteersShortcutsModal.tsx
+++ b/src/components/volunteers/VolunteersShortcutsModal.tsx
@@ -418,7 +418,8 @@ export const VolunteersShortcutsModal = ({
               onToggle={() => toggleSection("copyEmails")}
             >
               <p className="text-xs text-gray-600">
-                Copies non-empty emails from the current view, comma-separated.
+                Copies non-empty emails from the current view, comma-separated,
+                in the same order as the sorted table and with filters applied.
               </p>
               <button
                 type="button"
@@ -438,8 +439,9 @@ export const VolunteersShortcutsModal = ({
               onToggle={() => toggleSection("copyPhones")}
             >
               <p className="text-xs text-gray-600">
-                Copies non-empty phone values from the current view,
-                comma-separated (as shown in the table).
+                Copies non-empty phone numbers from the current view,
+                comma-separated, in the same order as the sorted table and with
+                filters applied.
               </p>
               <button
                 type="button"
@@ -557,8 +559,12 @@ export const VolunteersShortcutsModal = ({
             >
               <p className="text-xs text-gray-600">
                 Same email (case-insensitive, trimmed) or same phone (digits
-                only, 7+ digits). A row link jumps to the correct pagination
-                page and scrolls that volunteer into view.
+                only, 7+ digits). The links below jump to the correct page and
+                row in the table for the volunteer with duplicated email or
+                phone number.
+                <br />
+                Below, you will only see volunteers currently in the table (with
+                filters applied).
               </p>
               <div className="flex flex-wrap gap-3 text-xs">
                 <label className="inline-flex cursor-pointer items-center gap-2">
diff --git a/src/components/volunteers/VolunteersTable.tsx b/src/components/volunteers/VolunteersTable.tsx
index b17c52af..3a4cb9f1 100644
--- a/src/components/volunteers/VolunteersTable.tsx
+++ b/src/components/volunteers/VolunteersTable.tsx
@@ -374,6 +374,12 @@ const VolunteersTableContent = ({
     }
   }, [table, data, debouncedGlobalFilter, sorting, pageSize]);
 
+  /** Filtered rows in table sort order (matches column headers), for shortcuts like copy-all emails/phones. */
+  const visibleVolunteersSorted = useMemo(
+    () => table.getSortedRowModel().rows.map((r) => r.original),
+    [table, data, sorting, debouncedGlobalFilter]
+  );
+
   const {
     selectedCells,
     isSelected,
@@ -939,7 +945,7 @@ const VolunteersTableContent = ({
         isOpen={isShortcutsOpen}
         onClose={() => setIsShortcutsOpen(false)}
         isAdmin={isAdmin}
-        visibleVolunteers={data}
+        visibleVolunteers={visibleVolunteersSorted}
         allVolunteers={allVolunteers}
         selectedVolunteers={selectedVolunteers}
         onBulkEdit={handleBulkEdit}