From d55115d0ac02c8e7baf16085f9d641f2c2d72bb7 Mon Sep 17 00:00:00 2001
From: Padreug <padreug@aiolabs.dev>
Date: Tue, 29 Sep 2026 08:28:48 +0200
Subject: [PATCH] feat(events): manage ticket waves from the organizer form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Capacity, price, currency and fiat edits made in the webapp were
silently discarded. Since events ext v1.6.8 the backend derives those
event-level fields FROM the waves on every write, so submitting a
changed `amount_tickets` beside an unchanged wave list left the wave's
old number winning. Verified against a running instance before fixing:
999 / 77 went in, 45 / 10.0 came back, HTTP 200.

The dialog's price / capacity / currency fields ARE the primary wave, so
they are now written into it on submit — the same write-through the
LNbits admin dialog performs. A new "Ticket waves" section manages the
tiers after the first, mirroring PromoCodesEditor: v-model over a row
array, with the pure `validateWaveRows` so submit gates on exactly the
rules the backend enforces.

Validation follows `_validate_wave_capacity`, including its subtlety: a
wave already stored on the event may sit at zero capacity, because that
is what sold out looks like and rejecting it would make a sold-out event
uneditable. Only a newly added wave must state a real capacity. Stored
zeroes render as "Sold out" rather than as an error.

One hazard found while wiring the write-through: on CREATE there is no
stored event, so the implied primary wave was synthesized with empty
date strings — which the backend then throws on for every read
(`ValueError: Invalid isoformat string: ''`). The seed now supplies the
same inputs `create_event` uses, so the wave the webapp sends matches
the one the backend would have built. Pinned by a test.

72 tests; vue-tsc and prettier clean.
---
 .../events/components/CreateEventDialog.vue   | 834 ++++++++++++------
 .../events/components/TicketWavesEditor.vue   | 195 ++++
 src/modules/events/lib/ticketWaves.spec.ts    | 101 +++
 src/modules/events/lib/ticketWaves.ts         |  66 ++
 4 files changed, 909 insertions(+), 287 deletions(-)
 create mode 100644 src/modules/events/components/TicketWavesEditor.vue

diff --git a/src/modules/events/components/CreateEventDialog.vue b/src/modules/events/components/CreateEventDialog.vue
index 7bd43a0..76a476a 100644
--- a/src/modules/events/components/CreateEventDialog.vue
+++ b/src/modules/events/components/CreateEventDialog.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
-import { ref, computed, nextTick, watch } from 'vue'
-import { useForm } from 'vee-validate'
-import { toTypedSchema } from '@vee-validate/zod'
-import * as z from 'zod'
-import { useI18n } from 'vue-i18n'
-import { format } from 'date-fns'
+import { ref, computed, nextTick, watch } from "vue";
+import { useForm } from "vee-validate";
+import { toTypedSchema } from "@vee-validate/zod";
+import * as z from "zod";
+import { useI18n } from "vue-i18n";
+import { format } from "date-fns";
 import {
   Dialog,
   DialogContent,
   DialogDescription,
   DialogHeader,
   DialogTitle,
-} from '@/components/ui/dialog'
+} from "@/components/ui/dialog";
 import {
   FormControl,
   FormDescription,
@@ -19,83 +19,98 @@ import {
   FormItem,
   FormLabel,
   FormMessage,
-} from '@/components/ui/form'
-import { Input } from '@/components/ui/input'
-import { Textarea } from '@/components/ui/textarea'
-import { Button } from '@/components/ui/button'
-import { Badge } from '@/components/ui/badge'
-import { Switch } from '@/components/ui/switch'
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
-import { Bell, ChevronDown, Tag } from 'lucide-vue-next'
-import { ScrollArea } from '@/components/ui/scroll-area'
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { Button } from "@/components/ui/button";
+import { Badge } from "@/components/ui/badge";
+import { Switch } from "@/components/ui/switch";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import { Bell, ChevronDown, Layers, Tag } from "lucide-vue-next";
+import { ScrollArea } from "@/components/ui/scroll-area";
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/ui/select'
-import { Calendar, Loader2, MapPin, AlertCircle, Zap } from 'lucide-vue-next'
-import { toastService } from '@/core/services/ToastService'
-import { injectService, SERVICE_TOKENS } from '@/core/di-container'
-import ImageUpload from '@/modules/base/components/ImageUpload.vue'
-import DatePicker from '@/modules/base/components/DatePicker.vue'
-import TimePicker from '@/modules/base/components/TimePicker.vue'
-import { Checkbox } from '@/components/ui/checkbox'
+} from "@/components/ui/select";
+import { Calendar, Loader2, MapPin, AlertCircle, Zap } from "lucide-vue-next";
+import { toastService } from "@/core/services/ToastService";
+import { injectService, SERVICE_TOKENS } from "@/core/di-container";
+import ImageUpload from "@/modules/base/components/ImageUpload.vue";
+import DatePicker from "@/modules/base/components/DatePicker.vue";
+import TimePicker from "@/modules/base/components/TimePicker.vue";
+import { Checkbox } from "@/components/ui/checkbox";
 import {
   Tooltip,
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
-} from '@/components/ui/tooltip'
-import { useFiatProviders } from '@/modules/base/composables/useFiatProviders'
-import { CreditCard } from 'lucide-vue-next'
-import { Alert, AlertDescription } from '@/components/ui/alert'
-import type { ImageUploadService, UploadedImage } from '@/modules/base/services/ImageUploadService'
-import type { TicketApiService } from '../services/TicketApiService'
-import type { CreateEventRequest, TicketedEvent } from '../types/ticket'
-import { ALL_CATEGORIES } from '../types/category'
-import PromoCodesEditor from './PromoCodesEditor.vue'
+} from "@/components/ui/tooltip";
+import { useFiatProviders } from "@/modules/base/composables/useFiatProviders";
+import { CreditCard } from "lucide-vue-next";
+import { Alert, AlertDescription } from "@/components/ui/alert";
+import type {
+  ImageUploadService,
+  UploadedImage,
+} from "@/modules/base/services/ImageUploadService";
+import type { TicketApiService } from "../services/TicketApiService";
+import type { CreateEventRequest, TicketedEvent } from "../types/ticket";
+import { ALL_CATEGORIES } from "../types/category";
+import PromoCodesEditor from "./PromoCodesEditor.vue";
+import TicketWavesEditor from "./TicketWavesEditor.vue";
+import {
+  applyFormToPrimaryWave,
+  ensureTicketWaves,
+  validateWaveRows,
+} from "../lib/ticketWaves";
+import type { TicketWave } from "../types/ticket";
 import {
   fromWirePromoCodes,
   hasPromoErrors,
   toWirePromoCodes,
   validatePromoRows,
   type PromoCodeRow,
-} from '../lib/promoCodes'
+} from "../lib/promoCodes";
 
 interface Props {
-  open: boolean
+  open: boolean;
   /** When set, dialog opens in edit mode for this event. */
-  event?: TicketedEvent | null
+  event?: TicketedEvent | null;
   /** Create handler. Required when not editing. */
-  onCreateEvent?: (eventData: CreateEventRequest) => Promise<void>
+  onCreateEvent?: (eventData: CreateEventRequest) => Promise<void>;
   /** Update handler. Required when editing. */
-  onUpdateEvent?: (eventId: string, eventData: CreateEventRequest) => Promise<void>
+  onUpdateEvent?: (
+    eventId: string,
+    eventData: CreateEventRequest,
+  ) => Promise<void>;
   /** Whether the current user is an LNbits admin. Drives the
    *  "edit will go back to pending approval" warning copy. */
-  isAdmin?: boolean
+  isAdmin?: boolean;
   /** Whether the events extension has auto_approve enabled. */
-  autoApprove?: boolean
+  autoApprove?: boolean;
 }
 
-const props = defineProps<Props>()
+const props = defineProps<Props>();
 const emit = defineEmits<{
-  'update:open': [value: boolean]
-  'event-created': []
-  'event-updated': []
-}>()
+  "update:open": [value: boolean];
+  "event-created": [];
+  "event-updated": [];
+}>();
 
-const isEditMode = computed(() => Boolean(props.event?.id))
+const isEditMode = computed(() => Boolean(props.event?.id));
 // True when the submission will land in `proposed` status: a non-admin
 // owner with the extension's auto_approve toggle off. Same gate for
 // create and edit; the edit path also keys the in-form warning banner
 // on this so the user sees the consequence before submitting.
-const willLandInPending = computed(
-  () => !props.isAdmin && !props.autoApprove
-)
+const willLandInPending = computed(() => !props.isAdmin && !props.autoApprove);
 
