@bash-app/bash-common 30.403.0 → 30.408.0

package/src/__tests__/definitionsHelpers.test.ts

@@ -15,6 +15,16 @@ import {
   COMPLEMENTARY_SERVICE_TYPE,
   complementaryServiceTypeFor,
   ServiceTypes,
+  isIntroIntentId,
+  INTRO_INTENT_OPTIONS,
+  isLocusOfControlId,
+  LOCUS_OF_CONTROL_OPTIONS,
+  hasSensingIntuitionOverlap,
+  personalityOverlapHint,
+  normalizePersonalityType,
+  isInterestExpressionMode,
+  sharedIntroIntentHint,
+  locusOfControlShortLabel,
 } from "../definitions.js";
 
 describe("definitions helpers", () => {
@@ -183,4 +193,44 @@ describe("definitions helpers", () => {
       ).toBeUndefined();
     });
   });
+
+  describe("Intros intents", () => {
+    test("accepts the three platonic/professional intent ids", () => {
+      expect(INTRO_INTENT_OPTIONS.map((option) => option.id)).toEqual([
+        "friends",
+        "professional",
+        "mentorship",
+      ]);
+      expect(isIntroIntentId("friends")).toBe(true);
+      expect(isIntroIntentId("dating")).toBe(false);
+    });
+
+    test("normalizes personality type and detects S/N overlap", () => {
+      expect(normalizePersonalityType("enfp!")).toBe("ENFP");
+      expect(normalizePersonalityType("  ")).toBeNull();
+      expect(hasSensingIntuitionOverlap("ENFP", "INTJ")).toBe(true);
+      expect(hasSensingIntuitionOverlap("ESFP", "INTJ")).toBe(false);
+      expect(personalityOverlapHint("ENFP", "INTJ")).toBe(
+        "You both picked N — good icebreaker."
+      );
+      expect(isLocusOfControlId("internal")).toBe(true);
+      expect(isLocusOfControlId("random")).toBe(false);
+      expect(LOCUS_OF_CONTROL_OPTIONS.map((option) => option.id)).toEqual([
+        "internal",
+        "external",
+        "mixed",
+      ]);
+      expect(isInterestExpressionMode("named")).toBe(true);
+      expect(isInterestExpressionMode("crush")).toBe(false);
+    });
+
+    test("shared intro intent and locus labels stay conversational", () => {
+      expect(
+        sharedIntroIntentHint(["friends", "mentorship"], ["professional", "friends"])
+      ).toBe("You're both here for making friends.");
+      expect(sharedIntroIntentHint(["friends"], ["professional"])).toBeNull();
+      expect(locusOfControlShortLabel("internal")).toBe("Internal");
+      expect(locusOfControlShortLabel("nope")).toBeNull();
+    });
+  });
 });

package/src/definitions.ts

