Skip to content

[Customer Portal MicroApp] fix: guard against invalid user timezone #1015

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

Merged
Rashmika998 merged 2 commits into from
Jul 2, 2026
Merged

[Customer Portal MicroApp] fix: guard against invalid user timezone #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c3cb3a
[Customer Portal][Microapp] fix: guard against invalid user timezone …
2003dinijay Jul 2, 2026
df3feb8
Potential fix for pull request finding
2003dinijay Jul 2, 2026
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
3 changes: 2 additions & 1 deletion apps/customer-portal/microapp/src/context/me/MeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export default function MeProvider({ children }: { children: React.ReactNode })
id: meData.id,
roles: meData.roles,
isAdmin: meData.roles.includes(ADMIN_USER_ROLE),
timezone: meData.timezone,
// ServiceNow returns "--None--" for unset choice fields; treat it as absent.
timezone: meData.timezone && meData.timezone !== "--None--" ? meData.timezone : undefined,
}}
>
{children}
Expand Down
18 changes: 17 additions & 1 deletion apps/customer-portal/microapp/src/utils/useDateTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,25 @@ dayjs.extend(utc);
dayjs.extend(timezone);
dayjs.extend(relativeTime);

/**
* Returns the given timezone if it is a valid IANA identifier, otherwise
* falls back to the device timezone. Guards against placeholder values
* (e.g. ServiceNow's "--None--") that would make Intl/dayjs throw.
*/
const resolveTimezone = (tz?: string): string => {
const fallback = Intl.DateTimeFormat().resolvedOptions().timeZone;
if (!tz) return fallback;
try {
Intl.DateTimeFormat(undefined, { timeZone: tz });
return tz;
} catch {
return fallback;
}
};

export function useDateTime() {
const { timezone } = useMe();
const tz = timezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone;
const tz = resolveTimezone(timezone);

const toUtc = (date: Date | string) => {
if (date instanceof Date) {
Expand Down