Skip to content

fix(dashboard): welcome the tenant by its name on the overview #1437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iammukeshm merged 2 commits into from
Nov 3, 2026
Merged

fix(dashboard): welcome the tenant by its name on the overview #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e3663
fix(dashboard): welcome the tenant by its name on the overview
marcelo-maciel Oct 14, 2026
bc9187f
Merge branch 'main' into fix/overview-welcome-tenant-name
iammukeshm Nov 3, 2026
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
4 changes: 3 additions & 1 deletion clients/dashboard/src/pages/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,9 @@ export function OverviewPage() {
const firstName = (user?.name ?? user?.email?.split("@")[0] ?? "operator")
.toString()
.split(" ")[0];
const tenantLabel = user?.tenant ?? "your tenant";
// The JWT `tenant` claim is the identifier; the display name comes from the
// status query, so the id only shows while that is unavailable.
const tenantLabel = status.data?.name ?? user?.tenant ?? "your tenant";

// ── Stat values ───────────────────────────────────────────────────────
const planValue = subscription.isLoading ? (
Expand Down
9 changes: 9 additions & 0 deletions clients/dashboard/tests/overview/overview.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,15 @@ test.describe("overview (/)", () => {
}
});

test("first-run panel welcomes the tenant by its name, not its identifier", async ({ page }) => {
// No subscription → first-run panel. The shell mock's status says tenant
// "acme" is named "Acme Corp"; the JWT only carries the identifier.
await mockJsonResponse(page, "**/api/v1/billing/subscriptions/me**", null);
await page.goto("/");
await expect(page.getByRole("heading", { name: "Welcome to Acme Corp" })).toBeVisible();
await expect(page.getByRole("heading", { name: "Welcome to acme", exact: true })).toHaveCount(0);
});

test("Valid-for card reflects an in-grace tenant", async ({ page }) => {
await mockJsonResponse(page, "**/api/v1/tenants/me/status**", {
id: "acme",
Expand Down
Loading