-const { t } = useI18n()
+const { t } = useI18n();
 
 // Fold a date input ("YYYY-MM-DD") and an optional time input ("HH:MM")
 // into the events-extension wire format: date-only when no time given,
@@ -103,8 +118,8 @@ const { t } = useI18n()
 // the "T" delimiter. Hoisted above the schema so the validation refine
 // can reuse it.
 function foldDateTime(date: string, time: string): string {
-  if (!date) return ''
-  return time ? `${date}T${time}` : date
+  if (!date) return "";
+  return time ? `${date}T${time}` : date;
 }
 
 // Stamp the form's wall-clock datetime with the user's local UTC offset
@@ -116,120 +131,133 @@ function foldDateTime(date: string, time: string): string {
 // Preserving the user's intended wall-clock means stamping it here.
 // Date-only values (no "T") pass through unchanged.
 function withLocalTzOffset(value: string): string {
-  if (!value || !value.includes('T')) return value
+  if (!value || !value.includes("T")) return value;
   // The form's "YYYY-MM-DDTHH:MM" is parsed by JS Date as local time;
   // getTimezoneOffset() returns minutes west of UTC, so negate it.
-  const offMin = -new Date(value).getTimezoneOffset()
-  const sign = offMin >= 0 ? '+' : '-'
-  const abs = Math.abs(offMin)
-  const hh = String(Math.floor(abs / 60)).padStart(2, '0')
-  const mm = String(abs % 60).padStart(2, '0')
+  const offMin = -new Date(value).getTimezoneOffset();
+  const sign = offMin >= 0 ? "+" : "-";
+  const abs = Math.abs(offMin);
+  const hh = String(Math.floor(abs / 60)).padStart(2, "0");
+  const mm = String(abs % 60).padStart(2, "0");
   // Include `:00` seconds for compatibility with older Python
   // `datetime.fromisoformat` (pre-3.11 won't accept "HH:MM+HH:MM").
-  return `${value}:00${sign}${hh}:${mm}`
+  return `${value}:00${sign}${hh}:${mm}`;
 }
 
 const formSchema = toTypedSchema(
   z
     .object({
       name: z.string().min(1, "Title is required").max(200, "Title too long"),
-      info: z.string().max(2000, "Description too long").optional().default(''),
+      info: z.string().max(2000, "Description too long").optional().default(""),
       event_start_date: z.string().min(1, "Start date is required"),
-      event_start_time: z.string().optional().default(''),
-      event_end_date: z.string().optional().default(''),
-      event_end_time: z.string().optional().default(''),
-      location: z.string().max(500).optional().default(''),
+      event_start_time: z.string().optional().default(""),
+      event_end_date: z.string().optional().default(""),
+      event_end_time: z.string().optional().default(""),
+      location: z.string().max(500).optional().default(""),
       currency: z.string().default("sat"),
       // Rails buyers may use. `allow_fiat` on the wire is derived from
       // this list (fiat ∈ list) so older extensions / clients keep working.
       payment_methods: z
-        .array(z.enum(['lightning', 'fiat']))
-        .min(1, 'Enable at least one payment method'),
+        .array(z.enum(["lightning", "fiat"]))
+        .min(1, "Enable at least one payment method"),
       fiat_currency: z.string().default("USD"),
       // Required, and at least 1. A capacity of 0 used to mean
       // "unlimited", but the backend reads `amount_tickets < 1` as sold
       // out everywhere (aiolabs/events#34), so a 0 produced an event that
       // advertised unlimited tickets and refused every purchase.
-      amount_tickets: z.number().min(1, 'Set how many tickets are on sale').max(100000),
+      amount_tickets: z
+        .number()
+        .min(1, "Set how many tickets are on sale")
+        .max(100000),
       price_per_ticket: z.number().min(0).default(0),
       email_notifications: z.boolean().default(false),
       nostr_notifications: z.boolean().default(false),
-      notification_subject: z.string().max(200).default(''),
-      notification_body: z.string().max(2000).default(''),
+      notification_subject: z.string().max(200).default(""),
+      notification_body: z.string().max(2000).default(""),
     })
     .superRefine((v, ctx) => {
       // End must not precede start. Compare on the folded date+time
       // string so equal-date / later-time is enforced too.
       if (v.event_end_date) {
-        const start = foldDateTime(v.event_start_date, v.event_start_time)
-        const end = foldDateTime(v.event_end_date, v.event_end_time)
+        const start = foldDateTime(v.event_start_date, v.event_start_time);
+        const end = foldDateTime(v.event_end_date, v.event_end_time);
         if (start && end && end < start) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            path: ['event_end_date'],
-            message: 'End must be on or after start',
-          })
+            path: ["event_end_date"],
+            message: "End must be on or after start",
+          });
         }
       }
       // When the price is in sats and the organizer also accepts fiat,
       // they MUST choose a settle currency. Other price denominations
       // mirror themselves into fiat_currency automatically. The events
       // extension uses 'sat' and 'sats' interchangeably — accept both.
-      const isSat = v.currency === 'sat' || v.currency === 'sats'
-      if (v.payment_methods.includes('fiat') && isSat && !v.fiat_currency) {
+      const isSat = v.currency === "sat" || v.currency === "sats";
+      if (v.payment_methods.includes("fiat") && isSat && !v.fiat_currency) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          path: ['fiat_currency'],
-          message: 'Pick a fiat currency for buyers paying by card',
-        })
+          path: ["fiat_currency"],
+          message: "Pick a fiat currency for buyers paying by card",
+        });
       }
-    })
-)
+    }),
+);
 
 const form = useForm({
   validationSchema: formSchema,
   initialValues: {
-    name: '',
-    info: '',
-    event_start_date: '',
-    event_start_time: '',
-    event_end_date: '',
-    event_end_time: '',
-    location: '',
-    currency: 'sat',
-    payment_methods: ['lightning'],
-    fiat_currency: 'USD',
+    name: "",
+    info: "",
+    event_start_date: "",
+    event_start_time: "",
+    event_end_date: "",
+    event_end_time: "",
+    location: "",
+    currency: "sat",
+    payment_methods: ["lightning"],
+    fiat_currency: "USD",
     amount_tickets: undefined,
     price_per_ticket: 0,
     email_notifications: false,
     nostr_notifications: false,
-    notification_subject: '',
-    notification_body: '',
-  }
-})
+    notification_subject: "",
+    notification_body: "",
+  },
+});
 
 /** Rails an existing event has on; legacy events (no list) derive
  *  from allow_fiat. */
-function paymentMethodsOf(event: TicketedEvent): Array<'lightning' | 'fiat'> {
+function paymentMethodsOf(event: TicketedEvent): Array<"lightning" | "fiat"> {
   const explicit = (event.extra?.payment_methods ?? []).filter(
-    (m): m is 'lightning' | 'fiat' => m === 'lightning' || m === 'fiat',
-  )
-  if (explicit.length > 0) return explicit
-  return event.allow_fiat ? ['lightning', 'fiat'] : ['lightning']
+    (m): m is "lightning" | "fiat" => m === "lightning" || m === "fiat",
+  );
+  if (explicit.length > 0) return explicit;
+  return event.allow_fiat ? ["lightning", "fiat"] : ["lightning"];
 }
 
-const { hasAnyProvider, refresh: refreshFiatProviders } = useFiatProviders()
+const { hasAnyProvider, refresh: refreshFiatProviders } = useFiatProviders();
 // Refresh once so the Card checkbox reflects providers the organizer may
 // have just configured in LNbits.
-refreshFiatProviders()
+refreshFiatProviders();
 
 const PAYMENT_METHOD_OPTIONS = [
-  { id: 'lightning' as const, label: 'Lightning', icon: Zap, hint: 'Pay with any Lightning wallet' },
-  { id: 'fiat' as const, label: 'Card', icon: CreditCard, hint: 'Card or bank through your configured fiat provider' },
-]
+  {
+    id: "lightning" as const,
+    label: "Lightning",
+    icon: Zap,
+    hint: "Pay with any Lightning wallet",
+  },
+  {
+    id: "fiat" as const,
+    label: "Card",
+    icon: CreditCard,
+    hint: "Card or bank through your configured fiat provider",
+  },
+];
 
 function isSatDenomination(d: string | undefined): boolean {
-  return d === 'sat' || d === 'sats'
+  return d === "sat" || d === "sats";
 }
 
 // When the price is denominated in a fiat currency, the rail currency
@@ -238,33 +266,36 @@ watch(
   () => form.values.currency,
   (d) => {
     if (d && !isSatDenomination(d) && form.values.fiat_currency !== d) {
-      form.setFieldValue('fiat_currency', d)
+      form.setFieldValue("fiat_currency", d);
     }
   },
   { immediate: true },
-)
+);
 
 interface BannerImage extends UploadedImage {
-  isPrimary: boolean
+  isPrimary: boolean;
 }
