@meetelise/chat 1.43.29 → 1.43.30

package/src/WebComponent/Scheduler/tour-scheduler.ts

@@ -29,7 +29,12 @@ import { DatePicker } from "./date-picker";
 import { MESelect } from "../me-select";
 import { TimePicker } from "./time-picker";
 import { LabeledOption } from "../../fetchBuildingInfo";
-import { isMobile, isValidPhoneNumber, snakify } from "../../utils";
+import {
+  isMobile,
+  isValidEmail,
+  isValidPhoneNumber,
+  snakify,
+} from "../../utils";
 import axios, { AxiosError } from "axios";
 import mapValues from "lodash/mapValues";
 import classnames from "classnames";
@@ -558,7 +563,7 @@ export class TourScheduler extends LitElement {
     leadInfo: (): boolean => {
       return (
         (!!this.firstNameInput?.value || !!this.lastNameInput?.value) &&
-        this.emailInput?.value.includes("@") &&
+        isValidEmail(this.emailInput?.value ?? "") &&
         // TODO: deleting phone number doesn't cause validation to fail, at least on mobile
         !!this.phoneNumber &&
         this.phoneNumber.length === 14 &&
@@ -1146,6 +1151,8 @@ export class TourScheduler extends LitElement {
               ["webchat-input"]: true,
               ["webchat-font__desktop"]: !isMobile(),
               ["webchat-font__mobile"]: isMobile(),
+              ["webchat-input__error"]:
+                !!this.email && !isValidEmail(this.email),
             })}
             type="email"
             inputmode="email"
@@ -1155,6 +1162,9 @@ export class TourScheduler extends LitElement {
             .value=${this.email}
             @input=${this.onChangeEmail}
           />
+          ${!!this.email && !isValidEmail(this.email)
+            ? html`<p class="error-message">Invalid email address</p>`
+            : ""}
         </div>
         <div class="inputContainer" id="phone">
           <input

package/src/WebComponent/actions/email-us-window.ts

@@ -17,7 +17,7 @@ import axios from "axios";
 import { FeatureFlagsShowDropdown } from "../../fetchFeatureFlag";
 import { pushGtmEvent } from "../../gtm";
 import formDisclaimer from "../../disclaimers";
-import { isMobile, snakify } from "../../utils";
+import { isMobile, isValidEmail, snakify } from "../../utils";
 import LeadSourceClient, {
   getDefaultLeadSourceAttribution,
 } from "../LeadSourceClient";
@@ -233,8 +233,7 @@ export class EmailUsWindow extends LitElement {
     if (!this.firstName || !this.lastName) {
       this.hasNameError = true;
     }
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!this.email || !emailRegex.test(this.email)) {
+    if (!this.email || !isValidEmail(this.email)) {
       this.hasEmailError = true;
     }
     if (!this.phoneNumber || this.phoneNumber.length !== 14) {

package/src/utils.ts

@@ -78,6 +78,11 @@ export const isValidPhoneNumber = (phoneNumber: string): boolean => {
   return phoneNumberRegex.test(phoneNumber);
 };
 
+export const isValidEmail = (email: string): boolean => {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test(email);
+};
+
 export const isContainingEmail = (message: string): boolean => {
   try {
     const emailRegex = /\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b/;