Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/mobile/src/notifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, unknown>
const v = o.notification_campaign_id
const v = o.notification_campaign_id ?? o.notificationCampaignId
return typeof v === 'string' && v.length > 0 ? v : undefined
}

Expand Down
2 changes: 1 addition & 1 deletion packages/web/public/scripts/sw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
16 changes: 8 additions & 8 deletions packages/web/src/index.tsx
Original file line number Diff line number Diff line change
@@ -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()

Expand All @@ -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

Expand Down
Loading