-const bannerImages = ref<BannerImage[]>([])
+const bannerImages = ref<BannerImage[]>([]);
 
 // Inverse of foldDateTime: split a stored "YYYY-MM-DD[THH:MM[:SS][±HH:MM]]"
 // back into separate date + time pieces for the form inputs. The
 // time slice trims to "HH:MM" so any seconds + offset suffix added by
 // withLocalTzOffset on submit drops cleanly — the user sees the same
 // wall-clock they originally entered when re-editing.
-function splitDateTime(value: string | null | undefined): { date: string; time: string } {
-  if (!value) return { date: '', time: '' }
-  const [date, time = ''] = value.split('T')
-  return { date, time: time.slice(0, 5) }
+function splitDateTime(value: string | null | undefined): {
+  date: string;
+  time: string;
+} {
+  if (!value) return { date: "", time: "" };
+  const [date, time = ""] = value.split("T");
+  return { date, time: time.slice(0, 5) };
 }
 
 // When `true`, suppress the auto-mirror watcher so we don't clobber an
 // edit-mode population with start-date side effects mid-setValues.
-const isPopulating = ref(false)
-const notificationsOpen = ref(false)
-const promoOpen = ref(false)
+const isPopulating = ref(false);
+const notificationsOpen = ref(false);
+const promoOpen = ref(false);
 
 // Auto-mirror end date to start: when the user picks a start date,
 // surface that same date in the end-date picker so a one-day event
@@ -274,171 +305,241 @@ const promoOpen = ref(false)
 watch(
   () => form.values.event_start_date,
   (start, prev) => {
-    if (isPopulating.value) return
-    if (!start) return
-    const end = form.values.event_end_date
+    if (isPopulating.value) return;
+    if (!start) return;
+    const end = form.values.event_end_date;
     if (!end || end < start || end === prev) {
-      form.setFieldValue('event_end_date', start)
+      form.setFieldValue("event_end_date", start);
     }
-  }
-)
+  },
+);
 
-const paymentService = injectService(SERVICE_TOKENS.PAYMENT_SERVICE)
-const ticketApi = injectService(SERVICE_TOKENS.TICKET_API) as TicketApiService | null
-const imageService = injectService<ImageUploadService>(SERVICE_TOKENS.IMAGE_UPLOAD_SERVICE)
+const paymentService = injectService(SERVICE_TOKENS.PAYMENT_SERVICE);
+const ticketApi = injectService(
+  SERVICE_TOKENS.TICKET_API,
+) as TicketApiService | null;
+const imageService = injectService<ImageUploadService>(
+  SERVICE_TOKENS.IMAGE_UPLOAD_SERVICE,
+);
 
-const availableCurrencies = ref<string[]>(['sat'])
-const loadingCurrencies = ref(false)
-const selectedCategories = ref<string[]>([])
+const availableCurrencies = ref<string[]>(["sat"]);
+const loadingCurrencies = ref(false);
+const selectedCategories = ref<string[]>([]);
 // Promo codes live outside vee-validate like categories: a plain list
 // with its own pure validator (`validatePromoRows`), gating submit below.
-const promoRows = ref<PromoCodeRow[]>([])
-const promoErrors = computed(() => validatePromoRows(promoRows.value))
+const promoRows = ref<PromoCodeRow[]>([]);
+const promoErrors = computed(() => validatePromoRows(promoRows.value));
+
+// Ticket waves. The dialog's price / capacity / currency fields ARE the
+// primary wave (the backend derives the event-level values from it), so
+// this list is waves 2..n — the same split the LNbits admin uses.
+const extraWaves = ref<TicketWave[]>([]);
+const wavesOpen = ref(false);
+/** Waves already stored on the event: those may legitimately sit at zero
+ *  capacity (sold out), while a newly added one must state a real number. */
+const knownWaveIds = ref<string[]>([]);
+const waveErrors = computed(() =>
+  validateWaveRows(extraWaves.value, new Set(knownWaveIds.value)),
+);
+const hasWaveErrors = computed(() => Object.keys(waveErrors.value).length > 0);
+/** New waves inherit the primary wave's currency. */
+const primaryCurrency = computed(() => form.values.currency ?? "sat");
 
 async function populateFromEvent(event: TicketedEvent) {
-  isPopulating.value = true
-  const start = splitDateTime(event.event_start_date)
-  const end = splitDateTime(event.event_end_date)
+  isPopulating.value = true;
+  const start = splitDateTime(event.event_start_date);
+  const end = splitDateTime(event.event_end_date);
   form.setValues({
     name: event.name,
-    info: event.info ?? '',
+    info: event.info ?? "",
     event_start_date: start.date,
     event_start_time: start.time,
     event_end_date: end.date,
     event_end_time: end.time,
-    location: event.location ?? '',
-    currency: event.currency ?? 'sat',
+    location: event.location ?? "",
+    currency: event.currency ?? "sat",
     payment_methods: paymentMethodsOf(event),
-    fiat_currency: event.fiat_currency ?? 'USD',
+    fiat_currency: event.fiat_currency ?? "USD",
     // 0 is no longer a valid capacity, so an existing zero-capacity event
     // opens with the field empty and the organiser has to set a real one.
     amount_tickets: event.amount_tickets || undefined,
     price_per_ticket: event.price_per_ticket ?? 0,
     email_notifications: event.extra?.email_notifications ?? false,
     nostr_notifications: event.extra?.nostr_notifications ?? false,
-    notification_subject: event.extra?.notification_subject ?? '',
-    notification_body: event.extra?.notification_body ?? '',
-  })
-  selectedCategories.value = [...(event.categories ?? [])]
+    notification_subject: event.extra?.notification_subject ?? "",
+    notification_body: event.extra?.notification_body ?? "",
+  });
+  selectedCategories.value = [...(event.categories ?? [])];
   // Codes come only on the organizer-authenticated record (public
   // responses omit them) — useMyEvents / EventDetailPage hand us that one.
-  promoRows.value = fromWirePromoCodes(event.extra?.promo_codes)
-  promoOpen.value = promoRows.value.length > 0
+  promoRows.value = fromWirePromoCodes(event.extra?.promo_codes);
+  // Everything after the primary wave; the primary is represented by the
+  // price / capacity / currency fields above.
+  const storedWaves = event.extra?.ticket_waves ?? [];
+  knownWaveIds.value = storedWaves.map((w) => w.id);
+  extraWaves.value = storedWaves.slice(1).map((w) => ({ ...w }));
+  wavesOpen.value = extraWaves.value.length > 0;
+  promoOpen.value = promoRows.value.length > 0;
   if (event.banner) {
     // Re-render the stored banner via its pict-rs file ID. delete_token
     // is intentionally empty: we don't own the original upload's token
     // and removing the image on the client should NOT delete the
     // server-side file (it may be the user changing their mind about
     // re-using it, or the same image referenced elsewhere).
-    const alias = imageService.extractFileId(event.banner)
+    const alias = imageService.extractFileId(event.banner);
     bannerImages.value = [
-      { alias, isPrimary: true, delete_token: '', details: {} as any },
-    ]
+      { alias, isPrimary: true, delete_token: "", details: {} as any },
+    ];
   } else {
-    bannerImages.value = []
+    bannerImages.value = [];
   }
   // Release the watcher guard after Vue's microtask queue drains so
   // vee-validate's batched setValues lands before user input can drive
   // the auto-mirror. nextTick is more reliable than setTimeout(0) here
   // — it waits for the DOM tick *after* all current microtasks.
-  await nextTick()
-  isPopulating.value = false
+  await nextTick();
+  isPopulating.value = false;
 }
 
