Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions apps/desktop-tauri/src/components/MenuCard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ describe("MenuCard", () => {
expect(screen.getByText("58% left")).toBeInTheDocument();
});

it("limits quota rows and suppresses supplemental content in compact Overview", async () => {
it("shows every quota row in compact Overview (upstream 0.62.0 #2616)", async () => {
const snapshot = provider(null, 20, { resetDescription: "Resets in 2h" });
snapshot.secondary = rateWindow(42, { windowMinutes: 7 * 24 * 60 });
snapshot.secondaryLabel = "Weekly";
Expand All @@ -321,10 +321,8 @@ describe("MenuCard", () => {

expect(await screen.findByText("Session")).toBeInTheDocument();
expect(screen.getByText("ProviderWeeklyLabel")).toBeInTheDocument();
expect(screen.queryByText("ProviderMonthly")).not.toBeInTheDocument();
expect(document.querySelectorAll(".menu-metric")).toHaveLength(2);
expect(document.querySelector(".menu-metric__reset")).toBeNull();
expect(document.querySelector(".menu-card__more")).toBeNull();
expect(screen.getByText("ProviderMonthly")).toBeInTheDocument();
expect(document.querySelectorAll(".menu-metric")).toHaveLength(3);
});

it("localizes Claude scoped weekly extra-window labels", async () => {
Expand Down
6 changes: 3 additions & 3 deletions apps/desktop-tauri/src/components/MenuCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ export default function MenuCard({
resetFormatMode: extra.id === "reset-credits" ? "expires" : "reset",
});
}
const visibleMetrics = metrics
.filter((metric) => isUsageItemVisible(provider.hiddenUsageItemIds, metric.id))
.slice(0, compactOverview ? 2 : metrics.length);
const visibleMetrics = metrics.filter((metric) =>
isUsageItemVisible(provider.hiddenUsageItemIds, metric.id),
);

const presence = describeCard(
provider,
Expand Down
8 changes: 0 additions & 8 deletions apps/desktop-tauri/src/components/MenuCardDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -595,14 +595,6 @@ export default function MenuCardDetails({
))}
</section>
)}
{!provider.error && hasDisplayDetails && !compactOverview && (
<section className="menu-card__group menu-card__provider-details">
{provider.displayDetails?.map((detail, index) => (
<DisplayDetailRow key={`${detail.id}-${index}`} detail={detail} />
))}
</section>
)}

{!provider.error && hasDisplayDetails && (
<section className="menu-card__group menu-card__provider-details">
{provider.displayDetails?.map((detail, index) => (
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop-tauri/src/surfaces/TrayPanel.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ describe("TrayPanel provider grid", () => {
).toEqual(["Codex", "Claude", "Cursor", "Factory", "Gemini"]);
});

it("keeps compact Overview limited to two quota rows when explicitly selected", async () => {
it("shows all quota rows in compact Overview when explicitly selected (0.62.0 #2616)", async () => {
const { container } = renderTrayPanel(
[providerWithThreeQuotaWindows("codex", "Codex")],
{ overviewLayout: "compact" },
Expand All @@ -609,7 +609,7 @@ describe("TrayPanel provider grid", () => {
expect(container.querySelector(".menu-stack__item")).not.toBeNull();
});

expect(container.querySelectorAll(".menu-metric")).toHaveLength(2);
expect(container.querySelectorAll(".menu-metric")).toHaveLength(3);
});

it("uses independent columns for a wide user-sized overview", async () => {
Expand Down
2 changes: 1 addition & 1 deletion rust/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ impl Default for Settings {
}

fn default_overview_layout() -> String {
"compact".to_string()
"detailed".to_string()
}

pub fn normalize_overview_layout(value: &str) -> String {
Expand Down
10 changes: 5 additions & 5 deletions rust/src/settings/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn test_settings_default() {
assert!(!settings.predictive_pace_warning_enabled);
assert!(!settings.float_bar_show_cost);
assert!(!settings.tray_panel_always_on_top);
assert_eq!(settings.overview_layout, "compact");
assert_eq!(settings.overview_layout, "detailed");
assert!(settings.promote_tray_icon);
assert!(settings.claude_daily_routines_usage_visible);
assert!(!settings.claude_allow_reading_claude_code_credentials);
Expand All @@ -32,10 +32,10 @@ fn test_settings_default() {
}

#[test]
fn overview_layout_defaults_to_compact_and_round_trips() {
fn overview_layout_defaults_to_detailed_and_round_trips() {
let defaulted: Settings = serde_json::from_str(r#"{ "enabled_providers": [] }"#)
.expect("missing overview layout defaults to compact");
assert_eq!(defaulted.overview_layout, "compact");
.expect("missing overview layout defaults to detailed");
assert_eq!(defaulted.overview_layout, "detailed");

let compact = Settings {
overview_layout: "compact".to_string(),
Expand All @@ -48,7 +48,7 @@ fn overview_layout_defaults_to_compact_and_round_trips() {
let unknown: Settings =
serde_json::from_str(r#"{ "enabled_providers": [], "overview_layout": "unsupported" }"#)
.expect("unknown overview layout is accepted and normalized");
assert_eq!(unknown.overview_layout, "compact");
assert_eq!(unknown.overview_layout, "detailed");
}

#[test]
Expand Down