From d5d90a8b871ed33ff466aa12b5c42f9ba13ef1da Mon Sep 17 00:00:00 2001
From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date: Wed, 19 Mar 2025 01:29:13 +0530
Subject: [PATCH] fix: sms formatting (#18647)

---
 packages/sms/attendee/awaiting-payment-sms.ts | 15 ++++++++++----
 packages/sms/attendee/cancelled-seat-sms.ts   |  8 ++++++--
 packages/sms/attendee/event-cancelled-sms.ts  | 14 +++++++++----
 packages/sms/attendee/event-declined-sms.ts   | 11 ++++++++--
 .../attendee/event-location-changed-sms.ts    | 13 +++++++++---
 packages/sms/attendee/event-request-sms.ts    | 20 ++++++++++++++-----
 .../event-request-to-reschedule-sms.ts        | 16 +++++++++++----
 .../sms/attendee/event-rescheduled-sms.ts     | 18 +++++++++++++----
 packages/sms/attendee/event-scheduled-sms.ts  | 15 ++++++++++----
 9 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/packages/sms/attendee/awaiting-payment-sms.ts b/packages/sms/attendee/awaiting-payment-sms.ts
index 931d915246..9513e7d7a8 100644
--- a/packages/sms/attendee/awaiting-payment-sms.ts
+++ b/packages/sms/attendee/awaiting-payment-sms.ts
@@ -10,11 +10,18 @@ export default class AwaitingPaymentSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("meeting_awaiting_payment")}: ${t("complete_your_booking_subject", {
+
+    const messageText = `${t("meeting_awaiting_payment")}: ${t("complete_your_booking_subject", {
       title: this.calEvent.title,
       date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
-    })}. \n\n ${t("you_can_view_booking_details_with_this_url", {
-      url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`,
-    })} `;
+    })}`;
+
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`;
+
+    const urlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookingUrl,
+    });
+
+    return `${messageText}\n\n${urlText}`;
   }
 }
diff --git a/packages/sms/attendee/cancelled-seat-sms.ts b/packages/sms/attendee/cancelled-seat-sms.ts
index 35d9d033f0..354505ebf8 100644
--- a/packages/sms/attendee/cancelled-seat-sms.ts
+++ b/packages/sms/attendee/cancelled-seat-sms.ts
@@ -8,11 +8,15 @@ export default class CancelledSeatSMS extends SMSManager {
   }
 
   getMessage(attendee: Person) {
-    return `${attendee.language.translate("no_longer_attending", {
+    const t = attendee.language.translate;
+
+    const messageText = `${t("no_longer_attending", {
       name: attendee.name,
-    })}. \n\n${attendee.language.translate("event_no_longer_attending_subject", {
+    })}\n\n${t("event_no_longer_attending_subject", {
       name: this.calEvent.team?.name || this.calEvent.organizer.name,
       date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
     })} `;
+
+    return `${messageText}`;
   }
 }
diff --git a/packages/sms/attendee/event-cancelled-sms.ts b/packages/sms/attendee/event-cancelled-sms.ts
index b24b369e1a..68b9d134e9 100644
--- a/packages/sms/attendee/event-cancelled-sms.ts
+++ b/packages/sms/attendee/event-cancelled-sms.ts
@@ -10,14 +10,20 @@ export default class EventCancelledSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("hey_there")} ${attendee.name}, ${t("event_request_cancelled")}/n/n ${t(
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`;
+
+    const messageText = `${t("hey_there")} ${attendee.name}, ${t("event_request_cancelled")}\n\n${t(
       "event_cancelled_subject",
       {
         title: this.calEvent.title,
         date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
       }
-    )}. /n/n ${t("visit_cancelled_booking")} ${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${
-      this.calEvent.uid
-    } `;
+    )}`;
+
+    const urlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookingUrl,
+    });
+
+    return `${messageText}\n\n${urlText}`;
   }
 }
diff --git a/packages/sms/attendee/event-declined-sms.ts b/packages/sms/attendee/event-declined-sms.ts
index 3b14099e9c..db883305cf 100644
--- a/packages/sms/attendee/event-declined-sms.ts
+++ b/packages/sms/attendee/event-declined-sms.ts
@@ -9,9 +9,16 @@ export default class EventDeclinedSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("hey_there")} ${attendee.name}, ${t("event_request_declined")} ${t("event_declined_subject", {
+
+    const eventDeclinedText = t("event_declined_subject", {
       title: this.calEvent.title,
       date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
-    })}`;
+    });
+
+    const messageText = `${t("hey_there")} ${attendee.name}, ${t(
+      "event_request_declined"
+    )} ${eventDeclinedText}`;
+
+    return messageText;
   }
 }
diff --git a/packages/sms/attendee/event-location-changed-sms.ts b/packages/sms/attendee/event-location-changed-sms.ts
index 0dab9aa173..bed90322a9 100644
--- a/packages/sms/attendee/event-location-changed-sms.ts
+++ b/packages/sms/attendee/event-location-changed-sms.ts
@@ -10,8 +10,15 @@ export default class EventLocationChangedSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("event_location_changed")}. \n\n ${t("you_can_view_booking_details_with_this_url", {
-      url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`,
-    })}`;
+
+    const messageText = `${t("event_location_changed")}`;
+
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`;
+
+    const urlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookingUrl,
+    });
+
+    return `${messageText}\n\n${urlText}`;
   }
 }
