diff --git a/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.test.ts b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.test.ts
new file mode 100644
index 0000000000..feab451bcc
--- /dev/null
+++ b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it } from '@jest/globals';
+import {
+ canSubmitServiceFeeExemption,
+ resolveServiceFeeExemptionDialogOpenChange,
+ SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH,
+ SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH,
+ shouldBlockServiceFeeExemptionDialogDismiss,
+} from './OrganizationAdminServiceFeeExemption.dialog-state';
+
+describe('resolveServiceFeeExemptionDialogOpenChange', () => {
+ it('ignores close requests while the mutation is pending', () => {
+ expect(
+ resolveServiceFeeExemptionDialogOpenChange({ requestedOpen: false, isMutationPending: true })
+ ).toBeNull();
+ });
+
+ it('ignores reopen requests while the mutation is pending so state is never reset mid-flight', () => {
+ expect(
+ resolveServiceFeeExemptionDialogOpenChange({ requestedOpen: true, isMutationPending: true })
+ ).toBeNull();
+ });
+
+ it('resets the mutation only when the dialog opens while idle', () => {
+ expect(
+ resolveServiceFeeExemptionDialogOpenChange({ requestedOpen: true, isMutationPending: false })
+ ).toEqual({ open: true, resetMutation: true });
+ });
+
+ it('closes without resetting the mutation while idle', () => {
+ expect(
+ resolveServiceFeeExemptionDialogOpenChange({
+ requestedOpen: false,
+ isMutationPending: false,
+ })
+ ).toEqual({ open: false, resetMutation: false });
+ });
+});
+
+describe('shouldBlockServiceFeeExemptionDialogDismiss', () => {
+ it('blocks Escape, overlay pointer-down, and outside interaction only while pending', () => {
+ expect(shouldBlockServiceFeeExemptionDialogDismiss({ isMutationPending: true })).toBe(true);
+ expect(shouldBlockServiceFeeExemptionDialogDismiss({ isMutationPending: false })).toBe(false);
+ });
+});
+
+describe('canSubmitServiceFeeExemption', () => {
+ it('rejects a pending mutation even with a valid reason to prevent duplicates', () => {
+ expect(
+ canSubmitServiceFeeExemption({
+ trimmedReasonLength: SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH,
+ isMutationPending: true,
+ })
+ ).toBe(false);
+ });
+
+ it('enforces the trimmed reason length bounds while idle', () => {
+ const idle = { isMutationPending: false };
+ expect(
+ canSubmitServiceFeeExemption({
+ trimmedReasonLength: SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH - 1,
+ ...idle,
+ })
+ ).toBe(false);
+ expect(
+ canSubmitServiceFeeExemption({
+ trimmedReasonLength: SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH,
+ ...idle,
+ })
+ ).toBe(true);
+ expect(
+ canSubmitServiceFeeExemption({
+ trimmedReasonLength: SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH,
+ ...idle,
+ })
+ ).toBe(true);
+ expect(
+ canSubmitServiceFeeExemption({
+ trimmedReasonLength: SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH + 1,
+ ...idle,
+ })
+ ).toBe(false);
+ });
+});
diff --git a/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.ts b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.ts
new file mode 100644
index 0000000000..f18ffce1c5
--- /dev/null
+++ b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.dialog-state.ts
@@ -0,0 +1,65 @@
+/**
+ * Pure dialog-state rules for OrganizationAdminServiceFeeExemption, extracted
+ * so the pending-mutation dismiss guards are testable without a DOM (the repo
+ * has no component-test runner).
+ */
+
+// Mirrors ORGANIZATION_SERVICE_FEE_EXEMPTION_REASON_* in
+// @/lib/service-fees/organization-exemptions, which is server-only and cannot
+// be imported from a client component. The router remains the enforcement
+// boundary; these only drive client-side enablement and hints.
+export const SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH = 3;
+export const SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH = 500;
+
+export type ServiceFeeExemptionDialogOpenChange = {
+ open: boolean;
+ resetMutation: boolean;
+};
+
+/**
+ * Radix fires onOpenChange for the trigger, Cancel, the close button, Escape,
+ * and overlay pointer-down. While the set-exemption mutation is in flight,
+ * every open/close request must be ignored: closing would discard the pending
+ * UI, and a close-then-reopen would reset the mutation state, clear the
+ * isPending guard, and allow a duplicate mutation.
+ *
+ * Returns null when the request must be ignored, otherwise the next dialog
+ * state. The mutation is reset only on a fresh open so a previous error does
+ * not leak into the next attempt.
+ */
+export function resolveServiceFeeExemptionDialogOpenChange(input: {
+ requestedOpen: boolean;
+ isMutationPending: boolean;
+}): ServiceFeeExemptionDialogOpenChange | null {
+ if (input.isMutationPending) return null;
+ return { open: input.requestedOpen, resetMutation: input.requestedOpen };
+}
+
+/**
+ * Guarding onOpenChange alone is not enough for a controlled dialog: Radix
+ * processes Escape and overlay pointer-down in its own handlers before asking
+ * React, so DialogContent must also preventDefault those events while the
+ * mutation is pending. This predicate drives all three content-level guards
+ * (onEscapeKeyDown, onPointerDownOutside, onInteractOutside).
+ */
+export function shouldBlockServiceFeeExemptionDialogDismiss(input: {
+ isMutationPending: boolean;
+}): boolean {
+ return input.isMutationPending;
+}
+
+/**
+ * Confirm stays inert until the trimmed reason is within the allowed length
+ * and no mutation is in flight, so double-clicks or repeated Enter presses
+ * cannot fire a duplicate mutation.
+ */
+export function canSubmitServiceFeeExemption(input: {
+ trimmedReasonLength: number;
+ isMutationPending: boolean;
+}): boolean {
+ return (
+ !input.isMutationPending &&
+ input.trimmedReasonLength >= SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH &&
+ input.trimmedReasonLength <= SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH
+ );
+}
diff --git a/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.tsx b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.tsx
new file mode 100644
index 0000000000..fce265cc2f
--- /dev/null
+++ b/apps/web/src/app/admin/components/OrganizationAdmin/OrganizationAdminServiceFeeExemption.tsx
@@ -0,0 +1,277 @@
+'use client';
+
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@/components/ui/dialog';
+import { Label } from '@/components/ui/label';
+import { Skeleton } from '@/components/ui/skeleton';
+import { Textarea } from '@/components/ui/textarea';
+import {
+ useAdminOrganizationServiceFeeExemption,
+ useSetOrganizationServiceFeeExemption,
+} from '@/app/admin/api/organizations/hooks';
+import { Receipt } from 'lucide-react';
+import { useState } from 'react';
+import { toast } from 'sonner';
+import {
+ canSubmitServiceFeeExemption,
+ resolveServiceFeeExemptionDialogOpenChange,
+ SERVICE_FEE_EXEMPTION_REASON_MAX_LENGTH,
+ SERVICE_FEE_EXEMPTION_REASON_MIN_LENGTH,
+ shouldBlockServiceFeeExemptionDialogDismiss,
+} from './OrganizationAdminServiceFeeExemption.dialog-state';
+
+function formatLocalTimestamp(isoTimestamp: string): string {
+ return new Date(isoTimestamp).toLocaleString(undefined, {
+ dateStyle: 'medium',
+ timeStyle: 'short',
+ });
+}
+
+function ExemptionStateBadge({ isExempt }: { isExempt: boolean }) {
+ return (
+
+ {isExempt ? 'Exempt' : 'Fees apply'}
+
+ );
+}
+
+export function OrganizationAdminServiceFeeExemption({
+ organizationId,
+}: {
+ organizationId: string;
+}) {
+ const exemptionQuery = useAdminOrganizationServiceFeeExemption(organizationId);
+ const setExemptionMutation = useSetOrganizationServiceFeeExemption();
+
+ const [isDialogOpen, setIsDialogOpen] = useState(false);
+ const [reason, setReason] = useState('');
+
+ if (exemptionQuery.isPending) {
+ return ;
+ }
+
+ if (exemptionQuery.isError) {
+ return (
+
+
+ Service fee exemption
+ Unable to load the organization service fee exemption.
+
+
+
+
+
+ );
+ }
+
+ const { current, history } = exemptionQuery.data;
+ const isExempt = current?.isExempt ?? false;
+ const actionLabel = isExempt ? 'Revoke exemption' : 'Grant exemption';
+ const pendingLabel = isExempt ? 'Revoking exemption…' : 'Granting exemption…';
+ const isMutationPending = setExemptionMutation.isPending;
+ const trimmedReasonLength = reason.trim().length;
+ const canSubmit = canSubmitServiceFeeExemption({ trimmedReasonLength, isMutationPending });
+ const blockDismiss = shouldBlockServiceFeeExemptionDialogDismiss({ isMutationPending });
+
+ const handleConfirm = () => {
+ if (!canSubmit) return;
+
+ setExemptionMutation.mutate(
+ {
+ organizationId,
+ isExempt: !isExempt,
+ reason,
+ },
+ {
+ onSuccess: () => {
+ toast.success(
+ isExempt ? 'Service fee exemption revoked' : 'Service fee exemption granted'
+ );
+ setReason('');
+ setIsDialogOpen(false);
+ },
+ // On error the dialog stays open and the reason is kept so the admin
+ // can retry without retyping.
+ }
+ );
+ };
+
+ return (
+
+
+
+
+
+
+ Service fee exemption
+
+
+ Waive Stripe service fees on this organization's new purchases. Exemptions are
+ not inherited by parent or child organizations.
+
+