Cleanup pass 2

app/components/sections/AskOrganizer/AskOrganizer.container.tsx

@@ -1,5 +1,8 @@
 "use client";
 
+/**
+ * Figma: "Sections / AskOrganizer" (see registry).
+ */
 import { memo, useCallback, useState } from "react";
 import { useTranslation } from "../../../contexts/MessagesContext";
 import { useAnalytics } from "../../../hooks";
@@ -43,7 +46,6 @@ const AskOrganizerContainer = memo<AskOrganizerProps>(
     subtitle,
     description,
     buttonText,
-    buttonHref,
     className = "",
     variant: variantProp = "centered",
     onContactClick,
@@ -51,7 +53,7 @@ const AskOrganizerContainer = memo<AskOrganizerProps>(
     const variant = variantProp;
     const t = useTranslation();
     const defaultButtonText = buttonText ?? t("askOrganizer.buttonText");
-    const analyticsHref = buttonHref ?? "modal";
+    const ctaAriaLabel = t("askOrganizer.ariaLabel");
     const { trackEvent, trackCustomEvent } = useAnalytics();
     const [inquiryOpen, setInquiryOpen] = useState(false);
 
@@ -74,11 +76,9 @@ const AskOrganizerContainer = memo<AskOrganizerProps>(
 
     const labelledBy = title ? "ask-organizer-headline" : undefined;
 
-    const handleContactClick = (
-      event: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>,
-    ) => {
-      if (buttonHref) {
-        // Legacy link CTA: do not intercept navigation.
+    const handleContactClick = useCallback(
+      (event: React.MouseEvent<HTMLButtonElement>) => {
+        event.preventDefault();
         trackEvent({
           event: "contact_button_click",
           category: "engagement",
@@ -86,46 +86,30 @@ const AskOrganizerContainer = memo<AskOrganizerProps>(
           component: "AskOrganizer",
           variant: resolvedVariant,
         });
+
         trackCustomEvent(
           "contact_button_click",
           {
             component: "AskOrganizer",
             variant: resolvedVariant,
             buttonText: defaultButtonText,
-            buttonHref: analyticsHref,
+            buttonHref: "modal",
           },
           onContactClick as
             | ((_data: Record<string, unknown>) => void)
             | undefined,
         );
-        return event;
-      }
 
-      event.preventDefault();
-      trackEvent({
-        event: "contact_button_click",
-        category: "engagement",
-        label: "ask_organizer",
-        component: "AskOrganizer",
-        variant: resolvedVariant,
-      });
-
-      trackCustomEvent(
-        "contact_button_click",
-        {
-          component: "AskOrganizer",
-          variant: resolvedVariant,
-          buttonText: defaultButtonText,
-          buttonHref: analyticsHref,
-        },
-        onContactClick as
-          | ((_data: Record<string, unknown>) => void)
-          | undefined,
-      );
-
-      setInquiryOpen(true);
-      return event;
-    };
+        setInquiryOpen(true);
+      },
+      [
+        defaultButtonText,
+        onContactClick,
+        resolvedVariant,
+        trackCustomEvent,
+        trackEvent,
+      ],
+    );
 
     const closeInquiry = useCallback(() => {
       setInquiryOpen(false);
@@ -138,7 +122,7 @@ const AskOrganizerContainer = memo<AskOrganizerProps>(
           subtitle={subtitle}
           description={description}
           buttonText={defaultButtonText}
-          buttonHref={buttonHref}
+          ctaAriaLabel={ctaAriaLabel}
           className={className}
           sectionPadding={sectionPadding}
           contentGap={`${contentGap} ${styles.container}`}

app/components/sections/AskOrganizer/AskOrganizer.types.ts

@@ -12,10 +12,6 @@ export interface AskOrganizerProps {
   subtitle?: string;
   description?: string;
   buttonText?: string;
-  /**
-   * @deprecated Modal-only flow (CR-107). Omit; kept optional for Storybook overrides.
-   */
-  buttonHref?: string;
   className?: string;
   /**
    * Ask organizer variant.
@@ -26,7 +22,6 @@ export interface AskOrganizerProps {
     component: string;
     variant: string;
     buttonText: string;
-    buttonHref?: string;
     timestamp: string;
   }) => void;
 }
@@ -36,7 +31,7 @@ export interface AskOrganizerViewProps {
   subtitle?: string;
   description?: string;
   buttonText: string;
-  buttonHref?: string;
+  ctaAriaLabel: string;
   className: string;
   sectionPadding: string;
   contentGap: string;
@@ -44,6 +39,6 @@ export interface AskOrganizerViewProps {
   variant: AskOrganizerVariant;
   labelledBy?: string;
   onContactClick: (
-    _event: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>,
+    _event: React.MouseEvent<HTMLButtonElement>,
   ) => void;
 }

app/components/sections/AskOrganizer/AskOrganizer.view.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { useTranslation } from "../../../contexts/MessagesContext";
 import ContentLockup from "../../type/ContentLockup";
 import Button from "../../buttons/Button";
 import type { AskOrganizerViewProps } from "./AskOrganizer.types";
@@ -10,7 +9,7 @@ function AskOrganizerView({
   subtitle,
   description,
   buttonText,
-  buttonHref,
+  ctaAriaLabel,
   className,
   sectionPadding,
   contentGap,
@@ -19,8 +18,6 @@ function AskOrganizerView({
   labelledBy,
   onContactClick,
 }: AskOrganizerViewProps) {
-  const t = useTranslation();
-  const ariaLabel = t("askOrganizer.ariaLabel");
   const isUseCaseDetail = variant === "use-case-detail";
   const lockupVariant =
     variant === "inverse" || isUseCaseDetail ? "ask-inverse" : "ask";
@@ -33,14 +30,13 @@ function AskOrganizerView({
     <section
       className={`${sectionPadding} ${className}`}
       aria-labelledby={labelledBy}
-      aria-label={labelledBy ? undefined : ariaLabel}
+      aria-label={labelledBy ? undefined : ctaAriaLabel}
       tabIndex={-1}
       data-figma-node={isUseCaseDetail ? "22015-42624" : "18116-15960"}
     >
       <div
         className={`mx-auto flex w-full min-w-0 max-w-[1280px] flex-col md:min-w-[358px] ${contentGap} ${isUseCaseDetail ? "items-center" : ""}`}
       >
-        {/* Content Lockup */}
         <ContentLockup
           title={title}
           subtitle={subtitle}
@@ -50,18 +46,16 @@ function AskOrganizerView({
           titleId={labelledBy}
         />
 
-        {/* Button */}
         <div
           className={`${buttonContainerClass} flex-wrap gap-y-[var(--spacing-scale-016)]`}
         >
           <Button
-            {...(buttonHref ? { href: buttonHref } : {})}
             size="small"
             buttonType="filled"
             palette={buttonPalette}
             className="!px-[var(--spacing-scale-010)] md:!px-[var(--spacing-scale-016)] md:!py-[var(--spacing-scale-012)] md:!text-[16px] md:!leading-[20px]"
             onClick={onContactClick}
-            ariaLabel={ariaLabel}
+            ariaLabel={ctaAriaLabel}
             data-testid="ask-organizer-cta"
           >
             {buttonText}