Skip to content

Dashboard: Remove chakra provider from team/settings/notifications page #7479

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
merged 1 commit into from
Jun 30, 2025
Merged

Dashboard: Remove chakra provider from team/settings/notifications page #7479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...oard/src/app/(app)/team/[team_slug]/(team)/~/settings/members/TeamMembersSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function TeamMembersSettingsPage(props: {
return (
<div>
<h2 className="font-semibold text-2xl tracking-tight">Members</h2>
<p className="text-muted-foreground text-sm">
<p className="text-muted-foreground">
Manage team members and invitations
</p>

Expand Down
6 changes: 4 additions & 2 deletions ...ashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/Notifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@ export const Notifications: React.FC<NotificationsProps> = ({ account }) => {
};

return (
<div>
<div className="p-4 bg-card border rounded-lg">
<SettingSwitch
checked={preferences?.billing === "email"}
description="Approaching and exceeding usage credits"
label="Reminders"
onCheckedChange={(v) => handleChange("billing", v)}
/>

<div className="border-t border-dashed my-4" />

<SettingSwitch
checked={preferences?.updates === "email"}
description="New features and key product updates"
Expand All @@ -63,7 +65,7 @@ function SettingSwitch(props: {
}) {
const id = useId();
return (
<div className="flex items-center justify-between gap-6 border-border border-b py-6">
<div className="flex items-center justify-between gap-6">
<div>
<Label className="text-foreground text-lg" htmlFor={id}>
{props.label}
Expand Down
20 changes: 0 additions & 20 deletions ...oard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/NotificationsPage.tsx
View file
Open in desktop

This file was deleted.

16 changes: 11 additions & 5 deletions apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/settings/notifications/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ChakraProviderSetup } from "chakra/ChakraProviderSetup";
import { getValidAccount } from "../../../../../../account/settings/getAccount";
import { SettingsNotificationsPage } from "./NotificationsPage";
import { Notifications } from "./Notifications";

export default async function Page(props: {
params: Promise<{
Expand All @@ -13,8 +12,15 @@ export default async function Page(props: {
);

return (
<ChakraProviderSetup>
<SettingsNotificationsPage account={account} />
</ChakraProviderSetup>
<div>
<div className="mb-4">
<h1 className="font-semibold text-2xl tracking-tight">Notifications</h1>
<p className="text-muted-foreground">
Configure your email notification preferences
</p>
</div>

<Notifications account={account} />
</div>
);
}
Loading