Fix widget business hours showing wrong time due to missing UTC offset

Author: abhinavxd

cmd/chat.go

@@ -67,6 +67,7 @@ type chatSettingsResponse struct {
 	livechat.Config
 	BusinessHours          []bhmodels.BusinessHours      `json:"business_hours,omitempty"`
 	DefaultBusinessHoursID int                           `json:"default_business_hours_id,omitempty"`
+	WorkingHoursUTCOffset  *int                          `json:"working_hours_utc_offset,omitempty"`
 	CustomAttributes       map[int]customAttributeWidget `json:"custom_attributes,omitempty"`
 }
 
@@ -113,7 +114,7 @@ func handleGetChatSettings(r *fastglue.Request) error {
 			response.BusinessHours = businessHours
 		}
 
-		// Get default business hours ID from general settings which is the default / fallback.
+		// Get default business hours ID and UTC offset from general settings.
 		out, err := app.setting.GetByPrefix("app")
 		if err != nil {
 			app.lo.Error("error fetching general settings", "error", err)
@@ -123,6 +124,13 @@ func handleGetChatSettings(r *fastglue.Request) error {
 				if bhID, ok := settings["app.business_hours_id"].(string); ok {
 					response.DefaultBusinessHoursID, _ = strconv.Atoi(bhID)
 				}
+				if tz, ok := settings["app.timezone"].(string); ok && tz != "" {
+					if loc, err := time.LoadLocation(tz); err == nil {
+						_, offset := time.Now().In(loc).Zone()
+						offsetMinutes := offset / 60
+						response.WorkingHoursUTCOffset = &offsetMinutes
+					}
+				}
 			}
 		}
 	}
@@ -712,7 +720,6 @@ func saveContactAttrsAndCollectConvoAttrs(app *App, contactID int, claims *Claim
 	return mergeCustomAttributes(jwtConvoAttrs, formConvoAttrs)
 }
 
-
 // resolveOrCreateExternalContact finds or creates a contact from JWT claims.
 // It tries: 1) lookup by external_user_id, 2) create new (which internally enriches by email if possible).
 // On every call it syncs name/email from JWT claims.

frontend/apps/widget/src/components/ChatTitle.vue

@@ -75,7 +75,7 @@ const businessHoursStatus = computed(() => {
     return null
   }
 
-  const utcOffset = conversation.working_hours_utc_offset || 0
+  const utcOffset = conversation.working_hours_utc_offset ?? config.working_hours_utc_offset ?? 0
   const withinHoursMessage = config.chat_reply_expectation_message || ''
 
   const { status, isWithin } = getBusinessHoursStatus(businessHours, utcOffset, withinHoursMessage)

frontend/apps/widget/src/components/NoticeBanner.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="border rounded-lg p-4" v-if="noticeText" role="status">
-    <div class="flex items-start gap-3">
-      <AlertTriangle class="flex-shrink-0 mt-1" size="16" />
+    <div class="flex items-center justify-center gap-3">
+      <AlertTriangle class="flex-shrink-0" size="16" />
       <p class="text-sm">{{ noticeText }}</p>
     </div>
   </div>

internal/conversation/conversation.go

@@ -1761,22 +1761,26 @@ func (m *Manager) calculateBusinessHoursInfo(conversation models.Conversation) (
 		}
 	}
 
-	// Fallback to general settings if no team business hours
-	if businessHoursID == nil {
+	// Fallback to general settings if no team business hours or no timezone
+	if businessHoursID == nil || timezone == "" {
 		out, err := m.settingsStore.GetByPrefix("app")
 		if err == nil {
 			var settings map[string]any
 			err := json.Unmarshal([]byte(out), &settings)
 			if err != nil {
 				m.lo.Error("error unmarshalling settings", "error", err)
 			} else {
-				if bhIDStr, ok := settings["app.business_hours_id"].(string); ok && bhIDStr != "" {
-					if bhID, err := strconv.Atoi(bhIDStr); err == nil {
-						businessHoursID = &bhID
+				if businessHoursID == nil {
+					if bhIDStr, ok := settings["app.business_hours_id"].(string); ok && bhIDStr != "" {
+						if bhID, err := strconv.Atoi(bhIDStr); err == nil {
+							businessHoursID = &bhID
+						}
 					}
 				}
-				if tz, ok := settings["app.timezone"].(string); ok {
-					timezone = tz
+				if timezone == "" {
+					if tz, ok := settings["app.timezone"].(string); ok {
+						timezone = tz
+					}
 				}
 			}
 		}