Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(ios): invalidate queries on websocket reconnect (#4821)

Peter Chinman003466cc8d1a
diff --git a/apps/web/src/lib/queries/invalidate-on-reconnect.ts b/apps/web/src/lib/queries/invalidate-on-reconnect.ts
new file mode 100644
index 0000000000..667a5eeff7
--- /dev/null
+++ b/apps/web/src/lib/queries/invalidate-on-reconnect.ts
@@ -0,0 +1,10 @@
+import { createReconnectEffect } from '@macro-inc/collaboration/websocket';
+import { ws } from '@service-connection/websocket';
+import { queryClient } from './client';
+
+export function useInvalidateQueriesOnReconnect(): void {
+ createReconnectEffect(ws, () => {
+ // Marks cached queries as stale and automatically refetches active queries in the background
+ void queryClient.invalidateQueries();
+ });
+}
diff --git a/apps/web/src/lib/tauri/PushNotification.tsx b/apps/web/src/lib/tauri/PushNotification.tsx
index 0fed9e5664..929b1cdbef 100644
--- a/apps/web/src/lib/tauri/PushNotification.tsx
+++ b/apps/web/src/lib/tauri/PushNotification.tsx
@@ -12,7 +12,6 @@ import {
PlatformNotificationProvider,
triggerNotificationNavigation,
} from '@notifications';
-import { invalidateUserNotifications } from '@queries/notification/user-notifications';
import { notificationServiceClient } from '@service-notification/client';
import { makePersisted } from '@solid-primitives/storage';
import {
@@ -180,7 +179,6 @@ export function MaybePushNotificationRegistration(props: {
if (!tapped) return;
if (!notificationId) return;
- invalidateUserNotifications();
triggerNotificationNavigation(notificationId);
});
diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsx
index 66f155004b..51333d2843 100644
--- a/apps/web/src/routes/Root.tsx
+++ b/apps/web/src/routes/Root.tsx
@@ -18,6 +18,7 @@ import {
} from '@app/lib/analytics/analytics-context';
import { PosthogProvider, usePosthog } from '@app/lib/analytics/posthog';
import { trackSignupCompletion } from '@app/lib/analytics/signupCompletion';
+import { useInvalidateQueriesOnReconnect } from '@app/lib/queries/invalidate-on-reconnect';
import {
useEmailSoupBackfill,
useSoupBackfill,
@@ -78,7 +79,6 @@ import {
} from '@queries/auth/user-info';
import { useChatRenameWebsocketSync } from '@queries/chat';
import { prefetchHistory } from '@queries/history/history';
-import { invalidateUserNotifications } from '@queries/notification/user-notifications';
import { QuerySyncProvider } from '@queries/sync/SyncProvider';
import { MutationUndoProvider } from '@queries/undo';
import { useReopenTrackedEntitiesOnReconnect } from '@service-connection/client';
@@ -401,6 +401,10 @@ function ConfiguredGlobalAppStateProvider(props: ParentProps) {
useChatRenameWebsocketSync();
useReopenTrackedEntitiesOnReconnect();
+ if (isNativeMobilePlatform()) {
+ useInvalidateQueriesOnReconnect();
+ }
+
const onNotification = (notification: UnifiedNotification) => {
if (notifInterface === 'not-supported') return;
const layoutManager = globalSplitManager();
@@ -416,18 +420,6 @@ function ConfiguredGlobalAppStateProvider(props: ParentProps) {
onNotification
);
- if (isNativeMobilePlatform()) {
- const onVisibilityChange = () => {
- if (document.visibilityState === 'visible') {
- invalidateUserNotifications();
- }
- };
- document.addEventListener('visibilitychange', onVisibilityChange);
- onCleanup(() =>
- document.removeEventListener('visibilitychange', onVisibilityChange)
- );
- }
-
const blockOrchestrator = createBlockOrchestrator();
usePendingNotificationNavigationEffect(notificationSource);