-watch(() => props.open, async (isOpen) => {
-  if (isOpen) {
-    if (ticketApi && !loadingCurrencies.value) {
-      loadingCurrencies.value = true
-      try {
-        availableCurrencies.value = await ticketApi.getCurrencies()
-      } catch (error) {
-        console.warn('Failed to load currencies:', error)
-      } finally {
-        loadingCurrencies.value = false
+watch(
+  () => props.open,
+  async (isOpen) => {
+    if (isOpen) {
+      if (ticketApi && !loadingCurrencies.value) {
+        loadingCurrencies.value = true;
+        try {
+          availableCurrencies.value = await ticketApi.getCurrencies();
+        } catch (error) {
+          console.warn("Failed to load currencies:", error);
+        } finally {
+          loadingCurrencies.value = false;
+        }
       }
+      if (props.event) {
+        await populateFromEvent(props.event);
+      }
+    } else {
+      selectedCategories.value = [];
+      promoRows.value = [];
+      extraWaves.value = [];
+      knownWaveIds.value = [];
+      promoOpen.value = false;
     }
-    if (props.event) {
-      await populateFromEvent(props.event)
-    }
-  } else {
-    selectedCategories.value = []
-    promoRows.value = []
-    promoOpen.value = false
-  }
-})
+  },
+);
 
-const { resetForm, meta } = form
-const isFormValid = computed(() => meta.value.valid && !hasPromoErrors(promoErrors.value))
-const isLoading = ref(false)
+const { resetForm, meta } = form;
+const isFormValid = computed(
+  () =>
+    meta.value.valid &&
+    !hasPromoErrors(promoErrors.value) &&
+    !hasWaveErrors.value,
+);
+const isLoading = ref(false);
 
-const today = computed(() => format(new Date(), 'yyyy-MM-dd'))
+const today = computed(() => format(new Date(), "yyyy-MM-dd"));
 
 function toggleCategory(cat: string) {
-  const idx = selectedCategories.value.indexOf(cat)
+  const idx = selectedCategories.value.indexOf(cat);
   if (idx >= 0) {
-    selectedCategories.value.splice(idx, 1)
+    selectedCategories.value.splice(idx, 1);
   } else {
-    selectedCategories.value.push(cat)
+    selectedCategories.value.push(cat);
   }
 }
 
 const onSubmit = form.handleSubmit(async (formValues) => {
-  if (!isFormValid.value) return
+  if (!isFormValid.value) return;
 
   if (!paymentService) {
-    toastService.error('Payment service not available')
-    return
+    toastService.error("Payment service not available");
+    return;
   }
 
-  const paymentSvc = paymentService as any
-  const preferredWallet = paymentSvc?.getPreferredWallet?.()
+  const paymentSvc = paymentService as any;
+  const preferredWallet = paymentSvc?.getPreferredWallet?.();
   if (!preferredWallet) {
-    toastService.error('No wallet available. Please connect a wallet first.')
-    return
+    toastService.error("No wallet available. Please connect a wallet first.");
+    return;
   }
 
-  isLoading.value = true
+  isLoading.value = true;
   try {
     const eventData: CreateEventRequest = {
       name: formValues.name,
       event_start_date: withLocalTzOffset(
-        foldDateTime(formValues.event_start_date, formValues.event_start_time)
+        foldDateTime(formValues.event_start_date, formValues.event_start_time),
       ),
-    }
+    };
     if (!isEditMode.value) {
       // Wallet binds at creation. The backend ignores the field on
       // update so we leave it off the edit payload for clean wire.
-      eventData.wallet = preferredWallet.id
+      eventData.wallet = preferredWallet.id;
     }
 
     // Optional fields — only include if provided
-    if (formValues.info) eventData.info = formValues.info
+    if (formValues.info) eventData.info = formValues.info;
     if (formValues.event_end_date) {
       eventData.event_end_date = withLocalTzOffset(
-        foldDateTime(formValues.event_end_date, formValues.event_end_time)
-      )
+        foldDateTime(formValues.event_end_date, formValues.event_end_time),
+      );
     }
-    if (formValues.location) eventData.location = formValues.location
+    if (formValues.location) eventData.location = formValues.location;
     if (bannerImages.value.length > 0) {
-      eventData.banner = imageService.getImageUrl(bannerImages.value[0].alias)
+      eventData.banner = imageService.getImageUrl(bannerImages.value[0].alias);
     } else if (isEditMode.value) {
       // User cleared the banner during edit — propagate the null so the
       // backend wipes the field instead of keeping the old image.
-      eventData.banner = null
+      eventData.banner = null;
     }
-    if (formValues.currency) eventData.currency = formValues.currency
+    if (formValues.currency) eventData.currency = formValues.currency;
     // allow_fiat always sends (derived from the rail list) so a
     // true→false flip propagates on edit; fiat_currency only sends when
     // fiat is on (no point persisting a rail-currency the backend won't use).
-    const acceptsFiat = formValues.payment_methods.includes('fiat')
-    eventData.allow_fiat = acceptsFiat
+    const acceptsFiat = formValues.payment_methods.includes("fiat");
+    eventData.allow_fiat = acceptsFiat;
     if (acceptsFiat && formValues.fiat_currency) {
-      eventData.fiat_currency = formValues.fiat_currency
+      eventData.fiat_currency = formValues.fiat_currency;
     }
     if (formValues.amount_tickets !== undefined)
-      eventData.amount_tickets = formValues.amount_tickets
-    if (formValues.price_per_ticket) eventData.price_per_ticket = formValues.price_per_ticket
-    if (selectedCategories.value.length > 0) eventData.categories = selectedCategories.value
+      eventData.amount_tickets = formValues.amount_tickets;
+    if (formValues.price_per_ticket)
+      eventData.price_per_ticket = formValues.price_per_ticket;
+    if (selectedCategories.value.length > 0)
+      eventData.categories = selectedCategories.value;
+
+    // Notification config + promo codes go inside the `extra` envelope.
+    // On edit overlay onto the existing event.extra so fields only the
+    // LNbits admin UI sets (conditional, min_tickets) survive the
+    // round-trip. promo_codes is always sent explicitly: what the
+    // organizer sees in the editor is the truth, an empty list clears.
+    // Ticket waves. The price / capacity / currency fields above ARE the
+    // primary wave, so they have to be written INTO it: the backend
+    // derives the event-level values FROM the waves on every write
+    // (`sync_event_ticket_waves`), so sending a changed amount_tickets
+    // beside an unchanged wave list leaves the wave's old number winning
+    // and the organizer's edit is silently discarded.
+    // Seeded so a NEW event's implied primary wave matches what the
+    // backend would synthesize. `create_event` stamps `time` and derives
+    // the wave window from it plus the closing/end/start dates; without
+    // the same inputs here the wave lands with empty date strings, which
+    // the backend's date parse throws on for every later read.
+    const storedWaves = ensureTicketWaves({
+      ...(props.event ?? {}),
+      time: props.event?.time ?? new Date().toISOString(),
+      event_start_date: eventData.event_start_date,
+      event_end_date: eventData.event_end_date ?? null,
+      closing_date: props.event?.closing_date ?? null,
+      extra: props.event?.extra ?? null,
+    });
+    const [primaryWave] = applyFormToPrimaryWave(storedWaves, {
+      closing_date: eventData.closing_date,
+      currency: formValues.currency,
+      allow_fiat: formValues.payment_methods.includes("fiat"),
+      fiat_currency: formValues.fiat_currency,
+      amount_tickets: formValues.amount_tickets,
+      price_per_ticket: formValues.price_per_ticket ?? 0,
+    });
 
     // Notification config + promo codes go inside the `extra` envelope.
     // On edit overlay onto the existing event.extra so fields only the
@@ -453,61 +554,66 @@ const onSubmit = form.handleSubmit(async (formValues) => {
       notification_subject: formValues.notification_subject,
       notification_body: formValues.notification_body,
       promo_codes: toWirePromoCodes(promoRows.value),
-    }
+      ticket_waves: [primaryWave, ...extraWaves.value],
+    };
 
     if (isEditMode.value) {
       if (!props.onUpdateEvent || !props.event?.id) {
-        toastService.error('Update handler missing')
-        return
+        toastService.error("Update handler missing");
+        return;
       }
-      await props.onUpdateEvent(props.event.id, eventData)
+      await props.onUpdateEvent(props.event.id, eventData);
       toastService.success(
         willLandInPending.value
-          ? 'Updated — awaiting re-approval. Hidden from the public feed until reviewed.'
-          : 'Event updated!'
-      )
-      emit('event-updated')
+          ? "Updated — awaiting re-approval. Hidden from the public feed until reviewed."
+          : "Event updated!",
+      );
+      emit("event-updated");
     } else {
       if (!props.onCreateEvent) {
-        toastService.error('Create handler missing')
-        return
+        toastService.error("Create handler missing");
+        return;
       }
-      await props.onCreateEvent(eventData)
+      await props.onCreateEvent(eventData);
       toastService.success(
         willLandInPending.value
-          ? 'Submitted! Awaiting admin approval — your draft is visible on your feed with a Pending badge.'
-          : 'Event submitted!'
-      )
-      emit('event-created')
+          ? "Submitted! Awaiting admin approval — your draft is visible on your feed with a Pending badge."
+          : "Event submitted!",
+      );
+      emit("event-created");
     }
 
-    resetForm()
-    selectedCategories.value = []
-    promoRows.value = []
-    bannerImages.value = []
-    emit('update:open', false)
+    resetForm();
+    selectedCategories.value = [];
+    promoRows.value = [];
+    extraWaves.value = [];
+    knownWaveIds.value = [];
+    bannerImages.value = [];
+    emit("update:open", false);
   } catch (error) {
     const errorMessage =
       error instanceof Error
         ? error.message
         : isEditMode.value
-          ? 'Failed to update event'
-          : 'Failed to create event'
-    toastService.error(errorMessage)
+          ? "Failed to update event"
+          : "Failed to create event";
+    toastService.error(errorMessage);
   } finally {
-    isLoading.value = false
+    isLoading.value = false;
   }
