Skip to content

feat(webapp): Platform notifications admin imporovements #3324

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
0ski merged 1 commit into from
Apr 13, 2026
+979 −456
Merged

feat(webapp): Platform notifications admin imporovements #3324

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
6 changes: 5 additions & 1 deletion apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,17 @@ import { Badge } from "../primitives/Badge";
export function HelpAndFeedback({
disableShortcut = false,
isCollapsed = false,
organizationId,
projectId,
}: {
disableShortcut?: boolean;
isCollapsed?: boolean;
organizationId?: string;
projectId?: string;
}) {
const [isHelpMenuOpen, setHelpMenuOpen] = useState(false);
const currentPlan = useCurrentPlan();
const { changelogs } = useRecentChangelogs();
const { changelogs } = useRecentChangelogs(organizationId, projectId);

useShortcutKeys({
shortcut: disableShortcut ? undefined : { key: "h", enabledOnInputElements: false },
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export function OrganizationSettingsSideMenu({
)}
</div>
<div className="flex w-full items-center justify-between border-t border-grid-bright p-1">
<HelpAndFeedback />
<HelpAndFeedback organizationId={organization.id} />
<AskAI />
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions apps/webapp/app/components/navigation/SideMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ export function SideMenu({
isCollapsed && "items-center"
)}
>
<HelpAndAI isCollapsed={isCollapsed} />
<HelpAndAI isCollapsed={isCollapsed} organizationId={organization.id} projectId={project.id} />
{isFreeUser && (
<CollapsibleHeight isCollapsed={isCollapsed}>
<FreePlanUsage
Expand Down Expand Up @@ -1163,7 +1163,7 @@ function CollapsibleHeight({
);
}

function HelpAndAI({ isCollapsed }: { isCollapsed: boolean }) {
function HelpAndAI({ isCollapsed, organizationId, projectId }: { isCollapsed: boolean; organizationId: string; projectId: string }) {
return (
<LayoutGroup>
<div
Expand All @@ -1173,7 +1173,7 @@ function HelpAndAI({ isCollapsed }: { isCollapsed: boolean }) {
)}
>
<ShortcutsAutoOpen />
<HelpAndFeedback isCollapsed={isCollapsed} />
<HelpAndFeedback isCollapsed={isCollapsed} organizationId={organizationId} projectId={projectId} />
<AskAI isCollapsed={isCollapsed} />
</div>
</LayoutGroup>
Expand Down
Loading
Loading