@embedreach/components 0.3.12 → 0.3.14

package/dist/chunks/index.js

@@ -2788,6 +2788,57 @@ const duplicateBusinessAutomation = async (automationId, name, description2) =>
   );
   return response.data;
 };
+const findSegmentByName = async (name) => {
+  const response = await baseRequest(
+    `/automations/internal/segments/find-by-name?name=${encodeURIComponent(name)}`,
+    {
+      method: "GET"
+    }
+  );
+  return response.data;
+};
+var AutomationTriggerType = /* @__PURE__ */ ((AutomationTriggerType2) => {
+  AutomationTriggerType2["ONE_TIME"] = "one_time";
+  AutomationTriggerType2["TRIGGER_BASED"] = "trigger_based";
+  AutomationTriggerType2["DATE_BASED"] = "date_based";
+  return AutomationTriggerType2;
+})(AutomationTriggerType || {});
+var ReachEventNamesEnum = /* @__PURE__ */ ((ReachEventNamesEnum2) => {
+  ReachEventNamesEnum2["USER_ENTERS_SEGMENT"] = "USER_ENTERS_SEGMENT";
+  return ReachEventNamesEnum2;
+})(ReachEventNamesEnum || {});
+var BusinessAutomationTypeEnum = /* @__PURE__ */ ((BusinessAutomationTypeEnum2) => {
+  BusinessAutomationTypeEnum2["MANAGED"] = "managed";
+  BusinessAutomationTypeEnum2["CUSTOM"] = "custom";
+  return BusinessAutomationTypeEnum2;
+})(BusinessAutomationTypeEnum || {});
+var ActionType = /* @__PURE__ */ ((ActionType2) => {
+  ActionType2["SEND_COMMUNICATION"] = "send_communication";
+  ActionType2["WAIT_UNTIL_NEXT_FIXED_TIME"] = "wait_until_next_fixed_time";
+  return ActionType2;
+})(ActionType || {});
+var AutomationStatus = /* @__PURE__ */ ((AutomationStatus2) => {
+  AutomationStatus2["DRAFT"] = "draft";
+  AutomationStatus2["ACTIVE"] = "active";
+  AutomationStatus2["RUNNING"] = "running";
+  AutomationStatus2["COMPLETED"] = "completed";
+  AutomationStatus2["FAILED"] = "failed";
+  AutomationStatus2["DEACTIVATED"] = "deactivated";
+  AutomationStatus2["SENDING"] = "sending";
+  AutomationStatus2["SCHEDULED"] = "scheduled";
+  AutomationStatus2["PARTIALLY_CANCELLED"] = "partially_cancelled";
+  AutomationStatus2["CANCELLED"] = "cancelled";
+  AutomationStatus2["ARCHIVED"] = "archived";
+  return AutomationStatus2;
+})(AutomationStatus || {});
+var ChannelIntegrationTypeEnum = /* @__PURE__ */ ((ChannelIntegrationTypeEnum2) => {
+  ChannelIntegrationTypeEnum2["EMAIL"] = "email";
+  ChannelIntegrationTypeEnum2["SMS"] = "sms";
+  return ChannelIntegrationTypeEnum2;
+})(ChannelIntegrationTypeEnum || {});
+const shouldPoll = (automationStatus) => {
+  return automationStatus !== AutomationStatus.DRAFT && automationStatus !== AutomationStatus.COMPLETED && automationStatus !== AutomationStatus.PARTIALLY_CANCELLED && automationStatus !== AutomationStatus.CANCELLED;
+};
 const TOAST_LIMIT = 1;
 const TOAST_REMOVE_DELAY = 1e6;
 let count$8 = 0;
@@ -2961,6 +3012,16 @@ const resetCommunicationGroupToDefault = async (args) => {
   );
   return response.data;
 };
