Fixes

Author: ulrikandersen

src/app/api/diff/[owner]/[repository]/[...path]/route.ts

@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from "next/server"
-import { session } from "@/composition"
+import { session, diffCalculator } from "@/composition"
 import { makeUnauthenticatedAPIErrorResponse } from "@/common"
-import { diffCalculator } from "@/composition"
 
 interface GetDiffParams {
   owner: string

src/features/projects/data/GitHubRepositoryDataSource.ts

@@ -197,7 +197,10 @@ export default class GitHubProjectDataSource
     }
 
     // Map PRs by their head branch name for quick lookup
-    response.repository.pullRequests.edges.forEach((edge: any) => {
+    const pullRequestEdges =
+      response.repository.pullRequests.edges as Edge<GraphQLPullRequest>[];
+
+    pullRequestEdges.forEach((edge) => {
       const pr = edge.node;
       pullRequests.set(pr.headRefName, {
         headRefName: pr.headRefName,

src/features/sidebar/data/useDiff.ts

@@ -16,18 +16,28 @@ export default function useDiff() {
 
   useEffect(() => {
     if (!diffUrl) {
-      setData({ changes: [] })
-      setLoading(false)
-      setError(null)
       return
     }
 
-    setLoading(true)
-    setError(null)
+    let isCancelled = false
+
+    Promise.resolve().then(() => {
+      if (isCancelled) {
+        return
+      }
+
+      setLoading(true)
+      setError(null)
+      setData(null)
+    })
 
     fetch(diffUrl)
       .then(res => res.json())
       .then(result => {
+        if (isCancelled) {
+          return
+        }
+
         if (result.error) {
           setData(null)
           setError(result.error)
@@ -38,12 +48,26 @@ export default function useDiff() {
         setLoading(false)
       })
       .catch(err => {
+        if (isCancelled) {
+          return
+        }
+
         console.error("Failed to fetch diff:", err)
         setData(null)
         setError("We couldn't load the diff right now. Please try again later.")
         setLoading(false)
       })
+
+    return () => {
+      isCancelled = true
+    }
   }, [diffUrl])
 
-  return { data, loading, changes: data?.changes || [], error }
+  const hasDiffUrl = Boolean(diffUrl)
+  const resolvedData = hasDiffUrl ? data : { changes: [] }
+  const resolvedChanges = resolvedData?.changes ?? []
+  const resolvedLoading = hasDiffUrl ? loading : false
+  const resolvedError = hasDiffUrl ? error : null
+
+  return { data: resolvedData, loading: resolvedLoading, changes: resolvedChanges, error: resolvedError }
 }

src/features/sidebar/view/SecondarySplitHeader.tsx

@@ -141,8 +141,11 @@ const ToggleDiffButton = ({
   const [isMac, setIsMac] = useState(false);
   useEffect(() => {
     // checkIsMac uses window so we delay the check.
-    setIsMac(checkIsMac());
-  }, [isMac, setIsMac]);
+    const timeout = window.setTimeout(() => {
+      setIsMac(checkIsMac());
+    }, 0);
+    return () => window.clearTimeout(timeout);
+  }, []);
   const isSidebarTogglable = useContext(SidebarTogglableContext);
   const openCloseKeyboardShortcut = `(${isMac ? "⌘" : "^"} + K)`;
   const tooltip = isDiffbarOpen ? "Hide changes" : "Show changes";