diff --git a/packages/sms/attendee/event-request-sms.ts b/packages/sms/attendee/event-request-sms.ts
index 2341b435a2..93d2c8c53e 100644
--- a/packages/sms/attendee/event-request-sms.ts
+++ b/packages/sms/attendee/event-request-sms.ts
@@ -10,12 +10,22 @@ export default class EventRequestSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("booking_submitted", {
+
+    const bookingSubmittedText = t("booking_submitted", {
       name: attendee.name,
-    })}. ${t("user_needs_to_confirm_or_reject_booking", {
+    });
+
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`;
+    const urlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookingUrl,
+    });
+
+    const userNeedsToConfirmOrRejectBookingText = t("user_needs_to_confirm_or_reject_booking", {
       user: this.calEvent.organizer.name,
-    })}\n\n ${t("you_can_view_booking_details_with_this_url", {
-      url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`,
-    })}`;
+    });
+
+    const messageText = `${bookingSubmittedText}. ${userNeedsToConfirmOrRejectBookingText}\n\n${urlText}`;
+
+    return messageText;
   }
 }
diff --git a/packages/sms/attendee/event-request-to-reschedule-sms.ts b/packages/sms/attendee/event-request-to-reschedule-sms.ts
index 5b99d43b59..34c0e9abd9 100644
--- a/packages/sms/attendee/event-request-to-reschedule-sms.ts
+++ b/packages/sms/attendee/event-request-to-reschedule-sms.ts
@@ -10,10 +10,18 @@ export default class EventRequestToRescheduleSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("request_reschedule_booking")}: ${t("request_reschedule_subtitle", {
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}?changes=true`;
+
+    const requestRescheduleSubtitle = t("request_reschedule_subtitle", {
       organizer: this.calEvent.organizer.name,
-    })} \n\n${t("need_to_reschedule_or_cancel")} ${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${
-      this.calEvent.uid
-    }?changes=true`;
+    });
+
+    const needToRescheduleOrCancelText = t("need_to_reschedule_or_cancel");
+
+    const messageText = `${needToRescheduleOrCancelText}: ${requestRescheduleSubtitle} \n\n${t(
+      "need_to_reschedule_or_cancel"
+    )} ${bookingUrl}`;
+
+    return messageText;
   }
 }
diff --git a/packages/sms/attendee/event-rescheduled-sms.ts b/packages/sms/attendee/event-rescheduled-sms.ts
index 02d8b8361e..9adaa7924e 100644
--- a/packages/sms/attendee/event-rescheduled-sms.ts
+++ b/packages/sms/attendee/event-rescheduled-sms.ts
@@ -10,11 +10,21 @@ export default class EventSuccessfullyReScheduledSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("hey_there")} ${attendee.name}, ${t("event_type_has_been_rescheduled_on_time_date", {
+
+    const bookerUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`;
+    const bookerUrlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookerUrl,
+    });
+
+    const eventTypeHasBeenRescheduledOnTimeDateText = t("event_type_has_been_rescheduled_on_time_date", {
       title: this.calEvent.title,
       date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
-    })} \n\n ${t("you_can_view_booking_details_with_this_url", {
-      url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`,
-    })}`;
+    });
+
+    const messageText = `${t("hey_there")} ${
+      attendee.name
+    }, ${eventTypeHasBeenRescheduledOnTimeDateText} \n\n${bookerUrlText}`;
+
+    return messageText;
   }
 }
diff --git a/packages/sms/attendee/event-scheduled-sms.ts b/packages/sms/attendee/event-scheduled-sms.ts
index 73c91f846f..873e6ce505 100644
--- a/packages/sms/attendee/event-scheduled-sms.ts
+++ b/packages/sms/attendee/event-scheduled-sms.ts
@@ -10,11 +10,18 @@ export default class EventSuccessfullyScheduledSMS extends SMSManager {
 
   getMessage(attendee: Person) {
     const t = attendee.language.translate;
-    return `${t("confirming_your_booking_sms", {
+
+    const confirmationText = t("confirming_your_booking_sms", {
       name: attendee.name,
       date: this.getFormattedDate(attendee.timeZone, attendee.language.locale),
-    })} \n\n ${t("you_can_view_booking_details_with_this_url", {
-      url: `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`,
-    })}`;
+    });
+
+    const bookingUrl = `${this.calEvent.bookerUrl ?? WEBAPP_URL}/booking/${this.calEvent.uid}`;
+
+    const urlText = t("you_can_view_booking_details_with_this_url", {
+      url: bookingUrl,
+    });
+
+    return `${confirmationText}\n\n${urlText}`;
   }
 }