From 634d1e0a0fbd2357094d4d4141aa15149cc36a7d Mon Sep 17 00:00:00 2001 From: litruv Date: Sun, 1 Nov 2026 23:04:36 +1100 Subject: [PATCH] Resolve the exhaustive-deps findings and attach cause to the rethrown errors. [skip build] --- src/app/components/title-bar/TitleBar.tsx | 2 +- .../call/IncomingCallNotification.tsx | 2 +- src/app/features/room/RoomTimeline.tsx | 4 ++-- src/app/features/settings/audio/Audio.tsx | 8 +------ .../permissions/Permissions.tsx | 6 ++--- src/app/hooks/useAsyncCallback.ts | 2 +- src/app/hooks/useAuthenticatedMediaUrl.ts | 24 +++++++------------ src/app/hooks/useMemberSort.ts | 2 +- src/app/hooks/useSidebarItems.ts | 15 +++++------- src/app/pages/auth/SSOLogin.tsx | 12 ++++------ src/client/initMatrix.ts | 1 + tsconfig.json | 2 +- 12 files changed, 31 insertions(+), 49 deletions(-) diff --git a/src/app/components/title-bar/TitleBar.tsx b/src/app/components/title-bar/TitleBar.tsx index 00fa33ae..3dea5601 100644 --- a/src/app/components/title-bar/TitleBar.tsx +++ b/src/app/components/title-bar/TitleBar.tsx @@ -472,7 +472,7 @@ export function TitleBar({ mx, children }: TitleBarProps) { mx.off(RoomEvent.Receipt, update); mx.off(ClientEvent.Room, update); }; - }, [mx, roomId, scheduleDismiss, notificationData, shouldNotifySpecialMessage]); + }, [mx, roomId, scheduleDismiss, notificationData, shouldNotifySpecialMessage, mDirects]); // Clear notifications when user reads messages in a room useEffect(() => { diff --git a/src/app/features/call/IncomingCallNotification.tsx b/src/app/features/call/IncomingCallNotification.tsx index 220fd28c..63651de3 100644 --- a/src/app/features/call/IncomingCallNotification.tsx +++ b/src/app/features/call/IncomingCallNotification.tsx @@ -176,7 +176,7 @@ export function IncomingCallNotification() { checkForIncomingCalls(); } }, - [checkForIncomingCalls, declinedRooms, mx], + [checkForIncomingCalls, mx], ); // Set up event listeners diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 7977abb9..e4650905 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -1187,7 +1187,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli return () => { persistTimelineScroll(roomId); }; - }, [room.roomId, persistTimelineScroll]); + }, [room, persistTimelineScroll]); // Keep scroll cache updated while reading (useEffect cleanup runs after DOM teardown). useEffect(() => { @@ -1216,7 +1216,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli window.cancelAnimationFrame(raf); scrollEl.removeEventListener('scroll', onScroll); }; - }, [room.roomId, eventId, persistTimelineScroll]); + }, [room, eventId, persistTimelineScroll]); // Restore saved scroll or default to bottom on first open. useLayoutEffect(() => { diff --git a/src/app/features/settings/audio/Audio.tsx b/src/app/features/settings/audio/Audio.tsx index 2257d896..eb07f467 100644 --- a/src/app/features/settings/audio/Audio.tsx +++ b/src/app/features/settings/audio/Audio.tsx @@ -726,13 +726,7 @@ export function Audio({ requestClose }: AudioProps) { console.error('Microphone monitoring failed:', e); } } - }, [ - micMonitoring, - settings.microphoneId, - settings.noiseSuppression, - settings.echoCancellation, - settings.autoGainControl, - ]); + }, [micMonitoring, settings]); // Cleanup monitoring on unmount useEffect( diff --git a/src/app/features/space-settings/permissions/Permissions.tsx b/src/app/features/space-settings/permissions/Permissions.tsx index 089060ef..3e9c3dd7 100644 --- a/src/app/features/space-settings/permissions/Permissions.tsx +++ b/src/app/features/space-settings/permissions/Permissions.tsx @@ -52,11 +52,9 @@ export function Permissions({ requestClose }: PermissionsProps) { useRecursiveChildScopeFactory(mx, roomToParents), ); - // Combine both spaces and rooms for syncing - const allChildren = [...childSpaces, ...childRooms]; - // Calculate which children we can sync to const { syncableChildren, nonSyncableChildren } = useMemo(() => { + const allChildren = [...childSpaces, ...childRooms]; const syncable: string[] = []; const nonSyncable: { roomId: string; name: string }[] = []; @@ -97,7 +95,7 @@ export function Permissions({ requestClose }: PermissionsProps) { }); return { syncableChildren: syncable, nonSyncableChildren: nonSyncable }; - }, [allChildren, mx]); + }, [childSpaces, childRooms, mx]); const [syncState, syncPermissions] = useAsyncCallback( useCallback(async () => { diff --git a/src/app/hooks/useAsyncCallback.ts b/src/app/hooks/useAsyncCallback.ts index f3b0eb26..3a83316e 100644 --- a/src/app/hooks/useAsyncCallback.ts +++ b/src/app/hooks/useAsyncCallback.ts @@ -76,7 +76,7 @@ export const useAsync = ( return data; } catch (e) { if (currentReqNumber !== reqNumberRef.current) { - throw new Error('AsyncCallbackHook: Request replaced!'); + throw new Error('AsyncCallbackHook: Request replaced!', { cause: e }); } if (alive()) { diff --git a/src/app/hooks/useAuthenticatedMediaUrl.ts b/src/app/hooks/useAuthenticatedMediaUrl.ts index 6fbdc706..42b77b95 100644 --- a/src/app/hooks/useAuthenticatedMediaUrl.ts +++ b/src/app/hooks/useAuthenticatedMediaUrl.ts @@ -62,18 +62,12 @@ export const useAuthenticatedMediaUrl = ( * Creates an authenticated fetch function for media URLs. * Useful for components that need to load multiple images. */ -export const useAuthenticatedMediaFetch = () => { - const mx = useMatrixClient(); - - return useCallback( - async (src: string, useAuthentication = true): Promise => { - try { - return await resolveAuthenticatedMediaUrl(src, useAuthentication); - } catch (error) { - console.warn('[useAuthenticatedMediaFetch] Error fetching authenticated media:', error); - return src; - } - }, - [mx], - ); -}; +export const useAuthenticatedMediaFetch = () => + useCallback(async (src: string, useAuthentication = true): Promise => { + try { + return await resolveAuthenticatedMediaUrl(src, useAuthentication); + } catch (error) { + console.warn('[useAuthenticatedMediaFetch] Error fetching authenticated media:', error); + return src; + } + }, []); diff --git a/src/app/hooks/useMemberSort.ts b/src/app/hooks/useMemberSort.ts index 73f5e2f6..5afa2a6d 100644 --- a/src/app/hooks/useMemberSort.ts +++ b/src/app/hooks/useMemberSort.ts @@ -61,7 +61,7 @@ export const useMemberPowerSort = ( return getPowerLevel(b.userId) - getPowerLevel(a.userId); }, - [creators], + [creators, getPowerLevel], ); return sort; diff --git a/src/app/hooks/useSidebarItems.ts b/src/app/hooks/useSidebarItems.ts index 75ce0d17..a6e2e2ef 100644 --- a/src/app/hooks/useSidebarItems.ts +++ b/src/app/hooks/useSidebarItems.ts @@ -281,15 +281,12 @@ export const useHomeHidden = (): [boolean, Dispatch>] => useAccountDataCallback( mx, - useCallback( - (mEvent) => { - if (mEvent.getType() === AccountDataEvent.CinnySpaces) { - const newContent = mEvent.getContent(); - setHomeHidden(newContent?.hideHome ?? false); - } - }, - [mx], - ), + useCallback((mEvent) => { + if (mEvent.getType() === AccountDataEvent.CinnySpaces) { + const newContent = mEvent.getContent(); + setHomeHidden(newContent?.hideHome ?? false); + } + }, []), ); return [homeHidden, setHomeHidden]; diff --git a/src/app/pages/auth/SSOLogin.tsx b/src/app/pages/auth/SSOLogin.tsx index be3cf680..bfadae3b 100644 --- a/src/app/pages/auth/SSOLogin.tsx +++ b/src/app/pages/auth/SSOLogin.tsx @@ -16,11 +16,6 @@ export function SSOLogin({ providers, redirectUrl, action, saveScreenSpace }: SS const mx = useMemo(() => createClient({ baseUrl }), [baseUrl]); const [launchingProviderId, setLaunchingProviderId] = useState(null); - const getSSOIdUrl = (ssoId?: string): string => { - const existingDeviceId = localStorage.getItem('cinny_device_id') ?? undefined; - return mx.getSsoLoginUrl(redirectUrl, 'sso', ssoId, action, existingDeviceId); - }; - const handleContinue = useCallback( async (providerId?: string) => { if (launchingProviderId) { @@ -39,12 +34,15 @@ export function SSOLogin({ providers, redirectUrl, action, saveScreenSpace }: SS } try { - await openExternalUrl(getSSOIdUrl(providerId)); + const existingDeviceId = localStorage.getItem('cinny_device_id') ?? undefined; + await openExternalUrl( + mx.getSsoLoginUrl(redirectUrl, 'sso', providerId, action, existingDeviceId), + ); } finally { setLaunchingProviderId(null); } }, - [getSSOIdUrl, launchingProviderId], + [mx, redirectUrl, action, launchingProviderId], ); const withoutIcon = providers diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index dd3f4e25..cde3ee5e 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -345,6 +345,7 @@ export const initClient = async (session: Session): Promise => { `❌ Crypto store conflict detected.\n\n` + `This account's crypto store contains data from a different account.\n` + `Please clear site data in DevTools (F12 → Application → Storage → Clear site data)`, + { cause: error }, ); } diff --git a/tsconfig.json b/tsconfig.json index 744dc0f7..c81d4a2c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "outDir": "dist", "rootDir": "./src", "skipLibCheck": true, - "lib": ["ES2020", "DOM"] + "lib": ["ES2022", "DOM"] }, "exclude": ["node_modules", "dist"], "include": ["src"]