Full cleanup pass

app/components/controls/MultiSelect/MultiSelect.container.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { memo } from "react";
+import { useTranslation } from "../../../contexts/MessagesContext";
 import MultiSelectView from "./MultiSelect.view";
 import type { MultiSelectProps } from "./MultiSelect.types";
 
@@ -18,12 +19,13 @@ const MultiSelectContainer = memo<MultiSelectProps>(
     onChipClick,
     onAddClick,
     addButton: addButtonProp = true,
-    addButtonText = "Add organization type",
+    addButtonText,
     formHeader = true,
     onCustomChipConfirm,
     onCustomChipClose,
     className = "",
   }) => {
+    const t = useTranslation("controlsChrome");
     const size = sizeProp;
     const palette = paletteProp;
 
@@ -38,6 +40,9 @@ const MultiSelectContainer = memo<MultiSelectProps>(
         onAddClick={onAddClick}
         addButton={addButtonProp}
         addButtonText={addButtonText}
+        addButtonAriaLabel={
+          addButtonText || t("multiSelectAddFallback")
+        }
         formHeader={formHeader}
         onCustomChipConfirm={onCustomChipConfirm}
         onCustomChipClose={onCustomChipClose}

app/components/controls/MultiSelect/MultiSelect.types.ts

@@ -74,7 +74,8 @@ export interface MultiSelectViewProps {
   onChipClick?: (chipId: string) => void;
   onAddClick?: () => void;
   addButton: boolean;
-  addButtonText: string;
+  addButtonText?: string;
+  addButtonAriaLabel: string;
   formHeader: boolean;
   onCustomChipConfirm?: (chipId: string, value: string) => void;
   onCustomChipClose?: (chipId: string) => void;

app/components/controls/MultiSelect/MultiSelect.view.tsx

@@ -15,6 +15,7 @@ function MultiSelectView({
   onAddClick,
   addButton,
   addButtonText,
+  addButtonAriaLabel,
   formHeader = true,
   onCustomChipConfirm,
   onCustomChipClose,
@@ -81,7 +82,7 @@ function MultiSelectView({
         {addButton && (
           <button
             type="button"
-            aria-label={addButtonText || "Add option"}
+            aria-label={addButtonAriaLabel}
             onClick={(e) => {
               e.stopPropagation();
               onAddClick?.();