+const postBusinessMergeFieldFallbacks = async (mergeFieldFallbacks) => {
+  const response = await baseRequest(
+    `/businesses/merge-field-fallbacks`,
+    {
+      method: "PATCH",
+      body: JSON.stringify({ mergeFieldFallbacks })
+    }
+  );
+  return response.data;
+};
 const getLinkClickStats = async (automationId) => {
   const response = await baseRequest(
     `${COMMUNICATION_GROUP_PATH}/${automationId}/link-click-stats`
@@ -3079,6 +3140,36 @@ const useResetCommunicationGroupToDefault = () => {
     isPending: resetCommunicationGroupToDefaultMutation.isPending
   };
 };
+const usePostBusinessMergeFieldFallbacks = () => {
+  const queryClient = useQueryClient();
+  const { toast: toast2 } = useToast();
+  const mutation = useMutation({
+    mutationFn: ({
+      mergeFieldFallbacks
+    }) => postBusinessMergeFieldFallbacks(mergeFieldFallbacks),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: communicationGroupQueryKeys.all
+      });
+      toast2({
+        title: "Merge field fallbacks updated",
+        description: "Merge field fallbacks have been updated"
+      });
+    },
+    onError: () => {
+      toast2({
+        title: "Failed to update merge field fallbacks",
+        description: "Please reach out to your administrator"
+      });
+    }
+  });
+  return {
+    postBusinessMergeFieldFallbacks: mutation.mutate,
+    isPosting: mutation.isPending,
+    postError: mutation.error,
+    isPostSuccess: mutation.isSuccess
+  };
+};
 const useGetLinkClickStats = (automationId) => {
   const query = useQuery({
     queryKey: ["link-click-stats", automationId],
@@ -3096,7 +3187,14 @@ const useGetBusinessAutomation = (automationId) => {
   const queryClient = useQueryClient();
   const getAutomationQuery = useQuery({
     queryKey: automationKeys.single(automationId),
-    queryFn: () => getAutomation(automationId)
+    queryFn: () => getAutomation(automationId),
+    refetchInterval: (data) => {
+      const shouldPollResult = shouldPoll(data?.state.data?.status);
+      if (shouldPollResult) {
+        return 2e3;
+      }
+      return false;
+    }
   });
   return {
     // Get automation query
@@ -3124,7 +3222,13 @@ const useGetBusinessAutomationSentCommunications = (args) => {
     //    It will be false if placeholder data is being shown, even though a new fetch is in progress (`isFetching` will be true).
     // This provides a much smoother UX, as the UI doesn't jump to a loading state on pagination or filter changes
     // if previous data is available to show in the meantime.
-    placeholderData: keepPreviousData
+    placeholderData: keepPreviousData,
+    refetchInterval: () => {
+      if (shouldPoll(args.automationStatus)) {
+        return 2e3;
+      }
+      return false;
+    }
   });
   return {
     // Get automation sent communications query
@@ -3255,45 +3359,6 @@ const useDuplicateBusinessAutomation = () => {
     isDuplicateSuccess: duplicateAutomationMutation.isSuccess
   };
 };
-var AutomationTriggerType = /* @__PURE__ */ ((AutomationTriggerType2) => {
-  AutomationTriggerType2["ONE_TIME"] = "one_time";
-  AutomationTriggerType2["TRIGGER_BASED"] = "trigger_based";
-  AutomationTriggerType2["DATE_BASED"] = "date_based";
-  return AutomationTriggerType2;
-})(AutomationTriggerType || {});
-var ReachEventNamesEnum = /* @__PURE__ */ ((ReachEventNamesEnum2) => {
-  ReachEventNamesEnum2["USER_ENTERS_SEGMENT"] = "USER_ENTERS_SEGMENT";
-  return ReachEventNamesEnum2;
-})(ReachEventNamesEnum || {});
-var BusinessAutomationTypeEnum = /* @__PURE__ */ ((BusinessAutomationTypeEnum2) => {
-  BusinessAutomationTypeEnum2["MANAGED"] = "managed";
-  BusinessAutomationTypeEnum2["CUSTOM"] = "custom";
-  return BusinessAutomationTypeEnum2;
-})(BusinessAutomationTypeEnum || {});
-var ActionType = /* @__PURE__ */ ((ActionType2) => {
-  ActionType2["SEND_COMMUNICATION"] = "send_communication";
-  ActionType2["WAIT_UNTIL_NEXT_FIXED_TIME"] = "wait_until_next_fixed_time";
-  return ActionType2;
-})(ActionType || {});
-var AutomationStatus = /* @__PURE__ */ ((AutomationStatus2) => {
-  AutomationStatus2["DRAFT"] = "draft";
-  AutomationStatus2["ACTIVE"] = "active";
-  AutomationStatus2["RUNNING"] = "running";
-  AutomationStatus2["COMPLETED"] = "completed";
-  AutomationStatus2["FAILED"] = "failed";
-  AutomationStatus2["DEACTIVATED"] = "deactivated";
-  AutomationStatus2["SENDING"] = "sending";
-  AutomationStatus2["SCHEDULED"] = "scheduled";
-  AutomationStatus2["PARTIALLY_CANCELLED"] = "partially_cancelled";
-  AutomationStatus2["CANCELLED"] = "cancelled";
-  AutomationStatus2["ARCHIVED"] = "archived";
-  return AutomationStatus2;
-})(AutomationStatus || {});
-var ChannelIntegrationTypeEnum = /* @__PURE__ */ ((ChannelIntegrationTypeEnum2) => {
-  ChannelIntegrationTypeEnum2["EMAIL"] = "email";
-  ChannelIntegrationTypeEnum2["SMS"] = "sms";
-  return ChannelIntegrationTypeEnum2;
-})(ChannelIntegrationTypeEnum || {});
 class InvalidTokenError extends Error {
 }
 InvalidTokenError.prototype.name = "InvalidTokenError";
@@ -25678,6 +25743,16 @@ const Info = createLucideIcon("Info", [
   ["path", { d: "M12 16v-4", key: "1dtifu" }],
   ["path", { d: "M12 8h.01", key: "e9boi3" }]
 ]);
+/**
+ * @license lucide-react v0.464.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */
+const Link$1 = createLucideIcon("Link", [
+  ["path", { d: "M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71", key: "1cjeqo" }],
+  ["path", { d: "M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71", key: "19qd67" }]
+]);
 /**
  * @license lucide-react v0.464.0 - ISC
  *
@@ -29244,6 +29319,47 @@ const applyThemeStyles = (styles2, darkStyles) => {
   if (existingStyles) {
     existingStyles.remove();
   }
+  const isGoogleFont = (font) => {
+    if (!font) return null;
+    const match2 = font.match(/^["']?([\w\s]+)["']?/);
+    if (!match2) return null;
+    const fontName = match2[1].trim();
+    const systemFonts = [
+      "Inter",
+      "system-ui",
+      "-apple-system",
+      "BlinkMacSystemFont",
+      "Segoe UI",
+      "Roboto",
+      "sans-serif",
+      "serif",
+      "monospace",
+      "Arial",
+      "Georgia",
+      "Times New Roman",
+      "Courier New",
+      "Plus Jakarta Sans"
+    ];
+    if (systemFonts.some((sys) => fontName === sys)) return null;
+    return fontName;
+  };
+  const googleFonts = /* @__PURE__ */ new Set();
+  const fontBody = styles2["font-body"];
+  const fontHeading = styles2["font-heading"];
+  const bodyFont = isGoogleFont(fontBody);
+  const headingFont = isGoogleFont(fontHeading);
+  if (bodyFont) googleFonts.add(bodyFont);
+  if (headingFont) googleFonts.add(headingFont);
+  googleFonts.forEach((fontName) => {
+    const fontId = `reach-google-font-${fontName.replace(/\s+/g, "-")}`;
+    if (!document.getElementById(fontId)) {
+      const link2 = document.createElement("link");
+      link2.id = fontId;
+      link2.rel = "stylesheet";
+      link2.href = `https://fonts.googleapis.com/css?family=${encodeURIComponent(fontName)}:400,500,700&display=swap`;
+      document.head.appendChild(link2);
+    }
+  });
   const styleElement2 = document.createElement("style");
   styleElement2.id = "reach-theme-styles";
   let cssText = `
@@ -32360,6 +32476,8 @@ const measure$1 = {
       total_revenue: "Total Revenue",
       total_revenue_description: "The complete revenue generated by your business during the selected period from all sources, not just advertising campaigns. \n\nThis includes revenue from direct traffic, organic search, referrals, and any other channels in addition to paid advertising.",
       website_visitors: "Website Visitors",
+      unknown_revenue: "Unknown Revenue",
+      unknown_revenue_description: "Revenue from purchases where we were unable to find customer interactions (like site visits or phone calls) in the 90 days before buying.",
       website_visitors_description: "The number of unique visitors who came to your website from your advertising campaigns during the selected period. \n\nThis metric is tracked using analytics tools and represents actual people who successfully navigated from your ads to your website."
     },
     settings: {
@@ -32367,7 +32485,6 @@ const measure$1 = {
       description: "Manage your account settings",
       connected_accounts: "Connected Accounts",
       not_running_paid_ads: "Not running paid ads? Use AI to create a Google Ads campaign",
-      not_running_paid_ads_tooltip: "Contact your administrator to learn more about this feature and how to activate it for your account",
       privacy_policy: "Privacy Policy",
       quick_links: "Quick Links",
       setup_tracking_pixel: "Setup tracking pixel",
@@ -32388,7 +32505,11 @@ const measure$1 = {
           purchases_tooltip: "Purchases are the number of times a user made a purchase after clicking on your ad. \n\nThe percentage is calculated by dividing the number of purchases by the number of clicks (from the previous bar line)"
         },
         roas_chart: {
-          title: "Return on Ad Spend Trends"
+          title: "Return on Ad Spend Trends",
+          attribution_tooltip_title: "How revenue is counted in this chart",
+          attribution_tooltip_description: "For each day, we show the total ad spend, revenue, and ROAS (return on ad spend) from people who clicked an ad that day.\n\nIf someone clicks an ad and buys within 90 days, their purchase is counted for the day they clicked the ad.\n\nThe most recent 90 days may look low, since more purchases can still come in.",
+          incomplete_banner: "Revenue and ROAS for recent days may be lower than their final values, since we continue to count purchases made up to 90 days after someone clicks an ad.",
+          incomplete_tooltip: "Still updating (<90 days)"
         }
       },
       campaigns: {
@@ -32466,7 +32587,8 @@ const dates$1 = {
   last_week: "Last week",
   last_month: "Last month",
   last_quarter: "Last 90 days",
-  last_year: "Last year"
+  last_year: "Last year",
+  all_time: "All time"
 };
 const campaigns$1 = {
   setup: {
@@ -32545,16 +32667,15 @@ const analytics$1 = {
     google_tag_manager: {
       step_1: "Go to https://tagmanager.google.com",
       step_2: "Sign in to your Google Account",
-      step_3: "Click the Accounts tab, then select Create Account",
-      step_4: "Enter an account name and select your country location",
-      step_5: "In Container Setup, enter a container name (e.g., your website URL)",
-      step_6: 'Select "Web" as the container type',
-      step_7: "Click Create and agree to the Terms of Service",
-      step_8: "Once created, you'll receive two code snippets to install:",
-      step_9: "• Place the first snippet in the <head> of your page",
-      step_10: "• Place the second snippet immediately after the opening <body> tag",
-      step_11: "In the Tags tab, click the + button to create a new tag",
-      step_12: 'Select "Google Analytics: Universal Analytics" as the tag type',
+      step_3: 'In the Tags tab, click the "New" button to create a new tag',
+      step_4: 'Choose "Custom HTML" as the tag type',
+      step_5: "Paste the tracking code above into the HTML field",
+      step_6: "Click anywhere in the triggering section to edit this setting",
+      step_7: 'Select "Initialization - All Pages" as the trigger',
+      step_8: "Click Save to save the tag",
+      step_9: "Click Submit in the top right",
+      step_10: "Add a version name and description",
+      step_11: "Click Publish to deploy your changes",
       special_note: "Make sure you have the Google Tag Manager container code already installed on your site before adding this tag."
     },
     hubspot: {
@@ -32774,6 +32895,8 @@ const broadcast_other$1 = "Broadcasts";
 const trigger_based$1 = "Trigger Based";
 const insight$1 = "Insight";
 const insight_other$1 = "Insights";
+const merge_field$1 = "Merge Field";
+const merge_field_other$1 = "Merge Fields";
 const enEngage = {
   user: user$1,
   user_other: user_other$1,
@@ -32785,7 +32908,9 @@ const enEngage = {
   broadcast_other: broadcast_other$1,
   trigger_based: trigger_based$1,
   insight: insight$1,
-  insight_other: insight_other$1
+  insight_other: insight_other$1,
+  merge_field: merge_field$1,
+  merge_field_other: merge_field_other$1
 };
 const account_id = "ID de cuenta";
 const account_name = "Nombre de cuenta";
@@ -32908,6 +33033,8 @@ const measure = {
       total_revenue: "Ingresos totales",
       total_revenue_description: "Los ingresos totales generados por tu negocio durante el período seleccionado, no solo a través de campañas de anuncios. \n\nEsto incluye ingresos de tráfico directo, búsqueda orgánica, referencias y cualquier otro canal además de campañas de anuncios.",
       website_visitors: "Visitantes de tu sitio web",
+      unknown_revenue: "Ingresos desconocidos",
+      unknown_revenue_description: "Ingresos de compras donde no pudimos encontrar interacciones del cliente (como visitas al sitio o llamadas telefónicas) en los 90 días antes de la compra.",
       website_visitors_description: "El número de visitantes únicos que llegaron a tu sitio web a través de tus campañas de anuncios durante el período seleccionado. \n\nEsta métrica se rastrea usando herramientas de analytics y representa a las personas que realmente navegaron desde tus anuncios a tu sitio web."
     },
     settings: {
@@ -32915,7 +33042,6 @@ const measure = {
       description: "Gestiona tus ajustes de cuenta",
       connected_accounts: "Cuentas conectadas",
       not_running_paid_ads: "¿No estás ejecutando anuncios pagados? Usa IA para crear una campaña de Google Ads",
-      not_running_paid_ads_tooltip: "Contacta a tu administrador para aprender más sobre esta función y cómo activarla para tu cuenta",
       privacy_policy: "Política de privacidad",
       quick_links: "Enlaces rápidos",
       setup_tracking_pixel: "Configurar pixel de seguimiento",
@@ -32936,7 +33062,11 @@ const measure = {
           purchases_tooltip: "Las compras son el número de veces que un usuario hizo una compra después de hacer clic en tu anuncio. \n\nEl porcentaje se calcula dividiendo el número de compras por el número de clics (de la línea anterior)"
         },
         roas_chart: {
-          title: "Tendencias de Retorno de Inversión en Anuncios"
+          title: "Tendencias de Retorno de Inversión en Anuncios",
+          attribution_tooltip_title: "Cómo se cuentan los ingresos en este gráfico",
+          attribution_tooltip_description: "Para cada día, mostramos el gasto total en anuncios, ingresos y ROAS (retorno de inversión en anuncios) de personas que hicieron clic en un anuncio ese día.\n\nSi alguien hace clic en un anuncio y compra dentro de 90 días, su compra se cuenta para el día en que hizo clic en el anuncio.\n\nLos últimos 90 días pueden parecer bajos, ya que pueden seguir llegando más compras.",
+          incomplete_banner: "Los ingresos y ROAS de los días más recientes pueden ser inferiores a sus valores finales, ya que seguimos contando compras realizadas hasta 90 días después de que alguien haga clic en un anuncio.",
+          incomplete_tooltip: "Aún actualizando (<90 días)"
         }
       },
       campaigns: {
@@ -33014,7 +33144,8 @@ const dates = {
   last_week: "Semana pasada",
   last_month: "Mes pasado",
   last_quarter: "Últimos 90 días",
-  last_year: "Año pasado"
+  last_year: "Año pasado",
+  all_time: "Todo el tiempo"
 };
 const campaigns = {
   setup: {
@@ -33093,16 +33224,15 @@ const analytics = {
     google_tag_manager: {
       step_1: "Ve a https://tagmanager.google.com",
       step_2: "Inicia sesión en tu cuenta de Google",
-      step_3: "Haz click en la pestaña de Cuentas y selecciona Crear cuenta",
-      step_4: "Ingresa un nombre para tu cuenta y selecciona tu ubicación",
-      step_5: "En Container Setup, ingresa un nombre para tu contenedor (e.g., tu URL de sitio web)",
-      step_6: 'Selecciona "Web" como tipo de contenedor',
-      step_7: "Haz click en Crear y acepta los Términos de Servicio",
-      step_8: "Una vez creado, recibirás dos fragmentos de código para instalar:",
-      step_9: "• Coloca el primer fragmento en la etiqueta <head> de tu página",
-      step_10: "• Coloca el segundo fragmento justo después de la etiqueta <body>",
-      step_11: "En la pestaña de Etiquetas, haz click en el botón + para crear una nueva etiqueta",
-      step_12: 'Selecciona "Google Analytics: Universal Analytics" como tipo de etiqueta',
+      step_3: 'En la pestaña de Etiquetas, haz click en el botón "Nuevo" para crear una nueva etiqueta',
+      step_4: 'Elige "Código personalizado" como tipo de etiqueta',
+      step_5: "Pega el código de seguimiento en el campo HTML",
+      step_6: "Haz click en cualquier sección del trigger para editar esta configuración",
+      step_7: 'Elige "Inicialización - Todas las páginas" como trigger',
+      step_8: "Haz click en Guardar para guardar la etiqueta",
+      step_9: "Haz click en Enviar en la parte superior derecha",
+      step_10: "Añade un nombre y descripción de la versión",
+      step_11: "Haz click en Publicar para desplegar tus cambios",
       special_note: "Asegúrate de tener el código del contenedor de Google Tag Manager instalado en tu sitio web antes de agregar esta etiqueta."
     },
     hubspot: {
@@ -33322,6 +33452,8 @@ const broadcast_other = "Transmisiones";
 const trigger_based = "Basado en un disparador";
 const insight = "Estadísticas";
 const insight_other = "Estadísticas";
+const merge_field = "Campo de fusión";
+const merge_field_other = "Campos de fusión";
 const esEngage = {
   user,
   user_other,
@@ -33333,7 +33465,9 @@ const esEngage = {
   broadcast_other,
   trigger_based,
   insight,
-  insight_other
+  insight_other,
+  merge_field,
+  merge_field_other
 };
 const transaction_table_id_header$1 = "Transaction ID";
 const transaction_table_created_header$1 = "Transaction Created";
@@ -33521,6 +33655,8 @@ const defaultTranslations = {
           total_revenue: "Total Revenue",
           total_revenue_description: "The complete revenue generated by your business during the selected period from all sources, not just advertising campaigns. \n\nThis includes revenue from direct traffic, organic search, referrals, and any other channels in addition to paid advertising.",
           website_visitors: "Website Visitors",
+          unknown_revenue: "Unknown Revenue",
+          unknown_revenue_description: "Revenue from purchases where we were unable to find customer interactions (like site visits or phone calls) in the 90 days before buying.",
           website_visitors_description: "The number of unique visitors who came to your website from your advertising campaigns during the selected period. \n\nThis metric is tracked using analytics tools and represents actual people who successfully navigated from your ads to your website."
         },
         settings: {
@@ -33528,7 +33664,6 @@ const defaultTranslations = {
           description: "Manage your account settings",
           connected_accounts: "Connected Accounts",
           not_running_paid_ads: "Not running paid ads? Use AI to create a Google Ads campaign",
-          not_running_paid_ads_tooltip: "Contact your administrator to learn more about this feature and how to activate it for your account",
           privacy_policy: "Privacy Policy",
           quick_links: "Quick Links",
           setup_tracking_pixel: "Setup tracking pixel",
@@ -33549,7 +33684,11 @@ const defaultTranslations = {
               purchases_tooltip: "Purchases are the number of times a user made a purchase after clicking on your ad. \n\nThe percentage is calculated by dividing the number of purchases by the number of clicks (from the previous bar line)"
             },
             roas_chart: {
-              title: "Return on Ad Spend Trends"
+              title: "Return on Ad Spend Trends",
+              attribution_tooltip_title: "How revenue is counted in this chart",
+              attribution_tooltip_description: "For each day, we show the total ad spend, revenue, and ROAS (return on ad spend) from people who clicked an ad that day.\n\nIf someone clicks an ad and buys within 90 days, their purchase is counted for the day they clicked the ad.\n\nThe most recent 90 days may look low, since more purchases can still come in.",
+              incomplete_banner: "Revenue and ROAS for recent days may be lower than their final values, since we continue to count purchases made up to 90 days after someone clicks an ad.",
+              incomplete_tooltip: "Still updating (<90 days)"
             }
           },
           campaigns: {
@@ -33628,7 +33767,8 @@ const defaultTranslations = {
       last_week: "Last week",
       last_month: "Last month",
       last_quarter: "Last 90 days",
-      last_year: "Last year"
+      last_year: "Last year",
+      all_time: "All time"
     },
     campaigns: {
       setup: {
@@ -33707,16 +33847,15 @@ const defaultTranslations = {
         google_tag_manager: {
           step_1: "Go to https://tagmanager.google.com",
           step_2: "Sign in to your Google Account",
-          step_3: "Click the Accounts tab, then select Create Account",
-          step_4: "Enter an account name and select your country location",
-          step_5: "In Container Setup, enter a container name (e.g., your website URL)",
-          step_6: 'Select "Web" as the container type',
-          step_7: "Click Create and agree to the Terms of Service",
-          step_8: "Once created, you'll receive two code snippets to install:",
-          step_9: "• Place the first snippet in the <head> of your page",
-          step_10: "• Place the second snippet immediately after the opening <body> tag",
-          step_11: "In the Tags tab, click the + button to create a new tag",
-          step_12: 'Select "Google Analytics: Universal Analytics" as the tag type',
+          step_3: 'In the Tags tab, click the "New" button to create a new tag',
+          step_4: 'Choose "Custom HTML" as the tag type',
+          step_5: "Paste the tracking code above into the HTML field",
+          step_6: "Click anywhere in the triggering section to edit this setting",
+          step_7: 'Select "Initialization - All Pages" as the trigger',
+          step_8: "Click Save to save the tag",
+          step_9: "Click Submit in the top right",
+          step_10: "Add a version name and description",
+          step_11: "Click Publish to deploy your changes",
           special_note: "Make sure you have the Google Tag Manager container code already installed on your site before adding this tag."
         },
         hubspot: {
@@ -48907,16 +49046,16 @@ const getSegment = async (segmentId) => {
     return null;
   }
   const response = await baseRequest(
-    `${BUSINESS_SEGMENT_PATH}/${segmentId}`
+    `${BUSINESS_SEGMENT_PATH}/${segmentId}`,
+    {
+      method: "GET"
+    }
   );
   return response.data;
 };
-const updateSegment = async (params, segmentId) => {
-  if (!segmentId) {
-    return null;
-  }
+const updateSegment = async (id2, params) => {
   const response = await baseRequest(
-    `${BUSINESS_SEGMENT_PATH}/${segmentId}`,
+    `${BUSINESS_SEGMENT_PATH}/${id2}`,
     {
       method: "PATCH",
       body: JSON.stringify(params)
@@ -48924,16 +49063,12 @@ const updateSegment = async (params, segmentId) => {
   );
   return response.data;
 };
-const textToSegment = async (args) => {
-  const { userInput, userCustomVerb } = args;
+const textToSegment = async (params) => {
   const response = await baseRequest(
     `${BUSINESS_SEGMENT_PATH}/text-to-segment`,
     {
       method: "POST",
-      body: JSON.stringify({
-        text: userInput,
-        userCustomVerb: userCustomVerb || "user"
-      })
+      body: JSON.stringify(params)
     }
   );
   return response.data;
@@ -49047,7 +49182,12 @@ const useGetSegment = (segmentId) => {
 const useUpdateSegment = (segmentId) => {
   const queryClient = useQueryClient();
   const updateSegmentMutation = useMutation({
-    mutationFn: (params) => updateSegment(params, segmentId),
+    mutationFn: (params) => {
+      if (!segmentId) {
+        throw new Error("Segment ID is required");
+      }
+      return updateSegment(segmentId, params);
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: segmentKeys.all });
     }
@@ -49074,6 +49214,7 @@ var BusinessSegmentTypeEnum = /* @__PURE__ */ ((BusinessSegmentTypeEnum2) => {
   BusinessSegmentTypeEnum2["ALL_USERS"] = "all_users";
   BusinessSegmentTypeEnum2["MANAGED"] = "managed";
   BusinessSegmentTypeEnum2["CUSTOM"] = "custom";
+  BusinessSegmentTypeEnum2["ONE_OFF"] = "one_off";
   return BusinessSegmentTypeEnum2;
 })(BusinessSegmentTypeEnum || {});
 var ConditionOperatorEnumType = /* @__PURE__ */ ((ConditionOperatorEnumType2) => {
@@ -49131,20 +49272,29 @@ const useValidationStats = () => {
   const { state } = useViewAutomationContext();
   return state.recipientStats;
 };
-const useRecipientStatsTracking = (automation2) => {
-  const { setRecipientStats: setRecipientStats2 } = useViewAutomationContext();
+const useRecipientStatsTracking = (existingAutomation) => {
+  const { setRecipientStats: setRecipientStats2, state } = useViewAutomationContext();
+  const automation2 = state.automation || existingAutomation;
   const { estimatedMatchesStats } = useRecipientStats$1(automation2);
   useEffect(() => {
     if (estimatedMatchesStats) {
       setRecipientStats2(estimatedMatchesStats);
     }
-  }, [estimatedMatchesStats, setRecipientStats2]);
+  }, [estimatedMatchesStats, setRecipientStats2, automation2]);
 };
 const ViewAutomationProvider = ({
   automationId,
+  existingAutomation,
   children
 }) => {
-  return /* @__PURE__ */ jsx(Provider$2, { children: /* @__PURE__ */ jsx(ViewAutomationContent$1, { automationId, children }) });
+  return /* @__PURE__ */ jsx(Provider$2, { children: /* @__PURE__ */ jsx(
+    ViewAutomationContent$1,
+    {
+      automationId,
+      existingAutomation,
+      children
+    }
+  ) });
 };
 const ViewAutomationContent$1 = ({ automationId, existingAutomation, children }) => {
   useAutomationFetching(automationId);
@@ -49288,22 +49438,29 @@ const ActionButtons = ({
     )
   ] }) });
 };
-const BigSelector = ({ onClick, title: title2, subtitle, icon, selected, disabled = false }) => {
+const BigSelector = ({
+  onClick,
+  title: title2,
+  subtitle,
+  icon,
+  selected,
+  disabled = false,
+  hideSelectedText = false
+}) => {
   return /* @__PURE__ */ jsxs(
     "button",
     {
       onClick,
-      className: `relative flex flex-col items-center justify-center rounded-lg border-2 p-6 transition-all duration-300 ease-in-out hover:shadow-lg ${selected ? "border-blue-500 shadow-lg" : "border-gray-200 "} ${disabled ? "opacity-50 cursor-not-allowed hover:shadow-none" : "hover:scale-[1.04] scale-[1.02]"} ${!selected && !disabled && "hover:border-blue-500 hover:bg-gray-50"}`,
+      className: `relative flex flex-col items-center justify-center rounded-lg border-2 p-6 transition-all duration-300 ease-in-out hover:shadow-lg ${selected ? "[border-color:hsl(var(--reach-primary))] shadow-lg" : "border-gray-200 "} ${disabled ? "opacity-50 cursor-not-allowed hover:shadow-none" : "hover:scale-[1.04] scale-[1.02]"} ${!selected && !disabled && "hover:[border-color:hsl(var(--reach-primary))] hover:bg-gray-50"}`,
       children: [
         icon,
         /* @__PURE__ */ jsxs("div", { className: "text-center mt-3", children: [
           /* @__PURE__ */ jsx("div", { className: "text-sm font-medium text-primary", children: title2 }),
           /* @__PURE__ */ jsx("div", { className: "text-xs text-muted-foreground mt-1", children: subtitle })
         ] }),
-        selected && // inverse the colors from regular bg-card text-card-foreground pattern
-        /* @__PURE__ */ jsxs("div", { className: "absolute top-1 right-1 bg-card-foreground rounded-full px-3 py-1 flex items-center gap-1", children: [
-          /* @__PURE__ */ jsx(Check, { className: "w-4 h-4 text-card" }),
-          /* @__PURE__ */ jsx("span", { className: "text-card text-xs hidden md:inline", children: "Selected" })
+        selected && /* @__PURE__ */ jsxs("div", { className: "absolute top-1 right-1 bg-card rounded-full px-3 py-1 flex items-center gap-1", children: [
+          /* @__PURE__ */ jsx(Check, { className: "w-4 h-4 text-card-foreground" }),
+          !hideSelectedText && /* @__PURE__ */ jsx("span", { className: "text-card-foreground text-xs hidden md:inline", children: "Selected" })
         ] })
       ]
     }
@@ -49468,6 +49625,7 @@ const statusArchived = "reach-styles-module__statusArchived___XlN-L";
 const segmentAllUsers = "reach-styles-module__segmentAllUsers___1aXpc";
 const segmentManaged = "reach-styles-module__segmentManaged___o0gOu";
 const segmentCustom = "reach-styles-module__segmentCustom___xc3lG";
+const beta = "reach-styles-module__beta___n9qPf";
 const styles$5 = {
   base: base$4,
   "default": "reach-styles-module__default___zeGU1",
@@ -49494,7 +49652,8 @@ const styles$5 = {
   statusArchived,
   segmentAllUsers,
   segmentManaged,
-  segmentCustom
+  segmentCustom,
+  beta
 };
 const badgeVariants = cva([styles$5.base], {
   variants: {
@@ -49514,11 +49673,14 @@ const badgeVariants = cva([styles$5.base], {
       segmentAllUsers: styles$5.segmentAllUsers,
       segmentManaged: styles$5.segmentManaged,
       segmentCustom: styles$5.segmentCustom,
+      // Not real since we'll never show it
+      segmentOneOff: styles$5.segmentManaged,
       statusScheduled: styles$5.statusScheduled,
       statusQueued: styles$5.statusQueued,
       statusPartiallyCancelled: styles$5.statusPartiallyCancelled,
       statusCancelled: styles$5.statusCancelled,
-      statusArchived: styles$5.statusArchived
+      statusArchived: styles$5.statusArchived,
+      beta: styles$5.beta
     },
     size: {
       default: styles$5.sizeDefault,
@@ -67053,6 +67215,8 @@ const getTypeDescription = (type) => {
       return `System-defined ${t$2("engage:segment").toLowerCase()} that are not editable or deletable.`;
     case BusinessSegmentTypeEnum.CUSTOM:
       return `Custom ${t$2("engage:segment").toLowerCase()} that you can edit and delete as needed.`;
+    case BusinessSegmentTypeEnum.ONE_OFF:
+      return `One-off ${t$2("engage:segment").toLowerCase()} that is not editable or deletable.`;
     default:
       throw UnreachableCaseStatement(type, BusinessSegmentTypeEnum);
   }
@@ -67065,6 +67229,8 @@ const getSegmentTypeVariant = (type) => {
       return "segmentManaged";
     case BusinessSegmentTypeEnum.CUSTOM:
       return "segmentCustom";
+    case BusinessSegmentTypeEnum.ONE_OFF:
+      return "segmentOneOff";
     default:
       throw UnreachableCaseStatement(type, BusinessSegmentTypeEnum);
   }
@@ -67100,7 +67266,9 @@ function createNameColumn(nameAccessor = "name", headerText, showDescription = f
       const typeDotStyles = {
         [BusinessSegmentTypeEnum.ALL_USERS]: "bg-purple-500",
         [BusinessSegmentTypeEnum.MANAGED]: "bg-teal-500",
-        [BusinessSegmentTypeEnum.CUSTOM]: "bg-amber-500"
+        [BusinessSegmentTypeEnum.CUSTOM]: "bg-amber-500",
+        // Not real since we'll never show it
+        [BusinessSegmentTypeEnum.ONE_OFF]: "bg-gray-500"
       };
       const dotColor = type ? typeDotStyles[type] : status ? badgeStyles[status] : "bg-blue-500";
       return /* @__PURE__ */ jsx("div", { className: "w-full flex gap-6 justify-between items-center", children: /* @__PURE__ */ jsxs("div", { className: "flex gap-1 items-center w-full", children: [
@@ -67478,16 +67646,16 @@ const AttributionDialogContent = () => {
   return /* @__PURE__ */ jsxs(
     motion.div,
     {
-      className: "space-y-8 p-6",
+      className: "space-y-8 p-2",
       variants: containerVariants,
       initial: "hidden",
       animate: "visible",
       children: [
-        /* @__PURE__ */ jsxs(motion.div, { className: "text-center space-y-3", variants: itemVariants, children: [
+        /* @__PURE__ */ jsxs(motion.div, { className: "space-y-3", variants: itemVariants, children: [
           /* @__PURE__ */ jsxs(
             motion.h2,
             {
-              className: "text-2xl font-semibold flex items-center justify-center gap-2",
+              className: "text-2xl font-semibold flex items-center justify-start gap-2",
               initial: { scale: 0.9 },
               animate: { scale: 1 },
               transition: { duration: 0.5, ease: "easeOut" },
@@ -67621,6 +67789,41 @@ const AttributionDialogContent = () => {
             ] })
           ] }, scenario.id)) }) })
         ] }),
+        /* @__PURE__ */ jsxs(Card, { children: [
+          /* @__PURE__ */ jsxs(CardHeader, { children: [
+            /* @__PURE__ */ jsxs(CardTitle, { className: "flex items-center gap-2", children: [
+              /* @__PURE__ */ jsx(Eye, { className: "h-5 w-5" }),
+              'Understanding "Unknown" Revenue'
+            ] }),
+            /* @__PURE__ */ jsx(CardDescription, { children: "Sometimes purchases can't be attributed to specific marketing touchpoints" })
+          ] }),
+          /* @__PURE__ */ jsxs(CardContent, { className: "space-y-4", children: [
+            /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: `Revenue appears as "Unknown" when we can't connect a purchase to any marketing touchpoint within our 90-day attribution window. Here are common scenarios:` }),
+            /* @__PURE__ */ jsxs("div", { className: "space-y-3", children: [
+              /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
+                /* @__PURE__ */ jsx("div", { className: "w-2 h-2 rounded-full bg-amber-500 mt-2 flex-shrink-0" }),
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("h5", { className: "font-medium text-sm", children: "Attribution Window Expired" }),
+                  /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: "Customer clicked an ad and purchased 91+ days later, outside our tracking window" })
+                ] })
+              ] }),
+              /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
+                /* @__PURE__ */ jsx("div", { className: "w-2 h-2 rounded-full bg-amber-500 mt-2 flex-shrink-0" }),
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("h5", { className: "font-medium text-sm", children: "Identity Mismatch" }),
+                  /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: "Customer used different email/phone or didn't provide contact information when they visited your site vs. when they made the purchase." })
+                ] })
+              ] }),
+              /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
+                /* @__PURE__ */ jsx("div", { className: "w-2 h-2 rounded-full bg-amber-500 mt-2 flex-shrink-0" }),
+                /* @__PURE__ */ jsxs("div", { children: [
+                  /* @__PURE__ */ jsx("h5", { className: "font-medium text-sm", children: "Technical Limitations" }),
+                  /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: "Ad blockers, privacy settings, or technical issues prevented tracking" })
+                ] })
+              ] })
+            ] })
+          ] })
+        ] }),
         /* @__PURE__ */ jsx(Card, { className: "bg-blue-50 border-blue-200", children: /* @__PURE__ */ jsx(CardContent, { className: "pt-6", children: /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
           /* @__PURE__ */ jsx(Clock, { className: "h-5 w-5 text-blue-600 mt-0.5 flex-shrink-0" }),
           /* @__PURE__ */ jsxs("div", { children: [
@@ -67729,7 +67932,7 @@ const InfoTooltip = ({
             onClick: handleAttributionClick,
             variant: "ghost",
             size: "sm",
-            className: "flex justify-start w-full items-start gap-2 text-xs text-blue-400 hover:text-blue-200 hover:bg-transparent underline my-1 py-2 px-0 h-auto text-pretty",
+            className: "flex justify-start w-full items-start gap-2 text-xs text-blue-400 hover:text-blue-200 hover:bg-transparent underline my-1 py-2 px-0 h-auto text-pretty text-left",
             children: [
               /* @__PURE__ */ jsx(ExternalLink, { className: "text-blue-400 h-3 w-3" }),
               t3("measure.dashboard.methodology.tooltip")
@@ -90204,9 +90407,9 @@ var ChannelType = /* @__PURE__ */ ((ChannelType2) => {
   return ChannelType2;
 })(ChannelType || {});
 const HEIGHT_BUFFER = 10;
-const CHECK_DELAYS = [0, 100, 500];
+const CHECK_DELAYS = [0, 100, 500, 1e3, 2e3];
 const DEFAULT_EMAIL_PREVIEW_HEIGHT = 400;
-const EMAIL_PREVIEW_HEIGHT_CALCULATION_TIMEOUT = 3e3;
+const EMAIL_PREVIEW_HEIGHT_CALCULATION_TIMEOUT = 5e3;
 const SMS_LIMITS = {
   RECOMMENDED_LIMIT: 320
 };
@@ -90267,53 +90470,146 @@ const createHeightMonitor = () => {
   return `
     (function() {
       let lastHeight = 0;
+      let checkCount = 0;
+      const MAX_CHECKS = 20; // Prevent infinite loops
       
-      // Calculate max height from various measurements
+      // Calculate max height from various measurements with better error handling
       function getContentHeight() {
-        const { body, documentElement: html } = document;
-        return Math.max(
-          body.scrollHeight,
-          body.offsetHeight,
-          html.clientHeight,
-          html.scrollHeight,
-          html.offsetHeight
-        );
+        try {
+          const { body, documentElement: html } = document;
+          if (!body || !html) {
+            return 0;
+          }
+          
+          const measurements = [
+            body.scrollHeight,
+            body.offsetHeight,
+            html.clientHeight,
+            html.scrollHeight,
+            html.offsetHeight
+          ].filter(h => h > 0 && isFinite(h));
+          
+          if (measurements.length === 0) {
+            console.warn('HeightMonitor: No valid height measurements found');
+            return 0;
+          }
+          
+          return Math.max(...measurements);
+        } catch (error) {
+          console.warn('HeightMonitor: Error calculating height', error);
+          return 0;
+        }
       }
       
       function reportHeight() {
-        const height = getContentHeight();
-        if (height !== lastHeight && height > 0) {
-          lastHeight = height;
-          window.parent.postMessage({
-            type: 'IFRAME_HEIGHT_UPDATE',
-            height: height + ${HEIGHT_BUFFER}
-          }, '*');
+        try {
+          const height = getContentHeight();
+          if (height > 0 && height !== lastHeight) {
+            lastHeight = height;
+            window.parent.postMessage({
+              type: 'IFRAME_HEIGHT_UPDATE',
+              height: height + ${HEIGHT_BUFFER}
+            }, '*');
+          }
+        } catch (error) {
+          console.warn('HeightMonitor: Error reporting height', error);
+        }
+      }
+      
+      // Enhanced height monitoring with multiple strategies
+      function setupHeightMonitoring() {
+        try {
+          // Strategy 1: ResizeObserver for real-time monitoring
+          if (window.ResizeObserver) {
+            const observer = new ResizeObserver(() => {
+              requestAnimationFrame(() => {
+                reportHeight();
+                checkCount++;
+              });
+            });
+            observer.observe(document.body);
+            observer.observe(document.documentElement);
+          } else {
+            console.warn('HeightMonitor: ResizeObserver not available, using fallback');
+          }
+          
+          // Strategy 2: Handle image loading with better error handling
+          const images = document.querySelectorAll('img');
+          images.forEach(img => {
+            if (!img.complete) {
+              img.addEventListener('load', () => {
+                setTimeout(reportHeight, 100); // Small delay to ensure layout is complete
+              });
+              img.addEventListener('error', () => {
+                setTimeout(reportHeight, 100);
+              });
+            }
+          });
+          
+          // Strategy 3: Watch for DOM changes with throttling
+          let mutationTimeout;
+          new MutationObserver(() => {
+            if (mutationTimeout) clearTimeout(mutationTimeout);
+            mutationTimeout = setTimeout(() => {
+              requestAnimationFrame(reportHeight);
+              checkCount++;
+            }, 100); // Throttle mutations
+          }).observe(document.body, { 
+            childList: true, 
+            subtree: true,
+            attributes: true,
+            attributeFilter: ['style', 'class']
+          });
+          
+          // Strategy 4: Periodic checks with exponential backoff
+          let checkDelay = 100;
+          const periodicCheck = () => {
+            if (checkCount >= MAX_CHECKS) {
+              console.warn('HeightMonitor: Max checks reached, stopping periodic checks');
+              return;
+            }
+            
+            reportHeight();
+            checkCount++;
+            
+            // Exponential backoff for periodic checks
+            checkDelay = Math.min(checkDelay * 1.5, 2000);
+            setTimeout(periodicCheck, checkDelay);
+          };
+          
+          // Start periodic checks after initial setup
+          setTimeout(periodicCheck, 500);
+          
+        } catch (error) {
+          console.warn('HeightMonitor: Error setting up monitoring', error);
         }
       }
       
-      // Setup observers for real-time monitoring
-      if (window.ResizeObserver) {
-        const observer = new ResizeObserver(() => requestAnimationFrame(reportHeight));
-        observer.observe(document.body);
-        observer.observe(document.documentElement);
+      // Initial setup with multiple triggers
+      if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', setupHeightMonitoring);
+      } else {
+        setupHeightMonitoring();
       }
       
-      // Handle image loading
-      document.querySelectorAll('img').forEach(img => {
-        if (!img.complete) {
-          img.addEventListener('load', reportHeight);
-          img.addEventListener('error', reportHeight);
-        }
+      window.addEventListener('load', () => {
+        setTimeout(() => {
+          reportHeight();
+          checkCount++;
+        }, 100);
       });
       
-      // Watch for DOM changes
-      new MutationObserver(() => requestAnimationFrame(reportHeight))
-        .observe(document.body, { childList: true, subtree: true });
-      
       // Initial checks with progressive delays
-      window.addEventListener('load', () => setTimeout(reportHeight, 100));
-      document.addEventListener('DOMContentLoaded', reportHeight);
-      ${CHECK_DELAYS.map((delay2) => `setTimeout(reportHeight, ${delay2});`).join("\n      ")}
+      ${CHECK_DELAYS.map((delay2) => `setTimeout(() => { reportHeight(); checkCount++; }, ${delay2});`).join("\n      ")}
+      
+      // Final fallback check
+      setTimeout(() => {
+        if (lastHeight === 0) {
+          console.warn('HeightMonitor: No height reported, forcing final check');
+          reportHeight();
+        }
+      }, 4000);
+      
     })();
   `;
 };
@@ -90321,9 +90617,16 @@ const EmailPreviewHtmlRenderer = ({
   html,
   onHeightChange
 }) => {
-  const iframeRef = useRef(null);
   const timeoutRef = useRef();
   const [state, setState] = useState({ type: "loading" });
+  const [iframeElement, setIframeElement] = useState(
+    null
+  );
+  const setIframeRef = useCallback((element) => {
+    if (element) {
+      setIframeElement(element);
+    }
+  }, []);
   const communicationGroup = useCommunicationGroup();
   const { getMergeFields: getMergeFields2, isGetting: isGettingMergeFields } = useGetMergeFields(
     communicationGroup?.id ?? void 0
@@ -90348,6 +90651,24 @@ const EmailPreviewHtmlRenderer = ({
     },
     [onHeightChange]
   );
+  const handleFallback = useCallback(() => {
+    setState({ type: "error", fallbackHeight: DEFAULT_EMAIL_PREVIEW_HEIGHT });
+    handleHeightUpdate(DEFAULT_EMAIL_PREVIEW_HEIGHT);
+  }, [handleHeightUpdate]);
+  const estimateHeightFromContent = useCallback((htmlContent) => {
+    try {
+      const lines = htmlContent.split("\n").length;
+      const estimatedHeight = Math.max(200, Math.min(800, lines * 20));
+      return estimatedHeight;
+    } catch (error2) {
+      return DEFAULT_EMAIL_PREVIEW_HEIGHT;
+    }
+  }, []);
+  const forceStateChange = useCallback(() => {
+    const estimatedHeight = estimateHeightFromContent(prettyHtml);
+    setState({ type: "error", fallbackHeight: estimatedHeight });
+    handleHeightUpdate(estimatedHeight);
+  }, [prettyHtml, estimateHeightFromContent, handleHeightUpdate]);
   useEffect(() => {
     if (prettyHtml) {
       setState({ type: "calculating" });
@@ -90357,68 +90678,83 @@ const EmailPreviewHtmlRenderer = ({
     }
   }, [prettyHtml]);
   useEffect(() => {
-    if (!prettyHtml || !iframeRef.current || state.type === "ready") return;
-    const iframe = iframeRef.current;
+    if (!prettyHtml || !iframeElement) {
+      return;
+    }
+    if (state.type === "ready") {
+      return;
+    }
+    const iframe = iframeElement;
+    const timeoutDuration = Math.max(
+      EMAIL_PREVIEW_HEIGHT_CALCULATION_TIMEOUT,
+      5e3
+    );
     timeoutRef.current = setTimeout(() => {
-      setState({ type: "error", fallbackHeight: DEFAULT_EMAIL_PREVIEW_HEIGHT });
-      handleHeightUpdate(DEFAULT_EMAIL_PREVIEW_HEIGHT);
-    }, EMAIL_PREVIEW_HEIGHT_CALCULATION_TIMEOUT);
+      handleFallback();
+    }, timeoutDuration);
+    const aggressiveTimeout = setTimeout(() => {
+      if (state.type === "calculating") {
+        forceStateChange();
+      }
+    }, 1e4);
+    const estimatedHeight = estimateHeightFromContent(prettyHtml);
     const setupHeightMonitoring = () => {
       try {
         const doc2 = iframe.contentDocument || iframe.contentWindow?.document;
         if (!doc2) {
-          setState({
-            type: "error",
-            fallbackHeight: DEFAULT_EMAIL_PREVIEW_HEIGHT
-          });
+          setState({ type: "error", fallbackHeight: estimatedHeight });
+          handleHeightUpdate(estimatedHeight);
           return;
         }
         const injectStyles2 = () => {
-          const existingStyles = doc2.querySelectorAll(
-            "style[data-merge-field-pills]"
-          );
-          existingStyles.forEach((style22) => style22.remove());
-          const style2 = doc2.createElement("style");
-          style2.textContent = "html, body { height: auto !important; min-height: 0 !important; }";
-          doc2.head.appendChild(style2);
-          const pillStyle = doc2.createElement("style");
-          pillStyle.setAttribute("data-merge-field-pills", "true");
-          pillStyle.textContent = `
-            .merge-field-pill {
-              display: inline-block !important;
-              padding: 4px 8px !important;
-              border-radius: 6px !important;
-              background: #f3f4f6 !important;
-              color: #6b7280 !important;
-              font-size: 0.875rem !important;
-              border: 1px solid #e5e7eb !important;
-              font-weight: 500 !important;
-              margin: 0 2px !important;
-              vertical-align: middle !important;
-              line-height: 1.2 !important;
-              white-space: nowrap !important;
-              box-sizing: border-box !important;
-            }
-            
-            /* Ensure pills are visible even with conflicting styles */
-            span.merge-field-pill {
-              display: inline-block !important;
-              background: #f3f4f6 !important;
-              color: #6b7280 !important;
-              border: 1px solid #e5e7eb !important;
-            }
-            
-            /* Force override any inherited styles */
-            * .merge-field-pill {
-              display: inline-block !important;
-              background: #f3f4f6 !important;
-              color: #6b7280 !important;
-              border: 1px solid #e5e7eb !important;
-              padding: 4px 8px !important;
-              border-radius: 6px !important;
-            }
-          `;
-          doc2.head.appendChild(pillStyle);
+          try {
+            const existingStyles = doc2.querySelectorAll(
+              "style[data-merge-field-pills]"
+            );
+            existingStyles.forEach((style22) => style22.remove());
+            const style2 = doc2.createElement("style");
+            style2.textContent = "html, body { height: auto !important; min-height: 0 !important; }";
+            doc2.head.appendChild(style2);
+            const pillStyle = doc2.createElement("style");
+            pillStyle.setAttribute("data-merge-field-pills", "true");
+            pillStyle.textContent = `
+              .merge-field-pill {
+                display: inline-block !important;
+                padding: 4px 8px !important;
+                border-radius: 6px !important;
+                background: #f3f4f6 !important;
+                color: #6b7280 !important;
+                font-size: 0.875rem !important;
+                border: 1px solid #e5e7eb !important;
+                font-weight: 500 !important;
+                margin: 0 2px !important;
+                vertical-align: middle !important;
+                line-height: 1.2 !important;
+                white-space: nowrap !important;
+                box-sizing: border-box !important;
+              }
+              
+              /* Ensure pills are visible even with conflicting styles */
+              span.merge-field-pill {
+                display: inline-block !important;
+                background: #f3f4f6 !important;
+                color: #6b7280 !important;
+                border: 1px solid #e5e7eb !important;
+              }
+              
+              /* Force override any inherited styles */
+              * .merge-field-pill {
+                display: inline-block !important;
+                background: #f3f4f6 !important;
+                color: #6b7280 !important;
+                border: 1px solid #e5e7eb !important;
+                padding: 4px 8px !important;
+                border-radius: 6px !important;
+              }
+            `;
+            doc2.head.appendChild(pillStyle);
+          } catch (styleError) {
+          }
         };
         if (doc2.readyState === "complete" || doc2.readyState === "interactive") {
           injectStyles2();
@@ -90426,14 +90762,57 @@ const EmailPreviewHtmlRenderer = ({
           doc2.addEventListener("DOMContentLoaded", injectStyles2);
           doc2.addEventListener("load", injectStyles2);
         }
-        const script = doc2.createElement("script");
-        script.textContent = createHeightMonitor();
-        doc2.body.appendChild(script);
+        try {
+          const script = doc2.createElement("script");
+          script.textContent = createHeightMonitor();
+          doc2.body.appendChild(script);
+          setTimeout(() => {
+            if (state.type === "calculating") {
+              try {
+                const iframeDoc = iframe.contentDocument || iframe.contentWindow?.document;
+                if (iframeDoc) {
+                  const bodyHeight = iframeDoc.body?.scrollHeight || iframeDoc.body?.offsetHeight;
+                  if (bodyHeight && bodyHeight > 0) {
+                    handleHeightUpdate(bodyHeight + 10);
+                  } else {
+                    setState({
+                      type: "error",
+                      fallbackHeight: estimatedHeight
+                    });
+                    handleHeightUpdate(estimatedHeight);
+                  }
+                }
+              } catch (directError) {
+                setState({ type: "error", fallbackHeight: estimatedHeight });
+                handleHeightUpdate(estimatedHeight);
+              }
+            }
+          }, 2e3);
+        } catch (scriptError) {
+          setTimeout(() => {
+            try {
+              const iframeDoc = iframe.contentDocument || iframe.contentWindow?.document;
+              if (iframeDoc) {
+                const bodyHeight = iframeDoc.body?.scrollHeight || iframeDoc.body?.offsetHeight;
+                if (bodyHeight && bodyHeight > 0) {
+                  handleHeightUpdate(bodyHeight + 10);
+                } else {
+                  setState({ type: "error", fallbackHeight: estimatedHeight });
+                  handleHeightUpdate(estimatedHeight);
+                }
+              } else {
+                setState({ type: "error", fallbackHeight: estimatedHeight });
+                handleHeightUpdate(estimatedHeight);
+              }
+            } catch (error2) {
+              setState({ type: "error", fallbackHeight: estimatedHeight });
+              handleHeightUpdate(estimatedHeight);
+            }
+          }, 1e3);
+        }
       } catch (error2) {
-        setState({
-          type: "error",
-          fallbackHeight: DEFAULT_EMAIL_PREVIEW_HEIGHT
-        });
+        setState({ type: "error", fallbackHeight: estimatedHeight });
+        handleHeightUpdate(estimatedHeight);
       }
     };
     const handleHeightMessage = (event) => {
@@ -90448,20 +90827,49 @@ const EmailPreviewHtmlRenderer = ({
       }
     };
     const handleError = () => {
-      setState({ type: "error", fallbackHeight: DEFAULT_EMAIL_PREVIEW_HEIGHT });
+      setState({ type: "error", fallbackHeight: estimatedHeight });
+      handleHeightUpdate(estimatedHeight);
     };
-    iframe.addEventListener("load", setupHeightMonitoring);
+    const handleLoad = () => {
+      setupHeightMonitoring();
+    };
+    iframe.addEventListener("load", handleLoad);
     iframe.addEventListener("error", handleError);
     window.addEventListener("message", handleHeightMessage);
+    setTimeout(() => {
+      if (state.type === "calculating") {
+        try {
+          const iframeDoc = iframe.contentDocument || iframe.contentWindow?.document;
+          if (iframeDoc && iframeDoc.readyState === "complete") {
+            setupHeightMonitoring();
+          } else {
+            setState({ type: "error", fallbackHeight: estimatedHeight });
+            handleHeightUpdate(estimatedHeight);
+          }
+        } catch (error2) {
+          setState({ type: "error", fallbackHeight: estimatedHeight });
+          handleHeightUpdate(estimatedHeight);
+        }
+      }
+    }, 1e3);
     return () => {
-      iframe.removeEventListener("load", setupHeightMonitoring);
+      iframe.removeEventListener("load", handleLoad);
       iframe.removeEventListener("error", handleError);
       window.removeEventListener("message", handleHeightMessage);
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
+      clearTimeout(aggressiveTimeout);
     };
-  }, [prettyHtml, handleHeightUpdate, state.type]);
+  }, [
+    prettyHtml,
+    handleHeightUpdate,
+    handleFallback,
+    forceStateChange,
+    estimateHeightFromContent,
+    state.type,
+    iframeElement
+  ]);
   if (isGettingMergeFields && getMergeFields2 === void 0) {
     return /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center py-5", children: /* @__PURE__ */ jsx(BasicLoader, { text: "Fetching merge fields..." }) });
   }
@@ -90474,7 +90882,7 @@ const EmailPreviewHtmlRenderer = ({
     /* @__PURE__ */ jsx(
       "iframe",
       {
-        ref: iframeRef,
+        ref: setIframeRef,
         title: "Email Preview",
         srcDoc: prettyHtml,
         className: "w-full block",
@@ -90542,32 +90950,32 @@ const EmailPreviewHtmlRenderer = ({
     ) })
   ] });
 };
-const HELP_TOPICS = [
-  {
-    id: "dynamic-content",
-    title: "Dynamic Content",
-    image: "https://cdn.embedreach.com/assets/engage/merge-tags-demo.gif",
-    imageAlt: "Merge Tags Demo",
-    imageDesc: "Demonstration: Adding merge tags to personalize your emails",
-    selectorTitle: "Dynamic Content",
-    selectorSubtitle: "Dynamic content is a way to insert dynamic content into your email like name, email, or other details.",
-    selectorIcon: /* @__PURE__ */ jsx(Merge, {})
-  },
-  {
-    id: "responsive-design",
-    title: "Responsive Design",
-    image: "https://cdn.embedreach.com/assets/engage/layout-mobile-desktop.gif",
-    imageAlt: "Mobile Desktop Switch Demo",
-    imageDesc: "Demonstration: Switching between mobile and desktop preview modes",
-    selectorTitle: "Responsive Design",
-    selectorSubtitle: "Switch between mobile and desktop preview modes to ensure your emails look great on all devices.",
-    selectorIcon: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
-      /* @__PURE__ */ jsx(Smartphone, { className: "w-4 h-4" }),
-      /* @__PURE__ */ jsx(Monitor, { className: "w-4 h-4" })
-    ] })
-  }
-];
 const EmailPreviewHelpDialog = () => {
+  const HELP_TOPICS = [
+    {
+      id: "dynamic-content",
+      title: "Dynamic Content",
+      image: "https://cdn.embedreach.com/assets/engage/merge-tags-demo.gif",
+      imageAlt: `${t$2("engage:merge_field")} Demo`,
+      imageDesc: `Demonstration: Adding ${t$2("engage:merge_field").toLowerCase()} to personalize your emails`,
+      selectorTitle: "Dynamic Content",
+      selectorSubtitle: "Dynamic content is a way to insert dynamic content into your email like name, email, or other details.",
+      selectorIcon: /* @__PURE__ */ jsx(Merge, {})
+    },
+    {
+      id: "responsive-design",
+      title: "Responsive Design",
+      image: "https://cdn.embedreach.com/assets/engage/layout-mobile-desktop.gif",
+      imageAlt: "Mobile Desktop Switch Demo",
+      imageDesc: "Demonstration: Switching between mobile and desktop preview modes",
+      selectorTitle: "Responsive Design",
+      selectorSubtitle: "Switch between mobile and desktop preview modes to ensure your emails look great on all devices.",
+      selectorIcon: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
+        /* @__PURE__ */ jsx(Smartphone, { className: "w-4 h-4" }),
+        /* @__PURE__ */ jsx(Monitor, { className: "w-4 h-4" })
+      ] })
+    }
+  ];
   const { toggleEmailHelpDialog: toggleEmailHelpDialog2, data: business } = useBusiness$1();
   const { toast: toast2 } = useToast();
   const [selectedTopic, setSelectedTopic] = useState("dynamic-content");
@@ -90578,7 +90986,7 @@ const EmailPreviewHelpDialog = () => {
     });
   };
   const shouldShowDontShowAgainButton = business?.uiDefaults?.emailHelpDialogShow !== false;
-  const topic = HELP_TOPICS.find((t3) => t3.id === selectedTopic) ?? HELP_TOPICS[0];
+  const topic = HELP_TOPICS.find((t22) => t22.id === selectedTopic) ?? HELP_TOPICS[0];
   return /* @__PURE__ */ jsxs("div", { className: "p-6 overflow-y-auto", children: [
     /* @__PURE__ */ jsxs("div", { className: "mb-8 text-center", children: [
       /* @__PURE__ */ jsx("h2", { className: "text-2xl font-semibold mb-2", children: "Email Editor Help Center" }),
@@ -90609,16 +91017,16 @@ const EmailPreviewHelpDialog = () => {
       },
       topic.id
     ) }) }),
-    /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-4 sm:flex-row sm:gap-6 max-w-xl mx-auto", children: HELP_TOPICS.map((t3) => /* @__PURE__ */ jsx("div", { className: "flex-1", children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-4 sm:flex-row sm:gap-6 max-w-xl mx-auto", children: HELP_TOPICS.map((t22) => /* @__PURE__ */ jsx("div", { className: "flex-1", children: /* @__PURE__ */ jsx(
       BigSelector,
       {
-        onClick: () => setSelectedTopic(t3.id),
-        title: t3.selectorTitle,
-        subtitle: t3.selectorSubtitle,
-        icon: t3.selectorIcon,
-        selected: selectedTopic === t3.id
+        onClick: () => setSelectedTopic(t22.id),
+        title: t22.selectorTitle,
+        subtitle: t22.selectorSubtitle,
+        icon: t22.selectorIcon,
+        selected: selectedTopic === t22.id
       }
-    ) }, t3.id)) }),
+    ) }, t22.id)) }),
     shouldShowDontShowAgainButton && /* @__PURE__ */ jsx("div", { className: "flex justify-center pt-4", children: /* @__PURE__ */ jsx(Button$1, { size: "sm", onClick: handleDontShowAgain, children: "Don't show me again" }) })
   ] });
 };
