diff --git a/frontend/__tests__/components/features/sidebar/sidebar.test.tsx b/frontend/__tests__/components/features/sidebar/sidebar.test.tsx
index 14b84a14b628..12752079b5ba 100644
--- a/frontend/__tests__/components/features/sidebar/sidebar.test.tsx
+++ b/frontend/__tests__/components/features/sidebar/sidebar.test.tsx
@@ -4,7 +4,6 @@ import { afterEach, describe, expect, it, vi } from "vitest";
import { renderWithProviders } from "test-utils";
import { createRoutesStub } from "react-router";
import { Sidebar } from "#/components/features/sidebar/sidebar";
-import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
import OpenHands from "#/api/open-hands";
import { MOCK_USER_PREFERENCES } from "#/mocks/handlers";
@@ -20,7 +19,7 @@ const renderSidebar = () => {
};
describe("Sidebar", () => {
- it.skipIf(!MULTI_CONVERSATION_UI)(
+ it(
"should have the conversation panel open by default",
() => {
renderSidebar();
@@ -28,7 +27,7 @@ describe("Sidebar", () => {
},
);
- it.skipIf(!MULTI_CONVERSATION_UI)(
+ it(
"should toggle the conversation panel",
async () => {
const user = userEvent.setup();
diff --git a/frontend/__tests__/routes/_oh.app.test.tsx b/frontend/__tests__/routes/_oh.app.test.tsx
index 4fc96b25d3e5..d809b128ce08 100644
--- a/frontend/__tests__/routes/_oh.app.test.tsx
+++ b/frontend/__tests__/routes/_oh.app.test.tsx
@@ -5,7 +5,6 @@ import { screen, waitFor } from "@testing-library/react";
import toast from "react-hot-toast";
import App from "#/routes/_oh.app/route";
import OpenHands from "#/api/open-hands";
-import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
describe("App", () => {
const RouteStub = createRoutesStub([
@@ -35,7 +34,7 @@ describe("App", () => {
await screen.findByTestId("app-route");
});
- it.skipIf(!MULTI_CONVERSATION_UI)(
+ it(
"should call endSession if the user does not have permission to view conversation",
async () => {
const errorToastSpy = vi.spyOn(toast, "error");
diff --git a/frontend/src/components/features/sidebar/sidebar.tsx b/frontend/src/components/features/sidebar/sidebar.tsx
index cee990f9e963..1de8e0838571 100644
--- a/frontend/src/components/features/sidebar/sidebar.tsx
+++ b/frontend/src/components/features/sidebar/sidebar.tsx
@@ -15,7 +15,6 @@ import { SettingsModal } from "#/components/shared/modals/settings/settings-moda
import { useCurrentSettings } from "#/context/settings-context";
import { useSettings } from "#/hooks/query/use-settings";
import { ConversationPanel } from "../conversation-panel/conversation-panel";
-import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
import { useEndSession } from "#/hooks/use-end-session";
import { setCurrentAgentState } from "#/state/agent-slice";
import { AgentState } from "#/types/agent-state";
@@ -75,16 +74,14 @@ export function Sidebar() {
{user.isLoading && }
- {MULTI_CONVERSATION_UI && (
- setConversationPanelIsOpen((prev) => !prev)}
- >
-
-
- )}
+ setConversationPanelIsOpen((prev) => !prev)}
+ >
+
+
setSettingsModalIsOpen(true)} />
{!user.isLoading && (
diff --git a/frontend/src/routes/_oh.app/route.tsx b/frontend/src/routes/_oh.app/route.tsx
index ac846567e0a9..19ba0beb64e7 100644
--- a/frontend/src/routes/_oh.app/route.tsx
+++ b/frontend/src/routes/_oh.app/route.tsx
@@ -35,7 +35,6 @@ import { useUserConversation } from "#/hooks/query/use-user-conversation";
import { ServedAppLabel } from "#/components/layout/served-app-label";
import { TerminalStatusLabel } from "#/components/features/terminal/terminal-status-label";
import { useSettings } from "#/hooks/query/use-settings";
-import { MULTI_CONVERSATION_UI } from "#/utils/feature-flags";
function AppContent() {
useConversationConfig();
@@ -62,7 +61,7 @@ function AppContent() {
);
React.useEffect(() => {
- if (MULTI_CONVERSATION_UI && isFetched && !conversation) {
+ if (isFetched && !conversation) {
toast.error(
"This conversation does not exist, or you do not have permission to access it.",
);
diff --git a/frontend/src/utils/feature-flags.ts b/frontend/src/utils/feature-flags.ts
index 8cdf711aadf5..a5f32b1128e7 100644
--- a/frontend/src/utils/feature-flags.ts
+++ b/frontend/src/utils/feature-flags.ts
@@ -12,4 +12,4 @@ function loadFeatureFlag(
}
}
-export const MULTI_CONVERSATION_UI = loadFeatureFlag("MULTI_CONVERSATION_UI");
+export const MEMORY_CONDENSER = loadFeatureFlag("MEMORY_CONDENSER");
diff --git a/frontend/tests/conversation-panel.test.ts b/frontend/tests/conversation-panel.test.ts
index eca42a9e9228..f173a99da88b 100644
--- a/frontend/tests/conversation-panel.test.ts
+++ b/frontend/tests/conversation-panel.test.ts
@@ -32,7 +32,6 @@ const selectConversationCard = async (page: Page, index: number) => {
test.beforeEach(async ({ page }) => {
await page.goto("/");
await page.evaluate(() => {
- localStorage.setItem("FEATURE_MULTI_CONVERSATION_UI", "true");
localStorage.setItem("analytics-consent", "true");
localStorage.setItem("SETTINGS_VERSION", "5");
});