diff --git a/apps/web/ce/components/issues/issue-details/page.tsx b/apps/web/ce/components/issues/issue-details/page.tsx index 1ae334d5df..d6a761aeb0 100644 --- a/apps/web/ce/components/issues/issue-details/page.tsx +++ b/apps/web/ce/components/issues/issue-details/page.tsx @@ -3,6 +3,6 @@ import { FC } from "react"; import { observer } from "mobx-react"; -export type TIssuePageActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined }; +export type TIssuePageActivity = { activityId: string; showIssue?: boolean; ends?: "top" | "bottom" | undefined }; export const IssuePageActivity: FC = observer(() => <>); diff --git a/apps/web/ce/components/workspace-notifications/notification-card/content.ts b/apps/web/ce/components/workspace-notifications/notification-card/content.ts index a0b6fa82a3..50309f2991 100644 --- a/apps/web/ce/components/workspace-notifications/notification-card/content.ts +++ b/apps/web/ce/components/workspace-notifications/notification-card/content.ts @@ -15,3 +15,5 @@ export const shouldShowConnector = (notificationField: string | undefined) => !["comment", "archived_at", "None", "assignees", "labels", "start_date", "target_date", "parent"].includes( notificationField || "" ); + +export const shouldRender = (notificationField: string | undefined, verb: string | undefined) => verb !== "deleted"; diff --git a/apps/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx b/apps/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx index 75a1facafd..f2943aa097 100644 --- a/apps/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx +++ b/apps/web/core/components/workspace-notifications/sidebar/notification-card/content.tsx @@ -1,9 +1,5 @@ import { FC } from "react"; -import { - renderAdditionalAction, - renderAdditionalValue, - shouldShowConnector, -} from "ee/components/workspace-notifications"; + import { TNotification } from "@plane/types"; import { convertMinutesToHoursMinutesString, @@ -14,6 +10,12 @@ import { } from "@plane/utils"; // components import { LiteTextEditor } from "@/components/editor/lite-text"; +import { + renderAdditionalAction, + renderAdditionalValue, + shouldShowConnector, + shouldRender, +} from "@/plane-web/components/workspace-notifications"; export const NotificationContent: FC<{ notification: TNotification; @@ -86,7 +88,7 @@ export const NotificationContent: FC<{ <> {renderTriggerName()} {renderAction()} - {verb !== "deleted" && ( + {shouldRender(notificationField, verb) && ( <> {shouldShowConnector(notificationField) && to } {renderValue()}