Skip to content

πŸ™Œ OpenHands: AI-Driven Development

feat(frontend): allow all users to access the LLM page and disable Pro subscription functionality (#11573)

Hiep Le59a992c0fb7c
diff --git a/frontend/__tests__/components/features/payment/payment-form.test.tsx b/frontend/__tests__/components/features/payment/payment-form.test.tsx
index 068f1bf640..2e8d00c6f2 100644
--- a/frontend/__tests__/components/features/payment/payment-form.test.tsx
+++ b/frontend/__tests__/components/features/payment/payment-form.test.tsx
@@ -188,172 +188,4 @@ describe("PaymentForm", () => {
expect(mockMutate).not.toHaveBeenCalled();
});
});
-
- describe("Cancel Subscription", () => {
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- const cancelSubscriptionSpy = vi.spyOn(
- BillingService,
- "cancelSubscription",
- );
-
- beforeEach(() => {
- // Mock active subscription
- getSubscriptionAccessSpy.mockResolvedValue({
- start_at: "2024-01-01T00:00:00Z",
- end_at: "2024-12-31T23:59:59Z",
- created_at: "2024-01-01T00:00:00Z",
- });
- });
-
- it("should render cancel subscription button when user has active subscription", async () => {
- renderPaymentForm();
-
- await waitFor(() => {
- const cancelButton = screen.getByTestId("cancel-subscription-button");
- expect(cancelButton).toBeInTheDocument();
- expect(cancelButton).toHaveTextContent("PAYMENT$CANCEL_SUBSCRIPTION");
- });
- });
-
- it("should not render cancel subscription button when user has no subscription", async () => {
- getSubscriptionAccessSpy.mockResolvedValue(null);
- renderPaymentForm();
-
- await waitFor(() => {
- const cancelButton = screen.queryByTestId("cancel-subscription-button");
- expect(cancelButton).not.toBeInTheDocument();
- });
- });
-
- it("should show confirmation modal when cancel subscription button is clicked", async () => {
- const user = userEvent.setup();
- renderPaymentForm();
-
- const cancelButton = await screen.findByTestId(
- "cancel-subscription-button",
- );
- await user.click(cancelButton);
-
- // Should show confirmation modal
- expect(
- screen.getByTestId("cancel-subscription-modal"),
- ).toBeInTheDocument();
- expect(
- screen.getByText("PAYMENT$CANCEL_SUBSCRIPTION_TITLE"),
- ).toBeInTheDocument();
- // The message should be rendered (either with Trans component or regular text)
- const modalContent = screen.getByTestId("cancel-subscription-modal");
- expect(modalContent).toBeInTheDocument();
- expect(screen.getByTestId("confirm-cancel-button")).toBeInTheDocument();
- expect(screen.getByTestId("modal-cancel-button")).toBeInTheDocument();
- });
-
- it("should close modal when cancel button in modal is clicked", async () => {
- const user = userEvent.setup();
- renderPaymentForm();
-
- const cancelButton = await screen.findByTestId(
- "cancel-subscription-button",
- );
- await user.click(cancelButton);
-
- // Modal should be visible
- expect(
- screen.getByTestId("cancel-subscription-modal"),
- ).toBeInTheDocument();
-
- // Click cancel in modal
- const modalCancelButton = screen.getByTestId("modal-cancel-button");
- await user.click(modalCancelButton);
-
- // Modal should be closed
- expect(
- screen.queryByTestId("cancel-subscription-modal"),
- ).not.toBeInTheDocument();
- });
-
- it("should call cancel subscription API when confirm button is clicked", async () => {
- const user = userEvent.setup();
- renderPaymentForm();
-
- const cancelButton = await screen.findByTestId(
- "cancel-subscription-button",
- );
- await user.click(cancelButton);
-
- // Click confirm in modal
- const confirmButton = screen.getByTestId("confirm-cancel-button");
- await user.click(confirmButton);
-
- // Should call the cancel subscription API
- expect(cancelSubscriptionSpy).toHaveBeenCalled();
- });
-
- it("should close modal after successful cancellation", async () => {
- const user = userEvent.setup();
- cancelSubscriptionSpy.mockResolvedValue({
- status: "success",
- message: "Subscription cancelled successfully",
- });
- renderPaymentForm();
-
- const cancelButton = await screen.findByTestId(
- "cancel-subscription-button",
- );
- await user.click(cancelButton);
-
- const confirmButton = screen.getByTestId("confirm-cancel-button");
- await user.click(confirmButton);
-
- // Wait for API call to complete and modal to close
- await waitFor(() => {
- expect(
- screen.queryByTestId("cancel-subscription-modal"),
- ).not.toBeInTheDocument();
- });
- });
-
- it("should show next billing date for active subscription", async () => {
- // Mock active subscription with end_at as next billing date
- getSubscriptionAccessSpy.mockResolvedValue({
- start_at: "2024-01-01T00:00:00Z",
- end_at: "2025-01-01T00:00:00Z",
- created_at: "2024-01-01T00:00:00Z",
- cancelled_at: null,
- stripe_subscription_id: "sub_123",
- });
-
- renderPaymentForm();
-
- await waitFor(() => {
- const nextBillingInfo = screen.getByTestId("next-billing-date");
- expect(nextBillingInfo).toBeInTheDocument();
- // Check that it contains some date-related content (translation key or actual date)
- expect(nextBillingInfo).toHaveTextContent(
- /2025|PAYMENT.*BILLING.*DATE/,
- );
- });
- });
-
- it("should not show next billing date when subscription is cancelled", async () => {
- // Mock cancelled subscription
- getSubscriptionAccessSpy.mockResolvedValue({
- start_at: "2024-01-01T00:00:00Z",
- end_at: "2025-01-01T00:00:00Z",
- created_at: "2024-01-01T00:00:00Z",
- cancelled_at: "2024-06-15T10:30:00Z",
- stripe_subscription_id: "sub_123",
- });
-
- renderPaymentForm();
-
- await waitFor(() => {
- const nextBillingInfo = screen.queryByTestId("next-billing-date");
- expect(nextBillingInfo).not.toBeInTheDocument();
- });
- });
- });
});
diff --git a/frontend/__tests__/routes/llm-settings.test.tsx b/frontend/__tests__/routes/llm-settings.test.tsx
index 7459579b92..f826b20f45 100644
--- a/frontend/__tests__/routes/llm-settings.test.tsx
+++ b/frontend/__tests__/routes/llm-settings.test.tsx
@@ -4,14 +4,12 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
import LlmSettingsScreen from "#/routes/llm-settings";
import SettingsService from "#/settings-service/settings-service.api";
-import OptionService from "#/api/option-service/option-service.api";
import {
MOCK_DEFAULT_USER_SETTINGS,
resetTestHandlersMockSettings,
} from "#/mocks/handlers";
import * as AdvancedSettingsUtlls from "#/utils/has-advanced-settings-set";
import * as ToastHandlers from "#/utils/custom-toast-handlers";
-import BillingService from "#/api/billing-service/billing-service.api";
// Mock react-router hooks
const mockUseSearchParams = vi.fn();
@@ -25,12 +23,6 @@ vi.mock("#/hooks/query/use-is-authed", () => ({
useIsAuthed: () => mockUseIsAuthed(),
}));
-// Mock useIsAllHandsSaaSEnvironment hook
-const mockUseIsAllHandsSaaSEnvironment = vi.fn();
-vi.mock("#/hooks/use-is-all-hands-saas-environment", () => ({
- useIsAllHandsSaaSEnvironment: () => mockUseIsAllHandsSaaSEnvironment(),
-}));
-
const renderLlmSettingsScreen = () =>
render(<LlmSettingsScreen />, {
wrapper: ({ children }) => (
@@ -54,9 +46,6 @@ beforeEach(() => {
// Default mock for useIsAuthed - returns authenticated by default
mockUseIsAuthed.mockReturnValue({ data: true, isLoading: false });
-
- // Default mock for useIsAllHandsSaaSEnvironment - returns true for SaaS environment
- mockUseIsAllHandsSaaSEnvironment.mockReturnValue(true);
});
describe("Content", () => {
@@ -605,9 +594,14 @@ describe("Form submission", () => {
renderLlmSettingsScreen();
await screen.findByTestId("llm-settings-screen");
+ // Component automatically shows advanced view when advanced settings exist
+ // Switch to basic view to test clearing advanced settings
const advancedSwitch = screen.getByTestId("advanced-settings-switch");
await userEvent.click(advancedSwitch);
+ // Now we should be in basic view
+ await screen.findByTestId("llm-settings-form-basic");
+
const provider = screen.getByTestId("llm-provider-input");
const model = screen.getByTestId("llm-model-input");
@@ -731,405 +725,3 @@ describe("Status toasts", () => {
});
});
});
-
-describe("SaaS mode", () => {
- describe("SaaS subscription", () => {
- // Common mock configurations
- const MOCK_SAAS_CONFIG = {
- APP_MODE: "saas" as const,
- GITHUB_CLIENT_ID: "fake-github-client-id",
- POSTHOG_CLIENT_KEY: "fake-posthog-client-key",
- FEATURE_FLAGS: {
- ENABLE_BILLING: true,
- HIDE_LLM_SETTINGS: false,
- ENABLE_JIRA: false,
- ENABLE_JIRA_DC: false,
- ENABLE_LINEAR: false,
- },
- };
-
- const MOCK_ACTIVE_SUBSCRIPTION = {
- start_at: "2024-01-01",
- end_at: "2024-12-31",
- created_at: "2024-01-01",
- };
-
- it("should show upgrade banner and prevent all interactions for unsubscribed SaaS users", async () => {
- // Mock SaaS mode without subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (no subscription)
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- // Mock saveSettings to ensure it's not called
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Should show upgrade banner
- expect(screen.getByTestId("upgrade-banner")).toBeInTheDocument();
-
- // Should have a clickable upgrade button
- const upgradeButton = screen.getByRole("button", { name: /upgrade/i });
- expect(upgradeButton).toBeInTheDocument();
- expect(upgradeButton).not.toBeDisabled();
-
- // Form should be disabled
- const form = screen.getByTestId("llm-settings-form-basic");
- expect(form).toHaveAttribute("aria-disabled", "true");
-
- // All form inputs should be disabled or non-interactive
- const providerInput = screen.getByTestId("llm-provider-input");
- const modelInput = screen.getByTestId("llm-model-input");
- const apiKeyInput = screen.getByTestId("llm-api-key-input");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- const submitButton = screen.getByTestId("submit-button");
-
- // Inputs should be disabled
- expect(providerInput).toBeDisabled();
- expect(modelInput).toBeDisabled();
- expect(apiKeyInput).toBeDisabled();
- expect(advancedSwitch).toBeDisabled();
- expect(submitButton).toBeDisabled();
-
- // Confirmation mode switch is in advanced view, so it's not visible in basic view
- expect(
- screen.queryByTestId("enable-confirmation-mode-switch"),
- ).not.toBeInTheDocument();
-
- // Try to interact with inputs - they should not respond
- await userEvent.click(providerInput);
- await userEvent.type(apiKeyInput, "test-key");
-
- // Values should not change
- expect(apiKeyInput).toHaveValue("");
-
- // Try to submit form - should not call API
- await userEvent.click(submitButton);
- expect(saveSettingsSpy).not.toHaveBeenCalled();
- });
-
- it("should call subscription checkout API when upgrade button is clicked", async () => {
- // Mock SaaS mode without subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (no subscription)
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- // Mock the subscription checkout API call
- const createSubscriptionCheckoutSessionSpy = vi.spyOn(
- BillingService,
- "createSubscriptionCheckoutSession",
- );
- createSubscriptionCheckoutSessionSpy.mockResolvedValue({});
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Click the upgrade button
- const upgradeButton = screen.getByRole("button", { name: /upgrade/i });
- await userEvent.click(upgradeButton);
-
- // Should call the subscription checkout API
- expect(createSubscriptionCheckoutSessionSpy).toHaveBeenCalled();
- });
-
- it("should disable upgrade button for unauthenticated users in SaaS mode", async () => {
- // Mock SaaS mode without subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (no subscription)
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- // Mock subscription checkout API
- const createSubscriptionCheckoutSessionSpy = vi.spyOn(
- BillingService,
- "createSubscriptionCheckoutSession",
- );
-
- // Mock authentication to return false (unauthenticated) from the start
- mockUseIsAuthed.mockReturnValue({ data: false, isLoading: false });
-
- // Mock settings to return default settings even when unauthenticated
- // This is necessary because the useSettings hook is disabled when user is not authenticated
- const getSettingsSpy = vi.spyOn(SettingsService, "getSettings");
- getSettingsSpy.mockResolvedValue(MOCK_DEFAULT_USER_SETTINGS);
-
- renderLlmSettingsScreen();
-
- // Wait for either the settings screen or skeleton to appear
- await waitFor(() => {
- const settingsScreen = screen.queryByTestId("llm-settings-screen");
- const skeleton = screen.queryByTestId("app-settings-skeleton");
- expect(settingsScreen || skeleton).toBeInTheDocument();
- });
-
- // If we get the skeleton, the test scenario isn't valid - skip the rest
- if (screen.queryByTestId("app-settings-skeleton")) {
- // For unauthenticated users, the settings don't load, so no upgrade banner is shown
- // This is the expected behavior - unauthenticated users see a skeleton loading state
- expect(screen.queryByTestId("upgrade-banner")).not.toBeInTheDocument();
- return;
- }
-
- await screen.findByTestId("llm-settings-screen");
-
- // Should show upgrade banner
- expect(screen.getByTestId("upgrade-banner")).toBeInTheDocument();
-
- // Upgrade button should be disabled for unauthenticated users
- const upgradeButton = screen.getByRole("button", { name: /upgrade/i });
- expect(upgradeButton).toBeInTheDocument();
- expect(upgradeButton).toBeDisabled();
-
- // Clicking disabled button should not call the API
- await userEvent.click(upgradeButton);
- expect(createSubscriptionCheckoutSessionSpy).not.toHaveBeenCalled();
- });
-
- it("should not show upgrade banner and allow form interaction for subscribed SaaS users", async () => {
- // Mock SaaS mode with subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return active subscription
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(MOCK_ACTIVE_SUBSCRIPTION);
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Wait for subscription data to load
- await waitFor(() => {
- expect(getSubscriptionAccessSpy).toHaveBeenCalled();
- });
-
- // Should NOT show upgrade banner
- expect(screen.queryByTestId("upgrade-banner")).not.toBeInTheDocument();
-
- // Form should NOT be disabled
- const form = screen.getByTestId("llm-settings-form-basic");
- expect(form).not.toHaveAttribute("aria-disabled", "true");
- });
-
- it("should not call save settings API when making changes in disabled form for unsubscribed users", async () => {
- // Mock SaaS mode without subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (no subscription)
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- // Mock saveSettings to track calls
- const saveSettingsSpy = vi.spyOn(SettingsService, "saveSettings");
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Verify that basic form elements are disabled for unsubscribed users
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
- const submitButton = screen.getByTestId("submit-button");
-
- expect(advancedSwitch).toBeDisabled();
- expect(submitButton).toBeDisabled();
-
- // Confirmation mode switch is in advanced view, which can't be accessed when form is disabled
- expect(
- screen.queryByTestId("enable-confirmation-mode-switch"),
- ).not.toBeInTheDocument();
-
- // Try to submit the form - button should remain disabled
- await userEvent.click(submitButton);
-
- // Should NOT call save settings API for unsubscribed users
- expect(saveSettingsSpy).not.toHaveBeenCalled();
- });
-
- it("should show backdrop overlay for unsubscribed users", async () => {
- // Mock SaaS mode without subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (no subscription)
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Wait for subscription data to load
- await waitFor(() => {
- expect(getSubscriptionAccessSpy).toHaveBeenCalled();
- });
-
- // Should show upgrade banner
- expect(screen.getByTestId("upgrade-banner")).toBeInTheDocument();
-
- // Should show backdrop overlay
- const backdrop = screen.getByTestId("settings-backdrop");
- expect(backdrop).toBeInTheDocument();
- });
-
- it("should not show backdrop overlay for subscribed users", async () => {
- // Mock SaaS mode with subscription
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return active subscription
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(MOCK_ACTIVE_SUBSCRIPTION);
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Wait for subscription data to load
- await waitFor(() => {
- expect(getSubscriptionAccessSpy).toHaveBeenCalled();
- });
-
- // Should NOT show backdrop overlay
- expect(screen.queryByTestId("settings-backdrop")).not.toBeInTheDocument();
- });
-
- it("should display success toast when redirected back with ?checkout=success parameter", async () => {
- // Mock SaaS mode
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(MOCK_ACTIVE_SUBSCRIPTION);
-
- // Mock toast handler
- const displaySuccessToastSpy = vi.spyOn(
- ToastHandlers,
- "displaySuccessToast",
- );
-
- // Mock URL search params with ?checkout=success
- mockUseSearchParams.mockReturnValue([
- {
- get: (param: string) => (param === "checkout" ? "success" : null),
- },
- vi.fn(),
- ]);
-
- // Render component with checkout=success parameter
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Verify success toast is displayed with correct message
- expect(displaySuccessToastSpy).toHaveBeenCalledWith(
- "SUBSCRIPTION$SUCCESS",
- );
- });
-
- it("should display error toast when redirected back with ?checkout=cancel parameter", async () => {
- // Mock SaaS mode
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(MOCK_ACTIVE_SUBSCRIPTION);
-
- // Mock toast handler
- const displayErrorToastSpy = vi.spyOn(ToastHandlers, "displayErrorToast");
-
- // Mock URL search params with ?checkout=cancel
- mockUseSearchParams.mockReturnValue([
- {
- get: (param: string) => (param === "checkout" ? "cancel" : null),
- },
- vi.fn(),
- ]);
-
- // Render component with checkout=cancel parameter
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Verify error toast is displayed with correct message
- expect(displayErrorToastSpy).toHaveBeenCalledWith("SUBSCRIPTION$FAILURE");
- });
-
- it("should show upgrade banner when subscription is expired or disabled", async () => {
- // Mock SaaS mode
- const getConfigSpy = vi.spyOn(OptionService, "getConfig");
- getConfigSpy.mockResolvedValue(MOCK_SAAS_CONFIG);
-
- // Mock subscription access to return null (expired/disabled subscriptions return null from backend)
- // The backend only returns active subscriptions within their validity period
- const getSubscriptionAccessSpy = vi.spyOn(
- BillingService,
- "getSubscriptionAccess",
- );
- getSubscriptionAccessSpy.mockResolvedValue(null);
-
- renderLlmSettingsScreen();
- await screen.findByTestId("llm-settings-screen");
-
- // Wait for subscription data to load
- await waitFor(() => {
- expect(getSubscriptionAccessSpy).toHaveBeenCalled();
- });
-
- // Should show upgrade banner for expired/disabled subscriptions (when API returns null)
- expect(screen.getByTestId("upgrade-banner")).toBeInTheDocument();
-
- // Form should be disabled
- const form = screen.getByTestId("llm-settings-form-basic");
- expect(form).toHaveAttribute("aria-disabled", "true");
-
- // All form inputs should be disabled
- const providerInput = screen.getByTestId("llm-provider-input");
- const modelInput = screen.getByTestId("llm-model-input");
- const apiKeyInput = screen.getByTestId("llm-api-key-input");
- const advancedSwitch = screen.getByTestId("advanced-settings-switch");
-
- expect(providerInput).toBeDisabled();
- expect(modelInput).toBeDisabled();
- expect(apiKeyInput).toBeDisabled();
- expect(advancedSwitch).toBeDisabled();
-
- // Confirmation mode switch is in advanced view, which can't be accessed when form is disabled
- expect(
- screen.queryByTestId("enable-confirmation-mode-switch"),
- ).not.toBeInTheDocument();
- });
- });
-});
diff --git a/frontend/src/components/features/payment/payment-form.tsx b/frontend/src/components/features/payment/payment-form.tsx
index 8555c3341d..926ae831e0 100644
--- a/frontend/src/components/features/payment/payment-form.tsx
+++ b/frontend/src/components/features/payment/payment-form.tsx
@@ -1,8 +1,7 @@
import React from "react";
-import { useTranslation, Trans } from "react-i18next";
+import { useTranslation } from "react-i18next";
import { useCreateStripeCheckoutSession } from "#/hooks/mutation/stripe/use-create-stripe-checkout-session";
import { useBalance } from "#/hooks/query/use-balance";
-import { useSubscriptionAccess } from "#/hooks/query/use-subscription-access";
import { cn } from "#/utils/utils";
import MoneyIcon from "#/icons/money.svg?react";
import { SettingsInput } from "../settings/settings-input";
@@ -11,24 +10,13 @@ import { LoadingSpinner } from "#/components/shared/loading-spinner";
import { amountIsValid } from "#/utils/amount-is-valid";
import { I18nKey } from "#/i18n/declaration";
import { PoweredByStripeTag } from "./powered-by-stripe-tag";
-import { CancelSubscriptionModal } from "./cancel-subscription-modal";
export function PaymentForm() {
const { t } = useTranslation();
const { data: balance, isLoading } = useBalance();
- const { data: subscriptionAccess } = useSubscriptionAccess();
const { mutate: addBalance, isPending } = useCreateStripeCheckoutSession();
const [buttonIsDisabled, setButtonIsDisabled] = React.useState(true);
- const [showCancelModal, setShowCancelModal] = React.useState(false);
-
- const subscriptionExpiredDate =
- subscriptionAccess?.end_at &&
- new Date(subscriptionAccess.end_at).toLocaleDateString("en-US", {
- year: "numeric",
- month: "long",
- day: "numeric",
- });
const billingFormAction = async (formData: FormData) => {
const amount = formData.get("top-up-input")?.toString();
@@ -94,50 +82,7 @@ export function PaymentForm() {
{isPending && <LoadingSpinner size="small" />}
<PoweredByStripeTag />
</div>
-
- {/* Cancel Subscription Button or Cancellation Message */}
- {subscriptionAccess && (
- <div className="flex flex-col w-[680px] gap-2 mt-4">
- {subscriptionAccess.cancelled_at ? (
- <div className="text-red-500 text-sm">
- <Trans
- i18nKey={I18nKey.PAYMENT$SUBSCRIPTION_CANCELLED_EXPIRES}
- values={{ date: subscriptionExpiredDate }}
- components={{ date: <span className="underline" /> }}
- />
- </div>
- ) : (
- <div className="flex items-center gap-4">
- <BrandButton
- testId="cancel-subscription-button"
- variant="ghost-danger"
- type="button"
- onClick={() => setShowCancelModal(true)}
- >
- {t(I18nKey.PAYMENT$CANCEL_SUBSCRIPTION)}
- </BrandButton>
- <div
- className="text-sm text-gray-300"
- data-testid="next-billing-date"
- >
- <Trans
- i18nKey={I18nKey.PAYMENT$NEXT_BILLING_DATE}
- values={{ date: subscriptionExpiredDate }}
- components={{ date: <span className="underline" /> }}
- />
- </div>
- </div>
- )}
- </div>
- )}
</div>
-
- {/* Cancel Subscription Modal */}
- <CancelSubscriptionModal
- isOpen={showCancelModal}
- onClose={() => setShowCancelModal(false)}
- endDate={subscriptionExpiredDate}
- />
</form>
);
}
diff --git a/frontend/src/components/features/settings/settings-layout.tsx b/frontend/src/components/features/settings/settings-layout.tsx
index 72e2846357..6ac82cf8d0 100644
--- a/frontend/src/components/features/settings/settings-layout.tsx
+++ b/frontend/src/components/features/settings/settings-layout.tsx
@@ -11,13 +11,11 @@ interface NavigationItem {
interface SettingsLayoutProps {
children: React.ReactNode;
navigationItems: NavigationItem[];
- isSaas: boolean;
}
export function SettingsLayout({
children,
navigationItems,
- isSaas,
}: SettingsLayoutProps) {
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
@@ -44,7 +42,6 @@ export function SettingsLayout({
isMobileMenuOpen={isMobileMenuOpen}
onCloseMobileMenu={closeMobileMenu}
navigationItems={navigationItems}
- isSaas={isSaas}
/>
{/* Main content */}
diff --git a/frontend/src/components/features/settings/settings-navigation.tsx b/frontend/src/components/features/settings/settings-navigation.tsx
index acd288581b..ce9e49aa09 100644
--- a/frontend/src/components/features/settings/settings-navigation.tsx
+++ b/frontend/src/components/features/settings/settings-navigation.tsx
@@ -5,7 +5,6 @@ import { Typography } from "#/ui/typography";
import { I18nKey } from "#/i18n/declaration";
import SettingsIcon from "#/icons/settings-gear.svg?react";
import CloseIcon from "#/icons/close.svg?react";
-import { ProPill } from "./pro-pill";
interface NavigationItem {
to: string;
@@ -17,14 +16,12 @@ interface SettingsNavigationProps {
isMobileMenuOpen: boolean;
onCloseMobileMenu: () => void;
navigationItems: NavigationItem[];
- isSaas: boolean;
}
export function SettingsNavigation({
isMobileMenuOpen,
onCloseMobileMenu,
navigationItems,
- isSaas,
}: SettingsNavigationProps) {
const { t } = useTranslation();
@@ -85,7 +82,6 @@ export function SettingsNavigation({
<Typography.Text className="text-[#A3A3A3] whitespace-nowrap">
{t(text as I18nKey)}
</Typography.Text>
- {isSaas && to === "/settings" && <ProPill />}
</div>
</NavLink>
))}
diff --git a/frontend/src/routes/llm-settings.tsx b/frontend/src/routes/llm-settings.tsx
index b717febaac..ed89d03882 100644
--- a/frontend/src/routes/llm-settings.tsx
+++ b/frontend/src/routes/llm-settings.tsx
@@ -28,12 +28,6 @@ import { KeyStatusIcon } from "#/components/features/settings/key-status-icon";
import { DEFAULT_SETTINGS } from "#/services/settings";
import { getProviderId } from "#/utils/map-provider";
import { DEFAULT_OPENHANDS_MODEL } from "#/utils/verified-models";
-import { useSubscriptionAccess } from "#/hooks/query/use-subscription-access";
-import { UpgradeBannerWithBackdrop } from "#/components/features/settings/upgrade-banner-with-backdrop";
-import { useCreateSubscriptionCheckoutSession } from "#/hooks/mutation/stripe/use-create-subscription-checkout-session";
-import { useIsAuthed } from "#/hooks/query/use-is-authed";
-import { cn } from "#/utils/utils";
-import { useIsAllHandsSaaSEnvironment } from "#/hooks/use-is-all-hands-saas-environment";
interface OpenHandsApiKeyHelpProps {
testId: string;
@@ -75,11 +69,6 @@ function LlmSettingsScreen() {
const { data: resources } = useAIConfigOptions();
const { data: settings, isLoading, isFetching } = useSettings();
const { data: config } = useConfig();
- const { data: subscriptionAccess } = useSubscriptionAccess();
- const { data: isAuthed } = useIsAuthed();
- const { mutate: createSubscriptionCheckoutSession } =
- useCreateSubscriptionCheckoutSession();
- const isAllHandsSaaSEnvironment = useIsAllHandsSaaSEnvironment();
const [view, setView] = React.useState<"basic" | "advanced">("basic");
@@ -442,44 +431,16 @@ function LlmSettingsScreen() {
if (!settings || isFetching) return <LlmSettingsInputsSkeleton />;
- // Show upgrade banner and disable form in SaaS mode when user doesn't have an active subscription
- // Exclude self-hosted enterprise customers (those not on all-hands.dev domains)
- const shouldShowUpgradeBanner =
- config?.APP_MODE === "saas" &&
- !subscriptionAccess &&
- isAllHandsSaaSEnvironment;
-
const formAction = (formData: FormData) => {
- // Prevent form submission for unsubscribed SaaS users
- if (shouldShowUpgradeBanner) return;
-
if (view === "basic") basicFormAction(formData);
else advancedFormAction(formData);
};
return (
- <div
- data-testid="llm-settings-screen"
- className={cn(
- "h-full relative",
- shouldShowUpgradeBanner && "overflow-hidden",
- )}
- >
- {shouldShowUpgradeBanner && (
- <UpgradeBannerWithBackdrop
- onUpgradeClick={() => {
- createSubscriptionCheckoutSession();
- }}
- isDisabled={!isAuthed}
- />
- )}
+ <div data-testid="llm-settings-screen" className="h-full relative">
<form
action={formAction}
- className={cn(
- "flex flex-col h-full justify-between",
- shouldShowUpgradeBanner && "h-[calc(100%-theme(spacing.12))]",
- )}
- inert={shouldShowUpgradeBanner}
+ className="flex flex-col h-full justify-between"
>
<div className="flex flex-col gap-6">
<SettingsSwitch
@@ -487,7 +448,6 @@ function LlmSettingsScreen() {
defaultIsToggled={view === "advanced"}
onToggle={handleToggleAdvancedSettings}
isToggled={view === "advanced"}
- isDisabled={shouldShowUpgradeBanner}
>
{t(I18nKey.SETTINGS$ADVANCED)}
</SettingsSwitch>
@@ -496,7 +456,6 @@ function LlmSettingsScreen() {
<div
data-testid="llm-settings-form-basic"
className="flex flex-col gap-6"
- aria-disabled={shouldShowUpgradeBanner ? "true" : undefined}
>
{!isLoading && !isFetching && (
<>
@@ -504,7 +463,6 @@ function LlmSettingsScreen() {
models={modelsAndProviders}
currentModel={settings.LLM_MODEL || DEFAULT_OPENHANDS_MODEL}
onChange={handleModelIsDirty}
- isDisabled={shouldShowUpgradeBanner}
wrapperClassName="!flex-col !gap-6"
/>
{(settings.LLM_MODEL?.startsWith("openhands/") ||
@@ -522,7 +480,6 @@ function LlmSettingsScreen() {
className="w-full max-w-[680px]"
placeholder={settings.LLM_API_KEY_SET ? "<hidden>" : ""}
onChange={handleApiKeyIsDirty}
- isDisabled={shouldShowUpgradeBanner}
startContent={
settings.LLM_API_KEY_SET && (
<KeyStatusIcon isSet={settings.LLM_API_KEY_SET} />
@@ -602,7 +559,6 @@ function LlmSettingsScreen() {
defaultValue={settings.SEARCH_API_KEY || ""}
onChange={handleSearchApiKeyIsDirty}
placeholder={t(I18nKey.API$TVLY_KEY_EXAMPLE)}
- isDisabled={shouldShowUpgradeBanner}
startContent={
settings.SEARCH_API_KEY_SET && (
<KeyStatusIcon isSet={settings.SEARCH_API_KEY_SET} />
@@ -672,7 +628,6 @@ function LlmSettingsScreen() {
onToggle={handleConfirmationModeIsDirty}
defaultIsToggled={settings.CONFIRMATION_MODE}
isBeta
- isDisabled={shouldShowUpgradeBanner}
>
{t(I18nKey.SETTINGS$CONFIRMATION_MODE)}
</SettingsSwitch>
diff --git a/frontend/src/routes/settings.tsx b/frontend/src/routes/settings.tsx
index 1e936b7fb0..19370245b3 100644
--- a/frontend/src/routes/settings.tsx
+++ b/frontend/src/routes/settings.tsx
@@ -6,7 +6,6 @@ import { Route } from "./+types/settings";
import OptionService from "#/api/option-service/option-service.api";
import { queryClient } from "#/query-client-config";
import { GetConfigResponse } from "#/api/option-service/option.types";
-import { useSubscriptionAccess } from "#/hooks/query/use-subscription-access";
import { SAAS_NAV_ITEMS, OSS_NAV_ITEMS } from "#/constants/settings-nav";
import { Typography } from "#/ui/typography";
import { SettingsLayout } from "#/components/features/settings/settings-layout";
@@ -41,7 +40,6 @@ export const clientLoader = async ({ request }: Route.ClientLoaderArgs) => {
function SettingsScreen() {
const { t } = useTranslation();
const { data: config } = useConfig();
- const { data: subscriptionAccess } = useSubscriptionAccess();
const location = useLocation();
const isSaas = config?.APP_MODE === "saas";
@@ -55,7 +53,7 @@ function SettingsScreen() {
items.push(...OSS_NAV_ITEMS);
}
return items;
- }, [isSaas, !!subscriptionAccess]);
+ }, [isSaas]);
// Current section title for the main content area
const currentSectionTitle = useMemo(() => {
@@ -65,7 +63,7 @@ function SettingsScreen() {
return (
<main data-testid="settings-screen" className="h-full">
- <SettingsLayout navigationItems={navItems} isSaas={isSaas}>
+ <SettingsLayout navigationItems={navItems}>
<div className="flex flex-col gap-6 h-full">
<Typography.H2>{t(currentSectionTitle)}</Typography.H2>
<div className="flex-1 overflow-auto custom-scrollbar-always">