Merge branch 'canary' of github.com:makeplane/plane into preview

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

apps/admin/app/(all)/(dashboard)/sidebar-help-section.tsx

@@ -7,8 +7,8 @@ import { ExternalLink, FileText, HelpCircle, MoveLeft } from "lucide-react";
 import { Transition } from "@headlessui/react";
 // plane internal packages
 import { WEB_BASE_URL } from "@plane/constants";
+import { DiscordIcon, GithubIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiscordIcon, GithubIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useTheme } from "@/hooks/store";

apps/admin/app/(all)/(dashboard)/sidebar-menu.tsx

@@ -5,8 +5,8 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Image, BrainCog, Cog, Lock, Mail } from "lucide-react";
 // plane internal packages
+import { WorkspaceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { WorkspaceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useTheme } from "@/hooks/store";

apps/admin/app/(all)/(home)/auth-header.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 
 export const AuthHeader = () => (
   <div className="flex items-center justify-between gap-6 w-full flex-shrink-0 sticky top-0">

apps/api/plane/app/serializers/issue.py

@@ -667,16 +667,33 @@ class IssueReactionSerializer(BaseSerializer):
 
 
 class IssueReactionLiteSerializer(DynamicBaseSerializer):
+    display_name = serializers.CharField(source="actor.display_name", read_only=True)
+
     class Meta:
         model = IssueReaction
-        fields = ["id", "actor", "issue", "reaction"]
+        fields = ["id", "actor", "issue", "reaction", "display_name"]
 
 
 class CommentReactionSerializer(BaseSerializer):
+    display_name = serializers.CharField(source="actor.display_name", read_only=True)
+
     class Meta:
         model = CommentReaction
-        fields = "__all__"
-        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
+        fields = [
+            "id",
+            "actor",
+            "comment",
+            "reaction",
+            "display_name",
+            "deleted_at",
+            "workspace",
+            "project",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+        ]
+        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at", "created_by", "updated_by"]
 
 
 class IssueVoteSerializer(BaseSerializer):

apps/api/plane/bgtasks/page_version_task.py

@@ -30,6 +30,8 @@ def page_version(page_id, existing_instance, user_id):
                 description_binary=page.description_binary,
                 owned_by_id=user_id,
                 last_saved_at=page.updated_at,
+                description_json=page.description,
+                description_stripped=page.description_stripped,
             )
 
             # If page versions are greater than 20 delete the oldest one

apps/api/plane/utils/content_validator.py

@@ -67,20 +67,9 @@ def validate_binary_data(data):
 # Combine custom components and editor-specific nodes into a single set of tags
 CUSTOM_TAGS = {
     # editor node/tag names
-    "imageComponent",
-    "image",
-    "mention",
-    "link",
-    "customColor",
-    "emoji",
-    "tableHeader",
-    "tableCell",
-    "tableRow",
-    "codeBlock",
-    "code",
-    "horizontalRule",
-    "calloutComponent",
-    # component-style tag used by editor embeds
+    "mention-component",
+    "label",
+    "input",
     "image-component",
 }
 ALLOWED_TAGS = nh3.ALLOWED_TAGS | CUSTOM_TAGS
@@ -95,6 +84,8 @@ ATTRIBUTES = {
         "aria-label",
         "aria-hidden",
         "style",
+        "start",
+        "type",
         # common editor data-* attributes seen in stored HTML
         # (wildcards like data-* are NOT supported by nh3; we add known keys
         # here and dynamically include all data-* seen in the input below)
@@ -102,49 +93,64 @@ ATTRIBUTES = {
         "data-node-type",
         "data-type",
         "data-checked",
-        "data-background",
+        "data-background-color",
         "data-text-color",
+        "data-name",
+        # callout attributes
         "data-icon-name",
         "data-icon-color",
-        "data-background-color",
+        "data-background",
         "data-emoji-unicode",
         "data-emoji-url",
         "data-logo-in-use",
         "data-block-type",
-        "data-name",
-        "data-entity-id",
-        "data-entity-group-id",
     },
     "a": {"href", "target"},
     # editor node/tag attributes
-    "imageComponent": {"id", "width", "height", "aspectRatio", "src", "alignment"},
-    "image": {"width", "height", "aspectRatio", "alignment", "src", "alt", "title"},
-    "mention": {"id", "entity_identifier", "entity_name"},
-    "link": {"href", "target"},
-    "customColor": {"color", "backgroundColor"},
-    "emoji": {"name"},
-    "tableHeader": {"colspan", "rowspan", "colwidth", "background", "hideContent"},
-    "tableCell": {
+    "image-component": {
+        "id",
+        "width",
+        "height",
+        "aspectRatio",
+        "aspectratio",
+        "src",
+        "alignment",
+    },
+    "img": {
+        "width",
+        "height",
+        "aspectRatio",
+        "aspectratio",
+        "alignment",
+        "src",
+        "alt",
+        "title",
+    },
+    "mention-component": {"id", "entity_identifier", "entity_name"},
+    "th": {
+        "colspan",
+        "rowspan",
+        "colwidth",
+        "background",
+        "hideContent",
+        "hidecontent",
+        "style",
+    },
+    "td": {
         "colspan",
         "rowspan",
         "colwidth",
         "background",
         "textColor",
+        "textcolor",
         "hideContent",
+        "hidecontent",
+        "style",
     },
-    "tableRow": {"background", "textColor"},
-    "codeBlock": {"language"},
-    "calloutComponent": {
-        "data-icon-color",
-        "data-icon-name",
-        "data-emoji-unicode",
-        "data-emoji-url",
-        "data-logo-in-use",
-        "data-background",
-        "data-block-type",
-    },
-    # image-component (from editor extension and seeds)
-    "image-component": {"src", "id", "width", "height", "aspectratio", "alignment"},
+    "tr": {"background", "textColor", "textcolor", "style"},
+    "pre": {"language"},
+    "code": {"language", "spellcheck"},
+    "input": {"type", "checked"},
 }
 
 SAFE_PROTOCOLS = {"http", "https", "mailto", "tel"}

apps/api/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.22
+Django==4.2.24
 # rest framework
 djangorestframework==3.15.2
 # postgres

apps/space/app/issues/[anchor]/layout.tsx

@@ -13,6 +13,11 @@ export async function generateMetadata({ params }: Props) {
   const { anchor } = params;
   const DEFAULT_TITLE = "Plane";
   const DEFAULT_DESCRIPTION = "Made with Plane, an AI-powered work management platform with publishing capabilities.";
+  // Validate anchor before using in request (only allow alphanumeric, -, _)
+  const ANCHOR_REGEX = /^[a-zA-Z0-9_-]+$/;
+  if (!ANCHOR_REGEX.test(anchor)) {
+    return { title: DEFAULT_TITLE, description: DEFAULT_DESCRIPTION };
+  }
   try {
     const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/api/public/anchor/${anchor}/meta/`);
     const data = await response.json();

apps/space/core/components/account/user-logged-in.tsx

@@ -2,7 +2,7 @@
 
 import { observer } from "mobx-react";
 import Image from "next/image";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 // components
 import { PoweredBy } from "@/components/common/powered-by";
 import { UserAvatar } from "@/components/issues/navbar/user-avatar";

apps/space/core/components/common/powered-by.tsx

@@ -3,7 +3,7 @@
 import { FC } from "react";
 import { WEBSITE_URL } from "@plane/constants";
 // assets
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
 
 type TPoweredBy = {
   disabled?: boolean;

apps/space/core/components/issues/filters/applied-filters/priority.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { X } from "lucide-react";
-import { PriorityIcon, type TIssuePriorities } from "@plane/ui";
+import { PriorityIcon, type TIssuePriorities } from "@plane/propel/icons";
 
 type Props = {
   handleRemove: (val: string) => void;

apps/space/core/components/issues/filters/applied-filters/state.tsx

@@ -4,7 +4,7 @@ import { observer } from "mobx-react";
 import { X } from "lucide-react";
 // plane imports
 import { EIconSize } from "@plane/constants";
-import { StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
 // hooks
 import { useStates } from "@/hooks/store/use-state";
 

apps/space/core/components/issues/filters/priority.tsx

@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 // plane imports
 import { ISSUE_PRIORITY_FILTERS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { PriorityIcon } from "@plane/ui";
+import { PriorityIcon } from "@plane/propel/icons";
 // local imports
 import { FilterHeader } from "./helpers/filter-header";
 import { FilterOption } from "./helpers/filter-option";

apps/space/core/components/issues/filters/state.tsx

@@ -4,7 +4,8 @@ import React, { useState } from "react";
 import { observer } from "mobx-react";
 // ui
 import { EIconSize } from "@plane/constants";
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Loader } from "@plane/ui";
 // hooks
 import { useStates } from "@/hooks/store/use-state";
 // local imports

apps/space/core/components/issues/issue-layouts/properties/cycle.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { ContrastIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { ContrastIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 //hooks

apps/space/core/components/issues/issue-layouts/properties/modules.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 // hooks

apps/space/core/components/issues/issue-layouts/properties/priority.tsx

@@ -3,9 +3,9 @@
 import { SignalHigh } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
 // constants
 import { cn, getIssuePriorityFilters } from "@plane/utils";
 

apps/space/core/components/issues/issue-layouts/properties/state.tsx

@@ -2,8 +2,8 @@
 
 import { observer } from "mobx-react";
 // plane ui
+import { StateGroupIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { StateGroupIcon } from "@plane/ui";
 // plane utils
 import { cn } from "@plane/utils";
 //hooks

apps/space/core/components/issues/issue-layouts/utils.tsx

@@ -4,6 +4,7 @@ import isNil from "lodash/isNil";
 import { ContrastIcon } from "lucide-react";
 // types
 import { EIconSize, ISSUE_PRIORITIES } from "@plane/constants";
+import { CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/propel/icons";
 import {
   GroupByColumnTypes,
   IGroupByColumn,
@@ -12,7 +13,7 @@ import {
   TGroupedIssues,
 } from "@plane/types";
 // ui
-import { Avatar, CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
 // components
 // constants
 // stores

apps/space/core/components/issues/peek-overview/header.tsx

@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
 import { Link2, MoveRight } from "lucide-react";
 import { Listbox, Transition } from "@headlessui/react";
 // ui
-import { CenterPanelIcon, FullScreenPanelIcon, setToast, SidePanelIcon, TOAST_TYPE } from "@plane/ui";
+import { CenterPanelIcon, FullScreenPanelIcon, SidePanelIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/ui";
 // helpers
 import { copyTextToClipboard } from "@/helpers/string.helper";
 // hooks

apps/space/core/components/issues/peek-overview/issue-properties.tsx

@@ -5,7 +5,8 @@ import { useParams } from "next/navigation";
 import { CalendarCheck2, Signal } from "lucide-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { DoubleCircleIcon, StateGroupIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { DoubleCircleIcon, StateGroupIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 import { cn, getIssuePriorityFilters } from "@plane/utils";
 // components
 import { Icon } from "@/components/ui";

apps/space/core/components/views/header.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import Link from "next/link";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 
 export const AuthHeader = () => (
   <div className="flex items-center justify-between gap-6 w-full flex-shrink-0 sticky top-0">

apps/web/app/(all)/[workspaceSlug]/(projects)/active-cycles/header.tsx

@@ -2,7 +2,8 @@
 import { observer } from "mobx-react";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { Breadcrumbs, ContrastIcon, Header } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 // plane web components

apps/web/app/(all)/[workspaceSlug]/(projects)/profile/[userId]/header.tsx

@@ -8,8 +8,9 @@ import { useParams } from "next/navigation";
 import { ChevronDown, PanelRight } from "lucide-react";
 import { PROFILE_VIEWER_TAB, PROFILE_ADMINS_TAB, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { UserActivityIcon } from "@plane/propel/icons";
 import { IUserProfileProjectSegregation } from "@plane/types";
-import { Breadcrumbs, Header, CustomMenu, UserActivityIcon } from "@plane/ui";
+import { Breadcrumbs, Header, CustomMenu } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/header.tsx

@@ -3,10 +3,11 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
+import { ArchiveIcon, ContrastIcon, DiceIcon, LayersIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType } from "@plane/types";
 // ui
-import { ArchiveIcon, Breadcrumbs, Header, ContrastIcon, DiceIcon, LayersIcon } from "@plane/ui";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 // hooks

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/archives/issues/(detail)/header.tsx

@@ -4,7 +4,8 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import useSWR from "swr";
 // ui
-import { ArchiveIcon, Breadcrumbs, LayersIcon, Header } from "@plane/ui";
+import { ArchiveIcon, LayersIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { IssueDetailQuickActions } from "@/components/issues/issue-detail/issue-detail-quick-actions";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx

@@ -16,6 +16,7 @@ import {
 } from "@plane/constants";
 import { usePlatformOS } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
+import { ContrastIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import {
   EIssuesStoreType,
@@ -25,7 +26,7 @@ import {
   IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
-import { Breadcrumbs, Button, ContrastIcon, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
+import { Breadcrumbs, Button, BreadcrumbNavigationSearchDropdown, Header } from "@plane/ui";
 import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";

apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx

@@ -14,6 +14,7 @@ import {
   EProjectFeatureKey,
   WORK_ITEM_TRACKER_ELEMENTS,
 } from "@plane/constants";
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import {
   EIssuesStoreType,
@@ -23,7 +24,7 @@ import {
   IIssueFilterOptions,
   EIssueLayoutTypes,
 } from "@plane/types";
-import { Breadcrumbs, Button, DiceIcon, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
+import { Breadcrumbs, Button, Header, BreadcrumbNavigationSearchDropdown } from "@plane/ui";
 import { cn, isIssueFilterActive } from "@plane/utils";
 // components
 import { WorkItemsModal } from "@/components/analytics/work-items/modal";

apps/web/app/(all)/[workspaceSlug]/(projects)/stickies/header.tsx

@@ -3,7 +3,8 @@
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 // plane imports
-import { Breadcrumbs, Button, Header, RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
+import { Breadcrumbs, Button, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
 import { StickySearch } from "@/components/stickies/modal/search";

apps/web/app/(all)/create-workspace/page.tsx

@@ -6,8 +6,9 @@ import Image from "next/image";
 import Link from "next/link";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { PlaneLogo } from "@plane/propel/icons";
 import { IWorkspace } from "@plane/types";
-import { Button, getButtonStyling, PlaneLogo } from "@plane/ui";
+import { Button, getButtonStyling } from "@plane/ui";
 // components
 import { CreateWorkspaceForm } from "@/components/workspace/create-workspace-form";
 // hooks

apps/web/app/(all)/invitations/page.tsx

@@ -10,9 +10,10 @@ import { CheckCircle2 } from "lucide-react";
 import { ROLE, MEMBER_TRACKER_EVENTS, MEMBER_TRACKER_ELEMENTS, GROUP_WORKSPACE_TRACKER_EVENT } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PlaneLogo } from "@plane/propel/icons";
 import type { IWorkspaceMemberInvitation } from "@plane/types";
 // ui
-import { Button, TOAST_TYPE, setToast, PlaneLogo } from "@plane/ui";
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 import { truncateText } from "@plane/utils";
 // components
 import { EmptyState } from "@/components/common/empty-state";

apps/web/app/(all)/layout.tsx

@@ -5,7 +5,7 @@ import { PreloadResources } from "./layout.preload";
 // styles
 import "@/styles/command-pallette.css";
 import "@/styles/emoji.css";
-import "@/styles/react-day-picker.css";
+import "@plane/propel/styles/react-day-picker";
 
 export const metadata: Metadata = {
   robots: {

apps/web/app/error.tsx

@@ -1,14 +1,17 @@
 "use client";
 
-import Link from "next/link";
+import Image from "next/image";
+import { useTheme } from "next-themes";
 // plane imports
 import { API_BASE_URL } from "@plane/constants";
-import { Button, TOAST_TYPE, getButtonStyling, setToast } from "@plane/ui";
-import { cn } from "@plane/utils";
+import { Button, TOAST_TYPE, setToast } from "@plane/ui";
 // hooks
 import { useAppRouter } from "@/hooks/use-app-router";
 // layouts
 import DefaultLayout from "@/layouts/default-layout";
+// images
+import maintenanceModeDarkModeImage from "@/public/instance/maintenance-mode-dark.svg";
+import maintenanceModeLightModeImage from "@/public/instance/maintenance-mode-light.svg";
 // services
 import { AuthService } from "@/services/auth.service";
 
@@ -16,7 +19,10 @@ import { AuthService } from "@/services/auth.service";
 const authService = new AuthService();
 
 export default function CustomErrorComponent() {
+  // routers
   const router = useAppRouter();
+  // hooks
+  const { resolvedTheme } = useTheme();
 
   const handleSignOut = async () => {
     await authService
@@ -31,39 +37,52 @@ export default function CustomErrorComponent() {
       .finally(() => router.push("/"));
   };
 
+  // derived values
+  const maintenanceModeImage = resolvedTheme === "dark" ? maintenanceModeDarkModeImage : maintenanceModeLightModeImage;
+
   return (
     <DefaultLayout>
-      <div className={`h-screen w-full overflow-hidden bg-custom-background-100`}>
-        <div className="grid h-full place-items-center p-4">
-          <div className="space-y-8 text-center">
-            <div className="space-y-2 relative flex flex-col justify-center items-center">
-              <h3 className="text-lg font-semibold">Yikes! That doesn{"'"}t look good.</h3>
-              <p className="mx-auto md:w-1/2 text-sm text-custom-text-200">
-                That crashed Plane, pun intended. No worries, though. Our engineers have been notified. If you have more
-                details, please write to{" "}
-                <a href="mailto:support@plane.so" className="text-custom-primary">
-                  support@plane.so
-                </a>{" "}
-                or on our{" "}
-                <a
-                  href="https://discord.com/invite/A92xrEGCge"
-                  target="_blank"
-                  className="text-custom-primary"
-                  rel="noopener noreferrer"
-                >
-                  Discord
-                </a>
-                .
-              </p>
-            </div>
-            <div className="flex items-center justify-center gap-2">
-              <Link href="/" className={cn(getButtonStyling("primary", "md"))}>
-                Go to home
-              </Link>
-              <Button variant="neutral-primary" size="md" onClick={handleSignOut}>
-                Sign out
-              </Button>
-            </div>
+      <div className="relative container mx-auto h-full w-full max-w-xl flex flex-col gap-2 items-center justify-center gap-y-6 bg-custom-background-100 text-center px-6">
+        <div className="relative w-full">
+          <Image
+            src={maintenanceModeImage}
+            height="176"
+            width="288"
+            alt="ProjectSettingImg"
+            className="w-full h-full object-fill object-center"
+          />
+        </div>
+        <div className="w-full relative flex flex-col gap-4 mt-4">
+          <div className="flex flex-col gap-2.5">
+            <h1 className="text-xl font-semibold text-custom-text-100 text-left">
+              &#x1F6A7; Yikes! That doesn&apos;t look good.
+            </h1>
+            <span className="text-base font-medium text-custom-text-200 text-left">
+              That crashed Plane, pun intended. No worries, though. Our engineers have been notified. If you have more
+              details, please write to{" "}
+              <a href="mailto:support@plane.so" className="text-custom-primary">
+                support@plane.so
+              </a>{" "}
+              or on our{" "}
+              <a
+                href="https://discord.com/invite/A92xrEGCge"
+                target="_blank"
+                className="text-custom-primary"
+                rel="noopener noreferrer"
+              >
+                Discord
+              </a>
+              .
+            </span>
+          </div>
+
+          <div className="flex items-center justify-start gap-2">
+            <Button variant="primary" size="md" onClick={() => router.push("/")}>
+              Go to home
+            </Button>
+            <Button variant="neutral-primary" size="md" onClick={handleSignOut}>
+              Sign out
+            </Button>
           </div>
         </div>
       </div>

apps/web/ce/components/breadcrumbs/project-feature.tsx

@@ -4,7 +4,8 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { EProjectFeatureKey } from "@plane/constants";
-import { BreadcrumbNavigationDropdown, Breadcrumbs, ISvgIcons } from "@plane/ui";
+import { ISvgIcons } from "@plane/propel/icons";
+import { BreadcrumbNavigationDropdown, Breadcrumbs } from "@plane/ui";
 // components
 import { SwitcherLabel } from "@/components/common/switcher-label";
 import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";

apps/web/ce/components/command-palette/actions/work-item-actions/change-state-list.tsx

@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
 import { Check } from "lucide-react";
 // plane imports
 import { EIconSize } from "@plane/constants";
-import { Spinner, StateGroupIcon } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Spinner } from "@plane/ui";
 // store hooks
 import { useProjectState } from "@/hooks/store/use-project-state";
 

apps/web/ce/components/command-palette/helpers.tsx

@@ -2,6 +2,7 @@
 
 // types
 import { Briefcase, FileText, Layers, LayoutGrid } from "lucide-react";
+import { ContrastIcon, DiceIcon } from "@plane/propel/icons";
 import {
   IWorkspaceDefaultSearchResult,
   IWorkspaceIssueSearchResult,
@@ -10,7 +11,6 @@ import {
   IWorkspaceSearchResult,
 } from "@plane/types";
 // ui
-import { ContrastIcon, DiceIcon } from "@plane/ui";
 // helpers
 import { generateWorkItemLink } from "@plane/utils";
 // plane web components

apps/web/ce/components/comments/comment-block.tsx

@@ -2,9 +2,8 @@ import { FC, ReactNode, useRef } from "react";
 import { observer } from "mobx-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
-import { Tooltip } from "@plane/propel/tooltip";
-import { TIssueComment } from "@plane/types";
-import { Avatar } from "@plane/ui";
+import { EIssueCommentAccessSpecifier, TIssueComment } from "@plane/types";
+import { Avatar, Tooltip } from "@plane/ui";
 import { calculateTimeAgo, cn, getFileURL, renderFormattedDate, renderFormattedTime } from "@plane/utils";
 // hooks
 import { useMember } from "@/hooks/store/use-member";
@@ -27,7 +26,13 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {
   // translation
   const { t } = useTranslation();
 
-  if (!comment || !userDetails) return null;
+  const displayName = comment?.actor_detail?.is_bot
+    ? comment?.actor_detail?.first_name + ` ${t("bot")}`
+    : (userDetails?.display_name ?? comment?.actor_detail?.display_name);
+
+  const avatarUrl = userDetails?.avatar_url ?? comment?.actor_detail?.avatar_url;
+
+  if (!comment) return null;
 
   return (
     <div
@@ -43,20 +48,15 @@ export const CommentBlock: FC<TCommentBlock> = observer((props) => {
           "flex-shrink-0 relative w-7 h-6 rounded-full transition-border duration-1000 flex justify-center items-center z-[3] uppercase font-medium"
         )}
       >
-        <Avatar
-          size="base"
-          name={userDetails?.display_name}
-          src={getFileURL(userDetails?.avatar_url)}
-          className="flex-shrink-0"
-        />
+        <Avatar size="base" name={displayName} src={getFileURL(avatarUrl)} className="flex-shrink-0" />
       </div>
       <div className="flex flex-col gap-3 truncate flex-grow">
         <div className="flex w-full gap-2">
           <div className="flex-1 flex flex-wrap items-center gap-1">
-            <div className="text-xs font-medium">
-              {comment?.actor_detail?.is_bot
-                ? comment?.actor_detail?.first_name + ` ${t("bot")}`
-                : comment?.actor_detail?.display_name || userDetails.display_name}
+            <div className="flex items-center gap-1">
+              <span className="text-xs font-medium">
+                {`${displayName}${comment.access === EIssueCommentAccessSpecifier.EXTERNAL ? " (External User)" : ""}`}
+              </span>
             </div>
             <div className="text-xs text-custom-text-300">
               commented{" "}

apps/web/ce/components/global/product-updates-header.tsx

@@ -1,6 +1,6 @@
 import { observer } from "mobx-react";
 import { useTranslation } from "@plane/i18n";
-import { PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
 // helpers
 import { cn } from "@plane/utils";
 // package.json

apps/web/ce/components/instance/maintenance-message.tsx

@@ -1,17 +1,37 @@
-import { observer } from "mobx-react";
-import { useTranslation } from "@plane/i18n";
-
-export const MaintenanceMessage = observer(() => {
-  // hooks
-  const { t } = useTranslation();
+export const MaintenanceMessage = () => {
+  const linkMap = [
+    {
+      key: "mail_to",
+      label: "Contact Support",
+      value: "mailto:support@plane.so",
+    },
+  ];
 
   return (
-    <h1 className="text-xl font-medium text-custom-text-100 text-center md:text-left">
-      {t(
-        "self_hosted_maintenance_message.plane_didnt_start_up_this_could_be_because_one_or_more_plane_services_failed_to_start"
-      )}
-      <br />
-      {t("self_hosted_maintenance_message.choose_view_logs_from_setup_sh_and_docker_logs_to_be_sure")}
-    </h1>
+    <>
+      <div className="flex flex-col gap-2.5">
+        <h1 className="text-xl font-semibold text-custom-text-100 text-left">
+          &#x1F6A7; Looks like Plane didn&apos;t start up correctly!
+        </h1>
+        <span className="text-base font-medium text-custom-text-200 text-left">
+          Some services might have failed to start. Please check your container logs to identify and resolve the issue.
+          If you&apos;re stuck, reach out to our support team for more help.
+        </span>
+      </div>
+      <div className="flex items-center justify-start gap-6 mt-1">
+        {linkMap.map((link) => (
+          <div key={link.key}>
+            <a
+              href={link.value}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-custom-primary-100 hover:underline text-sm"
+            >
+              {link.label}
+            </a>
+          </div>
+        ))}
+      </div>
+    </>
   );
-});
+};

apps/web/ce/components/issues/issue-layouts/utils.tsx

@@ -13,8 +13,8 @@ import {
   Users,
 } from "lucide-react";
 // types
+import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/propel/icons";
 import { IGroupByColumn, IIssueDisplayProperties, TGetColumns, TSpreadsheetColumn } from "@plane/types";
-import { DiceIcon, DoubleCircleIcon, ISvgIcons } from "@plane/ui";
 // components
 import {
   SpreadsheetAssigneeColumn,

apps/web/ce/components/pages/navigation-pane/tab-panels/empty-states/assets.tsx

@@ -6,7 +6,7 @@ import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 export const PageNavigationPaneAssetsTabEmptyState = () => {
   // asset resolved path
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/pages/navigation-pane/assets" });
+  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/wiki/navigation-pane/assets" });
   // translation
   const { t } = useTranslation();
 

apps/web/ce/components/pages/navigation-pane/tab-panels/empty-states/outline.tsx

@@ -6,7 +6,7 @@ import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path";
 
 export const PageNavigationPaneOutlineTabEmptyState = () => {
   // asset resolved path
-  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/pages/navigation-pane/outline" });
+  const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/wiki/navigation-pane/outline" });
   // translation
   const { t } = useTranslation();
 

apps/web/ce/components/projects/navigation/helper.tsx

@@ -1,7 +1,7 @@
 import { FileText, Layers } from "lucide-react";
 // plane imports
 import { EUserPermissions, EProjectFeatureKey } from "@plane/constants";
-import { ContrastIcon, DiceIcon, Intake, LayersIcon } from "@plane/ui";
+import { ContrastIcon, DiceIcon, LayersIcon, Intake } from "@plane/propel/icons";
 // components
 import type { TNavigationItem } from "@/components/workspace/sidebar/project-navigation";
 

apps/web/ce/components/relations/index.tsx

@@ -1,5 +1,5 @@
 import { CircleDot, CopyPlus, XCircle } from "lucide-react";
-import { RelatedIcon } from "@plane/ui";
+import { RelatedIcon } from "@plane/propel/icons";
 import type { TRelationObject } from "@/components/issues/issue-detail-widgets/relations";
 import type { TIssueRelationTypes } from "../../types";
 

apps/web/ce/components/workspace/sidebar/helper.tsx

@@ -1,5 +1,5 @@
 import { BarChart2, Briefcase, Home, Inbox, Layers, PenSquare } from "lucide-react";
-import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/ui";
+import { ArchiveIcon, ContrastIcon, UserActivityIcon } from "@plane/propel/icons";
 import { cn } from "@plane/utils";
 
 export const getSidebarNavigationItemIcon = (key: string, className: string = "") => {

apps/web/ce/constants/project/settings/features.tsx

@@ -1,8 +1,8 @@
 import { ReactNode } from "react";
 import { FileText, Layers, Timer } from "lucide-react";
 // plane imports
+import { ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
 import { IProject } from "@plane/types";
-import { ContrastIcon, DiceIcon, Intake } from "@plane/ui";
 
 export type TProperties = {
   key: string;

apps/web/ce/constants/sidebar-favorites.ts

@@ -1,7 +1,7 @@
 import { Briefcase, FileText, Layers, LucideIcon } from "lucide-react";
 // plane imports
+import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/propel/icons";
 import { IFavorite } from "@plane/types";
-import { ContrastIcon, DiceIcon, FavoriteFolderIcon, ISvgIcons } from "@plane/ui";
 
 export const FAVORITE_ITEM_ICONS: Record<string, React.FC<ISvgIcons> | LucideIcon> = {
   page: FileText,

apps/web/core/components/analytics/insight-card.tsx

@@ -1,28 +1,17 @@
 // plane package imports
-import React, { useMemo } from "react";
+import React from "react";
 import { IAnalyticsResponseFields } from "@plane/types";
 import { Loader } from "@plane/ui";
-// components
-import TrendPiece from "./trend-piece";
 
 export type InsightCardProps = {
   data?: IAnalyticsResponseFields;
   label: string;
   isLoading?: boolean;
-  versus?: string | null;
 };
 
 const InsightCard = (props: InsightCardProps) => {
-  const { data, label, isLoading, versus } = props;
-  const { count, filter_count } = data || {};
-  const percentage = useMemo(() => {
-    if (count != null && filter_count != null) {
-      const result = ((count - filter_count) / count) * 100;
-      const isFiniteAndNotNaNOrZero = Number.isFinite(result) && !Number.isNaN(result) && result !== 0;
-      return isFiniteAndNotNaNOrZero ? result : null;
-    }
-    return null;
-  }, [count, filter_count]);
+  const { data, label, isLoading = false } = props;
+  const count = data?.count ?? 0;
 
   return (
     <div className="flex flex-col gap-3">
@@ -30,12 +19,6 @@ const InsightCard = (props: InsightCardProps) => {
       {!isLoading ? (
         <div className="flex flex-col gap-1">
           <div className="text-2xl font-bold text-custom-text-100">{count}</div>
-          {/* {percentage && (
-            <div className="flex gap-1 text-xs text-custom-text-300">
-              <TrendPiece percentage={percentage} size="xs" />
-              {versus && <div>vs {versus}</div>}
-            </div>
-          )} */}
         </div>
       ) : (
         <Loader.Item height="50px" width="100%" />

apps/web/core/components/analytics/total-insights.tsx

@@ -92,7 +92,6 @@ const TotalInsights: React.FC<{
           isLoading={isLoading}
           data={totalInsightsData?.[item.key]}
           label={getInsightLabel(analyticsType, item, isEpic, t)}
-          versus={selectedDurationLabel}
         />
       ))}
     </div>

apps/web/core/components/auth-screens/footer.tsx

@@ -1,6 +1,6 @@
 "use client";
 import React from "react";
-import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/ui";
+import { AccentureLogo, DolbyLogo, SonyLogo, ZerodhaLogo } from "@plane/propel/icons";
 
 const BRAND_LOGOS: {
   id: string;

apps/web/core/components/auth-screens/header.tsx

@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { AUTH_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { PlaneLockup } from "@plane/ui";
+import { PlaneLockup } from "@plane/propel/icons";
 import { PageHead } from "@/components/core/page-title";
 import { EAuthModes } from "@/helpers/authentication.helper";
 import { useInstance } from "@/hooks/store/use-instance";

apps/web/core/components/automation/auto-close-automation.tsx

@@ -15,9 +15,10 @@ import {
   PROJECT_SETTINGS_TRACKER_EVENTS,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon, DoubleCircleIcon } from "@plane/propel/icons";
 import { IProject } from "@plane/types";
 // ui
-import { CustomSelect, CustomSearchSelect, ToggleSwitch, StateGroupIcon, DoubleCircleIcon, Loader } from "@plane/ui";
+import { CustomSelect, CustomSearchSelect, ToggleSwitch, Loader } from "@plane/ui";
 // component
 import { SelectMonthModal } from "@/components/automation";
 // constants

apps/web/core/components/command-palette/actions/help-actions.tsx

@@ -3,7 +3,7 @@ import { Command } from "cmdk";
 import { observer } from "mobx-react";
 import { FileText, GithubIcon, MessageSquare, Rocket } from "lucide-react";
 // ui
-import { DiscordIcon } from "@plane/ui";
+import { DiscordIcon } from "@plane/propel/icons";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 import { useTransient } from "@/hooks/store/use-transient";

apps/web/core/components/command-palette/actions/issue-actions/actions-list.tsx

@@ -4,9 +4,10 @@ import { Command } from "cmdk";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { LinkIcon, Signal, Trash2, UserMinus2, UserPlus2, Users } from "lucide-react";
+import { DoubleCircleIcon } from "@plane/propel/icons";
 import { EIssueServiceType, TIssue } from "@plane/types";
 // hooks
-import { DoubleCircleIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 // helpers
 import { copyTextToClipboard } from "@plane/utils";
 // hooks

apps/web/core/components/command-palette/actions/issue-actions/change-priority.tsx

@@ -7,9 +7,9 @@ import { Check } from "lucide-react";
 // plane constants
 import { ISSUE_PRIORITIES } from "@plane/constants";
 // plane types
+import { PriorityIcon } from "@plane/propel/icons";
 import { EIssueServiceType, TIssue, TIssuePriorities } from "@plane/types";
 // mobx store
-import { PriorityIcon } from "@plane/ui";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // ui
 // types

apps/web/core/components/command-palette/actions/project-actions.tsx

@@ -9,7 +9,7 @@ import {
   PROJECT_PAGE_TRACKER_ELEMENTS,
   PROJECT_VIEW_TRACKER_ELEMENTS,
 } from "@plane/constants";
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
 // hooks
 import { useCommandPalette } from "@/hooks/store/use-command-palette";
 // ui

apps/web/core/components/command-palette/command-modal.tsx

@@ -16,8 +16,9 @@ import {
   WORKSPACE_DEFAULT_SEARCH_RESULT,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { LayersIcon } from "@plane/propel/icons";
 import { IWorkspaceSearchResults } from "@plane/types";
-import { LayersIcon, Loader, ToggleSwitch } from "@plane/ui";
+import { Loader, ToggleSwitch } from "@plane/ui";
 import { cn, getTabIndex } from "@plane/utils";
 // components
 import {

apps/web/core/components/common/activity/helper.tsx

@@ -25,7 +25,7 @@ import {
 } from "lucide-react";
 
 // components
-import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/ui";
+import { ArchiveIcon, DoubleCircleIcon, ContrastIcon, DiceIcon, Intake } from "@plane/propel/icons";
 import { store } from "@/lib/store-context";
 import { TProjectActivity } from "@/plane-web/types";
 

apps/web/core/components/common/switcher-label.tsx

@@ -1,6 +1,6 @@
 import { FC } from "react";
+import { ISvgIcons } from "@plane/propel/icons";
 import { TLogoProps } from "@plane/types";
-import { ISvgIcons } from "@plane/ui";
 import { getFileURL, truncateText } from "@plane/utils";
 import { Logo } from "@/components/common/logo";
 

apps/web/core/components/core/activity.tsx

@@ -20,9 +20,9 @@ import {
   MessageSquareIcon,
   UsersIcon,
 } from "lucide-react";
+import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, EpicIcon, Intake } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { IIssueActivity } from "@plane/types";
-import { BlockedIcon, BlockerIcon, RelatedIcon, LayersIcon, DiceIcon, Intake, EpicIcon } from "@plane/ui";
 import { renderFormattedDate, generateWorkItemLink, capitalizeFirstLetter } from "@plane/utils";
 // helpers
 import { useLabel } from "@/hooks/store/use-label";

apps/web/core/components/core/description-versions/modal.tsx

@@ -131,13 +131,14 @@ export const DescriptionVersionsModal: React.FC<Props> = observer((props) => {
         {/* End header */}
         {/* Version description */}
         <div className="mt-4 pb-4">
-          {activeVersionDescription ? (
+          {activeVersionId && activeVersionDescription ? (
             <RichTextEditor
+              key={activeVersionId}
               editable={false}
               containerClassName="p-0 !pl-0 border-none"
               editorClassName="pl-0"
-              id={activeVersionId ?? ""}
-              initialValue={activeVersionDescription ?? "<p></p>"}
+              id={activeVersionId}
+              initialValue={activeVersionDescription}
               projectId={projectId}
               ref={editorRef}
               workspaceId={workspaceId}

apps/web/core/components/core/description-versions/root.tsx

@@ -48,6 +48,9 @@ export const DescriptionVersionsRoot: React.FC<Props> = observer((props) => {
   const versionsCount = versions?.length ?? 0;
   const activeVersionDetails = versions?.find((version) => version.id === activeVersionId);
   const activeVersionIndex = versions?.findIndex((version) => version.id === activeVersionId);
+  const activeVersionDescription = activeVersionResponse
+    ? (activeVersionResponse.description_html ?? "<p></p>")
+    : undefined;
 
   const handleNavigation = useCallback(
     (direction: "prev" | "next") => {
@@ -64,7 +67,7 @@ export const DescriptionVersionsRoot: React.FC<Props> = observer((props) => {
   return (
     <>
       <DescriptionVersionsModal
-        activeVersionDescription={activeVersionResponse?.description_html ?? "<p></p>"}
+        activeVersionDescription={activeVersionDescription}
         activeVersionDetails={activeVersionDetails}
         handleClose={() => {
           setIsModalOpen(false);

apps/web/core/components/core/filters/date-filter-modal.tsx

@@ -5,7 +5,8 @@ import { Controller, useForm } from "react-hook-form";
 import { X } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
 
-import { Button, Calendar } from "@plane/ui";
+import { Calendar } from "@plane/propel/calendar";
+import { Button } from "@plane/ui";
 
 import { renderFormattedPayloadDate, renderFormattedDate, getDate } from "@plane/utils";
 import { DateFilterSelect } from "./date-filter-select";

apps/web/core/components/core/filters/date-filter-select.tsx

@@ -2,7 +2,8 @@
 import React from "react";
 import { CalendarDays } from "lucide-react";
 // ui
-import { CustomSelect, CalendarAfterIcon, CalendarBeforeIcon } from "@plane/ui";
+import { CalendarAfterIcon, CalendarBeforeIcon } from "@plane/propel/icons";
+import { CustomSelect } from "@plane/ui";
 
 type Props = {
   title: string;

apps/web/core/components/cycles/active-cycle/cycle-stats.tsx

@@ -8,10 +8,11 @@ import { CalendarCheck } from "lucide-react";
 import { Tab } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssuesStoreType, ICycle, IIssueFilterOptions } from "@plane/types";
 // ui
-import { Loader, PriorityIcon, Avatar } from "@plane/ui";
+import { Loader, Avatar } from "@plane/ui";
 import { cn, renderFormattedDate, renderFormattedDateWithoutYear, getFileURL } from "@plane/utils";
 // components
 import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";

apps/web/core/components/cycles/analytics-sidebar/progress-stats.tsx

@@ -6,6 +6,7 @@ import Image from "next/image";
 import { Tab } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
 import {
   IIssueFilterOptions,
   IIssueFilters,
@@ -14,7 +15,7 @@ import {
   TCyclePlotType,
   TStateGroups,
 } from "@plane/types";
-import { Avatar, StateGroupIcon } from "@plane/ui";
+import { Avatar } from "@plane/ui";
 import { cn, getFileURL } from "@plane/utils";
 // components
 import { SingleProgressStats } from "@/components/core/sidebar/single-progress-stats";

apps/web/core/components/cycles/list/cycle-list-group-header.tsx

@@ -3,9 +3,10 @@
 import React, { FC } from "react";
 import { ChevronDown } from "lucide-react";
 // types
+import { CycleGroupIcon } from "@plane/propel/icons";
 import { TCycleGroups } from "@plane/types";
 // icons
-import { Row, CycleGroupIcon } from "@plane/ui";
+import { Row } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 

apps/web/core/components/cycles/list/cycle-list-item-action.tsx

@@ -15,9 +15,10 @@ import {
 } from "@plane/constants";
 import { useLocalStorage } from "@plane/hooks";
 import { useTranslation } from "@plane/i18n";
+import { LayersIcon, TransferIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { ICycle, TCycleGroups } from "@plane/types";
-import { Avatar, AvatarGroup, FavoriteStar, LayersIcon, TransferIcon, setPromiseToast } from "@plane/ui";
+import { Avatar, AvatarGroup, FavoriteStar, setPromiseToast } from "@plane/ui";
 import { getDate, getFileURL, generateQueryParams } from "@plane/utils";
 // components
 import { DateRangeDropdown } from "@/components/dropdowns/date-range";

apps/web/core/components/cycles/quick-actions.tsx

@@ -13,7 +13,8 @@ import {
   CYCLE_TRACKER_ELEMENTS,
 } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
-import { ArchiveIcon, ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
+import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
 import { copyUrlToClipboard, cn } from "@plane/utils";
 // helpers
 // hooks

apps/web/core/components/cycles/transfer-issues-modal.tsx

@@ -5,11 +5,12 @@ import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
 import { AlertCircle, Search, X } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
+import { ContrastIcon, TransferIcon } from "@plane/propel/icons";
 import { EIssuesStoreType } from "@plane/types";
 // hooks
 // ui
 //icons
-import { ContrastIcon, TransferIcon, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/ui";
 import { useCycle } from "@/hooks/store/use-cycle";
 import { useIssues } from "@/hooks/store/use-issues";
 //icons

apps/web/core/components/cycles/transfer-issues.tsx

@@ -2,7 +2,8 @@
 import React from "react";
 import { AlertCircle } from "lucide-react";
 // ui
-import { Button, TransferIcon } from "@plane/ui";
+import { TransferIcon } from "@plane/propel/icons";
+import { Button } from "@plane/ui";
 
 type Props = {
   handleClick: () => void;

apps/web/core/components/dropdowns/cycle/cycle-options.tsx

@@ -11,9 +11,9 @@ import { Combobox } from "@headlessui/react";
 // i18n
 import { useTranslation } from "@plane/i18n";
 // icon
+import { ContrastIcon, CycleGroupIcon } from "@plane/propel/icons";
 import { TCycleGroups } from "@plane/types";
 // ui
-import { ContrastIcon, CycleGroupIcon } from "@plane/ui";
 // store hooks
 import { useCycle } from "@/hooks/store/use-cycle";
 import { usePlatformOS } from "@/hooks/use-platform-os";

apps/web/core/components/dropdowns/cycle/index.tsx

@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
 import { ChevronDown } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { ComboDropDown, ContrastIcon } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
+import { ComboDropDown } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 // hooks

apps/web/core/components/dropdowns/date-range.tsx

@@ -3,14 +3,14 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Placement } from "@popperjs/core";
 import { observer } from "mobx-react";
-import { DateRange, Matcher } from "react-day-picker";
 import { usePopper } from "react-popper";
 import { ArrowRight, CalendarCheck2, CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
 // ui
-import { ComboDropDown, Calendar } from "@plane/ui";
+import { Calendar, DateRange, Matcher } from "@plane/propel/calendar";
+import { ComboDropDown } from "@plane/ui";
 import { cn, renderFormattedDate } from "@plane/utils";
 // helpers
 // hooks

apps/web/core/components/dropdowns/date.tsx

@@ -1,12 +1,12 @@
 import React, { useRef, useState } from "react";
 import { observer } from "mobx-react";
-import { Matcher } from "react-day-picker";
 import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 import { CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // ui
-import { ComboDropDown, Calendar } from "@plane/ui";
+import { Calendar, Matcher } from "@plane/propel/calendar";
+import { ComboDropDown } from "@plane/ui";
 import { cn, renderFormattedDate, getDate } from "@plane/utils";
 // helpers
 // hooks

apps/web/core/components/dropdowns/module/button-content.tsx

@@ -2,8 +2,8 @@
 
 import { ChevronDown, X } from "lucide-react";
 // plane imports
+import { DiceIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { DiceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { useModule } from "@/hooks/store/use-module";

apps/web/core/components/dropdowns/module/module-options.tsx

@@ -8,8 +8,8 @@ import { Check, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { DiceIcon } from "@plane/propel/icons";
 import { IModule } from "@plane/types";
-import { DiceIcon } from "@plane/ui";
 import { cn } from "@plane/utils";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";

apps/web/core/components/dropdowns/priority.tsx

@@ -8,10 +8,11 @@ import { Combobox } from "@headlessui/react";
 import { ISSUE_PRIORITIES } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // types
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { TIssuePriorities } from "@plane/types";
 // ui
-import { ComboDropDown, PriorityIcon } from "@plane/ui";
+import { ComboDropDown } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 // hooks

apps/web/core/components/dropdowns/state/base.tsx

@@ -7,8 +7,9 @@ import { ChevronDown, Search } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { StateGroupIcon } from "@plane/propel/icons";
 import { IState } from "@plane/types";
-import { ComboDropDown, Spinner, StateGroupIcon } from "@plane/ui";
+import { ComboDropDown, Spinner } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { DropdownButton } from "@/components/dropdowns/buttons";

apps/web/core/components/editor/document/editor.tsx

@@ -1,6 +1,12 @@
 import React, { forwardRef } from "react";
 // plane imports
-import { DocumentEditorWithRef, type EditorRefApi, type IDocumentEditorProps, type TFileHandler } from "@plane/editor";
+import {
+  DocumentEditorWithRef,
+  IEditorPropsExtended,
+  type EditorRefApi,
+  type IDocumentEditorProps,
+  type TFileHandler,
+} from "@plane/editor";
 import { MakeOptional, TSearchEntityRequestPayload, TSearchResponse } from "@plane/types";
 import { cn } from "@plane/utils";
 // hooks
@@ -8,15 +14,14 @@ import { useEditorConfig, useEditorMention } from "@/hooks/editor";
 import { useMember } from "@/hooks/store/use-member";
 // plane web hooks
 import { useEditorFlagging } from "@/plane-web/hooks/use-editor-flagging";
-import { useIssueEmbed } from "@/plane-web/hooks/use-issue-embed";
 // local imports
 import { EditorMentionsRoot } from "../embeds/mentions";
 
 type DocumentEditorWrapperProps = MakeOptional<
-  Omit<IDocumentEditorProps, "fileHandler" | "mentionHandler" | "embedHandler" | "user" | "extendedEditorProps">,
+  Omit<IDocumentEditorProps, "fileHandler" | "mentionHandler" | "user" | "extendedEditorProps">,
   "disabledExtensions" | "editable" | "flaggedExtensions"
 > & {
-  embedHandler?: Partial<IDocumentEditorProps["embedHandler"]>;
+  extendedEditorProps?: Partial<IEditorPropsExtended>;
   workspaceSlug: string;
   workspaceId: string;
   projectId?: string;
@@ -35,7 +40,7 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
   const {
     containerClassName,
     editable,
-    embedHandler,
+    extendedEditorProps,
     workspaceSlug,
     workspaceId,
     projectId,
@@ -54,11 +59,6 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
   });
   // editor config
   const { getEditorFileHandlers } = useEditorConfig();
-  // issue-embed
-  const { issueEmbedProps } = useIssueEmbed({
-    projectId,
-    workspaceSlug,
-  });
 
   return (
     <DocumentEditorWithRef
@@ -81,11 +81,7 @@ export const DocumentEditor = forwardRef<EditorRefApi, DocumentEditorWrapperProp
         renderComponent: EditorMentionsRoot,
         getMentionedEntityDetails: (id: string) => ({ display_name: getUserDetails(id)?.display_name ?? "" }),
       }}
-      embedHandler={{
-        issue: issueEmbedProps,
-        ...embedHandler,
-      }}
-      extendedEditorProps={{}}
+      extendedEditorProps={extendedEditorProps}
       {...rest}
       containerClassName={cn("relative pl-3 pb-3", containerClassName)}
     />

apps/web/core/components/global/product-updates/footer.tsx

@@ -1,7 +1,8 @@
 import { USER_TRACKER_ELEMENTS } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
 // ui
-import { getButtonStyling, PlaneLogo } from "@plane/ui";
+import { PlaneLogo } from "@plane/propel/icons";
+import { getButtonStyling } from "@plane/ui";
 // helpers
 import { cn } from "@plane/utils";
 

apps/web/core/components/home/widgets/empty-states/recents.tsx

@@ -1,6 +1,6 @@
 import { Briefcase, FileText, History } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
-import { LayersIcon } from "@plane/ui";
+import { LayersIcon } from "@plane/propel/icons";
 
 const getDisplayContent = (type: string) => {
   switch (type) {

apps/web/core/components/home/widgets/empty-states/stickies.tsx

@@ -1,6 +1,6 @@
 // plane ui
 import { useTranslation } from "@plane/i18n";
-import { RecentStickyIcon } from "@plane/ui";
+import { RecentStickyIcon } from "@plane/propel/icons";
 
 export const StickiesEmptyState = () => {
   const { t } = useTranslation();

apps/web/core/components/home/widgets/recents/index.tsx

@@ -6,9 +6,9 @@ import useSWR from "swr";
 import { Briefcase, FileText } from "lucide-react";
 import { useTranslation } from "@plane/i18n";
 // plane types
+import { LayersIcon } from "@plane/propel/icons";
 import { TActivityEntityData, THomeWidgetProps, TRecentActivityFilterKeys } from "@plane/types";
 // plane ui
-import { LayersIcon } from "@plane/ui";
 // components
 import { ContentOverflowWrapper } from "@/components/core/content-overflow-HOC";
 // plane web services

apps/web/core/components/home/widgets/recents/issue.tsx

@@ -1,9 +1,9 @@
 import { observer } from "mobx-react";
 // plane types
+import { LayersIcon, PriorityIcon, StateGroupIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { EIssueServiceType, TActivityEntityData, TIssueEntityData } from "@plane/types";
 // plane ui
-import { LayersIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
 import { calculateTimeAgo, generateWorkItemLink } from "@plane/utils";
 // components
 import { ListItem } from "@/components/core/list";

apps/web/core/components/inbox/content/issue-properties.tsx

@@ -3,9 +3,10 @@
 import React from "react";
 import { observer } from "mobx-react";
 import { CalendarCheck2, CopyPlus, Signal, Tag, Users } from "lucide-react";
+import { DoubleCircleIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
 import { TInboxDuplicateIssueDetails, TIssue } from "@plane/types";
-import { ControlLink, DoubleCircleIcon } from "@plane/ui";
+import { ControlLink } from "@plane/ui";
 import { getDate, renderFormattedPayloadDate, generateWorkItemLink } from "@plane/utils";
 // components
 import { DateDropdown } from "@/components/dropdowns/date";

apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx

@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
 import { X } from "lucide-react";
 import { ISSUE_PRIORITIES } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
 import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon, Tag } from "@plane/ui";
+import { Tag } from "@plane/ui";
 // hooks
 import { useProjectInbox } from "@/hooks/store/use-project-inbox";
 

apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx

@@ -4,7 +4,8 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { X } from "lucide-react";
 import { EIconSize } from "@plane/constants";
-import { StateGroupIcon, Tag } from "@plane/ui";
+import { StateGroupIcon } from "@plane/propel/icons";
+import { Tag } from "@plane/ui";
 // hooks
 import { useProjectInbox } from "@/hooks/store/use-project-inbox";
 import { useProjectState } from "@/hooks/store/use-project-state";

apps/web/core/components/inbox/inbox-filter/filters/priority.tsx

@@ -4,8 +4,8 @@ import { FC, useState } from "react";
 import { observer } from "mobx-react";
 import { ISSUE_PRIORITIES } from "@plane/constants";
 import { useTranslation } from "@plane/i18n";
+import { PriorityIcon } from "@plane/propel/icons";
 import { TIssuePriorities } from "@plane/types";
-import { PriorityIcon } from "@plane/ui";
 // plane constants
 // components
 import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";

apps/web/core/components/inbox/inbox-filter/filters/state.tsx

@@ -3,8 +3,9 @@
 import { FC, useState } from "react";
 import { observer } from "mobx-react";
 import { EIconSize } from "@plane/constants";
+import { StateGroupIcon } from "@plane/propel/icons";
 import { IState } from "@plane/types";
-import { Loader, StateGroupIcon } from "@plane/ui";
+import { Loader } from "@plane/ui";
 // components
 import { FilterHeader, FilterOption } from "@/components/issues/issue-layouts/filters";
 // hooks

apps/web/core/components/inbox/modals/create-modal/issue-properties.tsx

@@ -89,7 +89,6 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
       {/* labels */}
       <div className="h-7">
         <IssueLabelSelect
-          setIsOpen={() => {}}
           value={data?.label_ids || []}
           onChange={(labelIds) => handleData("label_ids", labelIds)}
           projectId={projectId}

apps/web/core/components/inbox/modals/snooze-issue-modal.tsx

@@ -4,7 +4,8 @@ import { FC, Fragment, useState } from "react";
 import { Dialog, Transition } from "@headlessui/react";
 // ui
 import { useTranslation } from "@plane/i18n";
-import { Button, Calendar } from "@plane/ui";
+import { Calendar } from "@plane/propel/calendar";
+import { Button } from "@plane/ui";
 
 export type InboxIssueSnoozeModalProps = {
   isOpen: boolean;

apps/web/core/components/inbox/root.tsx

@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
 import { PanelLeft } from "lucide-react";
 // plane imports
 import { useTranslation } from "@plane/i18n";
+import { Intake } from "@plane/propel/icons";
 import { EInboxIssueCurrentTab } from "@plane/types";
-import { Intake } from "@plane/ui";
 import { cn } from "@plane/utils";
 // components
 import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";

apps/web/core/components/inbox/sidebar/inbox-list-item.tsx

@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
 import Link from "next/link";
 import { useSearchParams } from "next/navigation";
 // plane imports
+import { PriorityIcon } from "@plane/propel/icons";
 import { Tooltip } from "@plane/propel/tooltip";
-import { PriorityIcon, Row, Avatar } from "@plane/ui";
+import { Row, Avatar } from "@plane/ui";
 import { cn, renderFormattedDate, getFileURL } from "@plane/utils";
 // components
 import { ButtonAvatars } from "@/components/dropdowns/member/avatar";

apps/web/core/components/instance/maintenance-view.tsx

@@ -2,33 +2,36 @@
 
 import { FC } from "react";
 import Image from "next/image";
-// ui
-import { Button } from "@plane/ui";
+import { useTheme } from "next-themes";
 // layouts
 import DefaultLayout from "@/layouts/default-layout";
 // components
 import { MaintenanceMessage } from "@/plane-web/components/instance";
 // images
-import maintenanceModeImage from "@/public/maintenance-mode.webp";
+import maintenanceModeDarkModeImage from "@/public/instance/maintenance-mode-dark.svg";
+import maintenanceModeLightModeImage from "@/public/instance/maintenance-mode-light.svg";
 
-export const MaintenanceView: FC = () => (
-  <DefaultLayout>
-    <div className="relative container mx-auto h-full w-full flex flex-col md:flex-row gap-2 items-center justify-center gap-y-5 bg-custom-background-100 text-center">
-      <div className="relative w-full">
-        <Image
-          src={maintenanceModeImage}
-          height="176"
-          width="288"
-          alt="ProjectSettingImg"
-          className="w-full h-full object-fill object-center"
-        />
+export const MaintenanceView: FC = () => {
+  // hooks
+  const { resolvedTheme } = useTheme();
+  // derived values
+  const maintenanceModeImage = resolvedTheme === "dark" ? maintenanceModeDarkModeImage : maintenanceModeLightModeImage;
+  return (
+    <DefaultLayout>
+      <div className="relative container mx-auto h-full w-full max-w-xl flex flex-col gap-2 items-center justify-center gap-y-6 bg-custom-background-100 text-center">
+        <div className="relative w-full">
+          <Image
+            src={maintenanceModeImage}
+            height="176"
+            width="288"
+            alt="ProjectSettingImg"
+            className="w-full h-full object-fill object-center"
+          />
+        </div>
+        <div className="w-full relative flex flex-col gap-4 mt-4">
+          <MaintenanceMessage />
+        </div>
       </div>
-      <div className="w-full space-y-4 relative flex flex-col justify-center md:justify-start items-center md:items-start">
-        <MaintenanceMessage />
-        <Button variant="outline-primary" onClick={() => window.location.reload()}>
-          Reload
-        </Button>
-      </div>
-    </div>
-  </DefaultLayout>
-);
+    </DefaultLayout>
+  );
+};

apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/archived-at.tsx

@@ -4,7 +4,7 @@ import { FC } from "react";
 import { observer } from "mobx-react";
 import { RotateCcw } from "lucide-react";
 // hooks
-import { ArchiveIcon } from "@plane/ui";
+import { ArchiveIcon } from "@plane/propel/icons";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // components
 import { IssueActivityBlockComponent } from "./";

apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/cycle.tsx

@@ -3,7 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
-import { ContrastIcon } from "@plane/ui";
+import { ContrastIcon } from "@plane/propel/icons";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // components
 import { IssueActivityBlockComponent } from "./";

apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/default.tsx

@@ -3,8 +3,8 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // plane imports
+import { LayersIcon } from "@plane/propel/icons";
 import { EInboxIssueSource } from "@plane/types";
-import { LayersIcon } from "@plane/ui";
 // hooks
 import { capitalizeFirstLetter } from "@plane/utils";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";

apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/inbox.tsx

@@ -1,7 +1,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
-import { Intake } from "@plane/ui";
+import { Intake } from "@plane/propel/icons";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // components
 import { IssueActivityBlockComponent } from "./";

apps/web/core/components/issues/issue-detail/issue-activity/activity/actions/module.tsx

@@ -3,7 +3,7 @@
 import { FC } from "react";
 import { observer } from "mobx-react";
 // hooks
-import { DiceIcon } from "@plane/ui";
+import { DiceIcon } from "@plane/propel/icons";
 import { useIssueDetail } from "@/hooks/store/use-issue-detail";
 // components
 import { IssueActivityBlockComponent } from "./";