From b514740112ce79c43ec13eed0e5cc4b517ea3b37 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Mon, 30 Mar 2026 23:29:03 -0700 Subject: [PATCH 1/2] fix: check both camelCase and snake_case for announcement push campaign ID --- packages/mobile/src/notifications.ts | 2 +- packages/web/public/scripts/sw.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mobile/src/notifications.ts b/packages/mobile/src/notifications.ts index 527f56c2f01..844c04211e3 100644 --- a/packages/mobile/src/notifications.ts +++ b/packages/mobile/src/notifications.ts @@ -21,7 +21,7 @@ function extractNotificationCampaignIdFromPayload( const target = payload?.data?.data ?? payload?.data ?? payload ?? undefined if (!target || typeof target !== 'object') return undefined const o = target as Record - const v = o.notification_campaign_id + const v = o.notification_campaign_id ?? o.notificationCampaignId return typeof v === 'string' && v.length > 0 ? v : undefined } diff --git a/packages/web/public/scripts/sw.js b/packages/web/public/scripts/sw.js index 8bc17d8d095..ac207d092a2 100644 --- a/packages/web/public/scripts/sw.js +++ b/packages/web/public/scripts/sw.js @@ -8,7 +8,7 @@ function readNotificationCampaignId(raw) { const target = raw?.data?.data ?? raw?.data ?? raw if (!target || typeof target !== 'object') return null - const v = target.notification_campaign_id + const v = target.notification_campaign_id ?? target.notificationCampaignId return typeof v === 'string' && v.length > 0 ? v : null } From 7605b44dfe6aaef2d59042f9b93f8d71a5062684 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 31 Mar 2026 09:45:14 -0700 Subject: [PATCH 2/2] Fixing lint and stuff --- packages/web/src/index.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/web/src/index.tsx b/packages/web/src/index.tsx index 63ec55f2eba..7a7a86c5aa4 100644 --- a/packages/web/src/index.tsx +++ b/packages/web/src/index.tsx @@ -1,4 +1,12 @@ // Handle stale chunk errors after deploys by reloading once +import 'setimmediate' + +import { createRoot } from 'react-dom/client' + +import './index.css' +import RootWithProviders from 'ssr/RootWithProviders' +import { registerErrorHmrHandler } from 'utils/hmr/errorHmrHandler' + window.addEventListener('vite:preloadError', (event) => { event.preventDefault() @@ -13,14 +21,6 @@ window.addEventListener('vite:preloadError', (event) => { } }) -import 'setimmediate' - -import { createRoot } from 'react-dom/client' - -import './index.css' -import RootWithProviders from 'ssr/RootWithProviders' -import { registerErrorHmrHandler } from 'utils/hmr/errorHmrHandler' - // @ts-ignore window.global ||= window