Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend): show budgets in dollars and stop tab panels clipping run cards (#14073)

Abhimanyu Yadav7d268154a2ae
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
index 4aebe8f712..0b4a167587 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/NewAgentLibraryView.tsx
@@ -271,25 +271,15 @@ export function NewAgentLibraryView() {
/>
</div>
- {/* The tabs panel inside SidebarRunsList is flex-1 with basis 0, so
- it collapses (clipping the cards) unless its root is stretched to
- fill the column height. */}
- <div
- className={cn(
- isNewLayoutActive &&
- "lg:flex lg:min-h-0 lg:flex-1 lg:flex-col lg:[&>div]:min-h-0 lg:[&>div]:flex-1",
- )}
- >
- <SidebarRunsList
- agent={agent}
- selectedRunId={activeItemId ?? undefined}
- onSelectRun={handleSelectRun}
- onClearSelectedRun={handleClearSelectedRun}
- onScheduleDeleted={handleScheduleDeleted}
- onTabChange={setActiveTab}
- onCountsChange={handleCountsChange}
- />
- </div>
+ <SidebarRunsList
+ agent={agent}
+ selectedRunId={activeItemId ?? undefined}
+ onSelectRun={handleSelectRun}
+ onClearSelectedRun={handleClearSelectedRun}
+ onScheduleDeleted={handleScheduleDeleted}
+ onTabChange={setActiveTab}
+ onCountsChange={handleCountsChange}
+ />
</SectionWrap>
{activeItemId ? (
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/sidebar/SidebarRunsList/SidebarRunsList.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/sidebar/SidebarRunsList/SidebarRunsList.tsx
index f505dea5e0..3413ccc83b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/sidebar/SidebarRunsList/SidebarRunsList.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/sidebar/SidebarRunsList/SidebarRunsList.tsx
@@ -117,7 +117,7 @@ export function SidebarRunsList({
onClearSelectedRun?.();
}
}}
- className="flex min-h-0 flex-col overflow-hidden"
+ className="flex min-h-0 flex-1 flex-col overflow-hidden"
>
<div className="relative overflow-hidden">
<div className="pointer-events-none absolute right-0 top-0 z-10 h-[46px] w-12 bg-gradient-to-l from-[#FAFAFA] to-transparent" />
@@ -159,7 +159,7 @@ export function SidebarRunsList({
hasMore={!!hasMoreRuns}
isFetchingMore={isFetchingMoreRuns}
onEndReached={fetchMoreRuns}
- className="flex max-h-[76vh] flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden"
+ className="flex min-h-0 flex-1 flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden"
itemWrapperClassName="w-auto lg:w-full"
renderItem={(run) => (
<div className="w-[15rem] lg:w-full">
@@ -181,7 +181,7 @@ export function SidebarRunsList({
AGENT_LIBRARY_SECTION_PADDING_X,
)}
>
- <div className="flex h-full flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
+ <div className="flex min-h-0 flex-1 flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
{schedules.length > 0 ? (
schedules.map((s: GraphExecutionJobInfo) => (
<div className="w-[15rem] lg:w-full" key={s.id}>
@@ -212,7 +212,7 @@ export function SidebarRunsList({
AGENT_LIBRARY_SECTION_PADDING_X,
)}
>
- <div className="flex h-full flex-col gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
+ <div className="flex min-h-0 flex-1 flex-col gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
{triggers.length > 0 && (
<div className="flex flex-col gap-2">
<Text variant="body-medium" className="px-1 !text-zinc-500">
@@ -288,7 +288,7 @@ export function SidebarRunsList({
AGENT_LIBRARY_SECTION_PADDING_X,
)}
>
- <div className="flex h-full flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
+ <div className="flex min-h-0 flex-1 flex-nowrap items-center justify-start gap-4 overflow-x-scroll px-1 pb-4 pt-1 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-zinc-300 lg:flex-col lg:gap-3 lg:overflow-y-auto lg:overflow-x-hidden">
{templates.length > 0 ? (
templates.map((template) => (
<div className="w-[15rem] lg:w-full" key={template.id}>
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx
index e3cbd2ff5c..6eb76c2fac 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/main.test.tsx
@@ -329,7 +329,7 @@ test("picking a weekly budget advances to marketplace workflows", async () => {
seedAtBudget();
renderRaise();
await userEvent.click(
- await screen.findByRole("button", { name: /500 credits/ }),
+ await screen.findByRole("button", { name: "$5 / week" }),
);
expect(
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx
index 7953dadc4b..ea7e4c071b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/__tests__/raise-typewriter.test.tsx
@@ -102,10 +102,10 @@ test("renders restored conversation messages instantly after reload", async () =
).toBe(true);
expect(
visible.some((text) =>
- text.includes("Good pick. What do you want to call it?"),
+ text.includes("Good pick. What do you want to call them?"),
),
).toBe(true);
expect(
- visible.some((text) => text.includes("Nice. Now choose a color for it.")),
+ visible.some((text) => text.includes("Nice. Now choose a color for them.")),
).toBe(true);
});
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.test.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.test.tsx
index 6fce54bab1..c93ebd81ac 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.test.tsx
@@ -29,11 +29,11 @@ describe("BudgetStep", () => {
/>,
);
- await userEvent.click(screen.getByRole("button", { name: /500 credits/ }));
+ await userEvent.click(screen.getByRole("button", { name: "$5 / week" }));
expect(onSubmit).toHaveBeenCalledWith(500);
});
- test("submits a custom credit amount", async () => {
+ test("submits a custom dollar amount as credits", async () => {
const onSubmit = vi.fn();
render(
<BudgetStep
@@ -45,8 +45,8 @@ describe("BudgetStep", () => {
);
await userEvent.type(
- screen.getByRole("textbox", { name: "Custom weekly budget in credits" }),
- "750",
+ screen.getByRole("textbox", { name: "Custom weekly budget in dollars" }),
+ "7.50",
);
await userEvent.click(screen.getByRole("button", { name: "That's it" }));
expect(onSubmit).toHaveBeenCalledWith(750);
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.tsx
index 7382f1f3b3..90ce0f2d79 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/BudgetStep.tsx
@@ -4,7 +4,8 @@ import { Button } from "@/components/atoms/Button/Button";
import { Icon } from "@/components/atoms/Icon/Icon";
import { cn } from "@/lib/utils";
import { Forward02Icon } from "@hugeicons/core-free-icons";
-import { creditsToUsdLabel, kitBudgetLabel } from "../../helpers";
+import { creditsToUsdLabel } from "@/lib/credits";
+import { kitBudgetLabel } from "../../helpers";
import { KitBudget } from "../KitStep/KitBudget";
import { DEFAULT_BUDGET_CREDITS } from "../KitStep/helpers";
import { bubbleClassFor } from "../ColorStep/helpers";
@@ -33,15 +34,14 @@ export function BudgetStep({
<div className="flex w-full flex-col items-end gap-4">
<KitBudget
weeklyBudget={budget.weeklyBudget}
- customCredits={budget.customCredits}
+ customAmount={budget.customAmount}
color={color}
onSelect={budget.selectPreset}
- onCustomChange={budget.changeCustomCredits}
+ onCustomChange={budget.changeCustomAmount}
/>
<p className="max-w-[42rem] text-right text-xs text-muted-foreground">
- Skip to use the default {DEFAULT_BUDGET_CREDITS} credits (
- {creditsToUsdLabel(DEFAULT_BUDGET_CREDITS)}/week). 0 disables the weekly
- limit.
+ Skip to use the default {creditsToUsdLabel(DEFAULT_BUDGET_CREDITS)} a
+ week. $0 disables the weekly limit.
</p>
<div className="flex items-center gap-2">
{budget.canSubmitCustom ? (
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/useBudgetStep.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/useBudgetStep.ts
index fd329e9873..fbc19c2d75 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/useBudgetStep.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/BudgetStep/useBudgetStep.ts
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { parseCredits } from "../KitStep/helpers";
+import { parseBudget } from "../KitStep/helpers";
interface Args {
onSubmit: (credits: number) => void;
@@ -7,18 +7,18 @@ interface Args {
export function useBudgetStep({ onSubmit }: Args) {
const [weeklyBudget, setWeeklyBudget] = useState<number | null>(null);
- const [customCredits, setCustomCredits] = useState("");
- const parsedCustom = parseCredits(customCredits);
+ const [customAmount, setCustomAmount] = useState("");
+ const parsedCustom = parseBudget(customAmount);
function selectPreset(credits: number) {
setWeeklyBudget(credits);
- setCustomCredits("");
+ setCustomAmount("");
onSubmit(credits);
}
- function changeCustomCredits(value: string) {
- setCustomCredits(value);
- const parsed = parseCredits(value);
+ function changeCustomAmount(value: string) {
+ setCustomAmount(value);
+ const parsed = parseBudget(value);
if (parsed !== null) setWeeklyBudget(parsed);
}
@@ -29,10 +29,10 @@ export function useBudgetStep({ onSubmit }: Args) {
return {
weeklyBudget,
- customCredits,
+ customAmount,
canSubmitCustom: parsedCustom !== null,
selectPreset,
- changeCustomCredits,
+ changeCustomAmount,
submitCustom,
};
}
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/KitBudget.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/KitBudget.tsx
index 9dcce7a326..d7136761d9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/KitBudget.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/KitBudget.tsx
@@ -2,13 +2,12 @@
import { Input } from "@/components/atoms/Input/Input";
import { cn } from "@/lib/utils";
-import { creditsToUsdLabel } from "../../helpers";
import { bubbleClassFor } from "../ColorStep/helpers";
import { BUDGET_PRESETS } from "./helpers";
interface Props {
weeklyBudget: number | null;
- customCredits: string;
+ customAmount: string;
color: string | null;
onSelect: (credits: number) => void;
onCustomChange: (value: string) => void;
@@ -16,7 +15,7 @@ interface Props {
export function KitBudget({
weeklyBudget,
- customCredits,
+ customAmount,
color,
onSelect,
onCustomChange,
@@ -29,7 +28,7 @@ export function KitBudget({
className="flex flex-wrap justify-end gap-2.5"
>
{BUDGET_PRESETS.map((preset) => {
- const selected = !customCredits && weeklyBudget === preset.credits;
+ const selected = !customAmount && weeklyBudget === preset.credits;
return (
<button
key={preset.credits}
@@ -44,22 +43,19 @@ export function KitBudget({
)}
>
{preset.label}
- {preset.credits > 0
- ? ` · ${creditsToUsdLabel(preset.credits)}`
- : ""}
</button>
);
})}
</div>
<Input
id="raise-kit-custom-budget"
- label="Custom weekly budget in credits"
+ label="Custom weekly budget in dollars"
hideLabel
size="small"
- inputMode="numeric"
- value={customCredits}
+ inputMode="decimal"
+ value={customAmount}
onChange={(event) => onCustomChange(event.target.value)}
- placeholder="Custom credits…"
+ placeholder="Custom amount, e.g. $7.50…"
wrapperClassName="mb-0 w-full max-w-[16rem] [&_input]:h-[2.625rem] [&_input]:py-3"
/>
</div>
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.test.ts
index 4e7b324811..63031c0c0e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.test.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.test.ts
@@ -5,7 +5,7 @@ import {
combineSearchHits,
failedAttachmentMessage,
limitSearchHits,
- parseCredits,
+ parseBudget,
scoreSearchHit,
toRaiseAttachments,
type SearchHit,
@@ -25,12 +25,23 @@ const storeAgent = {
} as StoreAgent;
describe("kit helpers", () => {
- test("parses credit amounts and rejects junk", () => {
- expect(parseCredits("500")).toBe(500);
- expect(parseCredits(" 0 ")).toBe(0);
- expect(parseCredits("")).toBeNull();
- expect(parseCredits("12.5")).toBeNull();
- expect(parseCredits("-1")).toBeNull();
+ test("parses dollar amounts into credits and rejects junk", () => {
+ expect(parseBudget("5")).toBe(500);
+ expect(parseBudget(" $7.50 ")).toBe(750);
+ expect(parseBudget("1,000")).toBe(100_000);
+ expect(parseBudget(" 0 ")).toBe(0);
+ expect(parseBudget("")).toBeNull();
+ expect(parseBudget("12.555")).toBeNull();
+ expect(parseBudget("-1")).toBeNull();
+ expect(parseBudget("10001")).toBeNull();
+ });
+
+ test("rejects malformed thousands separators instead of stripping them", () => {
+ expect(parseBudget("1,2")).toBeNull();
+ expect(parseBudget("12,34")).toBeNull();
+ expect(parseBudget("1,0000")).toBeNull();
+ expect(parseBudget(",500")).toBeNull();
+ expect(parseBudget("$1,234.56")).toBe(123_456);
});
test("combines marketplace and library workflows in marketplace scope", () => {
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.ts
index 6f206af482..bcb844af15 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/KitStep/helpers.ts
@@ -2,6 +2,7 @@ import type { CopilotSkillInfo } from "@/app/api/__generated__/models/copilotSki
import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
import type { RaiseAttachment } from "@/app/api/__generated__/models/raiseAttachment";
import type { StoreAgent } from "@/app/api/__generated__/models/storeAgent";
+import { parseUsdToCredits } from "@/lib/credits";
import type { RaiseAttachmentDraft } from "../../helpers";
export const MAX_ATTACHMENTS = 20;
@@ -11,8 +12,8 @@ export const MAX_BUDGET_CREDITS = 1_000_000;
export const MAX_SEARCH_RESULTS = 3;
export const BUDGET_PRESETS = [
- { credits: 500, label: "500 credits" },
- { credits: 1000, label: "1,000 credits" },
+ { credits: 500, label: "$5 / week" },
+ { credits: 1000, label: "$10 / week" },
{ credits: 0, label: "No weekly limit" },
] as const;
@@ -51,14 +52,8 @@ export function limitSearchHits(hits: SearchHit[], query: string) {
return ranked.slice(0, MAX_SEARCH_RESULTS);
}
-export function parseCredits(value: string): number | null {
- const trimmed = value.trim();
- if (!trimmed) return null;
- if (!/^\d+$/.test(trimmed)) return null;
- const credits = Number(trimmed);
- if (!Number.isInteger(credits)) return null;
- if (credits < 0 || credits > MAX_BUDGET_CREDITS) return null;
- return credits;
+export function parseBudget(value: string): number | null {
+ return parseUsdToCredits(value, MAX_BUDGET_CREDITS);
}
export function marketplaceKey(creator: string, slug: string) {
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/components/SkillsStep/SkillsStep.tsx b/autogpt_platform/frontend/src/app/(platform)/raise/components/SkillsStep/SkillsStep.tsx
index bd9d9fac16..db107d3e65 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/components/SkillsStep/SkillsStep.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/components/SkillsStep/SkillsStep.tsx
@@ -33,7 +33,7 @@ export function SkillsStep({
searchPlaceholder="Search library and marketplace skills…"
emptyQueryHint="Search to add a marketplace skill, or pick from your library skills."
emptyResultsHint="No matching skills."
- primaryLabel={`Bring ${name || "it"} to life`}
+ primaryLabel={`Bring ${name || "them"} to life`}
onSubmit={onSubmit}
onSkip={onSkip}
/>
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts
index 302c3baff1..08006c9da0 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.test.ts
@@ -64,7 +64,7 @@ describe("raise helpers", () => {
"No weekly limit",
);
expect(kitBudgetLabel({ weeklyBudget: 500, attachments: [] })).toBe(
- "500 credits ($5/week)",
+ "$5 / week",
);
expect(
kitToolsLabel({
diff --git a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
index 9ecef10964..1f0614186b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/raise/helpers.ts
@@ -1,4 +1,5 @@
import type { VoiceSample } from "@/app/api/__generated__/models/voiceSample";
+import { creditsToUsdLabel } from "@/lib/credits";
import {
buildVoicePreferences,
type VoicePickResult,
@@ -56,16 +57,16 @@ export const VOICE_SAMPLES: VoiceSample[] = [
export const RAISE_PROMPTS = {
greeting: "Hello, I'm Autopilot. I'll help you raise your own expert.",
roleQuestion: "First — what should your expert do for you?",
- nameQuestion: "Good pick. What do you want to call it?",
- colorQuestion: "Nice. Now choose a color for it.",
+ nameQuestion: "Good pick. What do you want to call them?",
+ colorQuestion: "Nice. Now choose a color for them.",
avatarQuestion: (name: string) =>
- `Want to give ${name || "it"} a face? Upload a picture, let me generate one, or skip it.`,
+ `Want to give ${name || "them"} a face? Upload a picture, let me generate one, or skip it.`,
aboutQuestion: (name: string) =>
- `Anything else I should know about ${name || "your expert"}? How it should work, what matters to you — or skip it.`,
+ `Anything else I should know about ${name || "your expert"}? How they should work, what matters to you — or skip it.`,
voiceQuestion: (name: string) =>
- `How should ${name || "your expert"} sound when it writes? Pick the one that feels right.`,
+ `How should ${name || "your expert"} sound when they write? Pick the one that feels right.`,
budgetQuestion: (name: string) =>
- `How much weekly budget should ${name || "your expert"} have? 500 credits is the default — pick an amount, or skip.`,
+ `How much weekly budget should ${name || "your expert"} have? $5 a week is the default — pick an amount, or skip.`,
marketplaceQuestion: (name: string) =>
`Want ${name || "your expert"} to run workflows? Search the marketplace and your library, then add any you like — or skip.`,
skillsQuestion: (name: string) =>
@@ -203,15 +204,10 @@ export function raisedIdentity(name: string): string {
return `I'm ${name}, raised by you. I learn how you work and grow with you.`;
}
-export function creditsToUsdLabel(credits: number): string {
- const dollars = credits / 100;
- return Number.isInteger(dollars) ? `$${dollars}` : `$${dollars.toFixed(2)}`;
-}
-
export function kitBudgetLabel(kit: RaiseKit | null): string | null {
if (!kit || kit.weeklyBudget === null) return null;
if (kit.weeklyBudget === 0) return "No weekly limit";
- return `${kit.weeklyBudget.toLocaleString()} credits (${creditsToUsdLabel(kit.weeklyBudget)}/week)`;
+ return `${creditsToUsdLabel(kit.weeklyBudget)} / week`;
}
export function kitToolsLabel(kit: RaiseKit | null): string | null {
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/team/__tests__/main.test.tsx
index 33377872a8..c6c02e1bf1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/team/__tests__/main.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/team/__tests__/main.test.tsx
@@ -351,16 +351,16 @@ describe("TeamPage", () => {
test("shows weekly spend as a progress bar on the expert card", async () => {
const budgetMaria: Expert = {
...hiredMaria,
- weekly_budget: 50,
- weekly_spend: 12,
+ weekly_budget: 5000,
+ weekly_spend: 1200,
};
server.use(getListExpertsMockHandler([budgetMaria]));
render(<TeamPage />);
await screen.findByText("Maria");
- expect(screen.getByText("Credits this week")).toBeDefined();
- expect(screen.getByText("12 / 50")).toBeDefined();
+ expect(screen.getByText("Spend this week")).toBeDefined();
+ expect(screen.getByText("$12 / $50")).toBeDefined();
});
test("paused expert offers one-click resume", async () => {
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/ExpertTeamCard.tsx b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/ExpertTeamCard.tsx
index c01af0b2ce..733ea52b20 100644
--- a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/ExpertTeamCard.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/ExpertTeamCard.tsx
@@ -22,11 +22,12 @@ import {
Tick02Icon,
UserGroupIcon,
} from "@hugeicons/core-free-icons";
+import { creditsToUsdLabel } from "@/lib/credits";
import Image from "next/image";
import Link from "next/link";
import { MouseEvent } from "react";
-import { CreditsMeter } from "./components/CreditsMeter";
+import { SpendMeter } from "./components/SpendMeter";
import {
getNeedsSetupCount,
getScheduleCountLabel,
@@ -141,7 +142,7 @@ export function ExpertTeamCard({
<div className="flex flex-col gap-1">
<div className="flex items-baseline justify-between gap-2">
<Text variant="small" className="text-zinc-500">
- Credits this week
+ Spend this week
</Text>
<Text
variant="small"
@@ -149,11 +150,11 @@ export function ExpertTeamCard({
className="tabular-nums text-zinc-500"
>
{weeklySpend
- ? `${weeklySpend.spent} / ${weeklySpend.budget}`
+ ? `${creditsToUsdLabel(weeklySpend.spent)} / ${creditsToUsdLabel(weeklySpend.budget)}`
: "No budget"}
</Text>
</div>
- <CreditsMeter
+ <SpendMeter
spent={weeklySpend?.spent ?? 0}
budget={weeklySpend?.budget ?? 1}
muted={!weeklySpend}
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.test.tsx b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.test.tsx
deleted file mode 100644
index a0d1e25175..0000000000
--- a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.test.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { render, screen } from "@/tests/integrations/test-utils";
-import { describe, expect, test } from "vitest";
-import { CreditsMeter } from "./CreditsMeter";
-
-describe("CreditsMeter", () => {
- test("exposes a named progress bar with the real figures", () => {
- render(<CreditsMeter spent={12} budget={50} />);
-
- const meter = screen.getByRole("progressbar", {
- name: "Weekly credit usage",
- });
- expect(meter.getAttribute("aria-valuenow")).toBe("12");
- expect(meter.getAttribute("aria-valuemax")).toBe("50");
- expect(meter.getAttribute("aria-valuetext")).toBe(
- "12 of 50 credits used this week",
- );
- });
-
- test("clamps the value and announces the over-budget state", () => {
- render(<CreditsMeter spent={80} budget={50} />);
-
- const meter = screen.getByRole("progressbar", {
- name: "Weekly credit usage",
- });
- expect(meter.getAttribute("aria-valuenow")).toBe("50");
- expect(meter.getAttribute("aria-valuetext")).toBe(
- "80 of 50 credits used this week (over budget)",
- );
- });
-});
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.test.tsx b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.test.tsx
new file mode 100644
index 0000000000..df09a506c9
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.test.tsx
@@ -0,0 +1,26 @@
+import { render, screen } from "@/tests/integrations/test-utils";
+import { describe, expect, test } from "vitest";
+import { SpendMeter } from "./SpendMeter";
+
+describe("SpendMeter", () => {
+ test("exposes a named progress bar with the real figures in dollars", () => {
+ render(<SpendMeter spent={1200} budget={5000} />);
+
+ const meter = screen.getByRole("progressbar", { name: "Weekly spend" });
+ expect(meter.getAttribute("aria-valuenow")).toBe("1200");
+ expect(meter.getAttribute("aria-valuemax")).toBe("5000");
+ expect(meter.getAttribute("aria-valuetext")).toBe(
+ "$12 of $50 spent this week",
+ );
+ });
+
+ test("clamps the value and announces the over-budget state", () => {
+ render(<SpendMeter spent={8025} budget={5000} />);
+
+ const meter = screen.getByRole("progressbar", { name: "Weekly spend" });
+ expect(meter.getAttribute("aria-valuenow")).toBe("5000");
+ expect(meter.getAttribute("aria-valuetext")).toBe(
+ "$80.25 of $50 spent this week (over budget)",
+ );
+ });
+});
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.tsx b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.tsx
similarity index 80%
rename from autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.tsx
rename to autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.tsx
index d932da6236..80b94edd54 100644
--- a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/CreditsMeter.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCard/components/SpendMeter.tsx
@@ -1,3 +1,4 @@
+import { creditsToUsdLabel } from "@/lib/credits";
import { cn } from "@/lib/utils";
const SEGMENT_COUNT = 36;
@@ -8,18 +9,18 @@ interface Props {
muted?: boolean;
}
-export function CreditsMeter({ spent, budget, muted }: Props) {
+export function SpendMeter({ spent, budget, muted }: Props) {
const ratio = budget > 0 ? Math.min(Math.max(spent / budget, 0), 1) : 0;
const filledCount = Math.round(ratio * SEGMENT_COUNT);
const clampedSpent = Math.min(Math.max(spent, 0), Math.max(budget, 0));
- const valueText = `${spent} of ${budget} credits used this week${
+ const valueText = `${creditsToUsdLabel(spent)} of ${creditsToUsdLabel(budget)} spent this week${
spent > budget ? " (over budget)" : ""
}`;
return (
<div
role="progressbar"
- aria-label="Weekly credit usage"
+ aria-label="Weekly spend"
aria-valuenow={clampedSpent}
aria-valuemin={0}
aria-valuemax={budget}
diff --git a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCardSkeleton.tsx b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCardSkeleton.tsx
index 2665a2e337..0156ddde4b 100644
--- a/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCardSkeleton.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/team/components/ExpertTeamCardSkeleton.tsx
@@ -1,7 +1,7 @@
import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";
// Mirrors ExpertTeamCard's structure — banner, straddling avatar, tagline,
-// credits meter, footer actions — so the grid doesn't jump when the real
+// spend meter, footer actions — so the grid doesn't jump when the real
// cards land. A single flat block would settle at the wrong height.
export function ExpertTeamCardSkeleton() {
return (
diff --git a/autogpt_platform/frontend/src/components/molecules/TabsLine/TabsLine.tsx b/autogpt_platform/frontend/src/components/molecules/TabsLine/TabsLine.tsx
index c679d51776..4844d9bee5 100644
--- a/autogpt_platform/frontend/src/components/molecules/TabsLine/TabsLine.tsx
+++ b/autogpt_platform/frontend/src/components/molecules/TabsLine/TabsLine.tsx
@@ -135,7 +135,11 @@ const TabsLineContent = React.forwardRef<
<TabsPrimitive.Content
ref={ref}
className={cn(
- "mt-4 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-stone-400 focus-visible:ring-offset-2",
+ // Radix marks inactive panels with the `hidden` attribute, but the UA
+ // rule behind it is weaker than any author display utility — a panel
+ // styled `flex`/`grid` stays laid out and keeps stealing space from the
+ // active one. The data-state variant is specific enough to win.
+ "mt-4 data-[state=inactive]:hidden focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-stone-400 focus-visible:ring-offset-2",
className,
)}
{...props}
diff --git a/autogpt_platform/frontend/src/lib/credits.ts b/autogpt_platform/frontend/src/lib/credits.ts
new file mode 100644
index 0000000000..576c52c8f7
--- /dev/null
+++ b/autogpt_platform/frontend/src/lib/credits.ts
@@ -0,0 +1,34 @@
+// The backend meters spend in credits, but the UI only ever talks dollars:
+// every credit amount crossing into a view goes through these helpers, and
+// every dollar amount typed by a user comes back out as credits.
+export const CREDITS_PER_USD = 100;
+
+export function creditsToUsdLabel(credits: number): string {
+ const dollars = credits / CREDITS_PER_USD;
+ return Number.isInteger(dollars)
+ ? `$${dollars.toLocaleString()}`
+ : `$${dollars.toFixed(2)}`;
+}
+
+export function usdToCredits(dollars: number): number {
+ return Math.round(dollars * CREDITS_PER_USD);
+}
+
+// Accepts what a person would type into a dollar field — "5", "$5", "5.25",
+// "1,000" — and rejects anything finer than cents. Thousands separators are
+// validated in place rather than stripped first, so "1,2" stays invalid
+// instead of silently becoming $12. Returns credits so callers never have to
+// remember the conversion.
+const USD_INPUT = /^\$?(?:\d{1,3}(?:,\d{3})+|\d+)(?:\.\d{1,2})?$/;
+
+export function parseUsdToCredits(
+ value: string,
+ maxCredits: number,
+): number | null {
+ const trimmed = value.trim();
+ if (!trimmed) return null;
+ if (!USD_INPUT.test(trimmed)) return null;
+ const credits = usdToCredits(Number(trimmed.replace(/[$,]/g, "")));
+ if (credits < 0 || credits > maxCredits) return null;
+ return credits;
+}