From c5aefa09f66b2898bddf5a71f4dda1451531ff0e Mon Sep 17 00:00:00 2001
From: Brace Sproul <braceasproul@gmail.com>
Date: Sat, 26 Jul 2025 13:47:49 -0700
Subject: [PATCH] fix: Dont wrap layout in Github app provide since not all
 require it (#549)

* fix: Dont wrap layout in Github app provide since not all require it

* cr

* cr
---
 apps/web/src/app/(v2)/chat/[thread_id]/page.tsx |  2 --
 apps/web/src/app/(v2)/chat/layout.tsx           |  7 +------
 apps/web/src/app/(v2)/chat/page.tsx             | 12 ++++++++++--
 apps/web/src/app/(v2)/chat/threads/page.tsx     |  6 ++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/web/src/app/(v2)/chat/[thread_id]/page.tsx b/apps/web/src/app/(v2)/chat/[thread_id]/page.tsx
index b8c7265b..82c8d30b 100644
--- a/apps/web/src/app/(v2)/chat/[thread_id]/page.tsx
+++ b/apps/web/src/app/(v2)/chat/[thread_id]/page.tsx
@@ -25,7 +25,6 @@ export default function ThreadPage({
 }) {
   const router = useRouter();
   const { thread_id } = use(params);
-  const { currentInstallation } = useGitHubAppProvider();
   const stream = useStream<ManagerGraphState>({
     apiUrl: process.env.NEXT_PUBLIC_API_URL ?? "",
     assistantId: MANAGER_GRAPH_ID,
@@ -36,7 +35,6 @@ export default function ThreadPage({
 
   const { threads, isLoading: threadsLoading } = useThreadsSWR({
     assistantId: MANAGER_GRAPH_ID,
-    currentInstallation,
     disableOrgFiltering: true,
   });
 
diff --git a/apps/web/src/app/(v2)/chat/layout.tsx b/apps/web/src/app/(v2)/chat/layout.tsx
index 0f7e3c35..5c323195 100644
--- a/apps/web/src/app/(v2)/chat/layout.tsx
+++ b/apps/web/src/app/(v2)/chat/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import "../../globals.css";
 import React, { Suspense } from "react";
-import { GitHubAppProvider } from "@/providers/GitHubApp";
 
 export const metadata: Metadata = {
   title: "Open SWE - Chat",
@@ -18,9 +17,5 @@ export default function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <GitHubAppProvider>{children}</GitHubAppProvider>
-    </Suspense>
-  );
+  return <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>;
 }
diff --git a/apps/web/src/app/(v2)/chat/page.tsx b/apps/web/src/app/(v2)/chat/page.tsx
index cebded62..0b563369 100644
--- a/apps/web/src/app/(v2)/chat/page.tsx
+++ b/apps/web/src/app/(v2)/chat/page.tsx
@@ -2,12 +2,12 @@
 
 import { DefaultView } from "@/components/v2/default-view";
 import { useThreadsSWR } from "@/hooks/useThreadsSWR";
-import { useGitHubAppProvider } from "@/providers/GitHubApp";
+import { GitHubAppProvider, useGitHubAppProvider } from "@/providers/GitHubApp";
 import { Toaster } from "@/components/ui/sonner";
 import { Suspense } from "react";
 import { MANAGER_GRAPH_ID } from "@open-swe/shared/constants";
 
-export default function ChatPage() {
+function ChatPageComponent() {
   const { currentInstallation } = useGitHubAppProvider();
   const { threads, isLoading: threadsLoading } = useThreadsSWR({
     assistantId: MANAGER_GRAPH_ID,
@@ -30,3 +30,11 @@ export default function ChatPage() {
     </div>
   );
 }
+
+export default function ChatPage() {
+  return (
+    <GitHubAppProvider>
+      <ChatPageComponent />
+    </GitHubAppProvider>
+  );
+}
diff --git a/apps/web/src/app/(v2)/chat/threads/page.tsx b/apps/web/src/app/(v2)/chat/threads/page.tsx
index f8f1bb4a..77d3e4f4 100644
--- a/apps/web/src/app/(v2)/chat/threads/page.tsx
+++ b/apps/web/src/app/(v2)/chat/threads/page.tsx
@@ -11,7 +11,7 @@ import { useThreadsSWR } from "@/hooks/useThreadsSWR";
 import { ThreadCard, ThreadCardLoading } from "@/components/v2/thread-card";
 import { ThemeToggle } from "@/components/theme-toggle";
 import { InstallationSelector } from "@/components/github/installation-selector";
-import { useGitHubAppProvider } from "@/providers/GitHubApp";
+import { GitHubAppProvider, useGitHubAppProvider } from "@/providers/GitHubApp";
 import { MANAGER_GRAPH_ID } from "@open-swe/shared/constants";
 import { useThreadsStatus } from "@/hooks/useThreadsStatus";
 import { cn } from "@/lib/utils";
@@ -260,7 +260,9 @@ function AllThreadsPageContent() {
 export default function AllThreadsPage() {
   return (
     <Suspense fallback={<div>Loading...</div>}>
-      <AllThreadsPageContent />
+      <GitHubAppProvider>
+        <AllThreadsPageContent />
+      </GitHubAppProvider>
     </Suspense>
   );
 }