-})
+});
 
 const handleOpenChange = (open: boolean) => {
   if (!open && !isLoading.value) {
-    resetForm()
-    selectedCategories.value = []
-    promoRows.value = []
-    bannerImages.value = []
+    resetForm();
+    selectedCategories.value = [];
+    promoRows.value = [];
+    extraWaves.value = [];
+    knownWaveIds.value = [];
+    bannerImages.value = [];
   }
-  emit('update:open', open)
-}
+  emit("update:open", open);
+};
 </script>
 
 <template>
@@ -516,24 +622,28 @@ const handleOpenChange = (open: boolean) => {
       <DialogHeader class="px-6 pt-6 pb-2">
         <DialogTitle class="flex items-center gap-2">
           <Calendar class="w-5 h-5" />
-          {{ isEditMode ? 'Edit Event' : 'Create Event' }}
+          {{ isEditMode ? "Edit Event" : "Create Event" }}
         </DialogTitle>
         <DialogDescription>
           {{
             isEditMode
-              ? 'Update event details. Tickets already sold are not affected.'
-              : 'Only a title and start date are required.'
+              ? "Update event details. Tickets already sold are not affected."
+              : "Only a title and start date are required."
           }}
         </DialogDescription>
       </DialogHeader>
 
       <ScrollArea class="max-h-[70vh] px-6 pb-6">
         <form @submit="onSubmit" class="space-y-4">
-          <Alert v-if="isEditMode && willLandInPending" variant="default" class="border-orange-500/40 bg-orange-500/5">
+          <Alert
+            v-if="isEditMode && willLandInPending"
+            variant="default"
+            class="border-orange-500/40 bg-orange-500/5"
+          >
             <AlertCircle class="h-4 w-4 text-orange-500" />
             <AlertDescription>
-              Saving will resubmit for approval. The event will be removed
-              from public feeds until reviewed.
+              Saving will resubmit for approval. The event will be removed from
+              public feeds until reviewed.
             </AlertDescription>
           </Alert>
 
@@ -542,7 +652,10 @@ const handleOpenChange = (open: boolean) => {
             <FormItem>
               <FormLabel>Title *</FormLabel>
               <FormControl>
-                <Input placeholder="e.g. Bitcoin Meetup" v-bind="componentField" />
+                <Input
+                  placeholder="e.g. Bitcoin Meetup"
+                  v-bind="componentField"
+                />
               </FormControl>
               <FormMessage />
             </FormItem>
@@ -555,7 +668,7 @@ const handleOpenChange = (open: boolean) => {
                 <FormLabel>Start date *</FormLabel>
                 <FormControl>
                   <DatePicker
-                    :model-value="value as string ?? ''"
+                    :model-value="(value as string) ?? ''"
                     :min="today"
                     placeholder="Pick a date"
                     @update:model-value="handleChange"
@@ -570,7 +683,7 @@ const handleOpenChange = (open: boolean) => {
                 <FormLabel>Start time</FormLabel>
                 <FormControl>
                   <TimePicker
-                    :model-value="value as string ?? ''"
+                    :model-value="(value as string) ?? ''"
                     clearable
                     @update:model-value="handleChange"
                   />
@@ -589,7 +702,7 @@ const handleOpenChange = (open: boolean) => {
                 <FormLabel>End date</FormLabel>
                 <FormControl>
                   <DatePicker
-                    :model-value="value as string ?? ''"
+                    :model-value="(value as string) ?? ''"
                     :min="(form.values.event_start_date as string) || today"
                     placeholder="Pick a date"
                     @update:model-value="handleChange"
@@ -603,11 +716,13 @@ const handleOpenChange = (open: boolean) => {
               <FormItem class="min-w-0">
                 <FormLabel>
                   End time
-                  <span class="text-muted-foreground font-normal">(optional)</span>
+                  <span class="text-muted-foreground font-normal"
+                    >(optional)</span
+                  >
                 </FormLabel>
                 <FormControl>
                   <TimePicker
-                    :model-value="value as string ?? ''"
+                    :model-value="(value as string) ?? ''"
                     clearable
                     @update:model-value="handleChange"
                   />
@@ -622,7 +737,11 @@ const handleOpenChange = (open: boolean) => {
             <FormItem>
               <FormLabel>Description</FormLabel>
               <FormControl>
-                <Textarea placeholder="What's this event about?" rows="2" v-bind="componentField" />
+                <Textarea
+                  placeholder="What's this event about?"
+                  rows="2"
+                  v-bind="componentField"
+                />
               </FormControl>
               <FormMessage />
             </FormItem>
@@ -636,11 +755,16 @@ const handleOpenChange = (open: boolean) => {
                 Location
               </FormLabel>
               <FormControl>
-                <Input placeholder="e.g. Salle des fetes, Foix" v-bind="componentField" />
+                <Input
+                  placeholder="e.g. Salle des fetes, Foix"
+                  v-bind="componentField"
+                />
               </FormControl>
               <FormDescription class="flex items-center gap-1.5">
                 <MapPin class="w-3 h-3 text-muted-foreground/50" />
-                <span class="text-muted-foreground/50 italic text-xs">Map picker with geohash coming soon</span>
+                <span class="text-muted-foreground/50 italic text-xs"
+                  >Map picker with geohash coming soon</span
+                >
               </FormDescription>
               <FormMessage />
             </FormItem>
@@ -653,7 +777,9 @@ const handleOpenChange = (open: boolean) => {
               <Badge
                 v-for="cat in ALL_CATEGORIES"
                 :key="cat"
-                :variant="selectedCategories.includes(cat) ? 'default' : 'outline'"
+                :variant="
+                  selectedCategories.includes(cat) ? 'default' : 'outline'
+                "
                 class="cursor-pointer text-xs capitalize"
                 @click="toggleCategory(cat)"
               >
@@ -668,7 +794,8 @@ const handleOpenChange = (open: boolean) => {
           <div class="space-y-2">
             <p class="text-sm font-medium">Banner image</p>
             <p class="text-xs text-muted-foreground">
-              One poster image. Auto-resized to 1920px max edge and re-encoded as WebP.
+              One poster image. Auto-resized to 1920px max edge and re-encoded
+              as WebP.
             </p>
             <ImageUpload
               v-model="bannerImages"
@@ -687,8 +814,8 @@ const handleOpenChange = (open: boolean) => {
             <div>
               <p class="text-sm font-medium">Pricing</p>
               <p class="text-xs text-muted-foreground">
-                Set what buyers see. Lightning charges happen in sats;
-                fiat amounts convert at checkout using current rates.
+                Set what buyers see. Lightning charges happen in sats; fiat
+                amounts convert at checkout using current rates.
               </p>
             </div>
             <!-- Pricing grid: 2 cols on narrow phones (Tickets/Price share
@@ -700,9 +827,17 @@ const handleOpenChange = (open: boolean) => {
                 <FormItem class="min-w-0">
                   <FormLabel>Tickets</FormLabel>
                   <FormControl>
-                    <Input type="number" min="1" max="100000" placeholder="50" v-bind="componentField" />
+                    <Input
+                      type="number"
+                      min="1"
+                      max="100000"
+                      placeholder="50"
+                      v-bind="componentField"
+                    />
                   </FormControl>
-                  <FormDescription class="text-xs">Total on sale</FormDescription>
+                  <FormDescription class="text-xs"
+                    >Total on sale</FormDescription
+                  >
                   <FormMessage />
                 </FormItem>
               </FormField>
@@ -711,7 +846,13 @@ const handleOpenChange = (open: boolean) => {
                 <FormItem class="min-w-0">
                   <FormLabel>Price</FormLabel>
                   <FormControl>
-                    <Input type="number" min="0" step="1" placeholder="0" v-bind="componentField" />
+                    <Input
+                      type="number"
+                      min="0"
+                      step="1"
+                      placeholder="0"
+                      v-bind="componentField"
+                    />
                   </FormControl>
                   <FormDescription class="text-xs">0 = free</FormDescription>
                   <FormMessage />
@@ -727,7 +868,11 @@ const handleOpenChange = (open: boolean) => {
                         <SelectValue placeholder="sat" />
                       </SelectTrigger>
                       <SelectContent>
-                        <SelectItem v-for="c in availableCurrencies" :key="c" :value="c">
+                        <SelectItem
+                          v-for="c in availableCurrencies"
+                          :key="c"
+                          :value="c"
+                        >
                           {{ c }}
                         </SelectItem>
                       </SelectContent>
@@ -743,7 +888,9 @@ const handleOpenChange = (open: boolean) => {
           <FormField name="payment_methods">
             <FormItem class="space-y-3">
               <div>
-                <FormLabel class="text-sm font-medium">Payment methods</FormLabel>
+                <FormLabel class="text-sm font-medium"
+                  >Payment methods</FormLabel
+                >
                 <FormDescription class="text-xs">
                   Pick the rails buyers can pay with. Turn Lightning off for a
                   card-only sale.
@@ -759,9 +906,14 @@ const handleOpenChange = (open: boolean) => {
                   :unchecked-value="false"
                   name="payment_methods"
                 >
-                  <FormItem class="flex flex-row items-center gap-3 space-y-0 rounded-md border p-3">
+                  <FormItem
+                    class="flex flex-row items-center gap-3 space-y-0 rounded-md border p-3"
+                  >
                     <FormControl>
-                      <TooltipProvider v-if="opt.id === 'fiat' && !hasAnyProvider" :delay-duration="200">
+                      <TooltipProvider
+                        v-if="opt.id === 'fiat' && !hasAnyProvider"
+                        :delay-duration="200"
+                      >
                         <Tooltip>
                           <TooltipTrigger as-child>
                             <span class="inline-flex">
@@ -769,24 +921,33 @@ const handleOpenChange = (open: boolean) => {
                             </span>
                           </TooltipTrigger>
                           <TooltipContent class="max-w-xs">
-                            Your LNbits user has no fiat provider configured. Open
-                            LNbits → Account → Fiat providers and add Stripe, PayPal,
-                            or Square to enable card payments.
+                            Your LNbits user has no fiat provider configured.
+                            Open LNbits → Account → Fiat providers and add
+                            Stripe, PayPal, or Square to enable card payments.
                           </TooltipContent>
                         </Tooltip>
                       </TooltipProvider>
                       <Checkbox
                         v-else
-                        :model-value="Array.isArray(value) && value.includes(opt.id)"
+                        :model-value="
+                          Array.isArray(value) && value.includes(opt.id)
+                        "
                         :disabled="isLoading"
                         @update:model-value="handleChange"
                       />
                     </FormControl>
                     <div class="flex items-center gap-2 min-w-0">
-                      <component :is="opt.icon" class="w-4 h-4 text-muted-foreground shrink-0" />
+                      <component
+                        :is="opt.icon"
+                        class="w-4 h-4 text-muted-foreground shrink-0"
+                      />
                       <div class="min-w-0">
-                        <FormLabel class="font-normal">{{ opt.label }}</FormLabel>
-                        <p class="text-xs text-muted-foreground">{{ opt.hint }}</p>
+                        <FormLabel class="font-normal">{{
+                          opt.label
+                        }}</FormLabel>
+                        <p class="text-xs text-muted-foreground">
+                          {{ opt.hint }}
+                        </p>
                       </div>
                     </div>
                   </FormItem>
@@ -798,7 +959,10 @@ const handleOpenChange = (open: boolean) => {
 
           <FormField v-slot="{ componentField }" name="fiat_currency">
             <FormItem
-              v-show="(form.values.payment_methods ?? []).includes('fiat') && isSatDenomination(form.values.currency)"
+              v-show="
+                (form.values.payment_methods ?? []).includes('fiat') &&
+                isSatDenomination(form.values.currency)
+              "
             >
               <FormLabel>Fiat currency</FormLabel>
               <FormControl>
@@ -808,7 +972,9 @@ const handleOpenChange = (open: boolean) => {
                   </SelectTrigger>
                   <SelectContent>
                     <SelectItem
-                      v-for="c in availableCurrencies.filter(c => c !== 'sat' && c !== 'sats')"
+                      v-for="c in availableCurrencies.filter(
+                        (c) => c !== 'sat' && c !== 'sats',
+                      )"
                       :key="c"
                       :value="c"
                     >
@@ -817,7 +983,9 @@ const handleOpenChange = (open: boolean) => {
                   </SelectContent>
                 </Select>
               </FormControl>
-              <FormDescription class="text-xs">Currency card buyers are charged in.</FormDescription>
+              <FormDescription class="text-xs"
+                >Currency card buyers are charged in.</FormDescription
+              >
               <FormMessage />
             </FormItem>
           </FormField>
@@ -829,42 +997,74 @@ const handleOpenChange = (open: boolean) => {
                strings fall back to the extension's defaults. -->
           <Collapsible v-model:open="notificationsOpen">
             <CollapsibleTrigger as-child>
-              <Button type="button" variant="ghost" size="sm" class="w-full justify-between text-muted-foreground">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                class="w-full justify-between text-muted-foreground"
+              >
                 <span class="flex items-center gap-1.5">
                   <Bell class="w-4 h-4" />
                   Buyer notifications
                 </span>
-                <ChevronDown class="w-4 h-4 transition-transform" :class="{ 'rotate-180': notificationsOpen }" />
+                <ChevronDown
+                  class="w-4 h-4 transition-transform"
+                  :class="{ 'rotate-180': notificationsOpen }"
+                />
               </Button>
             </CollapsibleTrigger>
             <CollapsibleContent class="space-y-3 pt-2">
               <div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
-                <FormField v-slot="{ value, handleChange }" name="email_notifications">
-                  <FormItem class="flex flex-row items-center justify-between rounded-md border p-3">
+                <FormField
+                  v-slot="{ value, handleChange }"
+                  name="email_notifications"
+                >
+                  <FormItem
+                    class="flex flex-row items-center justify-between rounded-md border p-3"
+                  >
                     <FormLabel class="text-sm">Email confirmation</FormLabel>
                     <FormControl>
-                      <Switch :model-value="value as boolean" @update:model-value="handleChange" />
+                      <Switch
+                        :model-value="value as boolean"
+                        @update:model-value="handleChange"
+                      />
                     </FormControl>
                   </FormItem>
                 </FormField>
 
-                <FormField v-slot="{ value, handleChange }" name="nostr_notifications">
-                  <FormItem class="flex flex-row items-center justify-between rounded-md border p-3">
+                <FormField
+                  v-slot="{ value, handleChange }"
+                  name="nostr_notifications"
+                >
+                  <FormItem
+                    class="flex flex-row items-center justify-between rounded-md border p-3"
+                  >
                     <FormLabel class="text-sm">Nostr DM confirmation</FormLabel>
                     <FormControl>
-                      <Switch :model-value="value as boolean" @update:model-value="handleChange" />
+                      <Switch
+                        :model-value="value as boolean"
+                        @update:model-value="handleChange"
+                      />
                     </FormControl>
                   </FormItem>
                 </FormField>
               </div>
 
-              <FormField v-slot="{ componentField }" name="notification_subject">
+              <FormField
+                v-slot="{ componentField }"
+                name="notification_subject"
+              >
                 <FormItem>
                   <FormLabel class="text-sm">Subject</FormLabel>
                   <FormControl>
-                    <Input placeholder="Your ticket for {event_name}" v-bind="componentField" />
+                    <Input
+                      placeholder="Your ticket for {event_name}"
+                      v-bind="componentField"
+                    />
                   </FormControl>
-                  <FormDescription class="text-xs">Leave blank to use the default.</FormDescription>
+                  <FormDescription class="text-xs"
+                    >Leave blank to use the default.</FormDescription
+                  >
                   <FormMessage />
                 </FormItem>
               </FormField>
@@ -873,10 +1073,15 @@ const handleOpenChange = (open: boolean) => {
                 <FormItem>
                   <FormLabel class="text-sm">Body</FormLabel>
                   <FormControl>
-                    <Textarea placeholder="See you there!" rows="3" v-bind="componentField" />
+                    <Textarea
+                      placeholder="See you there!"
+                      rows="3"
+                      v-bind="componentField"
+                    />
                   </FormControl>
                   <FormDescription class="text-xs">
-                    Leave blank to use the default. The ticket link is appended automatically.
+                    Leave blank to use the default. The ticket link is appended
+                    automatically.
                   </FormDescription>
                   <FormMessage />
                 </FormItem>
@@ -889,15 +1094,27 @@ const handleOpenChange = (open: boolean) => {
                public responses and enforces active/max_uses at purchase. -->
           <Collapsible v-model:open="promoOpen">
             <CollapsibleTrigger as-child>
-              <Button type="button" variant="ghost" size="sm" class="w-full justify-between text-muted-foreground">
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                class="w-full justify-between text-muted-foreground"
+              >
                 <span class="flex items-center gap-1.5">
                   <Tag class="w-4 h-4" />
-                  {{ t('events.create.promo.title') }}
-                  <Badge v-if="promoRows.length > 0" variant="secondary" class="text-[10px] px-1.5">
+                  {{ t("events.create.promo.title") }}
+                  <Badge
+                    v-if="promoRows.length > 0"
+                    variant="secondary"
+                    class="text-[10px] px-1.5"
+                  >
                     {{ promoRows.length }}
                   </Badge>
                 </span>
-                <ChevronDown class="w-4 h-4 transition-transform" :class="{ 'rotate-180': promoOpen }" />
+                <ChevronDown
+                  class="w-4 h-4 transition-transform"
+                  :class="{ 'rotate-180': promoOpen }"
+                />
               </Button>
             </CollapsibleTrigger>
             <CollapsibleContent class="pt-2">
@@ -905,12 +1122,51 @@ const handleOpenChange = (open: boolean) => {
             </CollapsibleContent>
           </Collapsible>
 
+          <!-- Additional ticket waves (collapsible). The first wave is the
+               price / capacity fields above; these are the later tiers. -->
+          <Collapsible v-model:open="wavesOpen">
+            <CollapsibleTrigger as-child>
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                class="w-full justify-between text-muted-foreground"
+              >
+                <span class="flex items-center gap-1.5">
+                  <Layers class="w-4 h-4" />
+                  Ticket waves
+                  <Badge
+                    v-if="extraWaves.length > 0"
+                    variant="secondary"
+                    class="text-[10px] px-1.5"
+                  >
+                    {{ extraWaves.length + 1 }}
+                  </Badge>
+                </span>
+                <ChevronDown
+                  class="w-4 h-4 transition-transform"
+                  :class="{ 'rotate-180': wavesOpen }"
+                />
+              </Button>
+            </CollapsibleTrigger>
+            <CollapsibleContent class="pt-2">
+              <TicketWavesEditor
+                v-model="extraWaves"
+                :known-ids="knownWaveIds"
+                :currency="primaryCurrency"
+                :disabled="isLoading"
+              />
+            </CollapsibleContent>
+          </Collapsible>
+
           <!-- Actions. Stack full-width on narrow viewports so a wide
                localized "Submit Event" label can't push the Cancel
                button out of the dialog. Submit reads top-down on
                mobile (flex-col-reverse) to keep the primary action
                under the thumb. -->
-          <div class="flex flex-col-reverse sm:flex-row sm:justify-end gap-3 pt-2">
+          <div
+            class="flex flex-col-reverse sm:flex-row sm:justify-end gap-3 pt-2"
+          >
             <Button
               type="button"
               variant="outline"
@@ -928,8 +1184,12 @@ const handleOpenChange = (open: boolean) => {
               <Loader2 v-if="isLoading" class="w-4 h-4 mr-2 animate-spin" />
               {{
                 isLoading
-                  ? (isEditMode ? 'Saving...' : 'Submitting...')
-                  : (isEditMode ? 'Save changes' : 'Submit Event')
+                  ? isEditMode
+                    ? "Saving..."
+                    : "Submitting..."
+                  : isEditMode
+                    ? "Save changes"
+                    : "Submit Event"
               }}
             </Button>
           </div>
diff --git a/src/modules/events/components/TicketWavesEditor.vue b/src/modules/events/components/TicketWavesEditor.vue
new file mode 100644
index 0000000..0812886
--- /dev/null
+++ b/src/modules/events/components/TicketWavesEditor.vue
@@ -0,0 +1,195 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Plus, Trash2 } from "lucide-vue-next";
+import { newWaveRow, validateWaveRows } from "../lib/ticketWaves";
+import type { TicketWave } from "../types/ticket";
+
+/**
+ * Additional ticket waves — the tiers after the first.
+ *
+ * The primary wave is edited through the dialog's own price / capacity /
+ * currency fields, because those event-level fields ARE the primary
+ * wave's (`sync_event_ticket_waves` derives them from it). This editor
+ * covers waves 2..n, the same split the LNbits admin uses.
+ *
+ * Plain `v-model` over a `TicketWave[]`, matching PromoCodesEditor:
+ * validation is the pure `validateWaveRows` so the parent can gate
+ * submit on exactly the rules the backend enforces.
+ */
+const props = defineProps<{
+  modelValue: TicketWave[];
+  /** Waves already stored on the event. A stored wave may legitimately
+   *  sit at zero capacity — that is what sold out looks like — while a
+   *  new one must state a real number. */
+  knownIds?: string[];
+  /** Currency of the primary wave; new rows inherit it. */
+  currency?: string;
+  disabled?: boolean;
+}>();
+const emit = defineEmits<{ "update:modelValue": [waves: TicketWave[]] }>();
+
+const errors = computed(() =>
+  validateWaveRows(props.modelValue, new Set(props.knownIds ?? [])),
+);
+
+function update(index: number, patch: Partial<TicketWave>) {
+  emit(
+    "update:modelValue",
+    props.modelValue.map((row, i) =>
+      i === index ? { ...row, ...patch } : row,
+    ),
+  );
+}
+
+function add() {
+  emit("update:modelValue", [
+    ...props.modelValue,
+    newWaveRow({ currency: props.currency ?? "sat" }),
+  ]);
+}
+
+function remove(index: number) {
+  emit(
+    "update:modelValue",
+    props.modelValue.filter((_, i) => i !== index),
+  );
+}
+
+/** Empty input → 0 rather than NaN, so a cleared field reads as unset. */
+function toNumber(value: string | number): number {
+  const n = Number(String(value).trim());
+  return Number.isFinite(n) ? n : 0;
+}
+
+/** A stored wave at zero has sold out; say so instead of flagging it. */
+function isSoldOut(row: TicketWave): boolean {
+  return row.amount_tickets === 0 && (props.knownIds ?? []).includes(row.id);
+}
+</script>
+
+<template>
+  <div class="space-y-3">
+    <p class="text-xs text-muted-foreground">
+      Extra pricing tiers, each with its own dates, price and capacity. Buyers
+      choose between whichever are open; the cheapest open one is what the
+      public listing advertises.
+    </p>
+
+    <p v-if="modelValue.length === 0" class="text-sm text-muted-foreground">
+      No additional waves — everything sells at the price above.
+    </p>
+
+    <div
+      v-for="(row, index) in modelValue"
+      :key="row.id"
+      class="rounded-md border border-border p-3 space-y-2"
+    >
+      <div class="grid grid-cols-[minmax(0,1fr)_auto] gap-2">
+        <div class="space-y-1">
+          <Label :for="`wave-title-${index}`" class="text-xs">Name</Label>
+          <Input
+            :id="`wave-title-${index}`"
+            :model-value="row.title"
+            placeholder="Early bird"
+            :disabled="disabled"
+            @update:model-value="update(index, { title: String($event) })"
+          />
+        </div>
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          class="mt-5"
+          :disabled="disabled"
+          aria-label="Remove wave"
+          @click="remove(index)"
+        >
+          <Trash2 class="h-4 w-4" />
+        </Button>
+      </div>
+
+      <div class="grid grid-cols-2 gap-2">
+        <div class="space-y-1">
+          <Label :for="`wave-open-${index}`" class="text-xs">Opens</Label>
+          <Input
+            :id="`wave-open-${index}`"
+            type="date"
+            :model-value="row.opening_date"
+            :disabled="disabled"
+            @update:model-value="
+              update(index, { opening_date: String($event) })
+            "
+          />
+        </div>
+        <div class="space-y-1">
+          <Label :for="`wave-close-${index}`" class="text-xs">Closes</Label>
+          <Input
+            :id="`wave-close-${index}`"
+            type="date"
+            :model-value="row.closing_date"
+            :disabled="disabled"
+            @update:model-value="
+              update(index, { closing_date: String($event) })
+            "
+          />
+        </div>
+      </div>
+
+      <div class="grid grid-cols-2 gap-2">
+        <div class="space-y-1">
+          <Label :for="`wave-price-${index}`" class="text-xs">
+            Price ({{ row.currency }})
+          </Label>
+          <Input
+            :id="`wave-price-${index}`"
+            type="number"
+            inputmode="decimal"
+            min="0"
+            step="any"
+            :model-value="row.price_per_ticket"
+            :disabled="disabled"
+            @update:model-value="
+              update(index, { price_per_ticket: toNumber($event) })
+            "
+          />
+        </div>
+        <div class="space-y-1">
+          <Label :for="`wave-cap-${index}`" class="text-xs">Tickets</Label>
+          <Input
+            :id="`wave-cap-${index}`"
+            type="number"
+            inputmode="numeric"
+            min="1"
+            step="1"
+            :model-value="row.amount_tickets"
+            :disabled="disabled"
+            @update:model-value="
+              update(index, { amount_tickets: toNumber($event) })
+            "
+          />
+          <p v-if="isSoldOut(row)" class="text-xs text-muted-foreground">
+            Sold out
+          </p>
+        </div>
+      </div>
+
+      <p v-if="errors[index]" class="text-xs text-destructive">
+        {{ errors[index] }}
+      </p>
+    </div>
+
+    <Button
+      type="button"
+      variant="outline"
+      size="sm"
+      :disabled="disabled"
+      @click="add"
+    >
+      <Plus class="h-4 w-4 mr-1" />
+      Add wave
+    </Button>
+  </div>
+</template>
diff --git a/src/modules/events/lib/ticketWaves.spec.ts b/src/modules/events/lib/ticketWaves.spec.ts
index 48501ac..ce2bad2 100644
--- a/src/modules/events/lib/ticketWaves.spec.ts
+++ b/src/modules/events/lib/ticketWaves.spec.ts
@@ -5,8 +5,10 @@ import {
   applyFormToPrimaryWave,
   ensureTicketWaves,
   isWaveActive,
+  newWaveRow,
   resolveTicketWave,
   syncEventFromWaves,
+  validateWaveRows,
   waveDay,
 } from "./ticketWaves";
 import type { TicketWave } from "../types/ticket";
@@ -226,3 +228,102 @@ describe("applyFormToPrimaryWave", () => {
     expect(primary.amount_tickets).toBe(7);
   });
 });
+
+describe("validateWaveRows", () => {
+  const valid = wave({ id: "w1", title: "Late", amount_tickets: 5 });
+
+  it("accepts a well-formed wave", () => {
+    expect(validateWaveRows([valid])).toEqual({});
+  });
+
+  it("rejects a new wave with no capacity — there is no unlimited", () => {
+    expect(validateWaveRows([{ ...valid, amount_tickets: 0 }])[0]).toMatch(
+      /at least 1/,
+    );
+  });
+
+  it("lets a wave that sold out stay at zero, so the event stays editable", () => {
+    const soldOut = { ...valid, amount_tickets: 0 };
+    expect(validateWaveRows([soldOut], new Set(["w1"]))).toEqual({});
+  });
+
+  it("catches missing names, inverted windows and negative prices", () => {
+    expect(validateWaveRows([{ ...valid, title: "  " }])[0]).toMatch(/name/);
+    expect(
+      validateWaveRows([
+        { ...valid, opening_date: "2026-07-01", closing_date: "2026-06-01" },
+      ])[0],
+    ).toMatch(/Opens after/);
+    expect(validateWaveRows([{ ...valid, price_per_ticket: -1 }])[0]).toMatch(
+      /negative/,
+    );
+  });
+
+  it("reports the offending row by index", () => {
+    const errors = validateWaveRows([valid, { ...valid, id: "w2", title: "" }]);
+    expect(errors[0]).toBeUndefined();
+    expect(errors[1]).toMatch(/name/);
+  });
+});
+
+describe("newWaveRow", () => {
+  it("starts at the smallest capacity the backend accepts", () => {
+    expect(newWaveRow().amount_tickets).toBe(1);
+  });
+
+  it("gives each row a distinct id so the list keys stay stable", () => {
+    expect(newWaveRow().id).not.toBe(newWaveRow().id);
+  });
+});
+
+describe("the primary-wave write-through a create/edit form performs", () => {
+  // Composition the CreateEventDialog runs on submit. Pinned here because
+  // getting it wrong is silent: the backend accepts the payload and then
+  // either discards the organizer's numbers or throws on every read.
+  function submitted(
+    stored: {
+      time?: string;
+      closing_date?: string | null;
+      event_start_date?: string;
+      extra?: { ticket_waves?: TicketWave[] } | null;
+    },
+    form: {
+      amount_tickets: number;
+      price_per_ticket: number;
+      currency: string;
+    },
+  ) {
+    return applyFormToPrimaryWave(ensureTicketWaves(stored), form)[0];
+  }
+
+  it("never emits empty wave dates for a brand-new event", () => {
+    // The seed matters: with no dates at all `ensureTicketWaves` produces
+    // '' and the backend's date parse raises on every subsequent read.
+    const primary = submitted(
+      { time: "2026-06-15T10:00:00Z", event_start_date: "2026-09-01" },
+      { amount_tickets: 50, price_per_ticket: 10, currency: "sat" },
+    );
+    expect(primary.opening_date).toBe("2026-06-15");
+    expect(primary.closing_date).toBe("2026-09-01");
+    expect(primary.opening_date).not.toBe("");
+    expect(primary.closing_date).not.toBe("");
+  });
+
+  it("carries the form numbers into the stored primary wave on edit", () => {
+    const primary = submitted(
+      { extra: { ticket_waves: [EARLY, REGULAR] } },
+      { amount_tickets: 99, price_per_ticket: 42, currency: "EUR" },
+    );
+    expect(primary.id).toBe("early");
+    expect(primary.amount_tickets).toBe(99);
+    expect(primary.price_per_ticket).toBe(42);
+  });
+
+  it("leaves the later waves untouched", () => {
+    const waves = applyFormToPrimaryWave(
+      ensureTicketWaves({ extra: { ticket_waves: [EARLY, REGULAR] } }),
+      { amount_tickets: 99 },
+    );
+    expect(waves[1]).toEqual(REGULAR);
+  });
+});
diff --git a/src/modules/events/lib/ticketWaves.ts b/src/modules/events/lib/ticketWaves.ts
index 2b90644..9c2e710 100644
--- a/src/modules/events/lib/ticketWaves.ts
+++ b/src/modules/events/lib/ticketWaves.ts
@@ -226,3 +226,69 @@ export function applyFormToPrimaryWave(
   next[0] = primary;
   return next;
 }
+
+/** Per-row problems, keyed by wave index. Empty means the list is valid. */
+export type WaveRowErrors = Record<number, string>;
+
+/**
+ * Validate organizer-entered waves, mirroring `_validate_wave_capacity`
+ * plus the shape rules the backend model enforces.
+ *
+ * `knownIds` are the waves already stored on the event. Selling out is
+ * the legitimate route to zero, so an existing wave may sit at 0 and
+ * still be saved; only a wave new to the event must state real capacity.
+ * Rejecting stored zeroes would make a sold-out event uneditable.
+ */
+export function validateWaveRows(
+  rows: TicketWave[],
+  knownIds: ReadonlySet<string> = new Set(),
+): WaveRowErrors {
+  const errors: WaveRowErrors = {};
+  const seen = new Set<string>();
+
+  rows.forEach((row, index) => {
+    if (!row.title?.trim()) {
+      errors[index] = "Give this wave a name";
+    } else if (!row.opening_date || !row.closing_date) {
+      errors[index] = "Set both an opening and a closing date";
+    } else if (waveDay(row.opening_date) > waveDay(row.closing_date)) {
+      errors[index] = "Opens after it closes";
+    } else if (
+      !Number.isFinite(row.price_per_ticket) ||
+      row.price_per_ticket < 0
+    ) {
+      errors[index] = "Price cannot be negative";
+    } else if (
+      !knownIds.has(row.id) &&
+      (!Number.isFinite(row.amount_tickets) || row.amount_tickets < 1)
+    ) {
+      // Matches the backend: a zero-capacity wave can never be active, so
+      // creating one produces a tier that refuses every purchase.
+      errors[index] = "Needs a capacity of at least 1";
+    } else if (row.amount_tickets < 0) {
+      errors[index] = "Capacity cannot be negative";
+    } else if (seen.has(row.id)) {
+      errors[index] = "Duplicate wave";
+    }
+    seen.add(row.id);
+  });
+
+  return errors;
+}
+
+/** A blank wave row for the editor, opening today and priced like the event. */
+export function newWaveRow(defaults: Partial<TicketWave> = {}): TicketWave {
+  const today = todayKey();
+  return {
+    id: `w${Math.random().toString(36).slice(2, 10)}`,
+    title: "",
+    opening_date: today,
+    closing_date: today,
+    currency: "sat",
+    // 1, not 0: the smallest capacity the backend accepts. There is no
+    // unlimited (aiolabs/events#34).
+    amount_tickets: 1,
+    price_per_ticket: 0,
+    ...defaults,
+  };
+}