Merge branch 'fix/event-loop-call-desktop-app' into 'main'

feat(desktop): refresh event loop when returning from settings to mail or calendar

See merge request web/clients!25468

Author: MargeBot

applications/calendar/src/app/containers/calendar/MainContainer.tsx

@@ -11,6 +11,7 @@ import KeyTransparencyManager from '@proton/components/containers/keyTransparenc
 import SubscriptionModalProvider from '@proton/components/containers/payments/subscription/SubscriptionModalProvider';
 import useDrawerParent from '@proton/components/hooks/drawer/useDrawerParent';
 import { QuickSettingsRemindersProvider } from '@proton/components/hooks/drawer/useQuickSettingsReminders';
+import { useInboxDesktopEventLoopRefresh } from '@proton/components/hooks/useInboxDesktopEventLoopRefresh';
 import { usePreventWasmLoading } from '@proton/components/hooks/usePreventWasmLoading';
 import { FeatureCode, useFeatures } from '@proton/features';
 import { useInstance } from '@proton/hooks';
@@ -35,6 +36,7 @@ import NotificationManagerInjector from './notifications/NotificationManagerInje
 const MainContainer = () => {
     useCalendarFavicon();
     usePreventWasmLoading();
+    useInboxDesktopEventLoopRefresh();
 
     const hasReactivatedCalendarsRef = useRef<boolean>(false);
     const [addresses] = useAddresses();

applications/inbox-desktop/src/utils/view/viewManagement.ts

@@ -365,6 +365,7 @@ export async function showView(viewID: CHANGE_VIEW_TARGET, url: string = "") {
         return;
     }
 
+    const previousViewID = currentViewID;
     currentViewID = viewID;
 
     mainWindow!.title = viewTitleMap[viewID];
@@ -397,6 +398,19 @@ export async function showView(viewID: CHANGE_VIEW_TARGET, url: string = "") {
         viewLogger(viewID).info("showView showing view for ", url);
         mainWindow!.setContentView(view);
     }
+
+    if (previousViewID === "account" && (viewID === "mail" || viewID === "calendar")) {
+        try {
+            viewLogger(viewID).info("Refreshing event loop after returning from account view");
+            view.webContents.send("hostUpdate", { type: "refreshEventLoop" });
+        } catch (e) {
+            viewLogger(viewID).error("Refreshing event loop", e);
+            sentryReport.reportMessage("Failed to refresh event loop after returning from account view", {
+                level: "error",
+                error: e instanceof Error ? e : undefined,
+            });
+        }
+    }
 }
 
 /**

applications/mail/src/app/MainContainer.tsx

@@ -11,6 +11,7 @@ import SubscriptionModalProvider from '@proton/components/containers/payments/su
 import { DrawerThemeInjector } from '@proton/components/containers/themes/ThemeInjector';
 import { QuickSettingsRemindersProvider } from '@proton/components/hooks/drawer/useQuickSettingsReminders';
 import useConfig from '@proton/components/hooks/useConfig';
+import { useInboxDesktopEventLoopRefresh } from '@proton/components/hooks/useInboxDesktopEventLoopRefresh';
 import { useInboxDesktopMetrics } from '@proton/components/hooks/useInboxDesktopMetrics';
 import { usePreventWasmLoading } from '@proton/components/hooks/usePreventWasmLoading.ts';
 import AssistantProvider from '@proton/llm/lib/providers/AssistantProvider';
@@ -33,6 +34,7 @@ const MainContainer: FunctionComponent = () => {
 
     useInboxDesktopHeartbeat();
     useInboxDesktopMetrics();
+    useInboxDesktopEventLoopRefresh();
 
     usePreventWasmLoading();
 

packages/components/hooks/useInboxDesktopEventLoopRefresh.ts

@@ -0,0 +1,23 @@
+import { useEffect } from 'react';
+
+import { addIPCHostUpdateListener, canListenInboxDesktopHostMessages } from '@proton/shared/lib/desktop/ipcHelpers';
+
+import useEventManager from './useEventManager';
+
+export const useInboxDesktopEventLoopRefresh = () => {
+    const { call } = useEventManager();
+
+    useEffect(() => {
+        if (!canListenInboxDesktopHostMessages) {
+            return;
+        }
+
+        const listener = addIPCHostUpdateListener('refreshEventLoop', () => {
+            void call();
+        });
+
+        return () => {
+            listener.removeListener();
+        };
+    }, [call]);
+};

packages/shared/lib/desktop/desktopTypes.ts

@@ -114,6 +114,10 @@ export const IPCInboxHostUpdateMessageSchema = z.discriminatedUnion('type', [
         type: z.literal('sentHeartbeatMetrics'),
         payload: z.custom<HttpsProtonMeDesktopInboxHeartbeatTotalV1SchemaJson>(),
     }),
+    z.object({
+        type: z.literal('refreshEventLoop'),
+        payload: z.undefined().optional(),
+    }),
 ]);
 
 export type IPCInboxHostUpdateMessage = z.infer<typeof IPCInboxHostUpdateMessageSchema>;