Revert "Merge pull request #243 from twilio-labs/feat/pickup-location-welcome"

This reverts commit 08bf6ce, reversing
changes made to 6382ab7.

Author: thinkingserious

src/app/(layout-free)/event/[slug]/kiosk/page.tsx

@@ -31,7 +31,7 @@ export default async function KioskPage(props: {
     return (
       <div className="p-4 space-y-8 flex-1">
         <p className="text-xl md:text-4xl">
-          Order your beverage here and pick it up at {(event?.data as any)?.pickupLocation || "the Twilio booth"}.
+          Order your beverage here and pick it up at the Twilio booth.
         </p>
         {hasPermissions && (
           <OrderForm

src/app/(master-layout)/event/[slug]/page.tsx

@@ -404,15 +404,6 @@ function EventPage({ params }: { params: Promise<{ slug: string }> }) {
                 {touched.pickupLocation && fieldErrors.pickupLocation && (
                   <p className="text-xs text-red-500">{fieldErrors.pickupLocation}</p>
                 )}
-                <p className="text-xs text-gray-400 italic">
-                  {internalEvent.pickupLocation.length >= 3
-                    ? (internalEvent.language ?? "en") === "pt-BR"
-                      ? `"Bem-vindo ao ${internalEvent.pickupLocation}!"`
-                      : `"Welcome to ${internalEvent.pickupLocation}!"`
-                    : (internalEvent.language ?? "en") === "pt-BR"
-                      ? `"Bem-vindo ao Estande da Twilio!"`
-                      : `"Welcome to the Twilio Booth!"`}
-                </p>
               </div>
               <div className="space-y-1.5">
                 <Label htmlFor="language">Language</Label>

src/app/webhooks/messaging/ai-agent.ts

@@ -269,7 +269,7 @@ Rules:
 * Always reply in ${languageName}, regardless of what language the user writes in.
 * When suggesting menu items, ALWAYS format them as a markdown list.
 * Never fabricate information on tool execution failures. Acknowledge errors without speculation.
-* If the users want to learn more about Twilio, point them to the Twilio employees at ${event.pickupLocation || "the booth"}.
+* If the users want to learn more about Twilio, point them to the Twilio employees at the booth.
 * If they want to reach out to sales, point them to https://www.twilio.com/en-us/help/sales
 * UNDER NO CIRCUMSTANCES TALK ABOUT TWILIO COMPETITORS. If asked, say you can't help with that and suggest they ask a Twilion.
 * Use the log_feedback tool if the user asks for something you cannot do. This stores their attempted action so we can improve the system.`;

src/app/webhooks/messaging/route.ts

@@ -118,7 +118,7 @@ async function selectEventForCustomer(
 
     const welcomeMsg = isReturning
       ? getWelcomeBackMessage(newEvent.selection.mode, newEvent.name, newEvent.welcomeMessage, eventLang(newEvent))
-      : getWelcomeMessage(newEvent.selection.mode, newEvent.welcomeMessage, newEvent.leadCollection, eventLang(newEvent), newEvent.pickupLocation);
+      : getWelcomeMessage(newEvent.selection.mode, newEvent.welcomeMessage, newEvent.leadCollection, eventLang(newEvent));
     sendMessage(sender, welcomeMsg, undefined, undefined, from);
 
     const country = getCountryFromPhone(sender);
@@ -157,7 +157,7 @@ async function selectEventForCustomer(
     const newEvent = matches[0].data as Event;
     const welcomeMsg = isReturning
       ? getWelcomeBackMessage(newEvent.selection.mode, newEvent.name, newEvent.welcomeMessage, eventLang(newEvent))
-      : getWelcomeMessage(newEvent.selection.mode, newEvent.welcomeMessage, newEvent.leadCollection, eventLang(newEvent), newEvent.pickupLocation);
+      : getWelcomeMessage(newEvent.selection.mode, newEvent.welcomeMessage, newEvent.leadCollection, eventLang(newEvent));
     sendMessage(sender, welcomeMsg, undefined, undefined, from);
 
     const country = getCountryFromPhone(sender);

src/lib/stringTemplates.ts

@@ -73,15 +73,10 @@ export function getWelcomeMessage(
   customWelcomeMessage?: string,
   leadCollection: LeadCollection = "NONE",
   language: Language = "en",
-  pickupLocation?: string,
 ) {
-  const defaultWelcome = pickupLocation
-    ? language === "pt-BR"
-      ? `Bem-vindo ao ${pickupLocation}! Está pronto para um ${modeToBeverage(mode, language)} por nossa conta? 🎉`
-      : `Welcome to ${pickupLocation}! Are you ready for a ${modeToBeverage(mode, language)} on us? 🎉`
-    : language === "pt-BR"
-      ? `Bem-vindo ao Estande da Twilio! Está pronto para um ${modeToBeverage(mode, language)} por nossa conta? 🎉`
-      : `Welcome to the Twilio Booth! Are you ready for a ${modeToBeverage(mode, language)} on us? 🎉`;
+  const defaultWelcome = language === "pt-BR"
+    ? `Bem-vindo ao Estande da Twilio! Está pronto para um ${modeToBeverage(mode, language)} por nossa conta? 🎉`
+    : `Welcome to the Twilio Booth! Are you ready for a ${modeToBeverage(mode, language)} on us? 🎉`;
 
   const welcomeMessage = customWelcomeMessage || defaultWelcome;