Merge branch 'develop' into feat/advanced-settings

RocketChat · Jul 31, 2024 · e1e387d · e1e387d
2 parents 3c87aaf + 057e1dd
commit e1e387d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/popular-bottles-visit.md b/.changeset/popular-bottles-visit.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue that caused UI to show an error when the call to get the Business Hour type from settings returned `undefined`.
diff --git a/apps/meteor/app/livechat-enterprise/client/startup.ts b/apps/meteor/app/livechat-enterprise/client/startup.ts
@@ -15,7 +15,7 @@ const businessHours: Record<string, IBusinessHourBehavior> = {
 Meteor.startup(() => {
 	Tracker.autorun(async () => {
 		const bhType = settings.get<string>('Livechat_business_hour_type');
-		if (await hasLicense('livechat-enterprise')) {
+		if (bhType && (await hasLicense('livechat-enterprise'))) {
 			businessHourManager.registerBusinessHourBehavior(businessHours[bhType.toLowerCase()]);
 		}
 	});