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.
refactor(frontend): settings v2 cleanup — sidebar, account route, headers, wallet (#12976)
Abhimanyu Yadav042faba2c7dd
diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsMobileNav.test.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsMobileNav.test.tsxindex 0ad965de83..a6efcdb1ac 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsMobileNav.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsMobileNav.test.tsx@@ -58,7 +58,7 @@ describe("SettingsMobileNav", () => {expect(trigger.textContent).toContain("Billing");});- it("opens popover listing all 7 sections on click", async () => {+ it("opens popover listing all 6 sections on click", async () => {render(<SettingsMobileNav />);fireEvent.click(@@ -67,12 +67,11 @@ describe("SettingsMobileNav", () => {const labels = ["Profile",- "Creator Dashboard",+ "Account","Billing","Integrations",- "Preferences","AutoGPT API Keys",- "OAuth Apps",+ "Creator Dashboard",];for (const label of labels) {expect(diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsSidebar.test.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsSidebar.test.tsxindex bb1990b964..b04f6b2b13 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsSidebar.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/__tests__/SettingsSidebar.test.tsx@@ -41,12 +41,11 @@ import { SettingsSidebar } from "../components/SettingsSidebar/SettingsSidebar";const expectedItems = [{ label: "Profile", href: "/settings/profile" },- { label: "Creator Dashboard", href: "/settings/creator-dashboard" },+ { label: "Account", href: "/settings/account" },{ label: "Billing", href: "/settings/billing" },{ label: "Integrations", href: "/settings/integrations" },- { label: "Preferences", href: "/settings/preferences" },{ label: "AutoGPT API Keys", href: "/settings/api-keys" },- { label: "OAuth Apps", href: "/settings/oauth-apps" },+ { label: "Creator Dashboard", href: "/settings/creator-dashboard" },];describe("SettingsSidebar", () => {@@ -54,7 +53,7 @@ describe("SettingsSidebar", () => {usePathnameMock.mockReturnValue("/settings/profile");});- it("renders SETTINGS header and all 7 nav items with correct hrefs", () => {+ it("renders SETTINGS header and all 6 nav items with correct hrefs", () => {render(<SettingsSidebar />);expect(screen.getByText("SETTINGS")).toBeDefined();diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/__tests__/main.test.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/__tests__/main.test.tsxsimilarity index 98%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/__tests__/main.test.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/__tests__/main.test.tsxindex c6ed047335..eee97b716e 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/__tests__/main.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/account/__tests__/main.test.tsx@@ -154,7 +154,7 @@ describe("SettingsPreferencesPage", () => {expect((discardButton as HTMLButtonElement).disabled).toBe(true);});- test("toggling a notification enables Save and persists on click", async () => {+ test.skip("toggling a notification enables Save and persists on click", async () => {let submittedPreferences:| { email: string; preferences: Record<string, boolean> }| undefined;@@ -368,7 +368,7 @@ describe("SettingsPreferencesPage", () => {vi.unstubAllGlobals();});- test("Discard reverts unsaved notification toggles", async () => {+ test.skip("Discard reverts unsaved notification toggles", async () => {setupBaseHandlers();render(<SettingsPreferencesPage />);diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/AccountCard/AccountCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/AccountCard/AccountCard.tsxsimilarity index 95%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/AccountCard/AccountCard.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/AccountCard/AccountCard.tsxindex a2d1a1ca65..43598615a9 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/AccountCard/AccountCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/AccountCard/AccountCard.tsx@@ -58,15 +58,6 @@ export function AccountCard({ user, index = 0 }: Props) {}className="flex w-full flex-col gap-2">- <div className="flex flex-col gap-1 px-4">- <Text variant="body-medium" as="span" className="text-textBlack">- Account- </Text>- <Text variant="small" className="text-zinc-500">- Manage your sign-in details.- </Text>- </div>-<div className="flex flex-col divide-y divide-zinc-200 rounded-[18px] border border-zinc-200 bg-white shadow-[0_1px_2px_rgba(15,15,20,0.04)]"><div className="flex items-center justify-between gap-4 px-4 py-4"><Text variant="body-medium" as="span" className="text-textBlack">diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/AccountCard/useAccountCard.ts b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/AccountCard/useAccountCard.tssimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/AccountCard/useAccountCard.tsrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/AccountCard/useAccountCard.tsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/NotificationsCard/NotificationsCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/NotificationsCard/NotificationsCard.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/NotificationsCard/NotificationsCard.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/NotificationsCard/NotificationsCard.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/PreferencesHeader/PreferencesHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/PreferencesHeader/PreferencesHeader.tsxsimilarity index 88%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/PreferencesHeader/PreferencesHeader.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/PreferencesHeader/PreferencesHeader.tsxindex 7f23dd24a8..c5b40cea59 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/PreferencesHeader/PreferencesHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/PreferencesHeader/PreferencesHeader.tsx@@ -17,10 +17,10 @@ export function PreferencesHeader() {className="flex min-w-0 flex-col pb-2 pl-4"><Text variant="h4" as="h1" className="leading-[28px] text-textBlack">- Preferences+ Account</Text><Text variant="body" className="mt-4 max-w-[600px] text-zinc-700">- Tune your account, time zone, and which notifications reach you.+ Tune your account and time zone.</Text></motion.header>);diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/PreferencesSkeleton/PreferencesSkeleton.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/PreferencesSkeleton/PreferencesSkeleton.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/PreferencesSkeleton/PreferencesSkeleton.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/PreferencesSkeleton/PreferencesSkeleton.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/SaveBar/SaveBar.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/SaveBar/SaveBar.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/SaveBar/SaveBar.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/SaveBar/SaveBar.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/TimezoneCard/TimezoneCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/components/TimezoneCard/TimezoneCard.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/components/TimezoneCard/TimezoneCard.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/components/TimezoneCard/TimezoneCard.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/settings/account/helpers.tssimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/helpers.tsrename to autogpt_platform/frontend/src/app/(platform)/settings/account/helpers.tsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/page.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/account/page.tsxsimilarity index 84%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/page.tsxrename to autogpt_platform/frontend/src/app/(platform)/settings/account/page.tsxindex 2002c24055..8a0f857716 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/account/page.tsx@@ -5,7 +5,6 @@ import { useEffect } from "react";import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";import { AccountCard } from "./components/AccountCard/AccountCard";-import { NotificationsCard } from "./components/NotificationsCard/NotificationsCard";import { PreferencesHeader } from "./components/PreferencesHeader/PreferencesHeader";import { PreferencesSkeleton } from "./components/PreferencesSkeleton/PreferencesSkeleton";import { SaveBar } from "./components/SaveBar/SaveBar";@@ -14,7 +13,7 @@ import { usePreferencesPage } from "./usePreferencesPage";export default function SettingsPreferencesPage() {useEffect(() => {- document.title = "Preferences – AutoGPT Platform";+ document.title = "Account – AutoGPT Platform";}, []);const {@@ -27,7 +26,6 @@ export default function SettingsPreferencesPage() {dirty,isSaving,setTimezone,- toggleNotification,discardChanges,savePreferences,} = usePreferencesPage();@@ -62,12 +60,6 @@ export default function SettingsPreferencesPage() {index={1}/>- <NotificationsCard- values={formState.notifications}- onToggle={toggleNotification}- index={2}- />-<SaveBarvisible={dirty}saving={isSaving}diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/preferences/usePreferencesPage.ts b/autogpt_platform/frontend/src/app/(platform)/settings/account/usePreferencesPage.tssimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/settings/preferences/usePreferencesPage.tsrename to autogpt_platform/frontend/src/app/(platform)/settings/account/usePreferencesPage.tsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyList/APIKeyList.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyList/APIKeyList.tsxindex 83662d04b3..fab18200e3 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyList/APIKeyList.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyList/APIKeyList.tsx@@ -95,7 +95,7 @@ export function APIKeyList() {</AnimatePresence><motion.div- className="flex flex-col divide-y divide-zinc-200 overflow-hidden rounded-[8px] border border-zinc-200 bg-white"+ className="flex flex-col divide-y divide-zinc-200 overflow-hidden rounded-2xl border border-zinc-200 bg-white"initial={reduceMotion ? false : "hidden"}animate={reduceMotion ? undefined : "show"}variants={reduceMotion ? undefined : LIST_CONTAINER_VARIANTS}diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyListSkeleton/APIKeyListSkeleton.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyListSkeleton/APIKeyListSkeleton.tsxindex 73ed1c3e78..baa2df2798 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyListSkeleton/APIKeyListSkeleton.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeyListSkeleton/APIKeyListSkeleton.tsx@@ -30,7 +30,7 @@ export function APIKeyListSkeleton() {<motion.divrole="status"aria-label="Loading API keys"- className="flex w-full flex-col divide-y divide-zinc-200 overflow-hidden rounded-[8px] border border-zinc-200 bg-white"+ className="flex w-full flex-col divide-y divide-zinc-200 overflow-hidden rounded-2xl border border-zinc-200 bg-white"initial={reduceMotion ? false : "hidden"}animate={reduceMotion ? undefined : "show"}variants={reduceMotion ? undefined : SKELETON_CONTAINER_VARIANTS}diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeysHeader/APIKeysHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeysHeader/APIKeysHeader.tsxindex 5ff0c13ca5..0778839401 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeysHeader/APIKeysHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/api-keys/components/APIKeysHeader/APIKeysHeader.tsx@@ -10,7 +10,7 @@ interface Props {export function APIKeysHeader({ onCreate }: Props) {return (- <div className="flex flex-col items-start gap-4 pb-6 sm:flex-row sm:items-center sm:justify-between">+ <div className="flex flex-col items-start gap-4 pb-6 pl-4 sm:flex-row sm:items-center sm:justify-between"><div className="flex min-w-0 flex-col"><Text variant="h4" as="h1" className="leading-[28px] text-textBlack">AutoGPT API Keysdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/__tests__/billing-cards.test.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/__tests__/billing-cards.test.tsxindex 7e3d2f67d4..55ea9ae12b 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/__tests__/billing-cards.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/__tests__/billing-cards.test.tsx@@ -189,48 +189,35 @@ describe("PaymentMethodCard", () => {});describe("InvoicesCard", () => {- it("renders a no-invoices empty state when the credit history is empty", async () => {- server.use(- jsonHandler("get", "/api/credits/transactions", {- transactions: [],- next_transaction_time: null,- }),- );+ it("renders a no-invoices empty state when Stripe returns no invoices", async () => {+ server.use(jsonHandler("get", "/api/credits/invoices", []));render(<InvoicesCard />);expect(await screen.findByText(/No invoices yet/i)).toBeDefined();});- it("renders an invoice row per TOP_UP transaction (current fallback)", async () => {+ it("renders an invoice row per Stripe invoice", async () => {server.use(- jsonHandler("get", "/api/credits/transactions", {- transactions: [- {- transaction_key: "TXN-1",- transaction_time: "2026-04-01T00:00:00Z",- transaction_type: "TOP_UP",- amount: 2000,- description: "Top up",- running_balance: 2000,- },- {- transaction_key: "TXN-2",- transaction_time: "2026-04-02T00:00:00Z",- transaction_type: "USAGE",- amount: -50,- description: "Agent run",- running_balance: 1950,- },- ],- next_transaction_time: null,- }),+ jsonHandler("get", "/api/credits/invoices", [+ {+ id: "in_001",+ number: "INV-001",+ created_at: "2026-04-01T00:00:00Z",+ total_cents: 2000,+ amount_paid_cents: 2000,+ currency: "usd",+ status: "paid",+ description: "Top up",+ hosted_invoice_url: "https://stripe.com/i/001",+ invoice_pdf_url: "https://stripe.com/i/001.pdf",+ },+ ]),);render(<InvoicesCard />);- expect(await screen.findByText("TXN-1")).toBeDefined();- expect(screen.queryByText("TXN-2")).toBeNull();+ expect(await screen.findByText("INV-001")).toBeDefined();});});diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/AutoRefillCard/AutoRefillCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/AutoRefillCard/AutoRefillCard.tsxindex 048615c640..4861fecee7 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/AutoRefillCard/AutoRefillCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/AutoRefillCard/AutoRefillCard.tsx@@ -6,7 +6,7 @@ import { motion, useReducedMotion } from "framer-motion";import { Button } from "@/components/atoms/Button/Button";import { Text } from "@/components/atoms/Text/Text";-import { EASE_OUT } from "../../../helpers";+import { getSectionMotionProps } from "../../../helpers";import { AutoRefillDialog } from "./AutoRefillDialog";import { useAutoRefillCard } from "./useAutoRefillCard";@@ -34,13 +34,7 @@ export function AutoRefillCard({ index = 0 }: Props) {return (<motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }+ {...getSectionMotionProps(index, Boolean(reduceMotion))}className="flex w-full flex-wrap items-center justify-between gap-4 rounded-[18px] border border-zinc-200 bg-white p-5 shadow-[0_1px_2px_rgba(15,15,20,0.04)]"><div className="flex min-w-0 items-center gap-3">diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/BalanceCard/BalanceCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/BalanceCard/BalanceCard.tsxindex d01f8a5341..8edbf34649 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/BalanceCard/BalanceCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/BalanceCard/BalanceCard.tsx@@ -10,7 +10,7 @@ import { Dialog } from "@/components/molecules/Dialog/Dialog";import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";-import { EASE_OUT, formatCents } from "../../../helpers";+import { formatCents, getSectionMotionProps } from "../../../helpers";import { useBalanceCard } from "./useBalanceCard";interface Props {@@ -36,8 +36,14 @@ export function BalanceCard({ index = 0 }: Props) {handleSubmit,} = useBalanceCard();+ const sectionMotion = getSectionMotionProps(index, Boolean(reduceMotion));+if (isLoading) {- return <Skeleton className="h-[120px] rounded-[18px]" />;+ return (+ <motion.div {...sectionMotion}>+ <Skeleton className="h-[120px] rounded-[18px]" />+ </motion.div>+ );}if (isError || balanceCents === null) {@@ -51,16 +57,7 @@ export function BalanceCard({ index = 0 }: Props) {}return (- <motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }- className="flex w-full flex-col gap-2"- >+ <motion.section {...sectionMotion} className="flex w-full flex-col gap-2"><div className="flex items-center gap-1 px-4"><Text variant="body-medium" as="span" className="text-textBlack">Automation creditsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/TransactionHistoryCard/TransactionHistoryCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/TransactionHistoryCard/TransactionHistoryCard.tsxindex edf3c0a937..8b61c846ef 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/TransactionHistoryCard/TransactionHistoryCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/TransactionHistoryCard/TransactionHistoryCard.tsx@@ -6,7 +6,11 @@ import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";import { Text } from "@/components/atoms/Text/Text";import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";-import { EASE_OUT } from "../../../helpers";+import {+ getSectionMotionProps,+ rowVariants,+ rowsContainerVariants,+} from "../../../helpers";import { useTransactionHistoryCard } from "./useTransactionHistoryCard";interface Props {@@ -17,9 +21,14 @@ export function TransactionHistoryCard({ index = 0 }: Props) {const reduceMotion = useReducedMotion();const { transactions, isLoading, isError, refetch } =useTransactionHistoryCard();+ const sectionMotion = getSectionMotionProps(index, Boolean(reduceMotion));if (isLoading) {- return <Skeleton className="h-[200px] rounded-[18px]" />;+ return (+ <motion.div {...sectionMotion}>+ <Skeleton className="h-[200px] rounded-[18px]" />+ </motion.div>+ );}if (isError) {@@ -33,16 +42,7 @@ export function TransactionHistoryCard({ index = 0 }: Props) {}return (- <motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }- className="flex w-full flex-col gap-2"- >+ <motion.section {...sectionMotion} className="flex w-full flex-col gap-2"><div className="px-4"><Text variant="body-medium" as="span" className="text-textBlack">Transaction history@@ -57,61 +57,77 @@ export function TransactionHistoryCard({ index = 0 }: Props) {</Text></div>) : (- <table className="w-full border-collapse text-left">- <thead className="bg-zinc-50">- <tr className="border-b border-zinc-200">- <Th>Date</Th>- <Th>Description</Th>- <Th align="right">Amount</Th>- <Th align="right">Balance</Th>- </tr>- </thead>- <tbody>- {transactions.map((transaction, rowIndex) => (- <tr- key={transaction.id}- className={- rowIndex !== transactions.length - 1- ? "border-b border-zinc-100 transition-colors hover:bg-zinc-50/60"- : "transition-colors hover:bg-zinc-50/60"- }- >- <td className="px-4 py-4">- <Text variant="body" as="span" className="text-zinc-600">- {transaction.date}- </Text>- </td>- <td className="px-4 py-4">- <Text variant="body" as="span" className="text-textBlack">- {transaction.description}- </Text>- </td>- <td className="px-4 py-4 text-right">- <Text- variant="body-medium"- as="span"- className={- transaction.kind === "credit"- ? "tabular-nums text-emerald-700"- : "tabular-nums text-red-600"- }- >- {transaction.amount}- </Text>- </td>- <td className="px-4 py-4 text-right">- <Text- variant="body-medium"- as="span"- className="tabular-nums text-textBlack"- >- {transaction.balance}- </Text>- </td>+ <div className="overflow-x-auto">+ <table className="w-full border-collapse text-left">+ <thead className="bg-zinc-50">+ <tr className="border-b border-zinc-200">+ <Th className="hidden sm:table-cell">Date</Th>+ <Th>Description</Th>+ <Th align="right">Amount</Th>+ <Th align="right" className="hidden sm:table-cell">+ Balance+ </Th></tr>- ))}- </tbody>- </table>+ </thead>+ <motion.tbody+ initial={reduceMotion ? false : "hidden"}+ animate="show"+ variants={reduceMotion ? undefined : rowsContainerVariants}+ >+ {transactions.map((transaction, rowIndex) => (+ <motion.tr+ key={transaction.id}+ variants={reduceMotion ? undefined : rowVariants}+ className={+ rowIndex !== transactions.length - 1+ ? "border-b border-zinc-100 transition-colors hover:bg-zinc-50/60"+ : "transition-colors hover:bg-zinc-50/60"+ }+ >+ <td className="hidden px-2 py-4 sm:table-cell sm:px-4">+ <Text variant="body" as="span" className="text-zinc-600">+ {transaction.date}+ </Text>+ </td>+ <td className="px-2 py-4 sm:px-4">+ <Text variant="body" as="span" className="text-textBlack">+ {transaction.description}+ </Text>+ <Text+ variant="small"+ as="span"+ className="block text-zinc-500 sm:hidden"+ >+ {transaction.date}+ </Text>+ </td>+ <td className="px-2 py-4 text-right sm:px-4">+ <Text+ variant="body-medium"+ as="span"+ className={+ transaction.kind === "credit"+ ? "tabular-nums text-emerald-700"+ : "tabular-nums text-red-600"+ }+ >+ {transaction.amount}+ </Text>+ </td>+ <td className="hidden px-2 py-4 text-right sm:table-cell sm:px-4">+ <Text+ variant="body-medium"+ as="span"+ className="tabular-nums text-textBlack"+ >+ {transaction.balance}+ </Text>+ </td>+ </motion.tr>+ ))}+ </motion.tbody>+ </table>+ </div>)}</div></motion.section>@@ -121,13 +137,14 @@ export function TransactionHistoryCard({ index = 0 }: Props) {interface ThProps {children: React.ReactNode;align?: "left" | "right";+ className?: string;}-function Th({ children, align = "left" }: ThProps) {+function Th({ children, align = "left", className = "" }: ThProps) {return (<thscope="col"- className={`px-4 py-3 ${align === "right" ? "text-right" : "text-left"}`}+ className={`px-2 py-3 sm:px-4 ${align === "right" ? "text-right" : "text-left"} ${className}`}><Textvariant="small-medium"diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/UsageCard/UsageCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/UsageCard/UsageCard.tsxindex a80f83c7c0..ee4680a671 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/UsageCard/UsageCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/AutomationCreditsTab/UsageCard/UsageCard.tsx@@ -11,40 +11,44 @@ import {TooltipTrigger,} from "@/components/atoms/Tooltip/BaseTooltip";-import { EASE_OUT } from "../../../helpers";+import { EASE_OUT, getSectionMotionProps } from "../../../helpers";import { useUsageCard, type DailyUsageRow } from "./useUsageCard";interface Props {index?: number;}+const Y_TICK_COUNT = 4;+export function UsageCard({ index = 0 }: Props) {const reduceMotion = useReducedMotion();const { usage, isLoading } = useUsageCard();+ const sectionMotion = getSectionMotionProps(index, Boolean(reduceMotion));+if (isLoading) {- return <Skeleton className="h-[260px] rounded-[18px]" />;+ return (+ <motion.div {...sectionMotion}>+ <Skeleton className="h-[260px] rounded-[18px]" />+ </motion.div>+ );}- const max = Math.max(...usage.map((d) => d.amount), 0.01);+ const displayMax = Math.max(...usage.map((d) => d.amount), 0);+ const normalizedMax = Math.max(displayMax, 0.01);const totalSpent = usage.reduce((sum, d) => sum + d.amount, 0);const totalRuns = usage.reduce((sum, d) => sum + d.runs, 0);+ const yTicks = Array.from({ length: Y_TICK_COUNT + 1 }, (_, i) => {+ const value = (displayMax / Y_TICK_COUNT) * (Y_TICK_COUNT - i);+ return { value, label: `$${value.toFixed(2)}` };+ });- const first = usage[0];- const middle = usage[Math.floor(usage.length / 2)];- const last = usage[usage.length - 1];+ const firstDate = usage.at(0)?.date ?? "—";+ const middleDate = usage[Math.floor(usage.length / 2)]?.date ?? "—";+ const lastDate = usage.at(-1)?.date ?? "—";return (- <motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }- className="flex w-full flex-col gap-2"- >+ <motion.section {...sectionMotion} className="flex w-full flex-col gap-2"><div className="px-4"><Text variant="body-medium" as="span" className="text-textBlack">Usage@@ -71,30 +75,52 @@ export function UsageCard({ index = 0 }: Props) {</div><TooltipProvider delayDuration={150}>- <div className="flex h-44 items-end gap-1">- {usage.map((day, i) => (- <UsageBar- key={day.date}- day={day}- index={i}- max={max}- reduceMotion={Boolean(reduceMotion)}- />- ))}+ <div className="flex gap-3">+ <div+ className="flex h-44 w-10 flex-col justify-between text-right"+ aria-hidden="true"+ >+ {yTicks.map((tick, i) => (+ <Text+ key={i}+ variant="small"+ as="span"+ className="tabular-nums text-zinc-400"+ >+ {tick.label}+ </Text>+ ))}+ </div>++ <div className="flex flex-1 flex-col gap-2">+ <div className="relative">+ <div className="relative flex h-44 items-end gap-1 border-b border-l border-zinc-300 pl-1">+ {usage.map((day, i) => (+ <UsageBar+ key={day.date}+ day={day}+ index={i}+ max={normalizedMax}+ reduceMotion={Boolean(reduceMotion)}+ />+ ))}+ </div>+ </div>++ <div className="flex justify-between pl-1">+ <Text variant="small" as="span" className="text-zinc-500">+ {firstDate}+ </Text>+ <Text variant="small" as="span" className="text-zinc-500">+ {middleDate}+ </Text>+ <Text variant="small" as="span" className="text-zinc-500">+ {lastDate}+ </Text>+ </div>+ </div></div></TooltipProvider>-- <div className="flex justify-between">- <Text variant="small" as="span" className="text-zinc-500">- {first.date}- </Text>- <Text variant="small" as="span" className="text-zinc-500">- {middle.date}- </Text>- <Text variant="small" as="span" className="text-zinc-500">- {last.date}- </Text>- </div></div></motion.section>);@@ -112,31 +138,40 @@ function UsageBar({reduceMotion: boolean;}) {const heightPercent = (day.amount / max) * 100;+ const isEmpty = day.amount <= 0;return (<Tooltip><TooltipTrigger asChild><buttontype="button"- aria-label={`${day.date}: $${day.amount.toFixed(2)}, ${day.runs} runs`}+ aria-label={+ isEmpty+ ? `${day.date}: $0.00, 0 runs`+ : `${day.date}: $${day.amount.toFixed(2)}, ${day.runs} runs`+ }className="group flex h-full flex-1 flex-col justify-end focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-zinc-400">- <motion.div- initial={- reduceMotion ? { height: `${heightPercent}%` } : { height: 0 }- }- animate={{ height: `${heightPercent}%` }}- transition={- reduceMotion- ? undefined- : {- duration: 0.5,- ease: EASE_OUT,- delay: 0.15 + index * 0.015,- }- }- className="w-full cursor-help rounded-[3px] bg-zinc-200 transition-colors group-hover:bg-zinc-300"- />+ {isEmpty ? (+ <div className="h-px w-full bg-transparent" />+ ) : (+ <motion.div+ initial={+ reduceMotion ? { height: `${heightPercent}%` } : { height: 0 }+ }+ animate={{ height: `${heightPercent}%` }}+ transition={+ reduceMotion+ ? undefined+ : {+ duration: 0.5,+ ease: EASE_OUT,+ delay: 0.15 + index * 0.015,+ }+ }+ className="w-full cursor-help rounded-t-[3px] border-t-2 border-purple-500 bg-purple-500/30 transition-colors group-hover:bg-purple-500/50"+ />+ )}</button></TooltipTrigger><TooltipContent side="top">diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/AutopilotUsageCard/AutopilotUsageCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/AutopilotUsageCard/AutopilotUsageCard.tsxindex 7b5638ae38..6f9f7d87a0 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/AutopilotUsageCard/AutopilotUsageCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/AutopilotUsageCard/AutopilotUsageCard.tsx@@ -5,7 +5,7 @@ import { motion, useReducedMotion } from "framer-motion";import { Text } from "@/components/atoms/Text/Text";import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";-import { EASE_OUT } from "../../../helpers";+import { EASE_OUT, getSectionMotionProps } from "../../../helpers";import {useAutopilotUsageCard,type UsageWindowView,@@ -26,13 +26,7 @@ export function AutopilotUsageCard({ index = 0 }: Props) {return (<motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }+ {...getSectionMotionProps(index, Boolean(reduceMotion))}className="flex w-full flex-col gap-2"><div className="flex items-center gap-1 px-4">diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/InvoicesCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/InvoicesCard.tsxindex 7c1f18eddb..c2537a9378 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/InvoicesCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/InvoicesCard.tsx@@ -9,7 +9,11 @@ import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";import { Text } from "@/components/atoms/Text/Text";import { ErrorCard } from "@/components/molecules/ErrorCard/ErrorCard";-import { EASE_OUT } from "../../../helpers";+import {+ getSectionMotionProps,+ rowVariants,+ rowsContainerVariants,+} from "../../../helpers";import { useInvoicesCard } from "./useInvoicesCard";interface Props {@@ -27,9 +31,14 @@ const STATUS_VARIANT: Record<string, "success" | "info" | "error"> = {export function InvoicesCard({ index = 0 }: Props) {const reduceMotion = useReducedMotion();const { invoices, isLoading, isError, refetch } = useInvoicesCard();+ const sectionMotion = getSectionMotionProps(index, Boolean(reduceMotion));if (isLoading) {- return <Skeleton className="h-[200px] rounded-[18px]" />;+ return (+ <motion.div {...sectionMotion}>+ <Skeleton className="h-[200px] rounded-[18px]" />+ </motion.div>+ );}if (isError) {@@ -43,16 +52,7 @@ export function InvoicesCard({ index = 0 }: Props) {}return (- <motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }- className="flex w-full flex-col gap-2"- >+ <motion.section {...sectionMotion} className="flex w-full flex-col gap-2"><div className="px-4"><Text variant="body-medium" as="span" className="text-textBlack">Invoices@@ -67,89 +67,96 @@ export function InvoicesCard({ index = 0 }: Props) {</Text></div>) : (- <table className="w-full border-collapse text-left">- <thead className="bg-zinc-50">- <tr className="border-b border-zinc-200">- <Th>Invoice</Th>- <Th>Date</Th>- <Th>Description</Th>- <Th align="right">Amount</Th>- <Th>Status</Th>- <th scope="col" className="w-12 px-4 py-3">- <span className="sr-only">Download</span>- </th>- </tr>- </thead>- <tbody>- {invoices.map((invoice, rowIndex) => (- <tr- key={invoice.id}- className={- rowIndex !== invoices.length - 1- ? "border-b border-zinc-100 transition-colors hover:bg-zinc-50/60"- : "transition-colors hover:bg-zinc-50/60"- }- >- <td className="px-4 py-4">- <Text- variant="body-medium"- as="span"- className="tabular-nums text-textBlack"- >- {invoice.number}- </Text>- </td>- <td className="px-4 py-4">- <Text variant="body" as="span" className="text-zinc-600">- {invoice.date}- </Text>- </td>- <td className="px-4 py-4">- <Text variant="body" as="span" className="text-zinc-600">- {invoice.description}- </Text>- </td>- <td className="px-4 py-4 text-right">- <Text- variant="body-medium"- as="span"- className="tabular-nums text-textBlack"- >- {invoice.amount}- </Text>- </td>- <td className="px-4 py-4">- <Badge- variant={STATUS_VARIANT[invoice.status] ?? "info"}- size="small"- >- {invoice.status}- </Badge>- </td>- <td className="px-4 py-4 text-right">- <Button- variant="secondary"- size="small"- aria-label={`Download invoice ${invoice.number}`}- className="h-7 min-w-0 px-1.5 py-0.5"- disabled={!invoice.pdfUrl}- onClick={() => {- if (invoice.pdfUrl) {- window.open(- invoice.pdfUrl,- "_blank",- "noopener,noreferrer",- );- }- }}- >- <DownloadSimpleIcon size={14} />- </Button>- </td>+ <div className="overflow-x-auto">+ <table className="w-full border-collapse text-left">+ <thead className="bg-zinc-50">+ <tr className="border-b border-zinc-200">+ <Th>Invoice</Th>+ <Th className="hidden sm:table-cell">Date</Th>+ <Th className="hidden md:table-cell">Description</Th>+ <Th align="right">Amount</Th>+ <Th>Status</Th>+ <th scope="col" className="w-12 px-2 py-3 sm:px-4">+ <span className="sr-only">Download</span>+ </th></tr>- ))}- </tbody>- </table>+ </thead>+ <motion.tbody+ initial={reduceMotion ? false : "hidden"}+ animate="show"+ variants={reduceMotion ? undefined : rowsContainerVariants}+ >+ {invoices.map((invoice, rowIndex) => (+ <motion.tr+ key={invoice.id}+ variants={reduceMotion ? undefined : rowVariants}+ className={+ rowIndex !== invoices.length - 1+ ? "border-b border-zinc-100 transition-colors hover:bg-zinc-50/60"+ : "transition-colors hover:bg-zinc-50/60"+ }+ >+ <td className="px-2 py-4 sm:px-4">+ <Text+ variant="body-medium"+ as="span"+ className="tabular-nums text-textBlack"+ >+ {invoice.number}+ </Text>+ </td>+ <td className="hidden px-2 py-4 sm:table-cell sm:px-4">+ <Text variant="body" as="span" className="text-zinc-600">+ {invoice.date}+ </Text>+ </td>+ <td className="hidden px-2 py-4 md:table-cell md:px-4">+ <Text variant="body" as="span" className="text-zinc-600">+ {invoice.description}+ </Text>+ </td>+ <td className="px-2 py-4 text-right sm:px-4">+ <Text+ variant="body-medium"+ as="span"+ className="tabular-nums text-textBlack"+ >+ {invoice.amount}+ </Text>+ </td>+ <td className="px-2 py-4 sm:px-4">+ <Badge+ variant={STATUS_VARIANT[invoice.status] ?? "info"}+ size="small"+ >+ {invoice.status}+ </Badge>+ </td>+ <td className="px-2 py-4 text-right sm:px-4">+ <Button+ variant="secondary"+ size="small"+ aria-label={`Download invoice ${invoice.number}`}+ className="h-7 min-w-0 px-1.5 py-0.5"+ disabled={!invoice.pdfUrl}+ onClick={() => {+ if (invoice.pdfUrl) {+ window.open(+ invoice.pdfUrl,+ "_blank",+ "noopener,noreferrer",+ );+ }+ }}+ >+ <DownloadSimpleIcon size={14} />+ </Button>+ </td>+ </motion.tr>+ ))}+ </motion.tbody>+ </table>+ </div>)}</div></motion.section>@@ -159,13 +166,14 @@ export function InvoicesCard({ index = 0 }: Props) {interface ThProps {children: React.ReactNode;align?: "left" | "right";+ className?: string;}-function Th({ children, align = "left" }: ThProps) {+function Th({ children, align = "left", className = "" }: ThProps) {return (<thscope="col"- className={`px-4 py-3 ${align === "right" ? "text-right" : "text-left"}`}+ className={`px-2 py-3 sm:px-4 ${align === "right" ? "text-right" : "text-left"} ${className}`}><Textvariant="small-medium"diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/useInvoicesCard.ts b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/useInvoicesCard.tsindex f2b16a72c6..2c08607204 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/useInvoicesCard.ts+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/InvoicesCard/useInvoicesCard.ts@@ -1,12 +1,7 @@"use client";-// TODO: switch to the generated `useGetV1ListInvoices` hook once-// `pnpm generate:api` is re-run on this branch (the openapi.json change-// in this PR adds the `/credits/invoices` operation, but the regenerated-// client lives outside the diff). Until then, derive the invoice list-// from credit history TOP_UP transactions so the UI is still populated.-import { useGetV1GetCreditHistory } from "@/app/api/__generated__/endpoints/credits/credits";-import type { TransactionHistory } from "@/app/api/__generated__/models/transactionHistory";+import { useGetV1ListStripeInvoices } from "@/app/api/__generated__/endpoints/credits/credits";+import type { InvoiceListItem } from "@/app/api/__generated__/models/invoiceListItem";import { formatCents, formatShortDate } from "../../../helpers";@@ -22,27 +17,25 @@ export interface InvoiceRow {}export function useInvoicesCard() {- const { data, isLoading, isError, refetch } = useGetV1GetCreditHistory(- { transaction_count_limit: 50 },+ const { data, isLoading, isError, refetch } = useGetV1ListStripeInvoices(+ { limit: 24 },{query: {- select: (res) => res.data as TransactionHistory | undefined,+ select: (res) => res.data as InvoiceListItem[] | undefined,},},);- const invoices: InvoiceRow[] = (data?.transactions ?? [])- .filter((tx) => tx.transaction_type === "TOP_UP")- .map((tx, idx) => ({- id: tx.transaction_key ?? `top-up-${idx}`,- number: tx.transaction_key ?? "—",- date: formatShortDate(tx.transaction_time),- description: tx.description ?? "Top up",- amount: formatCents(Math.abs(tx.amount ?? 0)),- status: "paid",- hostedUrl: null,- pdfUrl: null,- }));+ const invoices: InvoiceRow[] = (data ?? []).map((invoice, idx) => ({+ id: invoice.id,+ number: invoice.number ?? `#${idx + 1}`,+ date: formatShortDate(invoice.created_at),+ description: invoice.description ?? "Invoice",+ amount: formatCents(invoice.total_cents),+ status: invoice.status,+ hostedUrl: invoice.hosted_invoice_url ?? null,+ pdfUrl: invoice.invoice_pdf_url ?? null,+ }));return { invoices, isLoading, isError, refetch };}diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/PaymentMethodCard/PaymentMethodCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/PaymentMethodCard/PaymentMethodCard.tsxindex f5d425300b..e5c510d8f9 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/PaymentMethodCard/PaymentMethodCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/PaymentMethodCard/PaymentMethodCard.tsx@@ -6,7 +6,7 @@ import { motion, useReducedMotion } from "framer-motion";import { Button } from "@/components/atoms/Button/Button";import { Text } from "@/components/atoms/Text/Text";-import { EASE_OUT } from "../../../helpers";+import { getSectionMotionProps } from "../../../helpers";import { usePaymentMethodCard } from "./usePaymentMethodCard";interface Props {@@ -19,13 +19,7 @@ export function PaymentMethodCard({ index = 0 }: Props) {return (<motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }+ {...getSectionMotionProps(index, Boolean(reduceMotion))}className="flex w-full flex-col gap-2"><div className="px-4">diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/YourPlanCard/YourPlanCard.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/YourPlanCard/YourPlanCard.tsxindex 8df7fd2d48..9fde0b6e5d 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/YourPlanCard/YourPlanCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/components/SubscriptionTab/YourPlanCard/YourPlanCard.tsx@@ -8,7 +8,11 @@ import { Button } from "@/components/atoms/Button/Button";import { Skeleton } from "@/components/atoms/Skeleton/Skeleton";import { Text } from "@/components/atoms/Text/Text";-import { EASE_OUT, formatCents, formatShortDate } from "../../../helpers";+import {+ formatCents,+ formatShortDate,+ getSectionMotionProps,+} from "../../../helpers";import { useYourPlanCard } from "./useYourPlanCard";const PRICING_PAGE_URL = "https://agpt.co/pricing";@@ -33,21 +37,18 @@ export function YourPlanCard({ index = 0 }: Props) {onManage,} = useYourPlanCard();+ const sectionMotion = getSectionMotionProps(index, Boolean(reduceMotion));+if (isLoading || !plan) {- return <Skeleton className="h-[100px] rounded-[18px]" />;+ return (+ <motion.div {...sectionMotion}>+ <Skeleton className="h-[100px] rounded-[18px]" />+ </motion.div>+ );}return (- <motion.section- initial={reduceMotion ? false : { opacity: 0, y: 12 }}- animate={reduceMotion ? undefined : { opacity: 1, y: 0 }}- transition={- reduceMotion- ? undefined- : { duration: 0.32, ease: EASE_OUT, delay: 0.04 + index * 0.05 }- }- className="flex w-full flex-col gap-2"- >+ <motion.section {...sectionMotion} className="flex w-full flex-col gap-2"><div className="flex items-center gap-2 px-4"><Text variant="body-medium" as="span" className="text-textBlack">Your plandiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/settings/billing/helpers.tsindex 3505c7ec3c..ba23e76c9f 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/helpers.ts@@ -1,5 +1,46 @@export const EASE_OUT = [0.16, 1, 0.3, 1] as const;+const SECTION_BASE_DELAY = 0.04;+const SECTION_STAGGER = 0.05;+const SECTION_DURATION = 0.32;+const ROW_DELAY_CHILDREN = 0.08;+const ROW_STAGGER = 0.035;+const ROW_DURATION = 0.28;++export function getSectionMotionProps(index: number, reduceMotion: boolean) {+ if (reduceMotion) {+ return { initial: false as const };+ }+ return {+ initial: { opacity: 0, y: 12 },+ animate: { opacity: 1, y: 0 },+ transition: {+ duration: SECTION_DURATION,+ ease: EASE_OUT,+ delay: SECTION_BASE_DELAY + index * SECTION_STAGGER,+ },+ };+}++export const rowsContainerVariants = {+ hidden: {},+ show: {+ transition: {+ delayChildren: ROW_DELAY_CHILDREN,+ staggerChildren: ROW_STAGGER,+ },+ },+};++export const rowVariants = {+ hidden: { opacity: 0, y: 8 },+ show: {+ opacity: 1,+ y: 0,+ transition: { duration: ROW_DURATION, ease: EASE_OUT },+ },+};+const CURRENCY_FORMATTER = new Intl.NumberFormat("en-US", {style: "currency",currency: "USD",diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/billing/page.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/billing/page.tsxindex a7c628979d..e58e58bf33 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/billing/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/billing/page.tsx@@ -94,13 +94,13 @@ export default function SettingsBillingPage() {);return (- <div className="flex flex-col gap-6 pb-8">+ <div className="flex flex-col gap-4 pb-8 sm:gap-6"><Text variant="h4" as="h1" className="pl-4 leading-[28px] text-textBlack">Billing</Text><TabsLine defaultValue="subscription">- <TabsLineList flush className="ml-4">+ <TabsLineList flush className="ml-4 overflow-x-auto"><TabsLineTrigger value="subscription">Subscription</TabsLineTrigger><TabsLineTrigger value="automation-credits">Automation Creditsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/components/SettingsSidebar/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/settings/components/SettingsSidebar/helpers.tsindex 0a194a8353..36193568fe 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/components/SettingsSidebar/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/settings/components/SettingsSidebar/helpers.ts@@ -1,7 +1,6 @@import {ChartLineUpIcon,CreditCardIcon,- IdentificationBadgeIcon,KeyIcon,PlugsConnectedIcon,SlidersHorizontalIcon,@@ -18,9 +17,9 @@ export interface SettingsNavItem {export const settingsNavItems: SettingsNavItem[] = [{ label: "Profile", href: "/settings/profile", Icon: UserIcon },{- label: "Creator Dashboard",- href: "/settings/creator-dashboard",- Icon: ChartLineUpIcon,+ label: "Account",+ href: "/settings/account",+ Icon: SlidersHorizontalIcon,},{ label: "Billing", href: "/settings/billing", Icon: CreditCardIcon },{@@ -28,15 +27,10 @@ export const settingsNavItems: SettingsNavItem[] = [href: "/settings/integrations",Icon: PlugsConnectedIcon,},- {- label: "Preferences",- href: "/settings/preferences",- Icon: SlidersHorizontalIcon,- },{ label: "AutoGPT API Keys", href: "/settings/api-keys", Icon: KeyIcon },{- label: "OAuth Apps",- href: "/settings/oauth-apps",- Icon: IdentificationBadgeIcon,+ label: "Creator Dashboard",+ href: "/settings/creator-dashboard",+ Icon: ChartLineUpIcon,},];diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/__tests__/helpers.test.ts b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/__tests__/helpers.test.tsindex b28ebd5962..2808b373cc 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/__tests__/helpers.test.ts+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/__tests__/helpers.test.ts@@ -165,15 +165,6 @@ describe("creator-dashboard helpers", () => {expect(result.map((s) => s.listing_version_id)).toEqual(["b", "a", "c"]);});- test("sorts by rating descending", () => {- const result = applyFiltersAndSort(items, {- ...INITIAL_FILTER_STATE,- sortKey: "rating",- sortDir: "desc",- });- expect(result.map((s) => s.listing_version_id)).toEqual(["c", "a", "b"]);- });-test("sorts by submitted date descending (newest first)", () => {const result = applyFiltersAndSort(items, {...INITIAL_FILTER_STATE,diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/MobileSubmissionsList/MobileSubmissionsList.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/MobileSubmissionsList/MobileSubmissionsList.tsxindex aec0fd8205..0bd3f7bd76 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/MobileSubmissionsList/MobileSubmissionsList.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/MobileSubmissionsList/MobileSubmissionsList.tsx@@ -146,16 +146,6 @@ export function MobileSubmissionsList({descLabel="Highest first"/></FilterChip>- <FilterChip label="Rating">- <SortColumnFilter- sortKey="rating"- activeKey={filterState.sortKey}- activeDir={filterState.sortDir}- onChange={setSort}- ascLabel="Lowest first"- descLabel="Highest first"- />- </FilterChip></div><AnimatePresence initial={false}>diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionItem/SubmissionItem.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionItem/SubmissionItem.tsxindex 1eb00e278a..cb3eb48b17 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionItem/SubmissionItem.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionItem/SubmissionItem.tsx@@ -8,7 +8,6 @@ import {ImageBrokenIcon,PencilSimpleIcon,SquareIcon,- StarIcon,TrashIcon,} from "@phosphor-icons/react";@@ -156,17 +155,6 @@ export function SubmissionItem({{formatRuns(submission.run_count ?? 0)}</td>- <td className="whitespace-nowrap px-4 py-3 text-right align-middle text-sm text-zinc-700">- {submission.review_avg_rating && submission.review_avg_rating > 0 ? (- <span className="inline-flex items-center justify-end gap-1 tabular-nums">- {submission.review_avg_rating.toFixed(1)}- <StarIcon size={12} weight="fill" className="text-amber-500" />- </span>- ) : (- <span className="text-zinc-400">—</span>- )}- </td>-<td className="px-2 py-3 text-right align-middle"><DropdownMenu><DropdownMenuTrigger asChild>diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/SubmissionsList.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/SubmissionsList.tsxindex 1f02f11080..6b5be6a0a9 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/SubmissionsList.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/SubmissionsList.tsx@@ -42,7 +42,7 @@ interface Props {index?: number;}-const COLUMN_COUNT = 7;+const COLUMN_COUNT = 6;export function SubmissionsList({submissions,@@ -205,21 +205,6 @@ export function SubmissionsList({/>}/>- <ColumnHeader- label="Rating"- align="right"- width="110px"- filter={- <SortColumnFilter- sortKey="rating"- activeKey={filterState.sortKey}- activeDir={filterState.sortDir}- onChange={setSort}- ascLabel="Lowest first"- descLabel="Highest first"- />- }- /><thscope="col"className="w-[60px] px-2 py-3"diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/columns/ColumnHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/columns/ColumnHeader.tsxindex a3ef0c0347..4d51b9c117 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/columns/ColumnHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/components/SubmissionsList/columns/ColumnHeader.tsx@@ -15,7 +15,7 @@ export function ColumnHeader({ label, filter, align = "left", width }: Props) {className={`px-4 py-3 ${align === "right" ? "text-right" : "text-left"}`}><div- className={`inline-flex items-center gap-1.5 text-xs font-medium uppercase tracking-wide text-zinc-500 ${+ className={`inline-flex items-center gap-1.5 text-xs font-medium uppercase tracking-wide text-zinc-700 ${align === "right" ? "flex-row-reverse" : ""}`}>diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/helpers.tsindex cd72080099..a983a1badb 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/helpers.ts+++ b/autogpt_platform/frontend/src/app/(platform)/settings/creator-dashboard/helpers.ts@@ -13,7 +13,7 @@ export const EASE_OUT = [0.16, 1, 0.3, 1] as const;export type StatusFilterValue = "all" | SubmissionStatus;-export type SortKey = "submitted" | "runs" | "rating";+export type SortKey = "submitted" | "runs";export type SortDir = "asc" | "desc";export interface FilterState {@@ -74,8 +74,7 @@ function sortValue(submission: StoreSubmission, key: SortKey): number {date instanceof Date ? date.getTime() : new Date(date).getTime();return Number.isNaN(time) ? 0 : time;}- if (key === "runs") return submission.run_count ?? 0;- return submission.review_avg_rating ?? 0;+ return submission.run_count ?? 0;}export function isFiltered(state: FilterState): boolean {diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/DeleteConfirmDialog.tsxindex 0c39ca7c3c..4c8f328740 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx@@ -1,7 +1,5 @@"use client";-import { WarningCircleIcon } from "@phosphor-icons/react";-import { Button } from "@/components/atoms/Button/Button";import { Text } from "@/components/atoms/Text/Text";import { Dialog } from "@/components/molecules/Dialog/Dialog";@@ -25,8 +23,6 @@ export function DeleteConfirmDialog({}: Props) {const count = itemNames.length;const isBulk = count > 1;- const preview = itemNames.slice(0, 3).join(", ");- const more = count > 3 ? ` and ${count - 3} more` : "";const isForce = variant === "force";const title = isForce? isBulk@@ -52,24 +48,9 @@ export function DeleteConfirmDialog({><Dialog.Content><div className="flex flex-col gap-4">- <div className="flex items-start gap-3">- <WarningCircleIcon- size={20}- weight="fill"- className="mt-0.5 shrink-0 text-red-500"- />- <div className="flex flex-col gap-1">- <Text variant="body" className="text-zinc-800">- {message}- </Text>- {isBulk && preview ? (- <Text variant="small" className="text-zinc-500">- {preview}- {more}- </Text>- ) : null}- </div>- </div>+ <Text variant="body" className="text-zinc-800">+ {message}+ </Text><div className="flex justify-end gap-2 pt-2"><Buttondiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/__tests__/DeleteConfirmDialog.test.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/__tests__/DeleteConfirmDialog.test.tsxindex 213d3dd7a7..3a3a830615 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/__tests__/DeleteConfirmDialog.test.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/DeleteConfirmDialog/__tests__/DeleteConfirmDialog.test.tsx@@ -30,7 +30,7 @@ describe("DeleteConfirmDialog", () => {expect(dialog.textContent).toContain("Remove GitHub key");});- test("bulk delete: titles by count and lists names with overflow indicator", () => {+ test("bulk delete: titles by count", () => {render(<DeleteConfirmDialogopen@@ -41,8 +41,6 @@ describe("DeleteConfirmDialog", () => {);const dialog = screen.getByRole("dialog");expect(dialog.textContent).toContain("Remove 5 integrations?");- expect(dialog.textContent).toContain("A, B, C");- expect(dialog.textContent).toContain("and 2 more");});test("Remove button fires onConfirm; Cancel fires onOpenChange(false)", () => {diff --git a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/IntegrationsHeader/IntegrationsHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/IntegrationsHeader/IntegrationsHeader.tsxindex fc0a00a66f..31a556f9e9 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/IntegrationsHeader/IntegrationsHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/IntegrationsHeader/IntegrationsHeader.tsx@@ -10,7 +10,7 @@ interface Props {export function IntegrationsHeader({ onConnect }: Props) {return (- <div className="flex flex-col items-start gap-4 pb-6 sm:flex-row sm:items-start sm:justify-between">+ <div className="flex flex-col items-start gap-4 pb-6 pl-4 sm:flex-row sm:items-start sm:justify-between"><div className="flex min-w-0 flex-col"><Text variant="h4" as="h1" className="leading-[28px] text-[#1F1F20]">Third Party Integrationsdiff --git a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/ProviderGroup/ProviderGroup.tsx b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/ProviderGroup/ProviderGroup.tsxindex b3f922aff2..d7a9921478 100644--- a/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/ProviderGroup/ProviderGroup.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/settings/integrations/components/ProviderGroup/ProviderGroup.tsx@@ -33,7 +33,7 @@ export function ProviderGroup({type="single"collapsibledefaultValue={provider.id}- className="w-full overflow-hidden rounded-lg border border-[#DADADC] bg-white"+ className="w-full overflow-hidden rounded-2xl border border-[#DADADC] bg-white"><AccordionItem value={provider.id} className="border-b-0"><AccordionTrigger className="px-3 py-3 pr-5 hover:no-underline [&>svg]:text-[#1F1F20]">diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsxindex d904b4f8d3..eae94babcc 100644--- a/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx+++ b/autogpt_platform/frontend/src/components/layout/Navbar/components/Wallet/Wallet.tsx@@ -296,14 +296,20 @@ export function Wallet() {side="bottom"align="end"collisionPadding={16}- className={cn("relative -top-12 z-50 w-[28.5rem] px-[0.625rem] py-2")}+ className={cn("relative -top-12 z-50 w-[28.5rem] px-4 py-4")}>{/* Header */}- <div className="mx-1 flex items-center justify-between border-b border-zinc-200 pb-3">- <span className="font-poppins font-medium text-zinc-900">- Your credits- </span>- <div className="flex items-center text-sm text-violet-700">+ <div className="mx-1 flex items-start justify-between gap-3 border-b border-zinc-200 pb-3">+ <div className="flex min-w-0 flex-col gap-1">+ <span className="font-poppins text-base font-semibold text-zinc-900">+ Automation Credits+ </span>+ <span className="font-sans text-xs text-zinc-500">+ Platform-only credits for automations. This is separate from your+ subscription and is not usable for plan fees.+ </span>+ </div>+ <div className="flex shrink-0 items-center text-sm text-violet-700"><div className="rounded-lg bg-violet-100 px-3 py-2">Earn credits{" "}<span className="font-semibold">{formatCredits(credits)}</span>diff --git a/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx b/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsxindex a3c7a464ab..597afaeec7 100644--- a/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx+++ b/autogpt_platform/frontend/src/components/layout/Navbar/helpers.tsx@@ -51,7 +51,7 @@ export const accountMenuItems: MenuItemGroup[] = [{icon: IconType.Edit,text: "Edit profile",- href: "/profile",+ href: "/settings/profile",},],},@@ -60,7 +60,7 @@ export const accountMenuItems: MenuItemGroup[] = [{icon: IconType.LayoutDashboard,text: "Creator Dashboard",- href: "/profile/dashboard",+ href: "/settings/creator-dashboard",},{icon: IconType.UploadCloud,@@ -73,7 +73,7 @@ export const accountMenuItems: MenuItemGroup[] = [{icon: IconType.Settings,text: "Settings",- href: "/profile/settings",+ href: "/settings",},],},@@ -94,7 +94,7 @@ export function getAccountMenuItems(userRole?: string): MenuItemGroup[] {{icon: IconType.Edit,text: "Edit profile",- href: "/profile",+ href: "/settings/profile",},],},@@ -103,7 +103,7 @@ export function getAccountMenuItems(userRole?: string): MenuItemGroup[] {{icon: IconType.LayoutDashboard,text: "Creator Dashboard",- href: "/profile/dashboard",+ href: "/settings/creator-dashboard",},{icon: IconType.UploadCloud,@@ -133,7 +133,7 @@ export function getAccountMenuItems(userRole?: string): MenuItemGroup[] {{icon: IconType.Settings,text: "Settings",- href: "/profile/settings",+ href: "/settings",},],},