Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Add abstraction for localStorage access (#1321)

Luke Vella92b311589662
diff --git a/apps/web/src/app/[locale]/timezone-change-detector.tsx b/apps/web/src/app/[locale]/timezone-change-detector.tsx
index 72e2b3a9d..18a1d489f 100644
--- a/apps/web/src/app/[locale]/timezone-change-detector.tsx
+++ b/apps/web/src/app/[locale]/timezone-change-detector.tsx
@@ -8,39 +8,32 @@ import {
DialogHeader,
DialogTitle,
} from "@rallly/ui/dialog";
-import * as Sentry from "@sentry/nextjs";
import { usePostHog } from "posthog-js/react";
import React, { useState } from "react";
import { Trans } from "@/components/trans";
import { usePreferences } from "@/contexts/preferences";
import { getBrowserTimeZone } from "@/utils/date-time-utils";
+import { safeLocalStorage } from "@/utils/local-storage";
export function TimeZoneChangeDetector() {
+ const [open, setOpen] = useState(false);
+
const { preferences, updatePreferences } = usePreferences();
+ const currentTimeZone = getBrowserTimeZone();
const [previousTimeZone, setPreviousTimeZone] = useState(() => {
- try {
- const cachedPreviousTimeZone = localStorage.getItem("previousTimeZone");
- if (cachedPreviousTimeZone) {
- return cachedPreviousTimeZone;
- }
- } catch (e) {
- Sentry.captureException(e);
+ const cachedPreviousTimeZone = safeLocalStorage.getItem("previousTimeZone");
+ if (cachedPreviousTimeZone) {
+ return cachedPreviousTimeZone;
}
- const timeZone = preferences.timeZone ?? getBrowserTimeZone();
+ const timeZone = preferences.timeZone ?? currentTimeZone;
- try {
- localStorage.setItem("previousTimeZone", timeZone);
- } catch (e) {
- Sentry.captureException(e);
- }
+ safeLocalStorage.setItem("previousTimeZone", timeZone);
return timeZone;
});
- const currentTimeZone = getBrowserTimeZone();
- const [open, setOpen] = useState(false);
const posthog = usePostHog();
diff --git a/apps/web/src/utils/local-storage.ts b/apps/web/src/utils/local-storage.ts
new file mode 100644
index 000000000..ca665e8de
--- /dev/null
+++ b/apps/web/src/utils/local-storage.ts
@@ -0,0 +1,47 @@
+import * as Sentry from "@sentry/nextjs";
+
+/**
+ * Wrapper around localStorage that catches errors and logs them to Sentry.
+ */
+class LocalStorage {
+ private isLocalStorageAvailable: boolean;
+
+ constructor() {
+ this.isLocalStorageAvailable =
+ typeof window !== "undefined" && !!window.localStorage;
+ }
+
+ getItem(key: string): string | null {
+ if (this.isLocalStorageAvailable) {
+ try {
+ return localStorage.getItem(key);
+ } catch (e) {
+ Sentry.captureException(e);
+ return null;
+ }
+ }
+ return null;
+ }
+
+ setItem(key: string, value: string): void {
+ if (this.isLocalStorageAvailable) {
+ try {
+ localStorage.setItem(key, value);
+ } catch (e) {
+ Sentry.captureException(e);
+ }
+ }
+ }
+
+ removeItem(key: string): void {
+ if (this.isLocalStorageAvailable) {
+ try {
+ localStorage.removeItem(key);
+ } catch (e) {
+ Sentry.captureException(e);
+ }
+ }
+ }
+}
+
+export const safeLocalStorage = new LocalStorage();