diff --git a/src/renderer/src/components/billing/PlanBillingSection.fixture.tsx b/src/renderer/src/components/billing/PlanBillingSection.fixture.tsx index c07c627551b..c7c0d04d10a 100644 --- a/src/renderer/src/components/billing/PlanBillingSection.fixture.tsx +++ b/src/renderer/src/components/billing/PlanBillingSection.fixture.tsx @@ -61,7 +61,7 @@ export const overageCapReached = defineFixture({ usedSeconds: 333 * HOUR, remainingIncludedSeconds: 0, usageWarningPercent: 100, - overageSeconds: 33 * HOUR, + overageSeconds: 25 * HOUR, overage: { optedIn: true, active: true, diff --git a/src/renderer/src/components/billing/PlanBillingUsage.tsx b/src/renderer/src/components/billing/PlanBillingUsage.tsx index 8f306414235..76b9b93d6ba 100644 --- a/src/renderer/src/components/billing/PlanBillingUsage.tsx +++ b/src/renderer/src/components/billing/PlanBillingUsage.tsx @@ -95,9 +95,15 @@ export function UsageSummary({ ) : null} {entitlement.overageSeconds > 0 ? (

- {t('auto.components.billing.overageHoursOnly', '{{value0}} overage hours this month', { - value0: formatHours(entitlement.overageSeconds) - })} + {t( + 'auto.components.billing.overageHoursOnly2', + '{{hours}} sandbox hours of overage this month', + { + count: Number(formatHours(entitlement.overageSeconds)), + hours: formatHours(entitlement.overageSeconds), + defaultValue_one: '{{hours}} sandbox hour of overage this month' + } + )}

) : null} {entitlement.usageWarningPercent !== null && entitlement.usageWarningPercent < 100 ? ( diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.tsx index a3ceb12b6e1..b4f596c4104 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.tsx @@ -169,7 +169,7 @@ export function CloudWorkspaceRow({ } }} className={cn( - 'group relative isolate flex items-center gap-3 rounded-lg pr-2 transition-colors hover:bg-accent', + 'group @container relative isolate flex items-center gap-3 rounded-lg pr-2 transition-colors hover:bg-accent', menuOpen && 'bg-accent' )} > @@ -295,8 +295,10 @@ export function CloudWorkspaceRow({ /> - - {hours} + {/* The list has no column headers, so the unit is spelled out; a narrow row drops the + column rather than the unit. */} + + {usage} diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json index fb5e777f89e..af855079409 100644 --- a/src/renderer/src/i18n/en-runtime-required.json +++ b/src/renderer/src/i18n/en-runtime-required.json @@ -205,6 +205,8 @@ } }, "billing": { + "overageHoursOnly2_one": "{{hours}} sandbox hour of overage this month", + "overageHoursOnly2_other": "{{hours}} sandbox hours of overage this month", "plans": { "seatsPerMember_one": "{{count}} seat, one per team member", "seatsPerMember_other": "{{count}} seats, one per team member" diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 63c87011e57..8b08f01fcd8 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -20688,7 +20688,8 @@ "openForbidden2": "Only an owner or admin can manage billing.", "openSignedOut2": "Sign in to Orca again to manage your team.", "overageDescription5": "Optional overage at {{value0}}/hour, up to a monthly spend cap you set ({{value1}} by default).", - "overageHoursOnly": "{{value0}} overage hours this month", + "overageHoursOnly2_one": "{{hours}} sandbox hour of overage this month", + "overageHoursOnly2_other": "{{hours}} sandbox hours of overage this month", "overageMemberHint": "Owners and admins can change overage.", "overageOffRead": "Off", "overageOnRead": "On",