@@ -90781,6 +91189,17 @@ const StripoEditor = ({ containerRef, stripoDialogDimensions, showSaving }) => {
           }
         });
       });
+      const mergeTagsElements = shadowRoot.querySelectorAll(
+        "span.service-element.caption.ng-star-inserted"
+      );
+      mergeTagsElements.forEach((element) => {
+        const htmlElement = element;
+        if (htmlElement.textContent?.trim() === "Merge Tags") {
+          htmlElement.textContent = t$2("engage:merge_field", {
+            count: 2
+          });
+        }
+      });
     };
     let shadowObserver = null;
     const setupShadowObserver = () => {
@@ -90928,115 +91347,174 @@ const StripoWrapper = ({
   mergeFieldsResponse,
   cancelClicked,
   setCancelClicked,
-  actionId
+  actionId,
+  onEditorReadyChange
 }) => {
+  const [stripoEmailSaved, setStripoEmailSaved] = useState(false);
+  const [stripoEmailCompiled, setStripoEmailCompiled] = useState(false);
+  const [isEditorReady, setIsEditorReady] = useState(false);
   const stripoOpenedOnce = useRef(false);
   const containerRef = useRef(null);
-  const { data: template, isLoading: isTemplateLoading } = useStripoTemplateForActionId({
+  const editorReadyCheckInterval = useRef(null);
+  const {
+    data: template,
+    isLoading: isTemplateLoading,
+    error: templateError
+  } = useStripoTemplateForActionId({
     automationId: automation2.id,
     actionId
   });
-  const { data: editorData, isLoading: isEditorDataLoading } = useStripoEditorData();
-  const [stripoEmailSaved, setStripoEmailSaved] = useState(false);
-  const [stripoEmailCompiled, setStripoEmailCompiled] = useState(false);
+  const {
+    data: editorData,
+    isLoading: isEditorDataLoading,
+    error: editorDataError
+  } = useStripoEditorData();
   const { updateCommunicationGroup: updateCommunicationGroup2 } = useUpdateCommunicationGroup();
+  const checkEditorReady = useCallback(() => {
+    const isReady = !!(window.StripoEditorApi?.actionsApi && typeof window.StripoEditorApi.actionsApi.save === "function" && typeof window.StripoEditorApi.actionsApi.compileEmail === "function");
+    if (isReady && !isEditorReady) {
+      setIsEditorReady(true);
+      onEditorReadyChange?.(true);
+      if (editorReadyCheckInterval.current) {
+        clearInterval(editorReadyCheckInterval.current);
+        editorReadyCheckInterval.current = null;
+      }
+    }
+    return isReady;
+  }, [isEditorReady, onEditorReadyChange]);
   const resetAndCloseEditor = useCallback(() => {
     setSaveClicked(false);
     setCancelClicked(false);
     setStripoEmailSaved(false);
     setStripoEmailCompiled(false);
+    setIsEditorReady(false);
+    onEditorReadyChange?.(false);
     setShowStripoEditor(false);
+    if (editorReadyCheckInterval.current) {
+      clearInterval(editorReadyCheckInterval.current);
+      editorReadyCheckInterval.current = null;
+    }
   }, [
     setSaveClicked,
     setCancelClicked,
     setStripoEmailSaved,
     setStripoEmailCompiled,
+    setIsEditorReady,
+    onEditorReadyChange,
     setShowStripoEditor
   ]);
-  useEffect(() => {
-    if (saveClicked && window.UIEditor && template?.communicationGroupId && window.StripoEditorApi?.actionsApi) {
-      const compileEmailCallback = function(error2, html) {
-        if (error2) {
-          console.error("Failed to compile email:", error2);
-          return;
-        }
-        updateCommunicationGroup2({
-          groupId: template.communicationGroupId,
-          params: {
-            emailHtmlBody: html
+  const executeSave = useCallback(async () => {
+    if (!isEditorReady) {
+      console.warn("Save operation blocked - editor not ready yet");
+      return;
+    }
+    if (!window.StripoEditorApi?.actionsApi || !template?.communicationGroupId) {
+      console.warn("Save operation blocked - preconditions not met");
+      return;
+    }
+    try {
+      const saveOperation = () => new Promise((resolve, reject) => {
+        const compileEmailCallback = async function(error2, html) {
+          if (error2) {
+            reject(new Error(`Compile failed: ${error2}`));
+            return;
+          }
+          try {
+            await updateCommunicationGroup2({
+              groupId: template.communicationGroupId,
+              params: { emailHtmlBody: html }
+            });
+          } catch (err) {
+            reject(err);
           }
+          setStripoEmailCompiled(true);
+          resolve();
+        };
+        const saveCallback = function(error2) {
+          if (error2) {
+            reject(new Error(`Save failed: ${error2}`));
+            return;
+          }
+          setStripoEmailSaved(true);
+        };
+        window.StripoEditorApi.actionsApi.compileEmail({
+          callback: compileEmailCallback,
+          minimize: true,
+          mergeTags: [],
+          forceAmp: false,
+          resetDataSavedFlag: false,
+          disableLineHeightsReplace: true
         });
-        setStripoEmailCompiled(true);
-      };
-      window.StripoEditorApi.actionsApi.compileEmail({
-        callback: compileEmailCallback,
-        minimize: true,
-        mergeTags: [],
-        forceAmp: false,
-        resetDataSavedFlag: false,
-        disableLineHeightsReplace: true
+        window.StripoEditorApi.actionsApi.save(saveCallback);
       });
-      const saveCallback = function(error2) {
-        if (error2) {
-          console.error("Failed to save email:", error2);
-          return;
-        }
-        setStripoEmailSaved(true);
-      };
-      window.StripoEditorApi.actionsApi.save(saveCallback);
+      await saveOperation();
+    } catch (error2) {
+      console.error("Save operation failed:", error2);
     }
-  }, [
-    saveClicked,
-    containerRef,
-    setSaveClicked,
-    setShowStripoEditor,
-    template,
-    updateCommunicationGroup2
-  ]);
+  }, [template, updateCommunicationGroup2, isEditorReady]);
   useEffect(() => {
-    const closeEditor = async () => {
-      if (stripoEmailSaved && stripoEmailCompiled || showStripoEditor === false) {
-        if (window.UIEditor && window.UIEditor.removeEditor && typeof window.UIEditor.removeEditor === "function") {
-          window.UIEditor.removeEditor();
-        }
-        resetAndCloseEditor();
-      }
-    };
-    closeEditor();
+    if (saveClicked && isEditorReady) {
+      executeSave();
+    } else if (saveClicked && !isEditorReady) {
+      console.warn("Save clicked but editor not ready - ignoring save request");
+      setSaveClicked(false);
+    }
+  }, [saveClicked, executeSave, isEditorReady, setSaveClicked]);
+  useEffect(() => {
+    if (stripoEmailSaved && stripoEmailCompiled || showStripoEditor === false) {
+      resetAndCloseEditor();
+    }
   }, [
     stripoEmailSaved,
     stripoEmailCompiled,
     showStripoEditor,
-    setShowStripoEditor,
-    setSaveClicked,
     resetAndCloseEditor
   ]);
   useEffect(() => {
     if (cancelClicked) {
-      if (window.UIEditor && window.UIEditor.removeEditor && typeof window.UIEditor.removeEditor === "function") {
-        window.UIEditor.removeEditor();
-      }
       resetAndCloseEditor();
     }
   }, [cancelClicked, resetAndCloseEditor]);
   useEffect(() => {
-    if (editorData?.businessId && containerRef.current && template) {
-      if (!stripoOpenedOnce.current) {
-        initStripo({
-          emailId: template.communicationGroupId,
-          html: template.html || "<div></div>",
-          css: template.css || "",
-          container: containerRef.current,
-          businessId: editorData.businessId,
-          mergeFields: mergeFieldsResponse.mergeFields || [],
-          forceRecreate: template.forceRecreate
-        }).catch((error2) => {
-          console.error("Failed to initialize Stripo:", error2);
-        });
-        stripoOpenedOnce.current = true;
-      }
+    if (editorData?.businessId && containerRef.current && template && !stripoOpenedOnce.current) {
+      const initializeEditor = async () => {
+        try {
+          await initStripo({
+            emailId: template.communicationGroupId,
+            html: template.html || "<div></div>",
+            css: template.css || "",
+            container: containerRef.current,
+            businessId: editorData.businessId,
+            mergeFields: mergeFieldsResponse.mergeFields || [],
+            forceRecreate: template.forceRecreate
+          });
+          stripoOpenedOnce.current = true;
+          console.log(
+            "Stripo initStripo completed, starting readiness check..."
+          );
+          editorReadyCheckInterval.current = setInterval(() => {
+            checkEditorReady();
+          }, 500);
+        } catch (error2) {
+          console.error("Failed to initialize Stripo editor:", error2);
+        }
+      };
+      initializeEditor();
     }
-  }, [editorData, mergeFieldsResponse, template]);
+  }, [editorData, mergeFieldsResponse, template, checkEditorReady]);
+  useEffect(() => {
+    return () => {
+      if (editorReadyCheckInterval.current) {
+        clearInterval(editorReadyCheckInterval.current);
+      }
+    };
+  }, []);
+  if (templateError || editorDataError) {
+    return /* @__PURE__ */ jsxs("div", { className: "w-full h-full flex flex-col items-center justify-center", children: [
+      /* @__PURE__ */ jsx("div", { className: "text-red-500 mb-4", children: "Failed to load editor data" }),
+      /* @__PURE__ */ jsx(Button$1, { onClick: () => window.location.reload(), variant: "outline", children: "Retry" })
+    ] });
+  }
   if (isTemplateLoading || isEditorDataLoading || !editorData || !template) {
     return /* @__PURE__ */ jsx("div", { className: "w-full h-full flex flex-col items-center justify-center", children: /* @__PURE__ */ jsx(BasicLoader, { text: ["Loading editor..."] }) });
   }
@@ -91045,7 +91523,7 @@ const StripoWrapper = ({
     {
       containerRef,
       stripoDialogDimensions,
-      showSaving: saveClicked
+      showSaving: saveClicked && isEditorReady
     }
   ) });
 };
@@ -91091,6 +91569,7 @@ const EmailPreview = ({
   const [showStripoEditor, setShowStripoEditor] = useState(false);
   const [saveClicked, setSaveClicked] = useState(false);
   const [cancelClicked, setCancelClicked] = useState(false);
+  const [isEditorReady, setIsEditorReady] = useState(false);
   const [fromName, setFromName] = useState("");
   const [replyToEmail, setReplyToEmail] = useState("");
   const [showHelpDialog, setShowHelpDialog] = useState(null);
@@ -91310,6 +91789,7 @@ const EmailPreview = ({
                   {
                     onClick: () => setSaveClicked(true),
                     className: "text-sm px-3 py-1 rounded",
+                    disabled: !isEditorReady,
                     children: "Save"
                   }
                 )
@@ -91327,7 +91807,8 @@ const EmailPreview = ({
                 setSaveClicked,
                 stripoDialogDimensions,
                 mergeFieldsResponse,
-                actionId: selectedActionId
+                actionId: selectedActionId,
+                onEditorReadyChange: setIsEditorReady
               }
             )
           ] })
@@ -94237,6 +94718,7 @@ var ENGAGE_STEPS = /* @__PURE__ */ ((ENGAGE_STEPS2) => {
   ENGAGE_STEPS2["BUSINESS"] = "business";
   ENGAGE_STEPS2["EMAIL"] = "email";
   ENGAGE_STEPS2["SMS"] = "sms";
+  ENGAGE_STEPS2["MERGE_FIELDS"] = "merge-fields";
   ENGAGE_STEPS2["SPLASH"] = "splash";
   ENGAGE_STEPS2["BUSINESS_SKIP_INTERSTITIAL"] = "business-skip-interstitial";
   ENGAGE_STEPS2["SMS_INTERSTITIAL"] = "sms-interstitial";
@@ -94254,6 +94736,7 @@ const ENGAGE_STRINGS = {
   BUSINESS_INFORMATION_TITLE: "Business Information",
   EMAIL_CHANNEL_TITLE: "Email Channel",
   SMS_CHANNEL_TITLE: "SMS Channel",
+  MERGE_FIELDS_TITLE: "Merge Fields",
   // Step titles - Onboarding mode
   BRAND_ONBOARDING_TITLE: "Customize Your Brand",
   BUSINESS_ONBOARDING_TITLE: "Business Settings",
@@ -94292,7 +94775,11 @@ const SHARED_STEP_CONFIGS = {
   [
     "sms"
     /* SMS */
-  ]: { label: ENGAGE_STRINGS.SMS_CHANNEL_TITLE }
+  ]: { label: ENGAGE_STRINGS.SMS_CHANNEL_TITLE },
+  [
+    "merge-fields"
+    /* MERGE_FIELDS */
+  ]: { label: ENGAGE_STRINGS.MERGE_FIELDS_TITLE }
 };
 const SETTINGS_STEP_CONFIGS = [
   {
@@ -94322,6 +94809,13 @@ const SETTINGS_STEP_CONFIGS = [
       "sms"
       /* SMS */
     ].label
+  },
+  {
+    key: "merge-fields",
+    label: SHARED_STEP_CONFIGS[
+      "merge-fields"
+      /* MERGE_FIELDS */
+    ].label
   }
 ];
 const ONBOARDING_STEP_CONFIGS = [
@@ -94353,6 +94847,13 @@ const ONBOARDING_STEP_CONFIGS = [
       /* SMS */
     ].label
   },
+  {
+    key: "merge-fields",
+    label: SHARED_STEP_CONFIGS[
+      "merge-fields"
+      /* MERGE_FIELDS */
+    ].label
+  },
   {
     key: "completion",
     label: ENGAGE_STRINGS.COMPLETION_TITLE
@@ -94892,6 +95393,20 @@ function extractBase64Data(dataUrl) {
   }
   return parts[1];
 }
+const capitalize = (str) => {
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
+};
+const getMergeFieldsFromUrl = (url, getMergeFields2) => {
+  if (!url || !getMergeFields2) return [];
+  const regex = /\{\{([^}]+)\}\}/g;
+  const matches2 = [...url.matchAll(regex)];
+  return matches2.map((match2) => {
+    const mergeFieldValue = match2[1];
+    const mergeField = getMergeFields2.mergeFields?.flatMap((f2) => f2.entries).find((entry) => entry.value === `{{${mergeFieldValue}}}`);
+    return mergeField ? mergeField.label : mergeFieldValue;
+  }).filter(Boolean);
+};
 const convertToHtml = (text2, mergeFields, variant) => {
   if (!text2) return "";
   const regex = /\{\{.*?\}\}/g;
@@ -94955,13 +95470,28 @@ const SMSPreview = ({ body, imageUrls }) => {
   const { getMergeFields: getMergeFields2, isGetting } = useGetMergeFields(
     communicationGroup?.id ?? void 0
   );
+  const hasMergeFieldsInUrl = React__default.useCallback((url) => {
+    return /\{\{[^}]+\}\}/.test(url);
+  }, []);
   if (isGetting || getMergeFields2 === void 0) {
     return null;
   }
   return /* @__PURE__ */ jsx("div", { className: "sms-preview-outer @container", children: /* @__PURE__ */ jsxs("div", { className: "sms-phone-mockup", children: [
     /* @__PURE__ */ jsx("div", { className: "sms-phone-notch" }),
     /* @__PURE__ */ jsxs("div", { className: "sms-phone-inner", children: [
-      imageUrls && imageUrls.length > 0 && imageUrls.map((url, idx) => /* @__PURE__ */ jsx("div", { className: "sms-message-row", children: /* @__PURE__ */ jsx("div", { className: "sms-message-bubble", children: /* @__PURE__ */ jsx(
+      imageUrls && imageUrls.length > 0 && imageUrls.map((url, idx) => /* @__PURE__ */ jsx("div", { className: "sms-message-row", children: /* @__PURE__ */ jsx("div", { className: "sms-message-bubble", children: hasMergeFieldsInUrl(url) ? /* @__PURE__ */ jsx("div", { className: "sms-message-image-placeholder", children: /* @__PURE__ */ jsxs("div", { className: "text-center text-white text-[10px] leading-tight", children: [
+        /* @__PURE__ */ jsx("div", { className: "font-medium mb-1", children: "Image will be populated at send time based on the following merge fields:" }),
+        /* @__PURE__ */ jsx("div", { className: "flex flex-wrap gap-1 justify-center", children: getMergeFieldsFromUrl(url, getMergeFields2).map(
+          (fieldName, fieldIndex) => /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: "inline-flex items-center px-1 py-0.5 rounded text-[10px] bg-green-500/30 text-white font-medium border border-green-400/40",
+              children: fieldName
+            },
+            fieldIndex
+          )
+        ) })
+      ] }) }) : /* @__PURE__ */ jsx(
         "img",
         {
           src: url,
@@ -97321,9 +97851,16 @@ const SMSEditor = ({
   initialImageUrls,
   imageBase64,
   isUpdating,
-  hasUnsavedChanges
+  hasUnsavedChanges,
+  communicationGroupId
 }) => {
   const [characterCount, setCharacterCount] = useState(0);
+  const [isAddImagePopoverOpen, setIsAddImagePopoverOpen] = useState(false);
+  const [isUrlDialogOpen, setIsUrlDialogOpen] = useState(false);
+  const [imageUrl, setImageUrl] = useState("");
+  const [isSavingUrl, setIsSavingUrl] = useState(false);
+  const { updateCommunicationGroup: updateCommunicationGroup2 } = useUpdateCommunicationGroup();
+  const { toast: toast2 } = useToast();
   const allMergeFields = useMemo(
     () => mergeFieldsResponse?.mergeFields?.flatMap((f2) => f2.entries) ?? [],
     [mergeFieldsResponse]
@@ -97398,6 +97935,43 @@ const SMSEditor = ({
     characterCount,
     maxLength
   );
+  const handleAddImageFromFile = useCallback(() => {
+    setIsAddImagePopoverOpen(false);
+    onAddImage?.();
+  }, [onAddImage]);
+  const handleAddImageFromUrl = useCallback(() => {
+    setIsAddImagePopoverOpen(false);
+    setIsUrlDialogOpen(true);
+  }, []);
+  const handleUrlSubmit = useCallback(async () => {
+    if (!imageUrl.trim() || !communicationGroupId) {
+      return;
+    }
+    setIsSavingUrl(true);
+    try {
+      await updateCommunicationGroup2({
+        groupId: communicationGroupId,
+        params: {
+          textMessageMediaUrls: [imageUrl.trim()]
+        }
+      });
+      setImageUrl("");
+      setIsUrlDialogOpen(false);
+      toast2({
+        title: "Image URL added",
+        description: "The image URL has been added to your SMS message."
+      });
+    } catch (error2) {
+      console.error("Failed to save image URL:", error2);
+      toast2({
+        title: "Failed to add image URL",
+        description: "Please try again.",
+        variant: "destructive"
+      });
+    } finally {
+      setIsSavingUrl(false);
+    }
+  }, [imageUrl, communicationGroupId, updateCommunicationGroup2, toast2]);
   if (!editor) {
     return /* @__PURE__ */ jsx("div", { children: "Loading editor..." });
   }
@@ -97413,15 +97987,98 @@ const SMSEditor = ({
             disabled: isRemovingImage || isUpdatingCommunicationGroup,
             children: "Remove Image"
           }
-        ) : /* @__PURE__ */ jsx(
-          Button$1,
+        ) : /* @__PURE__ */ jsxs(
+          Popover,
           {
-            variant: "outline",
-            onClick: onAddImage,
-            disabled: (initialImageUrls?.length || 0) >= 1 || isRemovingImage || imageBase64 !== null || isUpdatingCommunicationGroup,
-            children: "Add Image"
+            modal: true,
+            open: isAddImagePopoverOpen,
+            onOpenChange: setIsAddImagePopoverOpen,
+            children: [
+              /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
+                Button$1,
+                {
+                  variant: "outline",
+                  disabled: (initialImageUrls?.length || 0) >= 1 || isRemovingImage || imageBase64 !== null || isUpdatingCommunicationGroup,
+                  className: "flex items-center gap-2",
+                  children: [
+                    "Add Image",
+                    /* @__PURE__ */ jsx(ChevronDown, { className: "h-3 w-3" })
+                  ]
+                }
+              ) }),
+              /* @__PURE__ */ jsx(PopoverContent, { className: "w-56 p-3 z-[100]", align: "start", children: /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
+                /* @__PURE__ */ jsxs(
+                  Button$1,
+                  {
+                    variant: "ghost",
+                    size: "sm",
+                    onClick: handleAddImageFromFile,
+                    className: "w-full justify-start gap-2 h-9",
+                    children: [
+                      /* @__PURE__ */ jsx(Upload, { className: "h-4 w-4" }),
+                      "Upload from file"
+                    ]
+                  }
+                ),
+                /* @__PURE__ */ jsxs(
+                  Button$1,
+                  {
+                    variant: "ghost",
+                    size: "sm",
+                    onClick: handleAddImageFromUrl,
+                    className: "w-full justify-start gap-2 h-9",
+                    children: [
+                      /* @__PURE__ */ jsx(Link$1, { className: "h-4 w-4" }),
+                      "Add from URL"
+                    ]
+                  }
+                ),
+                /* @__PURE__ */ jsx("div", { className: "text-xs text-muted-foreground pt-1 border-t", children: "Maximum file size: 5MB. We will try to compress the image if possible." })
+              ] }) })
+            ]
           }
         ),
+        /* @__PURE__ */ jsx(Dialog, { open: isUrlDialogOpen, onOpenChange: setIsUrlDialogOpen, children: /* @__PURE__ */ jsxs(DialogContent, { className: "sm:max-w-md", children: [
+          /* @__PURE__ */ jsxs(DialogHeader, { children: [
+            /* @__PURE__ */ jsx(DialogTitle, { children: "Add Image from URL" }),
+            /* @__PURE__ */ jsxs(DialogDescription, { children: [
+              "Enter the URL of the image you want to add to your SMS message. You can use merge fields to make the URL dynamic (e.g., https://example.com/images/{{customer_name}}.jpg).",
+              /* @__PURE__ */ jsx("br", {}),
+              /* @__PURE__ */ jsx("br", {}),
+              /* @__PURE__ */ jsx("span", { className: "text-sm text-muted-foreground", children: "Maximum file size: 5MB. We will try to compress the image if possible." })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
+            /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
+              /* @__PURE__ */ jsx(Label$1, { htmlFor: "image-url", children: "Image URL" }),
+              /* @__PURE__ */ jsx(
+                RichTextInputWithMergeFields,
+                {
+                  value: imageUrl,
+                  onChange: setImageUrl,
+                  mergeFieldsResponse,
+                  placeholder: "https://example.com/image.jpg",
+                  className: "bg-background hover:bg-accent/50 focus:bg-accent transition-colors placeholder:text-muted-foreground/50",
+                  ariaLabel: "Insert merge field into image URL"
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
+              /* @__PURE__ */ jsx(
+                Button$1,
+                {
+                  variant: "outline",
+                  onClick: () => {
+                    setImageUrl("");
+                    setIsUrlDialogOpen(false);
+                  },
+                  children: "Cancel"
+                }
+              ),
+              /* @__PURE__ */ jsx(Button$1, { onClick: handleUrlSubmit, disabled: isSavingUrl, children: isSavingUrl ? "Adding..." : "Add Image" })
+            ] })
+          ] })
+        ] }) }),
         /* @__PURE__ */ jsx(
           MultiSelectDialog,
           {
@@ -97430,7 +98087,7 @@ const SMSEditor = ({
             setSelectedValues: () => {
             },
             onValueChange: handleMergeFieldInsert,
-            placeholder: "Add merge field",
+            placeholder: `Add ${t$2("engage:merge_field")}`,
             title: "Merge Fields",
             searchPlaceholder: "Search merge fields...",
             emptyMessage: "No merge fields found",
@@ -97693,6 +98350,9 @@ const SMSEditorContent = ({
   const { toast: toast2 } = useToast();
   const { updateCommunicationGroup: updateCommunicationGroup2, isUpdating: isUpdatingCommunicationGroup } = useUpdateCommunicationGroup();
   const { getMergeFields: getMergeFields2 } = useGetMergeFields(communicationGroupId);
+  const hasMergeFieldsInUrl = useCallback((url) => {
+    return /\{\{[^}]+\}\}/.test(url);
+  }, []);
   const [editingMessage, setEditingMessage] = useState(initialMessage);
   const [imagePreview, setImagePreview] = useState(
     initialImageUrls.length > 0 ? initialImageUrls[0] : null
@@ -97709,6 +98369,7 @@ const SMSEditorContent = ({
   const lastSavedStateRef = useRef({
     message: initialMessage
   });
+  const { communicationGroup } = useGetCommunicationGroup(communicationGroupId);
   const debouncedMessage = useDebounce(editingMessage, 1e3);
   const autoSave = useCallback(async () => {
     if (isInitialMountRef.current) {
@@ -97826,6 +98487,16 @@ const SMSEditorContent = ({
       if (fileInputRef.current) {
         fileInputRef.current.value = "";
       }
+      const MAX_FILE_SIZE = 20 * 1024 * 1024;
+      if (file.size > MAX_FILE_SIZE) {
+        console.log("File too large", file.size, MAX_FILE_SIZE);
+        toast2({
+          title: "File too large",
+          description: `Image must be 5MB or smaller. Your file is ${(file.size / (1024 * 1024)).toFixed(1)}MB.`,
+          variant: "destructive"
+        });
+        return;
+      }
       setIsUploadingImage(true);
       try {
         const reader = new FileReader();
@@ -97833,19 +98504,40 @@ const SMSEditorContent = ({
           try {
             const pngDataUrl = await convertToPng(reader.result);
             const base64String = extractBase64Data(pngDataUrl);
-            await updateCommunicationGroup2({
-              groupId: communicationGroupId,
-              params: {
-                textMessageMedia: [base64String]
+            updateCommunicationGroup2(
+              {
+                groupId: communicationGroupId,
+                params: {
+                  textMessageMedia: [base64String]
+                }
+              },
+              {
+                onSuccess: () => {
+                  setImageBase64(base64String);
+                  setImagePreview(pngDataUrl);
+                  setIsRemovingImage(false);
+                  toast2({
+                    title: "Image uploaded",
+                    description: "The image has been added to your SMS"
+                  });
+                },
+                onError: (data) => {
+                  if (data.message.includes("Image is still too large")) {
+                    toast2({
+                      title: "Image too large",
+                      description: "The image is too large. Please try again with a smaller image.",
+                      variant: "destructive"
+                    });
+                  } else {
+                    toast2({
+                      title: "Error uploading image",
+                      description: "Failed to process or upload the image",
+                      variant: "destructive"
+                    });
+                  }
+                }
               }
-            });
-            setImageBase64(base64String);
-            setImagePreview(pngDataUrl);
-            setIsRemovingImage(false);
-            toast2({
-              title: "Image uploaded",
-              description: "The image has been added to your SMS"
-            });
+            );
           } catch (error2) {
             console.error("Failed to convert or upload image:", error2);
             toast2({
@@ -97877,6 +98569,22 @@ const SMSEditorContent = ({
     return /* @__PURE__ */ jsx("div", { className: "flex justify-center items-center p-8", children: /* @__PURE__ */ jsx("div", { className: "text-sm text-muted-foreground", children: "Loading editor..." }) });
   }
   return /* @__PURE__ */ jsxs("div", { className: cn$2("w-full @container", className), children: [
+    !communicationGroup?.smsChannelSenderId && /* @__PURE__ */ jsx("div", { className: "mb-6 p-4 bg-amber-50 border border-amber-200 rounded-lg", children: /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-3", children: [
+      /* @__PURE__ */ jsx(
+        InfoTooltip,
+        {
+          title: "SMS Sender Required",
+          description: "You need to select an SMS sender before you can send SMS messages. Click 'Edit Sender & Company' above to configure your SMS sender.",
+          alertText: "Action Required",
+          size: "medium",
+          iconColor: "text-amber-500"
+        }
+      ),
+      /* @__PURE__ */ jsxs("div", { className: "flex-1", children: [
+        /* @__PURE__ */ jsx("h3", { className: "text-sm font-medium text-amber-800 mb-1", children: "SMS Sender Not Selected" }),
+        /* @__PURE__ */ jsx("p", { className: "text-sm text-amber-700", children: 'Please select an SMS sender to enable SMS messaging. Click the "Edit Sender & Company" button to configure your sender.' })
+      ] })
+    ] }) }),
     /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between mb-6", children: /* @__PURE__ */ jsx(
       MemoizedSMSSenderAndCompanyEditor$1,
       {
@@ -97887,7 +98595,20 @@ const SMSEditorContent = ({
     ) }),
     /* @__PURE__ */ jsxs("div", { className: "flex flex-col lg:flex-row gap-6 h-full", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex-1 min-w-0", children: [
-        imagePreview && /* @__PURE__ */ jsx("div", { className: "flex justify-center mb-6", children: /* @__PURE__ */ jsx("div", { className: "relative group w-fit", children: /* @__PURE__ */ jsx(
+        imagePreview && /* @__PURE__ */ jsx("div", { className: "flex justify-center mb-6", children: /* @__PURE__ */ jsx("div", { className: "relative group w-fit", children: hasMergeFieldsInUrl(imagePreview) ? /* @__PURE__ */ jsx("div", { className: "max-h-48 max-w-xs rounded-xl shadow-lg border border-gray-200 bg-gray-50 p-4 flex items-center justify-center", children: /* @__PURE__ */ jsxs("div", { className: "text-center", children: [
+          /* @__PURE__ */ jsx("div", { className: "text-sm font-medium text-gray-700 mb-2", children: "Image will be populated at send time based on the following merge fields:" }),
+          /* @__PURE__ */ jsx("div", { className: "flex flex-wrap gap-1 justify-center", children: getMergeFieldsFromUrl(
+            imagePreview,
+            getMergeFields2
+          ).map((fieldName, index2) => /* @__PURE__ */ jsx(
+            "span",
+            {
+              className: "inline-flex items-center px-2 py-1 rounded text-xs bg-blue-100 text-blue-800 font-medium border border-blue-200",
+              children: fieldName
+            },
+            index2
+          )) })
+        ] }) }) : /* @__PURE__ */ jsx(
           "img",
           {
             src: imagePreview,
@@ -97923,7 +98644,8 @@ const SMSEditorContent = ({
             initialImageUrls,
             imageBase64,
             isUpdating: isUpdatingCommunicationGroup || isUploadingImage,
-            hasUnsavedChanges
+            hasUnsavedChanges,
+            communicationGroupId
           }
         )
       ] }),
@@ -99817,6 +100539,7 @@ const AutomationEditorEmailPreview = ({
   const [showHelpDialog, setShowHelpDialog] = useState(null);
   const [saveClicked, setSaveClicked] = useState(false);
   const [cancelClicked, setCancelClicked] = useState(false);
+  const [isEditorReady, setIsEditorReady] = useState(false);
   const [stripoDialogDimensions, setStripoDialogDimensions] = useState({
     width: 0,
     height: 0
@@ -99959,6 +100682,7 @@ const AutomationEditorEmailPreview = ({
                   Button$1,
                   {
                     onClick: () => setSaveClicked(true),
+                    disabled: !isEditorReady,
                     className: "text-sm px-3 py-1 rounded",
                     children: "Save"
                   }
@@ -99977,7 +100701,8 @@ const AutomationEditorEmailPreview = ({
                 setSaveClicked,
                 stripoDialogDimensions,
                 mergeFieldsResponse: getMergeFields2,
-                actionId: selectedActionId
+                actionId: selectedActionId,
+                onEditorReadyChange: setIsEditorReady
               }
             )
           ] })
@@ -100078,12 +100803,6 @@ const SMSDetailField = ({ label: label2, value, className }) => /* @__PURE__ */
   ] }),
   /* @__PURE__ */ jsx("span", { className: cn$2("truncate", className), children: value })
 ] });
-const MemoizedTriggerButton = React__default.memo(
-  React__default.forwardRef((props2, ref) => /* @__PURE__ */ jsxs(Button$1, { size: "sm", variant: "outline", ref, ...props2, children: [
-    /* @__PURE__ */ jsx(IconDefinitions.EditIcon, { className: "w-3 h-3" }),
-    "Edit"
-  ] }))
-);
 const MemoizedSMSSenderAndCompanyEditor = React__default.memo(
   ({
     trigger,
@@ -100102,7 +100821,7 @@ const MemoizedSMSSenderAndCompanyEditor = React__default.memo(
     );
   }
 );
-const SMSDetailsPreview = ({ disableEditContent }) => {
+const SMSDetailsPreview = ({ disableEditContent, mergeFieldsResponse }) => {
   const automation2 = useAutomation();
   const communicationGroup = useCommunicationGroup();
   const { channelSenders } = useChannelSender();
@@ -100126,6 +100845,22 @@ const SMSDetailsPreview = ({ disableEditContent }) => {
     return null;
   }
   const messagePreview = messageBody ? messageBody.length > 50 ? messageBody.substring(0, 50) + "..." : messageBody : null;
+  const MemoizedTriggerButton = React__default.memo(
+    React__default.forwardRef((props2, ref) => /* @__PURE__ */ jsxs(
+      Button$1,
+      {
+        size: "sm",
+        variant: "outline",
+        ref,
+        ...props2,
+        disabled: automation2?.status !== AutomationStatus.DRAFT,
+        children: [
+          /* @__PURE__ */ jsx(IconDefinitions.EditIcon, { className: "w-3 h-3" }),
+          "Edit"
+        ]
+      }
+    ))
+  );
   return /* @__PURE__ */ jsx("div", { className: "w-full bg-background rounded-lg p-3", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 overflow-hidden flex-1", children: [
       fromPhone && /* @__PURE__ */ jsx(
@@ -100148,7 +100883,15 @@ const SMSDetailsPreview = ({ disableEditContent }) => {
         SMSDetailField,
         {
           label: "Message",
-          value: messagePreview,
+          value: /* @__PURE__ */ jsx(
+            MergeFieldRenderer,
+            {
+              content: messagePreview,
+              mergeFieldsResponse,
+              variant: "minimal",
+              className: "text-muted-foreground/50 italic"
+            }
+          ),
           className: "text-muted-foreground/50 italic"
         }
       )
@@ -100191,6 +100934,9 @@ const AutomationEditorSMSPreview = ({
     [communicationGroup?.textMessageMediaUrls]
   );
   const smsBody = communicationGroup?.smsMessageBody || "";
+  const { getMergeFields: getMergeFields2 } = useGetMergeFields(
+    communicationGroup?.id ?? void 0
+  );
   const hasAnySMSsenders = smsChannelSenders.length > 0;
   useEffect(() => {
     if (hasProcessedInitialSetupRef.current) {
@@ -100341,7 +101087,8 @@ const AutomationEditorSMSPreview = ({
           /* @__PURE__ */ jsx("div", { className: "w-full flex-shrink-0 max-w-2xl mx-auto rounded-md", children: /* @__PURE__ */ jsx(
             SMSDetailsPreview,
             {
-              disableEditContent
+              disableEditContent,
+              mergeFieldsResponse: getMergeFields2
             }
           ) }),
           /* @__PURE__ */ jsxs("div", { className: "rounded-lg bg-background flex-1 min-h-0 flex flex-col items-center max-w-2xl mx-auto w-full", children: [
@@ -104355,6 +105102,15 @@ const AutomationSelectTimeMain = ({ title: title2 = "Edit Schedule Time" }) => {
 const Schedule = () => {
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(AutomationSelectTimeMain, { title: "Set Schedule Time" }) });
 };
+var AutomationAudienceSelectorType = /* @__PURE__ */ ((AutomationAudienceSelectorType2) => {
+  AutomationAudienceSelectorType2["ALL"] = "all";
+  AutomationAudienceSelectorType2["SEGMENTS"] = "segments";
+  AutomationAudienceSelectorType2["INDIVIDUAL"] = "individual";
+  return AutomationAudienceSelectorType2;
+})(AutomationAudienceSelectorType || {});
+const generateOneOffSegmentName = (automationId) => {
+  return `ONE-OFF-SEGMENT-${automationId}`;
+};
 var DateUnit = /* @__PURE__ */ ((DateUnit2) => {
   DateUnit2["DAYS"] = "days";
   return DateUnit2;
@@ -104422,7 +105178,7 @@ const operatorToHumanReadable = (operator, type) => {
       return "Less than";
     }
     case ConditionOperatorEnumType.EXISTS:
-      return "Exists";
+      return "Is Known";
     case ConditionOperatorEnumType.EQUALS_MONTH_DAY:
       return "Month and Day Matches";
     case ConditionOperatorEnumType.EQUALS_MONTH_DAY_YEAR:
@@ -105410,6 +106166,39 @@ const ConditionRow = ({
     ] })
   ] });
 };
+const BetaTag = React.forwardRef(
+  ({
+    children = "BETA",
+    size: size2 = "default",
+    animated = false,
+    className,
+    ...props2
+  }, ref) => {
+    const sizeClasses = {
+      sm: "px-1.5 py-0.5 text-[10px]",
+      default: "px-2 py-0.5 text-xs",
+      lg: "px-2.5 py-1 text-sm"
+    };
+    return /* @__PURE__ */ jsx(
+      "span",
+      {
+        ref,
+        className: cn$2(
+          "inline-flex items-center justify-center rounded-full font-medium leading-none",
+          "bg-gray-100 text-gray-600 border border-gray-200",
+          "dark:bg-gray-800 dark:text-gray-300 dark:border-gray-700",
+          "relative select-none",
+          sizeClasses[size2],
+          animated && "animate-pulse",
+          className
+        ),
+        ...props2,
+        children
+      }
+    );
+  }
+);
+BetaTag.displayName = "BetaTag";
 const PromptBuilderStyle = ({ onSelectStyle }) => {
   const [selectedStyle, setSelectedStyle] = useState(
     null
@@ -105422,7 +106211,10 @@ const PromptBuilderStyle = ({ onSelectStyle }) => {
           setSelectedStyle("ai");
           onSelectStyle("ai");
         },
-        title: "Build with AI",
+        title: /* @__PURE__ */ jsxs("div", { className: "inline-flex items-center gap-2", children: [
+          /* @__PURE__ */ jsx("span", { children: "Build with AI" }),
+          /* @__PURE__ */ jsx(BetaTag, { size: "sm" })
+        ] }),
         subtitle: "Describe your audience in plain language and let AI create the conditions",
         icon: /* @__PURE__ */ jsx("div", { className: "h-12 w-12 rounded-full bg-primary/10 flex items-center justify-center", children: /* @__PURE__ */ jsx("div", { className: "w-6 h-6 text-[hsl(var(--reach-primary))]", children: /* @__PURE__ */ jsx(Sparkles, { className: "w-full h-full" }) }) }),
         selected: selectedStyle === "ai"
@@ -105502,6 +106294,7 @@ const TextToSegment = ({ setTextToSegment, setSegment }) => {
   const [userInput, setUserInput] = React__default.useState("");
   const [isLoading, setIsLoading] = React__default.useState(false);
   const { toast: toast2 } = useToast();
+  const { sendNotificationAsync } = useSlackNotification();
   const getSegment2 = async () => {
     if (!userInput) {
       toast2({
@@ -105513,9 +106306,14 @@ const TextToSegment = ({ setTextToSegment, setSegment }) => {
     }
     setIsLoading(true);
     const response = await textToSegment({
-      userInput,
+      text: userInput,
       userCustomVerb: t$2("engage:user")
     });
+    sendNotificationAsync({
+      message: "💬 New AI Segment requested",
+      product: "engage",
+      details: { userInput, response }
+    });
     if (response.success && response.conditions) {
       toast2({
         title: `${t$2("engage:segment")} conditions built successfully 🚀`,
@@ -106082,9 +106880,14 @@ const TotalExplanationTooltip = () => {
   return /* @__PURE__ */ jsx(
     InfoTooltip,
     {
-      title: `These are estimated numbers of ${t$2("engage:user", {
+      title: `The total number of ${t$2("engage:user", {
         count: 2
-      }).toLocaleLowerCase()} that are matched. The actual count may change at the time of sending. You can see the breakdown of who have opted into email or sms.`
+      }).toLocaleLowerCase()} may not match your SMS and email counts because some ${t$2(
+        "engage:user",
+        {
+          count: 2
+        }
+      ).toLocaleLowerCase()} may have unsubscribed, invalid contact information, or haven't opted into marketing messages.`
     }
   );
 };
@@ -106095,7 +106898,8 @@ const StatCard$1 = ({
   variant,
   isLoading,
   selected,
-  onClick
+  onClick,
+  tooltip
 }) => {
   const variantStyles = {
     default: "bg-gray-100/50 text-gray-700",
@@ -106114,13 +106918,16 @@ const StatCard$1 = ({
       children: [
         /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1 items-start w-full min-w-0", children: [
           /* @__PURE__ */ jsx("div", { className: "flex items-baseline gap-2 w-full min-w-0 @container/num", children: isLoading ? /* @__PURE__ */ jsx("span", { className: "animate-pulse", children: "..." }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
-            /* @__PURE__ */ jsx(
-              "span",
-              {
-                className: "font-semibold pl-2 break-words max-w-full min-w-0 truncate\n                  text-xl @[250px]/card:text-2xl @[350px]/card:text-3xl @[500px]/card:text-4xl text-primary",
-                children: value.toLocaleString()
-              }
-            ),
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1", children: [
+              /* @__PURE__ */ jsx(
+                "span",
+                {
+                  className: "font-semibold pl-2 break-words max-w-full min-w-0 truncate\n                    text-xl @[250px]/card:text-2xl @[350px]/card:text-3xl @[500px]/card:text-4xl text-primary",
+                  children: value.toLocaleString()
+                }
+              ),
+              tooltip && /* @__PURE__ */ jsx(InfoTooltip, { title: tooltip })
+            ] }),
             percentage2 !== void 0 && value.toLocaleString().replace(/,/g, "").length < 5 && /* @__PURE__ */ jsxs("span", { className: "text-muted-foreground/50 text-sm hidden @[120px]/num:inline", children: [
               "(",
               percentage2,
@@ -106153,11 +106960,28 @@ const EstimatedMatchesView = ({ countResponse, selectedFilter = "all", onFilterC
     );
   }, [countResponse]);
   const calculatePercentage = (value) => Math.round(value / (stats.total || 1) * 100);
+  const showReassuranceBanner = stats.total > Math.max(stats.emails, stats.phones);
   return /* @__PURE__ */ jsxs(Fragment$1, { children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
       /* @__PURE__ */ jsx(MinorText, { children: "Estimated Matches" }),
       /* @__PURE__ */ jsx(TotalExplanationTooltip, {})
     ] }),
+    showReassuranceBanner && /* @__PURE__ */ jsx("div", { className: "mt-2 p-3 bg-secondary/50 border border-border rounded-lg", children: /* @__PURE__ */ jsxs("p", { className: "text-xs text-muted-foreground", children: [
+      /* @__PURE__ */ jsx("span", { className: "font-medium", children: "Total vs. Subscribed mismatch?" }),
+      " ",
+      "Some ",
+      t$2("engage:user", { count: 2 }).toLowerCase(),
+      " may have unsubscribed or had hard bounces.",
+      /* @__PURE__ */ jsx(
+        InfoTooltip,
+        {
+          description: "This can happen when customers unsubscribe, emails bounces, or contact info is missing. This is normal and expected.",
+          size: "small",
+          iconColor: "text-muted-foreground",
+          children: /* @__PURE__ */ jsx("span", { className: "underline cursor-help", children: "Learn more" })
+        }
+      )
+    ] }) }),
     /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 md:grid-cols-3 md:mb-6 w-full gap-4 mt-3 px-1", children: [
       /* @__PURE__ */ jsx(
         StatCard$1,
@@ -106167,7 +106991,15 @@ const EstimatedMatchesView = ({ countResponse, selectedFilter = "all", onFilterC
           variant: "default",
           isLoading: countResponse === void 0,
           selected: selectedFilter === "all",
-          onClick: onFilterChange ? () => onFilterChange("all") : void 0
+          onClick: onFilterChange ? () => onFilterChange("all") : void 0,
+          tooltip: `Total includes all ${t$2("engage:user", {
+            count: 2
+          }).toLocaleLowerCase()} in your system. This does not factor in ${t$2(
+            "engage:user",
+            {
+              count: 2
+            }
+          ).toLocaleLowerCase()} who might have opted out of email or sms.`
         }
       ),
       /* @__PURE__ */ jsx(
@@ -106197,7 +107029,7 @@ const EstimatedMatchesView = ({ countResponse, selectedFilter = "all", onFilterC
     ] })
   ] });
 };
-const getDisplayName = (recipient) => {
+const getDisplayName$1 = (recipient) => {
   const fullName = `${recipient.firstName || ""} ${recipient.lastName || ""}`.trim();
   if (fullName) return fullName;
   if (recipient.firstName) return recipient.firstName;
@@ -106206,7 +107038,7 @@ const getDisplayName = (recipient) => {
   if (recipient.phone) return recipient.phone;
   return `Unnamed ${t$2("engage:user")}`;
 };
-const RecipientsTable = ({ recipients, filter: filter2 = "all" }) => {
+const RecipientsTable = ({ recipients, filter: filter2 = "all", audienceMode }) => {
   const filteredRecipients = recipients?.filter((recipient) => {
     const hasEmail = !!recipient.email;
     const hasPhone = !!recipient.phone;
@@ -106221,14 +107053,45 @@ const RecipientsTable = ({ recipients, filter: filter2 = "all" }) => {
         return true;
     }
   });
-  if (!filteredRecipients?.length) return null;
+  if (!filteredRecipients?.length) {
+    return /* @__PURE__ */ jsx("div", { className: "bg-foreground/5 rounded-lg h-full relative overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "absolute inset-0 w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsx("div", { className: "text-center max-w-sm", children: /* @__PURE__ */ jsxs("div", { className: "text-gray-400 text-sm mb-2", children: [
+      filter2 === "email" && "No recipients with email addresses",
+      filter2 === "phone" && "No recipients with phone numbers",
+      filter2 === "all" && (audienceMode === "segments" ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+        /* @__PURE__ */ jsxs("div", { className: "text-gray-500 font-medium mb-1", children: [
+          "No ",
+          t$2("engage:segment").toLowerCase(),
+          " selected"
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: "text-gray-400 text-xs", children: [
+          "Select one or more",
+          " ",
+          t$2("engage:segment", { count: 2 }).toLowerCase(),
+          " from the list above to see your recipients"
+        ] })
+      ] }) : audienceMode === "individual" ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+        /* @__PURE__ */ jsxs("div", { className: "text-gray-500 font-medium mb-1", children: [
+          "No individual",
+          " ",
+          t$2("engage:user", { count: 2 }).toLowerCase(),
+          " selected"
+        ] }),
+        /* @__PURE__ */ jsxs("div", { className: "text-gray-400 text-xs", children: [
+          "Choose specific",
+          " ",
+          t$2("engage:user", { count: 2 }).toLowerCase(),
+          "from the dropdown above to see your recipients"
+        ] })
+      ] }) : "No recipients found")
+    ] }) }) }) });
+  }
   return /* @__PURE__ */ jsx("div", { className: "bg-foreground/5 rounded-lg h-full relative overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "absolute inset-0 w-full h-full overflow-y-auto", children: /* @__PURE__ */ jsxs("table", { className: "w-full", children: [
     /* @__PURE__ */ jsx("thead", { className: "sticky top-0 bg-foreground/5 backdrop-blur-sm", children: /* @__PURE__ */ jsxs("tr", { children: [
       /* @__PURE__ */ jsx("th", { className: "px-3 sm:px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wide", children: "Name" }),
       /* @__PURE__ */ jsx("th", { className: "px-3 sm:px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wide", children: "Contact" })
     ] }) }),
     /* @__PURE__ */ jsx("tbody", { className: "divide-y divide-gray-200/50", children: filteredRecipients.map((recipient, index2) => /* @__PURE__ */ jsxs("tr", { className: "hover:bg-white/50 transition-colors", children: [
-      /* @__PURE__ */ jsx("td", { className: "px-3 sm:px-4 py-3 text-sm text-gray-900", children: getDisplayName(recipient) }),
+      /* @__PURE__ */ jsx("td", { className: "px-3 sm:px-4 py-3 text-sm text-gray-900", children: getDisplayName$1(recipient) }),
       /* @__PURE__ */ jsx("td", { className: "px-3 sm:px-4 py-3", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-wrap gap-1.5 sm:gap-2", children: [
         recipient.email && /* @__PURE__ */ jsx("span", { className: "px-2 sm:px-2.5 py-1 text-xs font-medium bg-blue-100/50 text-blue-700 rounded-lg", children: "Email" }),
         recipient.phone && /* @__PURE__ */ jsx("span", { className: "px-2 sm:px-2.5 py-1 text-xs font-medium bg-green-100/50 text-green-700 rounded-lg", children: "Phone" })
@@ -106236,7 +107099,11 @@ const RecipientsTable = ({ recipients, filter: filter2 = "all" }) => {
     ] }, index2)) })
   ] }) }) });
 };
-const AllOrSelectSegmentPicker = ({ onSelectionChange, defaultValue = "all", canEditAudience = true }) => {
+const AllOrSelectSegmentPicker = ({
+  onSelectionChange,
+  defaultValue = AutomationAudienceSelectorType.ALL,
+  canEditAudience = true
+}) => {
   const [selected, setSelected] = useState(defaultValue);
   const handleSelect = (value) => {
     if (!canEditAudience) return;
@@ -106248,32 +107115,124 @@ const AllOrSelectSegmentPicker = ({ onSelectionChange, defaultValue = "all", can
       /* @__PURE__ */ jsx(MinorText, { children: "Filter" }),
       !canEditAudience && /* @__PURE__ */ jsx(InfoTooltip, { title: "You cannot edit the audience unless you are in draft mode" })
     ] }),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4 p-1", children: [
+    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-3 gap-4 p-1", children: [
       /* @__PURE__ */ jsx(
         BigSelector,
         {
-          onClick: () => handleSelect("all"),
+          onClick: () => handleSelect(AutomationAudienceSelectorType.ALL),
           title: `All ${t$2("engage:user", { count: 2 })}`,
           subtitle: "Send to everyone",
           icon: /* @__PURE__ */ jsx(IconDefinitions.UsersIcon, { className: "w-5 h-5 mb-2 text-gray-600" }),
           selected: selected === "all",
-          disabled: !canEditAudience
+          disabled: !canEditAudience,
+          hideSelectedText: true
         }
       ),
       /* @__PURE__ */ jsx(
         BigSelector,
         {
-          onClick: () => handleSelect("segments"),
-          title: `Select ${t$2("engage:user", { count: 2 })}`,
+          onClick: () => handleSelect(AutomationAudienceSelectorType.SEGMENTS),
+          title: `Select ${t$2("engage:segment", { count: 2 })}`,
           subtitle: `Choose from ${t$2("engage:segment", { count: 2 })}`,
           icon: /* @__PURE__ */ jsx(IconDefinitions.UserEdit, { className: "w-5 h-5 mb-2 text-gray-600" }),
           selected: selected === "segments",
-          disabled: !canEditAudience
+          disabled: !canEditAudience,
+          hideSelectedText: true
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        BigSelector,
+        {
+          onClick: () => handleSelect(AutomationAudienceSelectorType.INDIVIDUAL),
+          title: "Select Individual",
+          subtitle: `Pick ${t$2("engage:user", { count: 2 }).toLowerCase()} one by one`,
+          icon: /* @__PURE__ */ jsx(IconDefinitions.UserIcon, { className: "w-5 h-5 mb-2 text-gray-600" }),
+          selected: selected === "individual",
+          disabled: !canEditAudience,
+          hideSelectedText: true
         }
       )
     ] })
   ] });
 };
+const getDisplayName = (recipient) => {
+  const fullName = `${recipient.firstName || ""} ${recipient.lastName || ""}`.trim();
+  if (fullName) return fullName;
+  if (recipient.firstName) return recipient.firstName;
+  if (recipient.lastName) return recipient.lastName;
+  if (recipient.email) return recipient.email;
+  if (recipient.phone) return recipient.phone;
+  return `Unnamed User`;
+};
+const SelectIndividualUsersContent = ({ selectedUserIds, onUserSelectionChange, canEditAudience = true }) => {
+  const [tempSelectedUserIds, setTempSelectedUserIds] = useState(selectedUserIds);
+  const [allUsersForDropdown, setAllUsersForDropdown] = useState();
+  const { segments } = useListSegments();
+  useEffect(() => {
+    setTempSelectedUserIds(selectedUserIds);
+  }, [selectedUserIds]);
+  useEffect(() => {
+    const fetchAllUsers = async () => {
+      if (!segments) return;
+      const allUsersSegment = segments.find(
+        (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS
+      );
+      if (allUsersSegment) {
+        try {
+          const allUsersResponse = await getCountOfBusinessAutomationRecipients(
+            {
+              includeSegments: [allUsersSegment.id],
+              excludeSegments: []
+            }
+          );
+          setAllUsersForDropdown(allUsersResponse);
+        } catch (error2) {
+          console.error("Error fetching all users for dropdown:", error2);
+        }
+      }
+    };
+    fetchAllUsers();
+  }, [segments]);
+  const userOptions = React__default.useMemo(() => {
+    if (!allUsersForDropdown?.recipients) return [];
+    return allUsersForDropdown.recipients.map((recipient) => ({
+      label: getDisplayName(recipient),
+      value: recipient.externalId
+    }));
+  }, [allUsersForDropdown?.recipients]);
+  const handleUserSelectionChange = (newSelectedUserIds) => {
+    setTempSelectedUserIds(newSelectedUserIds);
+    onUserSelectionChange(newSelectedUserIds);
+  };
+  return /* @__PURE__ */ jsxs("div", { className: "space-y-4", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
+      /* @__PURE__ */ jsxs("div", { children: [
+        /* @__PURE__ */ jsx("h3", { className: "text-sm font-medium text-gray-900", children: "Select Individual Users" }),
+        /* @__PURE__ */ jsx("p", { className: "text-sm text-gray-500", children: "Choose specific users to include in your automation" })
+      ] }),
+      selectedUserIds.length > 0 && /* @__PURE__ */ jsxs("div", { className: "text-sm text-gray-500", children: [
+        selectedUserIds.length,
+        " user",
+        selectedUserIds.length !== 1 ? "s" : "",
+        " selected"
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx(
+      MultiSelectDialog,
+      {
+        options: userOptions,
+        onValueChange: handleUserSelectionChange,
+        selectedValues: tempSelectedUserIds,
+        setSelectedValues: setTempSelectedUserIds,
+        placeholder: "Select users...",
+        title: "Select Individual Users",
+        searchPlaceholder: "Search users...",
+        emptyMessage: "No users found",
+        canOpen: canEditAudience
+      }
+    )
+  ] });
+};
 const SegmentSection = ({
   segments,
   allSegments,
@@ -106304,8 +107263,9 @@ const SegmentSection = ({
       setSelectedValues: setSegmentSelectedIds,
       options,
       onValueChange: handleValueChange,
-      placeholder: "Select segments",
+      placeholder: `Select ${t$2("engage:segment", { count: 2 })}`,
       maxCount: 5,
+      title: `Select ${t$2("engage:segment", { count: 2 })}`,
       extraCommandItems: [
         (closePopup) => /* @__PURE__ */ jsxs(
           CommandItem,
@@ -106399,7 +107359,7 @@ const SelectSegmentsContent = ({
 const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" }) => {
   const automation2 = useAutomation();
   const [selectedAudience, setSelectedAudience] = useState(
-    "all"
+    AutomationAudienceSelectorType.ALL
   );
   const [includedSegments, setIncludedSegments] = useState(
     automation2?.includeSegmentIds || []
@@ -106407,6 +107367,7 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
   const [excludedSegments, setExcludedSegments] = useState(
     automation2?.excludeSegmentIds || []
   );
+  const [selectedIndividualUserIds, setSelectedIndividualUserIds] = useState([]);
   const [openCreateSegmentDialog, setOpenCreateSegmentDialog] = useState(false);
   const [initialStateSet, setInitialStateSet] = useState(false);
   const [selectedFilter, setSelectedFilter] = useState("all");
@@ -106418,35 +107379,58 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
   const allUsersSelected = includedSegments.length === 1 && excludedSegments.length === 0 && segments?.find(
     (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS && segment2.id === includedSegments[0]
   ) !== void 0;
+  const segmentIdToFetch = includedSegments.length === 1 && excludedSegments.length === 0 && !allUsersSelected ? includedSegments[0] : "";
+  const { segment: singleSegment } = useGetSegment(segmentIdToFetch);
+  const oneOffSegmentSelected = singleSegment?.type === BusinessSegmentTypeEnum.ONE_OFF;
   useEffect(() => {
-    if (automation2 && !initialStateSet && isLoading === false) {
-      if (includedSegments.length === 1 && segments.find(
-        (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS && segment2.id === includedSegments[0]
-      ) !== void 0) {
-        setSelectedAudience("all");
-      } else {
-        setSelectedAudience("segments");
+    const initializeState = async () => {
+      if (automation2 && !initialStateSet && isLoading === false) {
+        if (includedSegments.length === 1 && segments.find(
+          (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS && segment2.id === includedSegments[0]
+        ) !== void 0) {
+          setSelectedAudience(AutomationAudienceSelectorType.ALL);
+        } else if (oneOffSegmentSelected && singleSegment) {
+          setSelectedAudience(AutomationAudienceSelectorType.INDIVIDUAL);
+          if (singleSegment.conditions) {
+            const userIds = [];
+            singleSegment.conditions.forEach((condition) => {
+              if (condition.field === "userId" && condition.operator === ConditionOperatorEnumType.EQUALS) {
+                condition.value.forEach((val) => {
+                  if (typeof val === "string") {
+                    userIds.push(val);
+                  }
+                });
+              }
+            });
+            setSelectedIndividualUserIds(userIds);
+          }
+        } else {
+          setSelectedAudience(AutomationAudienceSelectorType.SEGMENTS);
+        }
+        getCountOfBusinessAutomationRecipients({
+          includeSegments: includedSegments,
+          excludeSegments: excludedSegments
+        }).then((response) => {
+          setCountResponse(response);
+        });
+        setInitialStateSet(true);
       }
-      getCountOfBusinessAutomationRecipients({
-        includeSegments: includedSegments,
-        excludeSegments: excludedSegments
-      }).then((response) => {
-        setCountResponse(response);
-      });
-      setInitialStateSet(true);
-    }
+    };
+    initializeState();
   }, [
     automation2,
     allUsersSelected,
+    oneOffSegmentSelected,
     initialStateSet,
     includedSegments,
     excludedSegments,
     segments,
-    isLoading
+    isLoading,
+    singleSegment
   ]);
-  const handleAudienceSelectionChange = (value) => {
+  const handleAudienceSelectionChange = async (value) => {
     setSelectedAudience(value);
-    if (value === "all") {
+    if (value === AutomationAudienceSelectorType.ALL) {
       const allUsersSegment = segments?.find(
         (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS
       );
@@ -106456,6 +107440,61 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
       }
       setIncludedSegments([allUsersSegment.id]);
       setExcludedSegments([]);
+      setSelectedIndividualUserIds([]);
+    } else if (value === AutomationAudienceSelectorType.INDIVIDUAL) {
+      if (automation2?.id) {
+        try {
+          const segmentName = generateOneOffSegmentName(automation2.id);
+          let segment2;
+          try {
+            segment2 = await findSegmentByName(segmentName);
+          } catch (error2) {
+          }
+          if (segment2) {
+            setIncludedSegments([segment2.id]);
+            setExcludedSegments([]);
+            if (segment2.conditions) {
+              const userIds = [];
+              segment2.conditions.forEach((condition) => {
+                if (condition.field === "userId" && condition.operator === ConditionOperatorEnumType.EQUALS) {
+                  condition.value.forEach((val) => {
+                    if (typeof val === "string") {
+                      userIds.push(val);
+                    }
+                  });
+                }
+              });
+              setSelectedIndividualUserIds(userIds);
+            }
+          } else {
+            const newSegment = await createSegment({
+              name: segmentName,
+              description: "One-off segment for individual user selection",
+              type: BusinessSegmentTypeEnum.ONE_OFF,
+              conditions: [
+                {
+                  field: "userId",
+                  operator: ConditionOperatorEnumType.EQUALS,
+                  value: []
+                }
+              ]
+            });
+            if (newSegment?.id) {
+              setIncludedSegments([newSegment.id]);
+              setExcludedSegments([]);
+            }
+          }
+        } catch (error2) {
+          console.error("Error creating ONE_OFF segment:", error2);
+        }
+      }
+    } else if (value === AutomationAudienceSelectorType.SEGMENTS) {
+      setIncludedSegments([]);
+      setExcludedSegments([]);
+      setCountResponse({
+        count: 0,
+        recipients: []
+      });
     }
   };
   const handleAddSegment = (segmentId, type) => {
@@ -106472,8 +107511,75 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
       setExcludedSegments((prev) => prev.filter((id2) => id2 !== segmentId));
     }
   };
+  const handleIndividualUserSelectionChange = async (userIds) => {
+    setSelectedIndividualUserIds(userIds);
+    if (automation2?.id) {
+      try {
+        const segmentName = generateOneOffSegmentName(automation2.id);
+        let segment2;
+        try {
+          segment2 = await findSegmentByName(segmentName);
+        } catch (error2) {
+        }
+        if (segment2) {
+          const updatedSegment = await updateSegment(segment2.id, {
+            conditions: userIds.length > 0 ? [
+              {
+                field: "userId",
+                operator: ConditionOperatorEnumType.EQUALS,
+                value: userIds
+              }
+            ] : [
+              {
+                field: "userId",
+                operator: ConditionOperatorEnumType.EQUALS,
+                value: []
+              }
+            ]
+          });
+          segment2 = updatedSegment;
+        } else {
+          segment2 = await createSegment({
+            name: segmentName,
+            description: "One-off segment for individual user selection",
+            type: BusinessSegmentTypeEnum.ONE_OFF,
+            conditions: userIds.length > 0 ? [
+              {
+                field: "userId",
+                operator: ConditionOperatorEnumType.EQUALS,
+                value: userIds
+              }
+            ] : [
+              {
+                field: "userId",
+                operator: ConditionOperatorEnumType.EQUALS,
+                value: []
+              }
+            ]
+          });
+        }
+        if (segment2?.id) {
+          await updateAutomation2({
+            includeSegments: [segment2.id],
+            excludeSegments: []
+          });
+          await new Promise((resolve) => setTimeout(resolve, 100));
+          const countResponse2 = await getCountOfBusinessAutomationRecipients({
+            includeSegments: [segment2.id],
+            excludeSegments: []
+          });
+          setCountResponse(countResponse2);
+        }
+      } catch (error2) {
+        console.error("Error creating/updating ONE_OFF segment:", error2);
+      }
+    }
+  };
   useEffect(() => {
     if (automation2 && initialStateSet) {
+      if (selectedAudience === AutomationAudienceSelectorType.INDIVIDUAL && includedSegments.length === 0 && excludedSegments.length === 0) {
+        return;
+      }
       if (JSON.stringify(includedSegments) !== JSON.stringify(automation2.includeSegmentIds) || JSON.stringify(excludedSegments) !== JSON.stringify(automation2.excludeSegmentIds)) {
         updateAutomation2({
           includeSegments: includedSegments,
@@ -106492,7 +107598,8 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
     excludedSegments,
     automation2,
     initialStateSet,
-    updateAutomation2
+    updateAutomation2,
+    selectedAudience
   ]);
   const onSegmentUpdated = (id2) => {
     if (id2) {
@@ -106519,7 +107626,7 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
             canEditAudience
           }
         ),
-        /* @__PURE__ */ jsx(AnimatePresence, { children: selectedAudience === "segments" && /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(AnimatePresence, { children: selectedAudience === AutomationAudienceSelectorType.SEGMENTS && /* @__PURE__ */ jsx(
           motion.div,
           {
             initial: { opacity: 0, height: 0 },
@@ -106541,13 +107648,33 @@ const AutomationAudienceSelectorMain = ({ title: title2 = "Preview Audience" })
               }
             )
           }
+        ) }),
+        /* @__PURE__ */ jsx(AnimatePresence, { children: selectedAudience === AutomationAudienceSelectorType.INDIVIDUAL && /* @__PURE__ */ jsx(
+          motion.div,
+          {
+            initial: { opacity: 0, height: 0 },
+            animate: { opacity: 1, height: "auto" },
+            exit: { opacity: 0, height: 0 },
+            transition: { duration: 0.3, ease: "easeInOut" },
+            className: "w-full pt-4",
+            children: /* @__PURE__ */ jsx(
+              SelectIndividualUsersContent,
+              {
+                countResponse,
+                selectedUserIds: selectedIndividualUserIds,
+                onUserSelectionChange: handleIndividualUserSelectionChange,
+                canEditAudience
+              }
+            )
+          }
         ) })
       ] }),
       /* @__PURE__ */ jsx("div", { className: "flex flex-col flex-1 relative overflow-hidden", children: countResponse?.recipients && /* @__PURE__ */ jsx(
         RecipientsTable,
         {
           recipients: countResponse.recipients,
-          filter: selectedFilter
+          filter: selectedFilter,
+          audienceMode: selectedAudience
         }
       ) })
     ] }),
@@ -106927,7 +108054,7 @@ const getAutomationSteps = ({
   ];
 };
 const useRecipientStats = (automation2) => {
-  const { data: estimatedMatches } = useGetCountOfBusinessAutomationRecipients({
+  const { data: estimatedMatches, isLoading } = useGetCountOfBusinessAutomationRecipients({
     automationId: automation2?.id ?? "",
     includeSegments: automation2?.includeSegmentIds ?? [],
     excludeSegments: automation2?.excludeSegmentIds ?? []
@@ -106944,7 +108071,8 @@ const useRecipientStats = (automation2) => {
   }, [estimatedMatches?.recipients]);
   return {
     estimatedMatches,
-    estimatedMatchesStats
+    estimatedMatchesStats,
+    isLoading
   };
 };
 const DEFAULT_LOGO_URL = "https://assets.embedreach.com/defaults/logo-placeholder-128.png";
@@ -106987,7 +108115,7 @@ const validateAutomationStep = async (args) => {
       const smsChannelSender = smsChannelSenders.find(
         (sender) => sender.channelSender.id === communicationGroup.smsChannelSenderId
       );
-      if (!smsChannelSender) {
+      if (!smsChannelSender && !communicationGroup.emailChannelSenderId) {
         return {
           canMove: false,
           errorMessage: "Please ensure you have selected a text sender"
@@ -106999,7 +108127,7 @@ const validateAutomationStep = async (args) => {
           errorMessage: "Please ensure you have a text body"
         };
       }
-      if (smsChannelSender.smsApplication && smsChannelSender.smsApplication.status !== SmsRegistrationApplicationStatus.APPROVED) {
+      if (smsChannelSender && smsChannelSender.smsApplication && smsChannelSender.smsApplication.status !== SmsRegistrationApplicationStatus.APPROVED) {
         return {
           canMove: true,
           errorMessage: null,
@@ -107027,10 +108155,10 @@ const validateAutomationStep = async (args) => {
           errorMessage: "Please ensure you have selected a communication group"
         };
       }
-      if (!communicationGroup.emailChannelSenderId) {
+      if (!communicationGroup.emailChannelSenderId && !communicationGroup.smsChannelSenderId) {
         return {
           canMove: false,
-          errorMessage: "Please ensure you have selected a email sender"
+          errorMessage: "Please ensure you have selected an email or SMS sender"
         };
       }
       if (!communicationGroup.emailHtmlBody || !communicationGroup.emailSubject) {
@@ -107154,7 +108282,7 @@ const OneTimeWizardMain = ({ onFinish, getExtraMergeFields, onBeforeSchedule })
   const { updateAutomation: updateAutomation2 } = useUpdateBusinessAutomation(
     automation2?.id || ""
   );
-  const { estimatedMatchesStats } = useRecipientStats(automation2 ?? void 0);
+  const { estimatedMatchesStats, isLoading: isLoadingRecipientStats } = useRecipientStats(automation2 ?? void 0);
   const {
     state: { selectedChannels }
   } = useContext(Context);
@@ -107243,6 +108371,11 @@ const OneTimeWizardMain = ({ onFinish, getExtraMergeFields, onBeforeSchedule })
     }
     if (onBeforeSchedule) {
       try {
+        let attempts = 0;
+        while (isLoadingRecipientStats && attempts < 10) {
+          await new Promise((resolve) => setTimeout(resolve, 250));
+          attempts++;
+        }
         const result = await onBeforeSchedule({
           estimatedEmailRecipients: estimatedMatchesStats?.emails || 0,
           estimatedSmsRecipients: estimatedMatchesStats?.phones || 0
@@ -107344,6 +108477,8 @@ const OneTimeWizardMain = ({ onFinish, getExtraMergeFields, onBeforeSchedule })
     if (currentStep > AutomationSteps.SelectAudience) {
       if (currentStep === AutomationSteps.EditSmsContent && selectedChannels.length === 1 && selectedChannels[0] === "sms") {
         setCurrentStep(currentStep - 2);
+      } else if (currentStep === AutomationSteps.Schedule && selectedChannels.length === 1 && selectedChannels[0] === "email") {
+        setCurrentStep(currentStep - 2);
       } else {
         setCurrentStep(currentStep - 1);
       }
@@ -107739,8 +108874,7 @@ function CreateAutomationDialog({
   replyToSettingsText,
   replyToSettingsLink,
   fromNameSettingsText,
-  fromNameSettingsLink,
-  onBeforeSchedule
+  fromNameSettingsLink
 }) {
   const onCloseInner = (createdAutomation) => {
     onClose?.(createdAutomation);
@@ -107780,8 +108914,7 @@ function CreateAutomationDialog({
                 automationType,
                 currentStep,
                 setCurrentStep,
-                getExtraMergeFields,
-                onBeforeSchedule
+                getExtraMergeFields
               }
             )
           ]
@@ -108001,14 +109134,20 @@ const generateBrandSettings = async () => {
   return response.data;
 };
 const useBrandSettingsMutation = () => {
+  const { sendNotificationAsync } = useSlackNotification();
   return useMutation({
     mutationFn: generateBrandSettings,
     mutationKey: websiteContentKeys.brandSettings(),
-    onSuccess: () => {
+    onSuccess: (data) => {
       toast({
         title: "Brand settings generated successfully!",
         description: "Your brand identity has been analyzed."
       });
+      sendNotificationAsync({
+        message: "💬 New brand settings generated",
+        product: "engage",
+        details: { brandSettingsResponse: data }
+      });
     },
     onError: () => {
       toast({
@@ -109445,6 +110584,123 @@ const EmailChannelStep = ({
     }
   );
 };
+const MergeFieldForm = forwardRef(({ onSubmit }, ref) => {
+  const { getMergeFields: getMergeFields2, isGetting, getError } = useGetMergeFields("all");
+  const { data: business } = useBusiness();
+  const [fallbacks, setFallbacks] = useState([]);
+  useEffect(() => {
+    if (getMergeFields2?.mergeFields && business) {
+      setFallbacks(
+        getMergeFields2.mergeFields.flatMap(
+          (category) => category.entries.map((entry) => ({
+            label: entry.label,
+            value: entry.value,
+            // Keep the template name (value) for backend
+            fallbackValue: business.merge_field_fallbacks[entry.label] || ""
+          }))
+        )
+      );
+    }
+  }, [getMergeFields2, business]);
+  const handleFallbackChange = (index2, value) => {
+    setFallbacks(
+      (fallbacks2) => fallbacks2.map(
+        (f2, i3) => i3 === index2 ? { ...f2, fallbackValue: value } : f2
+      )
+    );
+  };
+  const handleSubmit = (e4) => {
+    e4.preventDefault();
+    onSubmit(fallbacks);
+  };
+  useImperativeHandle(
+    ref,
+    () => ({
+      submit: () => {
+        onSubmit(fallbacks);
+      },
+      getData: () => fallbacks
+    }),
+    [fallbacks, onSubmit]
+  );
+  const hasMergeFields = Array.isArray(getMergeFields2?.mergeFields) && getMergeFields2.mergeFields.some(
+    (category) => Array.isArray(category.entries) && category.entries.length > 0
+  );
+  if (isGetting) {
+    return /* @__PURE__ */ jsx("div", { className: "py-8", children: /* @__PURE__ */ jsx(BasicLoader, { text: "Loading merge fields..." }) });
+  }
+  if (getError) {
+    return /* @__PURE__ */ jsx("div", { className: "py-8 text-center text-destructive", children: "Error loading merge fields" });
+  }
+  if (!hasMergeFields) {
+    return /* @__PURE__ */ jsx("div", { className: "py-8 text-center text-muted-foreground", children: "No merge fields available" });
+  }
+  return /* @__PURE__ */ jsx("form", { onSubmit: handleSubmit, className: "space-y-6 p-8", children: /* @__PURE__ */ jsx("div", { className: "overflow-x-auto", children: /* @__PURE__ */ jsxs("table", { className: "min-w-full border-separate border-spacing-y-2", children: [
+    /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsxs("tr", { children: [
+      /* @__PURE__ */ jsx("th", { className: "text-left text-sm font-semibold text-foreground pb-2", children: "Merge Field" }),
+      /* @__PURE__ */ jsx("th", { className: "text-left text-sm font-semibold text-foreground pb-2", children: "Fallback Value" })
+    ] }) }),
+    /* @__PURE__ */ jsx("tbody", { children: fallbacks.map((field, idx) => /* @__PURE__ */ jsxs("tr", { className: "align-top", children: [
+      /* @__PURE__ */ jsx("td", { className: "pr-4 py-1 text-base text-foreground whitespace-nowrap", children: field.label }),
+      /* @__PURE__ */ jsx("td", { className: "py-1", children: /* @__PURE__ */ jsx(
+        Input,
+        {
+          value: field.fallbackValue,
+          onChange: (e4) => handleFallbackChange(idx, e4.target.value),
+          placeholder: "Enter fallback value",
+          className: "w-full max-w-xs"
+        }
+      ) })
+    ] }, field.value)) })
+  ] }) }) });
+});
+const MergeFieldSettings = ({
+  onBack,
+  title: title2,
+  description: description2
+}) => {
+  const { navigation } = useEngageSettingsContext();
+  const { postBusinessMergeFieldFallbacks: postBusinessMergeFieldFallbacks2, isPosting, postError } = usePostBusinessMergeFieldFallbacks();
+  const wizardContext = useContext(
+    WizardContext
+  );
+  const goToPreviousStep = onBack || wizardContext?.goToPreviousStep || navigation?.goToPreviousStep || (() => {
+  });
+  const stepTitle = title2 || ENGAGE_STRINGS.MERGE_FIELDS_TITLE;
+  const stepDescription = description2 || "Manage merge fields for personalizing your communications with dynamic content.";
+  const formRef = useRef(null);
+  const handleFormSubmit = () => {
+    if (formRef.current) {
+      const mergeFields = formRef.current.getData();
+      const mapping = Object.fromEntries(
+        mergeFields.filter((field) => field.fallbackValue.trim()).map((field) => [
+          field.value.replace(/[{}]/g, ""),
+          // Remove {{}} syntax
+          field.fallbackValue.trim()
+        ])
+      );
+      postBusinessMergeFieldFallbacks2({
+        mergeFieldFallbacks: mapping
+      });
+    }
+  };
+  return /* @__PURE__ */ jsxs(
+    WizardFormWrapper,
+    {
+      title: stepTitle,
+      description: stepDescription,
+      onBack: goToPreviousStep,
+      onNext: handleFormSubmit,
+      submitLabel: "Save",
+      mode: "settings",
+      isSubmitting: isPosting,
+      children: [
+        postError && /* @__PURE__ */ jsx("div", { className: "text-destructive text-center py-2", children: "Error saving merge fields" }),
+        /* @__PURE__ */ jsx(MergeFieldForm, { ref: formRef, onSubmit: handleFormSubmit })
+      ]
+    }
+  );
+};
 const SMSChannelSettings = ({
   hideSubmitButton = false,
   formRef,
@@ -109709,7 +110965,8 @@ const EngageSettings = () => {
         [ENGAGE_STEPS.BRAND]: /* @__PURE__ */ jsx(BrandSettingsStep, {}),
         [ENGAGE_STEPS.BUSINESS]: /* @__PURE__ */ jsx(BusinessSettingsStep, {}),
         [ENGAGE_STEPS.EMAIL]: /* @__PURE__ */ jsx(EmailChannelStep, {}),
-        [ENGAGE_STEPS.SMS]: /* @__PURE__ */ jsx(SMSChannelStep, {})
+        [ENGAGE_STEPS.SMS]: /* @__PURE__ */ jsx(SMSChannelStep, {}),
+        [ENGAGE_STEPS.MERGE_FIELDS]: /* @__PURE__ */ jsx(MergeFieldSettings, {})
       }[currentStep] || null
     }
   );
@@ -110093,6 +111350,7 @@ const EngageOnboarding = () => {
     [ENGAGE_STEPS.BUSINESS_SKIP_INTERSTITIAL]: /* @__PURE__ */ jsx(BusinessSkipInterstitialStep, {}),
     [ENGAGE_STEPS.SMS_INTERSTITIAL]: /* @__PURE__ */ jsx(SMSInterstitialStep, {}),
     [ENGAGE_STEPS.SMS]: /* @__PURE__ */ jsx(SMSChannelStep, {}),
+    [ENGAGE_STEPS.MERGE_FIELDS]: /* @__PURE__ */ jsx(MergeFieldSettings, { isOnboarding: true }),
     [ENGAGE_STEPS.COMPLETION]: /* @__PURE__ */ jsx(CompletionStep, {})
   };
   const handleOpenChange = (isOpen) => {
@@ -110794,6 +112052,9 @@ function SegmentList() {
               case BusinessSegmentTypeEnum.MANAGED:
                 typeOfSegment = "Managed";
                 break;
+              case BusinessSegmentTypeEnum.ONE_OFF:
+                typeOfSegment = "One-off";
+                break;
               default:
                 throw UnreachableCaseStatement(
                   row.type,
@@ -111204,10 +112465,6 @@ function InlineEditor({
     }
   ) });
 }
-const capitalize = (str) => {
-  if (!str) return str;
-  return str.charAt(0).toUpperCase() + str.slice(1);
-};
 function AutomationCancelRunningDialog({
   open,
   onOpenChange
@@ -111723,6 +112980,7 @@ const AutomationsEditorHeader = ({ showBackButton, onDuplicationCreated, onBefor
     );
     const noEmailSubjectORnoEmailHtmlBody = communicationGroup?.emailChannelSenderId && (!communicationGroup?.emailSubject || !communicationGroup?.emailHtmlBody);
     const noSmsMessageBody = communicationGroup?.smsChannelSenderId && !communicationGroup?.smsMessageBody;
+    const noIncludeSegments = automation2.includeSegmentIds?.length === 0;
     const missingScheduledAt = automationOneTime && (!automation2.triggerMetadata || !("scheduledAt" in automation2.triggerMetadata) || !automation2.triggerMetadata?.scheduledAt);
     let disableSwitch = false;
     let showSwitch = true;
@@ -111736,7 +112994,7 @@ const AutomationsEditorHeader = ({ showBackButton, onDuplicationCreated, onBefor
           /**
            * If we have a emailChannelSenderId, we need to have a emailSubject and emailHtmlBody
            */
-          noEmailANDnoSmsSender || noEmailSubjectORnoEmailHtmlBody || noSmsMessageBody
+          noEmailANDnoSmsSender || noEmailSubjectORnoEmailHtmlBody || noSmsMessageBody || noIncludeSegments
         ) {
           disableSwitch = true;
           if (noEmailSubjectORnoEmailHtmlBody) {
@@ -111745,6 +113003,9 @@ const AutomationsEditorHeader = ({ showBackButton, onDuplicationCreated, onBefor
           if (noSmsMessageBody) {
             infoOnDisabled = "Missing SMS message in SMS communication";
           }
+          if (noIncludeSegments) {
+            infoOnDisabled = "Missing include segment";
+          }
         }
         if (missingScheduledAt) {
           disableSwitch = true;
@@ -111843,7 +113104,7 @@ const AutomationsEditorHeader = ({ showBackButton, onDuplicationCreated, onBefor
               }
             );
           }
-          if (noTriggerMetadata || oneTimeNoScheduledAt || noEmailANDnoSmsSender || smsApplicationNotApproved || noEmailSubjectORnoEmailHtmlBody || noSmsMessageBody) {
+          if (noTriggerMetadata || oneTimeNoScheduledAt || noEmailANDnoSmsSender || smsApplicationNotApproved || noEmailSubjectORnoEmailHtmlBody || noSmsMessageBody || noIncludeSegments) {
             const renderInfoTooltip = () => {
               const sendText = automation2.triggerMetadata && "scheduledAt" in automation2.triggerMetadata && automation2.triggerMetadata?.scheduledAt === "now" ? `Start ${automationLanguage}` : "Schedule Send";
               if (automation2.status !== AutomationStatus.DRAFT) {
@@ -111885,6 +113146,13 @@ const AutomationsEditorHeader = ({ showBackButton, onDuplicationCreated, onBefor
                   "Please add a message to your SMS communication"
                 );
               }
+              if (noIncludeSegments) {
+                alertMessages.push(
+                  `Please select at least one ${t$2("engage:segment", {
+                    count: 1
+                  }).toLowerCase()}`
+                );
+              }
               const formattedMessages = alertMessages.map(
                 (msg) => capitalize(msg)
               );
@@ -112159,7 +113427,8 @@ const AutomationRecipientsTable = () => {
     automationId: automation2?.id ?? "",
     cursor: cursorForQuery,
     limit: pageSizeForQuery,
-    search: searchQuery || void 0
+    search: searchQuery || void 0,
+    automationStatus: automation2?.status
   });
   const handleQueryParametersChange = useCallback(
     (params) => {
@@ -114569,47 +115838,32 @@ const AutomationAudienceSelector = () => {
     setActionId: setActionId2,
     state: { selectedActionId }
   } = useContext(Context$1);
-  const [includeSegmentIds, setIncludeSegmentIds] = useState(
-    automation2?.includeSegmentIds || null
-  );
-  const [excludeSegmentIds, setExcludeSegmentIds] = useState(
-    automation2?.excludeSegmentIds || null
-  );
   const { segments } = useListSegments();
-  const getAllUsersSegment = useCallback(() => {
-    return segments?.find(
-      (segment2) => segment2.type === BusinessSegmentTypeEnum.ALL_USERS
-    );
-  }, [segments]);
-  useEffect(() => {
-    if (!automation2 || !segments) {
-      return;
-    }
-    if (includeSegmentIds === null && excludeSegmentIds === null) {
-      setIncludeSegmentIds(automation2?.includeSegmentIds || null);
-      setExcludeSegmentIds(automation2?.excludeSegmentIds || null);
-      if (automation2.includeSegmentIds.length === 0 && automation2.excludeSegmentIds.length === 0) {
-        setIncludeSegmentIds([getAllUsersSegment()?.id || ""]);
-        setExcludeSegmentIds([]);
-      }
-    } else {
-      if (JSON.stringify(automation2.includeSegmentIds) !== JSON.stringify(includeSegmentIds)) {
-        setIncludeSegmentIds(automation2.includeSegmentIds);
-      }
-      if (JSON.stringify(automation2.excludeSegmentIds) !== JSON.stringify(excludeSegmentIds)) {
-        setExcludeSegmentIds(automation2.excludeSegmentIds);
-      }
-    }
-  }, [
-    automation2,
-    excludeSegmentIds,
-    includeSegmentIds,
-    segments,
-    getAllUsersSegment
-  ]);
-  if (!automation2 || !includeSegmentIds || !excludeSegmentIds) {
+  const segmentIdToFetch = automation2?.includeSegmentIds?.length === 1 && automation2?.excludeSegmentIds?.length === 0 ? automation2.includeSegmentIds[0] : "";
+  const { segment: singleSegment } = useGetSegment(segmentIdToFetch);
+  if (!automation2 || !segments) {
     return null;
   }
+  const includeSegmentIds = automation2.includeSegmentIds;
+  let copyText;
+  let showSegmentPills = true;
+  if (singleSegment?.type === BusinessSegmentTypeEnum.ALL_USERS) {
+    copyText = `Send to all ${t$2("engage:user", { count: 2 })}`;
+    showSegmentPills = false;
+  } else if (singleSegment?.type === BusinessSegmentTypeEnum.ONE_OFF) {
+    copyText = `Send to specific ${t$2("engage:user", { count: 2 })}`;
+    showSegmentPills = false;
+  } else {
+    copyText = `Send to all ${t$2("engage:user", {
+      count: 2
+    })} in ${includeSegmentIds.length === 1 ? "this" : "these"} ${t$2(
+      "engage:segment",
+      {
+        count: includeSegmentIds.length
+      }
+    ).toLowerCase()}`;
+    showSegmentPills = true;
+  }
   return /* @__PURE__ */ jsx(Fragment$1, { children: /* @__PURE__ */ jsx(
     BasicsButton,
     {
@@ -114623,20 +115877,8 @@ const AutomationAudienceSelector = () => {
       children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-0.5 flex-1", children: [
         /* @__PURE__ */ jsx(MinorText, { children: "Audience" }),
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 flex-wrap", children: [
-          /* @__PURE__ */ jsx(
-            AutomationFlowLabel,
-            {
-              copyText: `Send to all ${t$2("engage:user", {
-                count: 2
-              })} in ${includeSegmentIds.length === 1 ? "this" : "these"} ${t$2(
-                "engage:segment",
-                {
-                  count: includeSegmentIds.length
-                }
-              ).toLowerCase()}`
-            }
-          ),
-          /* @__PURE__ */ jsx("div", { className: "flex gap-1 flex-wrap", children: includeSegmentIds.map((id2) => {
+          /* @__PURE__ */ jsx(AutomationFlowLabel, { copyText }),
+          showSegmentPills && /* @__PURE__ */ jsx("div", { className: "flex gap-1 flex-wrap", children: includeSegmentIds.map((id2) => {
             const segment2 = segments?.find((segment22) => segment22.id === id2);
             if (!segment2) return null;
             return /* @__PURE__ */ jsx(SegmentPill, { segmentName: segment2.name }, id2);
@@ -115013,7 +116255,10 @@ const AutomationEditorSubStep = ({
       return;
     }
     try {
-      const params = {};
+      const params = {
+        emailChannelSenderId: communicationGroup.emailChannelSenderId,
+        smsChannelSenderId: communicationGroup.smsChannelSenderId
+      };
       switch (type) {
         case CommunicationSubStepType.EMAIL:
           if (channelEnabled && communicationGroup.emailChannelSenderId) {
@@ -115036,10 +116281,21 @@ const AutomationEditorSubStep = ({
           }
           break;
       }
-      await updateCommunicationGroup2({
-        groupId: communicationGroup.id,
-        params
-      });
+      await updateCommunicationGroup2(
+        {
+          groupId: communicationGroup.id,
+          params
+        },
+        {
+          onError: () => {
+            toast2({
+              title: "Error toggling channel",
+              description: "Please contact your administrator",
+              variant: "destructive"
+            });
+          }
+        }
+      );
     } catch (error2) {
       console.error("Error toggling channel:", error2);
     }