Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: validate bhType before registering it #32931

Merged
merged 4 commits into from
Jul 31, 2024
Merged

fix: validate bhType before registering it #32931

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3fa6e2
check if bhType is valid before registering
KevLehman Jul 29, 2024
e107c0f
Create popular-bottles-visit.md
KevLehman Jul 29, 2024
7c22d9a
Update apps/meteor/app/livechat-enterprise/client/startup.ts
KevLehman Jul 31, 2024
62067d6
Merge branch 'develop' into fix/tolowerofundefined
ggazzo Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/popular-bottles-visit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`.
2 changes: 1 addition & 1 deletion apps/meteor/app/livechat-enterprise/client/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ((await hasLicense('livechat-enterprise')) && bhType) {
KevLehman marked this conversation as resolved.
Show resolved Hide resolved
businessHourManager.registerBusinessHourBehavior(businessHours[bhType.toLowerCase()]);
}
});
Expand Down
Loading