YC (S26) | Open Computer History | Continuously record your company computer work, map your workflows, help you find work worth automating, and power your agents' context
Rust agentsagiaiai-memoryaudio-recordingcomputer-visionhermeshermes-agentllmlocal-ailocal-firstmachine-learningmcpmultimodalopenclawprivacyrewindscreen-recordingspeech-to-textycombinator
Pass the app language to hosted onboarding checkout (#7177)
Ezra Ellette521c4d073b56
diff --git a/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.test.tsx b/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.test.tsxindex ccafc7719..9969c2381 100644--- a/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.test.tsx+++ b/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.test.tsx@@ -13,6 +13,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";const mocks = vi.hoisted(() => ({+ locale: "en",capture: vi.fn(),getCloudToken: vi.fn(),setOnboardingStep: vi.fn().mockResolvedValue({ status: "ok", data: null }),@@ -25,6 +26,7 @@ const mocks = vi.hoisted(() => ({}));vi.mock("posthog-js", () => ({ default: { capture: mocks.capture } }));+vi.mock("@/lib/i18n/provider", () => ({ useUiLocale: () => mocks.locale }));vi.mock("@/lib/hooks/use-settings", () => ({useSettings: () => ({settings: { user: mocks.user },@@ -63,6 +65,7 @@ let submitSpy: ReturnType<typeof vi.spyOn>;beforeEach(() => {vi.clearAllMocks();+ mocks.locale = "en";window.history.replaceState({}, "", "/home");document.querySelectorAll("form").forEach((form) => form.remove());window.sessionStorage.clear();@@ -86,6 +89,14 @@ function checkoutForm(): HTMLFormElement {}describe("TrialActivationPaywall", () => {+ it("passes the app language to the shared hosted checkout", async () => {+ mocks.locale = "ja";+ mocks.getCloudToken.mockResolvedValue("clerk-token");+ render(<TrialActivationPaywall open locked />);+ await waitFor(() => expect(submitSpy).toHaveBeenCalledOnce());+ expect(checkoutForm().querySelector<HTMLInputElement>('input[name="locale"]')?.value).toBe("ja");+ });+it("uses onboarding's authenticated hosted checkout instead of the cardless trial iframe", async () => {mocks.getCloudToken.mockResolvedValue("clerk-token");diff --git a/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.tsx b/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.tsxindex 97ffb1237..17cd40647 100644--- a/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.tsx+++ b/apps/screenpipe-app-tauri/components/first-run/trial-activation-paywall.tsx@@ -26,6 +26,7 @@ import {TRIAL_ACTIVATION_UNLOCKED_STEP,} from "@/lib/first-run/trial-activation";import { useGT } from "gt-react";+import { useUiLocale } from "@/lib/i18n/provider";const HOSTED_CHECKOUT_URL = screenpipeWebUrl(@@ -42,6 +43,7 @@ export function TrialActivationPaywall({}) {const ui = useGT();+ const locale = useUiLocale();const { settings } = useSettings();const user = settings.user as AppUser | null | undefined;const [checkoutToken, setCheckoutToken] = React.useState<string | null>(@@ -126,6 +128,7 @@ export function TrialActivationPaywall({"pending",);submitHostedCheckoutStart({+ locale,hostedCheckoutUrl: HOSTED_CHECKOUT_URL,token: checkoutToken,currentHref: window.location.href,@@ -139,7 +142,7 @@ export function TrialActivationPaywall({: ui("Secure checkout could not be opened"),);}- }, [checkoutToken]);+ }, [checkoutToken, locale]);React.useEffect(() => {if (!open || !tokenResolved || !checkoutToken || returnedWithoutStatus) {diff --git a/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.test.tsx b/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.test.tsxindex dbcf7739b..6e65ba338 100644--- a/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.test.tsx+++ b/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.test.tsx@@ -21,6 +21,7 @@ import { buildLocalCheckoutReturnUrl } from "@/lib/onboarding-checkout-navigatioconst mocks = vi.hoisted(() => ({loadUser: vi.fn(async () => undefined),capture: vi.fn(),+ locale: "en",settings: {user: {token: "token-1",@@ -48,6 +49,7 @@ vi.mock("@/lib/web-url", () => ({screenpipeWebUrl: (path: string) => `https://example.test${path}`,}));vi.mock("posthog-js", () => ({ default: { capture: mocks.capture } }));+vi.mock("@/lib/i18n/provider", () => ({ useUiLocale: () => mocks.locale }));import PlanSelectionStep from "./plan-selection-step";@@ -55,6 +57,7 @@ let submitSpy: ReturnType<typeof vi.spyOn>;beforeEach(() => {vi.clearAllMocks();+ mocks.locale = "en";window.history.replaceState({}, "", "/onboarding");document.querySelectorAll("form").forEach((form) => form.remove());mocks.settings.user = {@@ -92,7 +95,8 @@ describe("hosted onboarding checkout", () => {expect(form.target).toBe("_self");expect(Array.from(form.querySelectorAll("input"), (input) => input.name),- ).toEqual(["token", "return_to"]);+ ).toEqual(["token", "return_to", "locale"]);+ expect(form.querySelector<HTMLInputElement>('input[name="locale"]')?.value).toBe("en");expect(form.querySelector<HTMLInputElement>('input[name="token"]')?.value,).toBe("token-1");@@ -112,6 +116,14 @@ describe("hosted onboarding checkout", () => {expect(submitSpy).toHaveBeenCalledOnce();});+ it("hands off the effective app language instead of the browser preference", async () => {+ mocks.locale = "ja";+ vi.spyOn(navigator, "language", "get").mockReturnValue("fr-FR");+ render(<PlanSelectionStep handleNextSlide={vi.fn()} />);+ await waitFor(() => expect(submitSpy).toHaveBeenCalledOnce());+ expect(checkoutForm().querySelector<HTMLInputElement>('input[name="locale"]')?.value).toBe("ja");+ });+it("allows only the app's exact local return origins", () => {expect(buildLocalCheckoutReturnUrl("tauri://localhost/onboarding?stale=1"),diff --git a/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.tsx b/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.tsxindex a2d6da690..0a1e49334 100644--- a/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.tsx+++ b/apps/screenpipe-app-tauri/components/onboarding/plan-selection-step.tsx@@ -15,6 +15,7 @@ import {import type { AppUser } from "@/lib/app-entitlement";import { isOnboardingCheckoutResolved } from "@/lib/onboarding-checkout";import { useGT } from "gt-react";+import { useUiLocale } from "@/lib/i18n/provider";const HOSTED_CHECKOUT_URL = screenpipeWebUrl(@@ -36,6 +37,7 @@ export default function PlanSelectionStep({}) {const ui = useGT();+ const locale = useUiLocale();const { settings, loadUser } = useSettings();const user = settings.user as AppUser | null | undefined;const [returnStatus] = useState(checkoutStatus);@@ -71,6 +73,7 @@ export default function PlanSelectionStep({destination_type: "hosted_stripe_payment_element",});submitHostedCheckoutStart({+ locale,hostedCheckoutUrl: HOSTED_CHECKOUT_URL,token: userToken,currentHref: window.location.href,@@ -84,7 +87,7 @@ export default function PlanSelectionStep({: ui("Secure checkout could not be opened"),);}- }, [userToken]);+ }, [userToken, locale]);useEffect(() => {if (returnStatus !== null) return;diff --git a/apps/screenpipe-app-tauri/lib/onboarding-checkout-navigation.ts b/apps/screenpipe-app-tauri/lib/onboarding-checkout-navigation.tsindex 9b49b0840..d1ab739ef 100644--- a/apps/screenpipe-app-tauri/lib/onboarding-checkout-navigation.ts+++ b/apps/screenpipe-app-tauri/lib/onboarding-checkout-navigation.ts@@ -67,10 +67,12 @@ export function submitHostedCheckoutStart({hostedCheckoutUrl,token,currentHref,+ locale,}: {hostedCheckoutUrl: string;token: string;currentHref: string;+ locale: string;}): void {if (!token.trim()) throw new Error("sign in to continue");@@ -83,6 +85,7 @@ export function submitHostedCheckoutStart({form.append(hiddenField("token", token),hiddenField("return_to", buildLocalCheckoutReturnUrl(currentHref)),+ hiddenField("locale", locale),);document.body.appendChild(form);form.submit();