diff --git a/frontend/app/App.tsx b/frontend/app/App.tsx
index 6f1c6eb96b9d..3ca446b9b808 100644
--- a/frontend/app/App.tsx
+++ b/frontend/app/App.tsx
@@ -3,11 +3,15 @@
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { PropsWithChildren, useEffect } from "react";
+import { Menu } from "@/lib/components/Menu/Menu";
+import { NotificationBanner } from "@/lib/components/NotificationBanner";
import { BrainProvider } from "@/lib/context";
import { useBrainContext } from "@/lib/context/BrainProvider/hooks/useBrainContext";
+import { SideBarProvider } from "@/lib/context/SidebarProvider/sidebar-provider";
import { useSupabase } from "@/lib/context/SupabaseProvider";
import { UpdateMetadata } from "@/lib/helpers/updateMetadata";
import { usePageTracking } from "@/services/analytics/june/usePageTracking";
+
import "../lib/config/LocaleConfig/i18n";
// This wrapper is used to make effect calls at a high level in app rendering.
@@ -27,10 +31,14 @@ const App = ({ children }: PropsWithChildren): JSX.Element => {
}, [session]);
return (
- <>
- {children}
-
- >
+
+
{children}
diff --git a/frontend/app/chat/[chatId]/__tests__/page.test.tsx b/frontend/app/chat/[chatId]/__tests__/page.test.tsx
index be9cb7d48dbd..53e4a3d6a9ac 100644
--- a/frontend/app/chat/[chatId]/__tests__/page.test.tsx
+++ b/frontend/app/chat/[chatId]/__tests__/page.test.tsx
@@ -11,6 +11,7 @@ import {
ChatProviderMock,
} from "@/lib/context/ChatProvider/mocks/ChatProviderMock";
import { KnowledgeToFeedProvider } from "@/lib/context/KnowledgeToFeedProvider";
+import { SideBarProvider } from "@/lib/context/SidebarProvider/sidebar-provider";
import {
SupabaseContextMock,
SupabaseProviderMock,
@@ -87,7 +88,9 @@ describe("Chat page", () => {
- ,
+
+ ,
+
diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx
index dd952bf47ef7..dc7ed708bd6c 100644
--- a/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx
+++ b/frontend/app/chat/[chatId]/components/ActionsBar/ActionsBar.tsx
@@ -2,12 +2,14 @@ import { AnimatePresence, motion } from "framer-motion";
import { useTranslation } from "react-i18next";
import { AiOutlineLoading3Quarters } from "react-icons/ai";
+import { useKnowledgeToFeedContext } from "@/lib/context/KnowledgeToFeedProvider/hooks/useKnowledgeToFeedContext";
+
import { ChatInput, KnowledgeToFeed } from "./components";
import { useActionBar } from "./hooks/useActionBar";
export const ActionsBar = (): JSX.Element => {
- const { hasPendingRequests, setHasPendingRequests, shouldDisplayFeedCard } =
- useActionBar();
+ const { hasPendingRequests, setHasPendingRequests } = useActionBar();
+ const { shouldDisplayFeedCard } = useKnowledgeToFeedContext();
const { t } = useTranslation(["chat"]);
@@ -39,9 +41,7 @@ export const ActionsBar = (): JSX.Element => {
)}
- {!shouldDisplayFeedCard && (
-
- )}
+ {!shouldDisplayFeedCard &&
}
>
);
diff --git a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx b/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx
index 8035b965a2ee..431f05c28ef1 100644
--- a/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx
+++ b/frontend/app/chat/[chatId]/components/ActionsBar/components/ChatInput/components/ActionsModal/ActionsModal.tsx
@@ -12,6 +12,7 @@ import {
import { ChangeBrainButton } from "./components/ChangeBrainButton";
import { ChatHistoryButton } from "./components/ChatHistoryButton/ChatHistoryButton";
import { ConfigModal } from "./components/ConfigModal";
+import { FeedCardTrigger } from "./components/FeedCardTrigger";
import { NewDiscussionButton } from "./components/NewDiscussionButton";
import { SelectedBrainTag } from "./components/SelectedBrainTag";
@@ -40,6 +41,7 @@ export const ActionsModal = (): JSX.Element => {
>