@@ -4,7 +4,6 @@ import {
     Contact,
     DietaryOption,
     EntertainmentServiceType,
-    IncomeRange,
     JudgingType,
     MembershipTier,
     MusicGenreType,
@@ -17,6 +16,7 @@ import {
 } from "@prisma/client";
 import type {
     AgePolicy as AgePolicyEnum,
+    IncomeRange,
     BashPassTier,
     BashEventDressTags,
     BashEventVibeTags,
@@ -134,6 +134,109 @@ export const AgePolicy = {
 
 export type AgePolicy = AgePolicyEnum;
 
+export const INTRO_INTENT_OPTIONS = [
+  { id: "friends", label: "Making friends" },
+  { id: "professional", label: "Professional networking" },
+  { id: "mentorship", label: "Finding a mentor or mentee" },
+] as const;
+
+export type IntroIntentId = (typeof INTRO_INTENT_OPTIONS)[number]["id"];
+
+export const INTRO_INTENT_IDS: readonly IntroIntentId[] =
+  INTRO_INTENT_OPTIONS.map((option) => option.id);
+
+export function isIntroIntentId(value: string): value is IntroIntentId {
+  return (INTRO_INTENT_IDS as readonly string[]).includes(value);
+}
+
+export const LOCUS_OF_CONTROL_OPTIONS = [
+  { id: "internal", label: "Internal — I shape my own outcomes" },
+  { id: "external", label: "External — circumstances shape outcomes" },
+  { id: "mixed", label: "Mixed — bit of both" },
+] as const;
+
+export type LocusOfControlId = (typeof LOCUS_OF_CONTROL_OPTIONS)[number]["id"];
+
+export const LOCUS_OF_CONTROL_IDS: readonly LocusOfControlId[] =
+  LOCUS_OF_CONTROL_OPTIONS.map((option) => option.id);
+
+export function isLocusOfControlId(value: string): value is LocusOfControlId {
+  return (LOCUS_OF_CONTROL_IDS as readonly string[]).includes(value);
+}
+
+export const PERSONALITY_TYPE_MAX_LENGTH = 4;
+
+export function normalizePersonalityType(
+  value: string | null | undefined
+): string | null {
+  if (!value) return null;
+  const normalized = value
+    .toUpperCase()
+    .replace(/[^A-Z]/g, "")
+    .slice(0, PERSONALITY_TYPE_MAX_LENGTH);
+  return normalized.length > 0 ? normalized : null;
+}
+
+/** True if two MBTI codes share the same second letter (S/N axis). */
+export function hasSensingIntuitionOverlap(a: string, b: string): boolean {
+  return (
+    a.length >= 2 &&
+    b.length >= 2 &&
+    a[1].toUpperCase() === b[1].toUpperCase()
+  );
+}
+
+export function personalityOverlapHint(
+  a: string | null | undefined,
+  b: string | null | undefined
+): string | null {
+  if (!a || !b || !hasSensingIntuitionOverlap(a, b)) return null;
+  return `You both picked ${a[1].toUpperCase()} — good icebreaker.`;
+}
+
+export function sharedIntroIntentHint(
+  viewerIntents: readonly string[] | null | undefined,
+  guestIntents: readonly string[] | null | undefined
+): string | null {
+  if (!viewerIntents?.length || !guestIntents?.length) return null;
+  const guest = new Set(guestIntents);
+  const match = viewerIntents.find((id) => guest.has(id));
+  if (!match || !isIntroIntentId(match)) return null;
+  const label = INTRO_INTENT_OPTIONS.find((option) => option.id === match)?.label;
+  return label ? `You're both here for ${label.toLowerCase()}.` : null;
+}
+
+export function locusOfControlShortLabel(
+  id: string | null | undefined
+): string | null {
+  if (!id || !isLocusOfControlId(id)) return null;
+  if (id === "internal") return "Internal";
+  if (id === "external") return "External";
+  return "Mixed";
+}
+
+export const INTEREST_EXPRESSION_MODES = ["named", "anonymous"] as const;
+
+export type InterestExpressionMode = (typeof INTEREST_EXPRESSION_MODES)[number];
+
+export function isInterestExpressionMode(
+  value: string
+): value is InterestExpressionMode {
+  return (INTEREST_EXPRESSION_MODES as readonly string[]).includes(value);
+}
+
+export const INTROS_DISCLAIMER =
+  "Intros connects you only with people who have also explicitly opted in. Bash does not conduct background checks, verify identities beyond basic account registration, or screen users for any purpose. This feature supports platonic and professional connections only — romantic or sexual contact is a violation of our Community Guidelines. Always meet at the event, in public. Use the Report button if anyone makes you uncomfortable. By turning on Intros, you agree that Bash is not responsible for interactions between users.";
+
+export const INTROS_DISCLAIMER_SHORT =
+  "Bash does not background-check users. Meet at the event, in public. Romantic or sexual contact is prohibited. Bash is not responsible for interactions between users.";
+
+/** @deprecated Use INTROS_DISCLAIMER */
+export const SCENE_INTROS_DISCLAIMER = INTROS_DISCLAIMER;
+
+/** @deprecated Use INTROS_DISCLAIMER_SHORT */
+export const SCENE_INTROS_DISCLAIMER_SHORT = INTROS_DISCLAIMER_SHORT;
+
 export const PASSWORD_MIN_LENGTH = 8 as const;
 export const PASSWORD_REQUIREMENTS_REGEX = new RegExp(
   String.raw`^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&^#])[A-Za-z\d@$!%*?&^#]{${PASSWORD_MIN_LENGTH},}$`
@@ -602,8 +705,8 @@ export const BASH_EVENT_WIZARD_WHAT_SUBSTEP = {
 } as const;
 
 export const BASH_EVENT_WIZARD_WHERE_SUBSTEP = {
-  LOCATION: 0,
-  UPLOAD_MEDIA: 1,
+  UPLOAD_MEDIA: 0,
+  LOCATION: 1,
 } as const;
 
 export const BASH_EVENT_WIZARD_WHEN_SUBSTEP = {
@@ -1366,6 +1469,8 @@ export interface StripeConfirmPaymentResult {
   ticketsSubtotalCents?: number;
   /** Actual amount charged to the guest (cents), including pass-through fees when applicable */
   totalPaidCents?: number;
+  /** True when this is the buyer's first ticket purchase on Bash ever. */
+  isFirstTicketPurchase?: boolean;
 }
 
 export interface IMediaUploadArgs {
@@ -1649,96 +1754,101 @@ export type BashEventTypeToStringType = {
   [key in BashEventType]: string;
 };
 export { BashEventType };
+/**
+ * Keys are string literals (not `BashEventType.*`) so this module can load
+ * when Jest's `@prisma/client` cache is briefly incomplete after resetModules
+ * (see api/jest.setup.afterEnv.cjs). Same pattern as SERVICE_TYPE_LABELS.
+ */
 export const BashEventTypeToString: BashEventTypeToStringType = {
-  [BashEventType.AfterParty]: "After-Party",
-  [BashEventType.AnniversaryCelebration]: "Anniversary Celebration",
-  [BashEventType.ArtAndCraftNight]: "Art and Craft Night",
-  [BashEventType.ArtExhibitOpening]: "Art Exhibit Opening",
-  [BashEventType.BBQCookout]: "BBQ Cookout",
-  [BashEventType.BabyShower]: "Baby Shower",
-  [BashEventType.BachelorParty]: "Bachelor Party",
-  [BashEventType.BacheloretteParty]: "Bachelorette Party",
-  [BashEventType.BeachParty]: "Beach Party",
-  [BashEventType.Birthday]: "Birthday",
-  [BashEventType.BoatParty]: "Boat Party",
-  [BashEventType.Bonfire]: "Bonfire",
-  [BashEventType.BridalShower]: "Bridal Shower",
-  [BashEventType.BrunchGathering]: "Brunch Gathering",
-  [BashEventType.CarShow]: "Car Show",
-  [BashEventType.Carnival]: "Carnival",
-  [BashEventType.CasinoNight]: "Casino Night",
-  [BashEventType.CasualMixer]: "Casual Mixer",
-  [BashEventType.CharityGala]: "Charity Gala",
-  [BashEventType.ChristmasParty]: "Christmas Party",
-  [BashEventType.ChurchEvent]: "Church Event",
-  [BashEventType.CitySponsored]: "City-Sponsored Event",
-  [BashEventType.CocktailParty]: "Cocktail Party",
-  [BashEventType.CollegeParty]: "College Party",
-  [BashEventType.ComedyShow]: "Comedy Show",
-  [BashEventType.Concert]: "Concert",
-  [BashEventType.Conference]: "Conference",
-  [BashEventType.Convention]: "Convention",
-  [BashEventType.CorporateEvent]: "Corporate Event",
-  [BashEventType.Cruise]: "Cruise",
-  [BashEventType.DanceParty]: "Dance Party",
-  [BashEventType.DiscoNight]: "Disco Night",
-  [BashEventType.EasterGathering]: "Easter Gathering",
-  [BashEventType.EngagementParty]: "Engagement Party",
-  [BashEventType.Fair]: "Fair",
-  [BashEventType.FarewellParty]: "Farewell Party",
-  [BashEventType.FashionShow]: "Fashion Show",
-  [BashEventType.Festival]: "Festival",
-  [BashEventType.FestivalFilm]: "Film Festival",
-  [BashEventType.FestivalFood]: "Food Festival",
-  [BashEventType.Fundraiser]: "Fundraiser",
-  [BashEventType.GameNight]: "Game Night",
-  [BashEventType.GamingEvent]: "Gaming Event",
-  [BashEventType.GardenParty]: "Garden Party",
-  [BashEventType.GraduationParty]: "Graduation Party",
-  [BashEventType.HalloweenParty]: "Halloween Party",
-  [BashEventType.HanukkahParty]: "Hanukkah Party",
-  [BashEventType.HolidayParty]: "Holiday Party",
-  [BashEventType.HouseParty]: "House Party",
-  [BashEventType.HousewarmingParty]: "Housewarming Party",
-  [BashEventType.KaraokeNight]: "Karaoke Night",
-  [BashEventType.LaunchParty]: "Launch Party",
-  [BashEventType.LuxuryRetreat]: "Luxury Retreat",
-  [BashEventType.MansionParty]: "Mansion Party",
-  [BashEventType.MardiGras]: "Mardi Gras",
-  [BashEventType.Memorial]: "Memorial",
-  [BashEventType.MovieNight]: "Movie Night",
-  [BashEventType.MoviePremiere]: "Movie Premiere",
-  [BashEventType.MusicFestival]: "Music Festival",
-  [BashEventType.NewYearsEveCelebration]: "New Year's Eve Celebration",
-  [BashEventType.OfficeParty]: "Office Party",
-  [BashEventType.OpenMicNight]: "Open Mic Night",
-  [BashEventType.OutdoorActivity]: "Outdoor Activity",
-  [BashEventType.Parade]: "Parade",
-  [BashEventType.Party]: "Party",
-  [BashEventType.PoolParty]: "Pool Party",
-  [BashEventType.Potluck]: "Potluck",
-  [BashEventType.PreParty]: "Pre-Party",
-  [BashEventType.ProfessionalNetworkingEvent]: "Professional Networking Event",
-  [BashEventType.PubCrawl]: "Pub Crawl",
-  [BashEventType.Rave]: "Rave",
-  [BashEventType.RetirementCelebration]: "Retirement Celebration",
-  [BashEventType.Reunion]: "Reunion",
-  [BashEventType.SchoolEvent]: "School Event",
-  [BashEventType.SocialClubEvent]: "Social Club Event",
-  [BashEventType.SportsWatchParty]: "Sports Watch Party",
-  [BashEventType.ThanksgivingDinner]: "Thanksgiving Dinner",
-  [BashEventType.ThemedDinnerParty]: "Themed Dinner Party",
-  [BashEventType.ThemedParty]: "Themed Party",
-  [BashEventType.ThemedPubCrawl]: "Themed Pub Crawl",
-  [BashEventType.Tournament]: "Tournament",
-  [BashEventType.TradeShow]: "Trade Show",
-  [BashEventType.TriviaNight]: "Trivia Night",
-  [BashEventType.ValentinesDayParty]: "Valentine's Day Party",
-  [BashEventType.WeddingReception]: "Wedding Reception",
-  [BashEventType.WelcomeHomeParty]: "Welcome Home Party",
-  [BashEventType.WineTastingEvent]: "Wine Tasting Event",
-  [BashEventType.Workshop]: "Workshop",
-  [BashEventType.Other]: "Other",
+  AfterParty: "After-Party",
+  AnniversaryCelebration: "Anniversary Celebration",
+  ArtAndCraftNight: "Art and Craft Night",
+  ArtExhibitOpening: "Art Exhibit Opening",
+  BBQCookout: "BBQ Cookout",
+  BabyShower: "Baby Shower",
+  BachelorParty: "Bachelor Party",
+  BacheloretteParty: "Bachelorette Party",
+  BeachParty: "Beach Party",
+  Birthday: "Birthday",
+  BoatParty: "Boat Party",
+  Bonfire: "Bonfire",
+  BridalShower: "Bridal Shower",
+  BrunchGathering: "Brunch Gathering",
+  CarShow: "Car Show",
+  Carnival: "Carnival",
+  CasinoNight: "Casino Night",
+  CasualMixer: "Casual Mixer",
+  CharityGala: "Charity Gala",
+  ChristmasParty: "Christmas Party",
+  ChurchEvent: "Church Event",
+  CitySponsored: "City-Sponsored Event",
+  CocktailParty: "Cocktail Party",
+  CollegeParty: "College Party",
+  ComedyShow: "Comedy Show",
+  Concert: "Concert",
+  Conference: "Conference",
+  Convention: "Convention",
+  CorporateEvent: "Corporate Event",
+  Cruise: "Cruise",
+  DanceParty: "Dance Party",
+  DiscoNight: "Disco Night",
+  EasterGathering: "Easter Gathering",
+  EngagementParty: "Engagement Party",
+  Fair: "Fair",
+  FarewellParty: "Farewell Party",
+  FashionShow: "Fashion Show",
+  Festival: "Festival",
+  FestivalFilm: "Film Festival",
+  FestivalFood: "Food Festival",
+  Fundraiser: "Fundraiser",
+  GameNight: "Game Night",
+  GamingEvent: "Gaming Event",
+  GardenParty: "Garden Party",
+  GraduationParty: "Graduation Party",
+  HalloweenParty: "Halloween Party",
+  HanukkahParty: "Hanukkah Party",
+  HolidayParty: "Holiday Party",
+  HouseParty: "House Party",
+  HousewarmingParty: "Housewarming Party",
+  KaraokeNight: "Karaoke Night",
+  LaunchParty: "Launch Party",
+  LuxuryRetreat: "Luxury Retreat",
+  MansionParty: "Mansion Party",
+  MardiGras: "Mardi Gras",
+  Memorial: "Memorial",
+  MovieNight: "Movie Night",
+  MoviePremiere: "Movie Premiere",
+  MusicFestival: "Music Festival",
+  NewYearsEveCelebration: "New Year's Eve Celebration",
+  OfficeParty: "Office Party",
+  OpenMicNight: "Open Mic Night",
+  OutdoorActivity: "Outdoor Activity",
+  Parade: "Parade",
+  Party: "Party",
+  PoolParty: "Pool Party",
+  Potluck: "Potluck",
+  PreParty: "Pre-Party",
+  ProfessionalNetworkingEvent: "Professional Networking Event",
+  PubCrawl: "Pub Crawl",
+  Rave: "Rave",
+  RetirementCelebration: "Retirement Celebration",
+  Reunion: "Reunion",
+  SchoolEvent: "School Event",
+  SocialClubEvent: "Social Club Event",
+  SportsWatchParty: "Sports Watch Party",
+  ThanksgivingDinner: "Thanksgiving Dinner",
+  ThemedDinnerParty: "Themed Dinner Party",
+  ThemedParty: "Themed Party",
+  ThemedPubCrawl: "Themed Pub Crawl",
+  Tournament: "Tournament",
+  TradeShow: "Trade Show",
+  TriviaNight: "Trivia Night",
+  ValentinesDayParty: "Valentine's Day Party",
+  WeddingReception: "Wedding Reception",
+  WelcomeHomeParty: "Welcome Home Party",
+  WineTastingEvent: "Wine Tasting Event",
+  Workshop: "Workshop",
+  Other: "Other",
 };
 
 /**
@@ -1751,47 +1861,61 @@ export type DietaryOptionToStringType = {
   [key in DietaryOption]: string;
 };
 export const DietaryOptionToString: DietaryOptionToStringType = {
-  [DietaryOption.GlutenFreeOptions]: "Gluten-Free Options Available",
-  [DietaryOption.VeganOptions]: "Vegan Options Available",
-  [DietaryOption.VegetarianOptions]: "Vegetarian Options Available",
-  [DietaryOption.DairyFreeOptions]: "Dairy-Free Options Available",
-  [DietaryOption.NutFreeOptions]: "Nut-Free Options Available",
-  [DietaryOption.HalalOptions]: "Halal Options Available",
-  [DietaryOption.KosherOptions]: "Kosher Options Available",
-  [DietaryOption.SugarFreeOptions]: "Low-Sugar / Sugar-Free Options Available",
-  [DietaryOption.KetoOptions]: "Keto-Friendly Options Available",
-  [DietaryOption.PaleoOptions]: "Paleo-Friendly Options Available",
-  [DietaryOption.AlcoholFreeOptions]: "Non-Alcoholic Options Available",
+  GlutenFreeOptions: "Gluten-Free Options Available",
+  VeganOptions: "Vegan Options Available",
+  VegetarianOptions: "Vegetarian Options Available",
+  DairyFreeOptions: "Dairy-Free Options Available",
+  NutFreeOptions: "Nut-Free Options Available",
+  HalalOptions: "Halal Options Available",
+  KosherOptions: "Kosher Options Available",
+  SugarFreeOptions: "Low-Sugar / Sugar-Free Options Available",
+  KetoOptions: "Keto-Friendly Options Available",
+  PaleoOptions: "Paleo-Friendly Options Available",
+  AlcoholFreeOptions: "Non-Alcoholic Options Available",
 };
 
 /** Short chip labels used in tight UI spots (filter modal, card pills). */
 export const DietaryOptionShortLabel: DietaryOptionToStringType = {
-  [DietaryOption.GlutenFreeOptions]: "Gluten-Free",
-  [DietaryOption.VeganOptions]: "Vegan",
-  [DietaryOption.VegetarianOptions]: "Vegetarian",
-  [DietaryOption.DairyFreeOptions]: "Dairy-Free",
-  [DietaryOption.NutFreeOptions]: "Nut-Free",
-  [DietaryOption.HalalOptions]: "Halal",
-  [DietaryOption.KosherOptions]: "Kosher",
-  [DietaryOption.SugarFreeOptions]: "Sugar-Free",
-  [DietaryOption.KetoOptions]: "Keto",
-  [DietaryOption.PaleoOptions]: "Paleo",
-  [DietaryOption.AlcoholFreeOptions]: "Non-Alcoholic",
+  GlutenFreeOptions: "Gluten-Free",
+  VeganOptions: "Vegan",
+  VegetarianOptions: "Vegetarian",
+  DairyFreeOptions: "Dairy-Free",
+  NutFreeOptions: "Nut-Free",
+  HalalOptions: "Halal",
+  KosherOptions: "Kosher",
+  SugarFreeOptions: "Sugar-Free",
+  KetoOptions: "Keto",
+  PaleoOptions: "Paleo",
+  AlcoholFreeOptions: "Non-Alcoholic",
 };
 
 /** All `DietaryOption` enum values in display order (for rendering checkboxes/tags). */
 export const DIETARY_OPTION_VALUES: ReadonlyArray<DietaryOption> = [
-  DietaryOption.GlutenFreeOptions,
-  DietaryOption.VeganOptions,
-  DietaryOption.VegetarianOptions,
-  DietaryOption.DairyFreeOptions,
-  DietaryOption.NutFreeOptions,
-  DietaryOption.HalalOptions,
-  DietaryOption.KosherOptions,
-  DietaryOption.SugarFreeOptions,
-  DietaryOption.KetoOptions,
-  DietaryOption.PaleoOptions,
-  DietaryOption.AlcoholFreeOptions,
+  "GlutenFreeOptions",
+  "VeganOptions",
+  "VegetarianOptions",
+  "DairyFreeOptions",
+  "NutFreeOptions",
+  "HalalOptions",
+  "KosherOptions",
+  "SugarFreeOptions",
+  "KetoOptions",
+  "PaleoOptions",
+  "AlcoholFreeOptions",
+];
+
+/**
+ * Guest-facing filter chips — everyday accommodations only.
+ * Religious, drink, and diet-trend tags stay on the host form / enum
+ * so existing events keep their data, but they do not crowd the filter menu.
+ */
+export const DIETARY_OPTION_FILTER_VALUES: ReadonlyArray<DietaryOption> = [
+  "VegetarianOptions",
+  "VeganOptions",
+  "GlutenFreeOptions",
+  "DairyFreeOptions",
+  "NutFreeOptions",
+  "SugarFreeOptions",
 ];
 
 /** Display labels for `IncomeRange` (wizard primary/secondary chips). */
@@ -1799,29 +1923,28 @@ export type IncomeRangeToStringType = {
   [key in IncomeRange]: string;
 };
 export const IncomeRangeLabel: IncomeRangeToStringType = {
-  [IncomeRange.NoPreference]: "Anyone",
-  [IncomeRange.Under40k]: "Under $40k",
-  [IncomeRange.From40to80k]: "$40k – $80k",
-  [IncomeRange.From80to150k]: "$80k – $150k",
-  [IncomeRange.From150to200k]: "$150k – $200k",
-  [IncomeRange.From200to500k]:
-    "$200k – $500k (common accredited-income band)",
-  [IncomeRange.From500kTo1M]: "$500k – $1M",
-  [IncomeRange.Over1M]: "$1M+",
-  [IncomeRange.PreferNotToSay]: "Prefer not to say",
+  NoPreference: "Anyone",
+  Under40k: "Under $40k",
+  From40to80k: "$40k – $80k",
+  From80to150k: "$80k – $150k",
+  From150to200k: "$150k – $200k",
+  From200to500k: "$200k – $500k (common accredited-income band)",
+  From500kTo1M: "$500k – $1M",
+  Over1M: "$1M+",
+  PreferNotToSay: "Prefer not to say",
 };
 
 /** Short labels for filter modal / tight chips. */
 export const IncomeRangeShortLabel: IncomeRangeToStringType = {
-  [IncomeRange.NoPreference]: "Any income",
-  [IncomeRange.Under40k]: "<$40k",
-  [IncomeRange.From40to80k]: "$40–80k",
-  [IncomeRange.From80to150k]: "$80–150k",
-  [IncomeRange.From150to200k]: "$150–200k",
-  [IncomeRange.From200to500k]: "$200–500k",
-  [IncomeRange.From500kTo1M]: "$500k–$1M",
-  [IncomeRange.Over1M]: "$1M+",
-  [IncomeRange.PreferNotToSay]: "No answer",
+  NoPreference: "Any income",
+  Under40k: "<$40k",
+  From40to80k: "$40–80k",
+  From80to150k: "$80–150k",
+  From150to200k: "$150–200k",
+  From200to500k: "$200–500k",
+  From500kTo1M: "$500k–$1M",
+  Over1M: "$1M+",
+  PreferNotToSay: "No answer",
 };
 
 /**
@@ -1829,15 +1952,15 @@ export const IncomeRangeShortLabel: IncomeRangeToStringType = {
  * Audience-targeting only — never use to gate ticket purchase or entry.
  */
 export const INCOME_RANGE_VALUES: ReadonlyArray<IncomeRange> = [
-  IncomeRange.Under40k,
-  IncomeRange.From40to80k,
-  IncomeRange.From80to150k,
-  IncomeRange.From150to200k,
-  IncomeRange.From200to500k,
-  IncomeRange.From500kTo1M,
-  IncomeRange.Over1M,
-  IncomeRange.PreferNotToSay,
-  IncomeRange.NoPreference,
+  "Under40k",
+  "From40to80k",
+  "From80to150k",
+  "From150to200k",
+  "From200to500k",
+  "From500kTo1M",
+  "Over1M",
+  "PreferNotToSay",
+  "NoPreference",
 ];
 
 /** Homepage / discovery section labels for synthetic rows (not `BashEventType` enum values). */

package/src/extendedSchemas.ts

@@ -257,7 +257,22 @@ export const PUBLIC_TEASER_USER_DATA_TO_SELECT = {
 
 export type PublicTeaserUser = Prisma.UserGetPayload<{
   select: typeof PUBLIC_TEASER_USER_DATA_TO_SELECT;
-}>;
+}> & {
+  /** Only populated by Intros endpoints for eligible viewers. */
+  openToIntros?: boolean;
+  /** Only populated by Intros endpoints for eligible viewers. */
+  personalityType?: string | null;
+  /** Only populated by Intros endpoints for eligible viewers. */
+  locusOfControl?: string | null;
+  /** True when the viewer already sent an interest expression to this person. */
+  alreadyExpressedInterest?: boolean;
+  /** True when this person already sent an interest expression to the viewer. */
+  interestFromThem?: boolean;
+  /** True when both people have sent a signal. */
+  mutualInterest?: boolean;
+  /** Only populated by Intros endpoints for eligible viewers. */
+  introIntents?: string[];
+};
 
 export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
   ...FRONT_END_USER_DATA_TO_SELECT,
@@ -652,6 +667,9 @@ type BashEventExtBase = Override<
   dateOptions?: IdeaDateOption[];
   /** Public aggregate when poll enabled (no PII) */
   datePollPublicSummary?: IdeaDatePollPublicSummary;
+  hideCancellationPolicy?: boolean;
+  hideGroupUp?: boolean;
+  hideServicesOpenTo?: boolean;
   /** GET /event/:id — tickets sold (non-cancelled), for social proof */
   goingCount?: number;
   /** GET /event/:id — true when at least one Budget line has `showOnBashDetailPage` set. Drives the "View budget" reveal on the public bash page; never carries dollar amounts. */
@@ -729,6 +747,10 @@ type BashEventExtBase = Override<
    * When true (default), signed-in visitors can message the host from the bash detail page.
    */
   allowViewerContact: boolean;
+  /**
+   * Host opt-in: guests must have a profile photo to RSVP or buy tickets.
+   */
+  requireProfilePhoto: boolean;
 };
 
 export type BashEventExt = Omit<
@@ -1310,6 +1332,10 @@ export const SERVICE_BOOKING_PUBLIC_DATA_TO_INCLUDE = {
       title: true,
       slug: true,
       status: true,
+      coverPhoto: true,
+      startDateTime: true,
+      endDateTime: true,
+      timezone: true,
     },
   },
   representedByOrganization: {
@@ -1344,7 +1370,14 @@ export const SERVICE_BOOKING_PRIVATE_DATA_TO_INCLUDE = {
 // so call sites can cast prisma.upsert/findUnique results without needing `as unknown`.
 export type ServiceBookingBashEventRef = Pick<
   BashEvent,
-  "id" | "title" | "slug" | "status"
+  | "id"
+  | "title"
+  | "slug"
+  | "status"
+  | "coverPhoto"
+  | "startDateTime"
+  | "endDateTime"
+  | "timezone"
 >;
 
 export type ServiceBookingCheckoutRef = Pick<
@@ -1981,10 +2014,10 @@ export interface UserExt extends User {
   socialEventCadenceDisplay?: string;
 
   /**
-   * Computed trust badges. Server gates the entire object on
-   * `showVerifiedBadgesOnProfile` and strips the underlying raw fields
+   * Computed trust badges. Server strips the underlying raw fields
    * (`paymentVerified`, `stripeAccountId`, `studentIdImageS3Key`, `schoolName`)
-   * from the public response.
+   * from the public response. `paymentVerified` stays public once true;
+   * ID / host / student badges still require `showVerifiedBadgesOnProfile`.
    */
   badges?: {
     idVerified: boolean;

package/src/sideQuestTypes.ts

@@ -42,7 +42,7 @@ export interface CircuitVendorOptionExt {
   status: string;
   contactEmail: string | null;
   contactName: string | null;
-  kindLabel: "Vendor" | "Exhibitor";
+  kindLabel: "Vendor" | "Exhibitor" | "Hire";
 }
 
 export interface SideQuestExt {