diff --git a/apps/admin/app/authentication/oidc/form.tsx b/apps/admin/app/authentication/oidc/form.tsx
index 80397dac95..f7ccbde05b 100644
--- a/apps/admin/app/authentication/oidc/form.tsx
+++ b/apps/admin/app/authentication/oidc/form.tsx
@@ -3,8 +3,8 @@ import Link from "next/link";
import { useForm } from "react-hook-form";
// plane internal packages
import { Button, getButtonStyling } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { IFormattedInstanceConfiguration, TInstanceOIDCAuthenticationConfigurationKeys } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { CodeBlock } from "@/components/common/code-block";
diff --git a/apps/admin/app/authentication/oidc/page.tsx b/apps/admin/app/authentication/oidc/page.tsx
index 8bcb218826..4c74b7ba69 100644
--- a/apps/admin/app/authentication/oidc/page.tsx
+++ b/apps/admin/app/authentication/oidc/page.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import Image from "next/image";
import useSWR from "swr";
// ui
-import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
+import { setPromiseToast } from "@plane/propel/toast";
+import { Loader, ToggleSwitch } from "@plane/ui";
// components
import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";
import { PageHeader } from "@/components/common/page-header";
diff --git a/apps/admin/app/authentication/saml/form.tsx b/apps/admin/app/authentication/saml/form.tsx
index 668077fb06..7181b5e775 100644
--- a/apps/admin/app/authentication/saml/form.tsx
+++ b/apps/admin/app/authentication/saml/form.tsx
@@ -3,8 +3,9 @@ import Link from "next/link";
import { Controller, useForm } from "react-hook-form";
// plane internal packages
import { Button, getButtonStyling } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { IFormattedInstanceConfiguration, TInstanceSAMLAuthenticationConfigurationKeys } from "@plane/types";
-import { TOAST_TYPE, TextArea, setToast } from "@plane/ui";
+import { TextArea } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { CodeBlock } from "@/components/common/code-block";
diff --git a/apps/admin/app/authentication/saml/page.tsx b/apps/admin/app/authentication/saml/page.tsx
index 045ebaba1f..651dba54a0 100644
--- a/apps/admin/app/authentication/saml/page.tsx
+++ b/apps/admin/app/authentication/saml/page.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import Image from "next/image";
import useSWR from "swr";
// ui
-import { Loader, ToggleSwitch, setPromiseToast } from "@plane/ui";
+import { setPromiseToast } from "@plane/propel/toast";
+import { Loader, ToggleSwitch } from "@plane/ui";
// components
import { AuthenticationMethodCard } from "@/components/authentication/authentication-method-card";
import { PageHeader } from "@/components/common/page-header";
diff --git a/apps/space/ee/components/intake/create/create-issue-modal.tsx b/apps/space/ee/components/intake/create/create-issue-modal.tsx
index 64e49a97b6..e285c63649 100644
--- a/apps/space/ee/components/intake/create/create-issue-modal.tsx
+++ b/apps/space/ee/components/intake/create/create-issue-modal.tsx
@@ -5,8 +5,8 @@ import { FormProvider, useForm } from "react-hook-form";
// plane imports
import type { EditorRefApi } from "@plane/editor";
import { PlaneLogo } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import type { IProject } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web imports
import { useIntake } from "@/plane-web/hooks/store/use-intake";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/dashboards/(detail)/[dashboardId]/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/dashboards/(detail)/[dashboardId]/header.tsx
index 4d5829358d..9f88d18696 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/dashboards/(detail)/[dashboardId]/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/dashboards/(detail)/[dashboardId]/header.tsx
@@ -4,16 +4,9 @@ import { useParams } from "next/navigation";
import { Eye, LayoutGrid, Pencil, Plus } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EWidgetChartModels, EWidgetChartTypes, ICustomSearchSelectOption } from "@plane/types";
-import {
- BreadcrumbNavigationSearchDropdown,
- Breadcrumbs,
- Button,
- getButtonStyling,
- Header,
- setToast,
- TOAST_TYPE,
-} from "@plane/ui";
+import { BreadcrumbNavigationSearchDropdown, Breadcrumbs, Button, getButtonStyling, Header } from "@plane/ui";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
import { SwitcherLabel } from "@/components/common/switcher-label";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/automations/[automationId]/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/automations/[automationId]/header.tsx
index c14b879ba6..6ebe39ae3c 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/automations/[automationId]/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/automations/[automationId]/header.tsx
@@ -6,16 +6,9 @@ import { observer } from "mobx-react";
import { Activity, Repeat } from "lucide-react";
import { AUTOMATION_TRACKER_ELEMENTS, AUTOMATION_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EAutomationSidebarTab, ICustomSearchSelectOption } from "@plane/types";
-import {
- BreadcrumbNavigationSearchDropdown,
- Breadcrumbs,
- Button,
- Header,
- setToast,
- TOAST_TYPE,
- Tooltip,
-} from "@plane/ui";
+import { BreadcrumbNavigationSearchDropdown, Breadcrumbs, Button, Header, Tooltip } from "@plane/ui";
// hooks
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
import { SwitcherLabel } from "@/components/common/switcher-label";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/customers/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/customers/page.tsx
index 56e12b2f12..3a5fc2321a 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/customers/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/customers/page.tsx
@@ -6,8 +6,9 @@ import { useParams } from "next/navigation";
// plane imports
import { E_FEATURE_FLAGS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
import { cn } from "@plane/utils";
// component
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/initiatives/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/initiatives/page.tsx
index 13298148de..7919bc559f 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/initiatives/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/initiatives/page.tsx
@@ -6,9 +6,10 @@ import { useParams } from "next/navigation";
import { INITIATIVE_TRACKER_EVENTS, INITIATIVES_TRACKER_ELEMENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { InitiativeIcon } from "@plane/propel/icons";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
// component
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
import { SettingsContentWrapper } from "@/components/settings/content-wrapper";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github-enterprise/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github-enterprise/page.tsx
index 2a400aacbd..a789c089d3 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github-enterprise/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github-enterprise/page.tsx
@@ -10,8 +10,8 @@ import { Cloud } from "lucide-react";
import { E_FEATURE_FLAGS } from "@plane/constants";
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { E_INTEGRATION_KEYS } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { UserAuthentication, IntegrationRoot } from "@/plane-web/components/integrations/github";
// plane web hooks
import { useFlag, useGithubIntegration, useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github/page.tsx
index c7fd42e100..e23859c059 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/github/page.tsx
@@ -8,8 +8,9 @@ import { Cloud } from "lucide-react";
import { E_FEATURE_FLAGS } from "@plane/constants";
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { E_INTEGRATION_KEYS } from "@plane/types";
-import { Loader, TOAST_TYPE, setToast } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { GithubHeader, IntegrationRoot, UserAuthentication } from "@/plane-web/components/integrations/github";
// plane web hooks
import { useFlag, useGithubIntegration, useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/gitlab/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/gitlab/page.tsx
index 099b80b194..738487e252 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/gitlab/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/gitlab/page.tsx
@@ -8,8 +8,9 @@ import { Cloud } from "lucide-react";
import { E_FEATURE_FLAGS } from "@plane/constants";
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { E_INTEGRATION_KEYS } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { UserAuthentication, IntegrationRoot, GitlabHeader } from "@/plane-web/components/integrations/gitlab";
// plane web hooks
import { useFlag, useGitlabIntegration, useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/sentry/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/sentry/page.tsx
index 6321ed4973..04cc6fe28e 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/sentry/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/sentry/page.tsx
@@ -8,8 +8,9 @@ import { Cloud } from "lucide-react";
// plane web components
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { E_INTEGRATION_KEYS } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { SentryIntegrationRoot } from "@/plane-web/components/integrations/sentry";
// plane web hooks
import { useFlag, useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/slack/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/slack/page.tsx
index 1ac7129931..ae720ad6bf 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/slack/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/(integrations)/slack/page.tsx
@@ -9,8 +9,9 @@ import { Cloud } from "lucide-react";
import { E_FEATURE_FLAGS } from "@plane/constants";
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { E_INTEGRATION_KEYS } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { SlackIntegrationRoot } from "@/plane-web/components/integrations/slack";
// plane web hooks
import { useFlag, useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/[appSlug]/edit/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/[appSlug]/edit/page.tsx
index 6a58b753f7..0b09219a4d 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/[appSlug]/edit/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/[appSlug]/edit/page.tsx
@@ -6,8 +6,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import useSWR from "swr";
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TApplication } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
// hooks
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/create/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/create/page.tsx
index 75acb6f4f2..8e5e974114 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/create/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/integrations/create/page.tsx
@@ -8,8 +8,8 @@ import { useParams } from "next/navigation";
import useSWR from "swr";
import { ChevronLeftIcon } from "lucide-react";
import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TUserApplication } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
import { APPLICATION_CATEGORIES_LIST } from "@/constants/fetch-keys";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/plane-intelligence/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/plane-intelligence/page.tsx
index b2b8b0be90..6ce3eb4fde 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/plane-intelligence/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/plane-intelligence/page.tsx
@@ -11,8 +11,9 @@ import {
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { PiIcon } from "@plane/propel/icons";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
// component
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/teamspaces/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/teamspaces/page.tsx
index f9cbadb7b9..3e3827c12b 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/teamspaces/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/(workspace)/teamspaces/page.tsx
@@ -7,8 +7,9 @@ import { useParams } from "next/navigation";
import { TEAMSPACE_TRACKER_ELEMENTS, TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { TeamsIcon } from "@plane/propel/icons";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { setPromiseToast, ToggleSwitch, Tooltip } from "@plane/ui";
+import { ToggleSwitch, Tooltip } from "@plane/ui";
// component
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/account/connections/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/account/connections/page.tsx
index c9ca7a0555..6654a21974 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/account/connections/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/account/connections/page.tsx
@@ -5,7 +5,7 @@ import { useEffect } from "react";
import { useSearchParams } from "next/navigation";
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// components
import { PageHead } from "@/components/core/page-title";
import { SettingsHeading } from "@/components/settings/heading";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/project-updates/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/project-updates/page.tsx
index 9e80c3f8f4..dbcb31f09e 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/project-updates/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/project-updates/page.tsx
@@ -7,8 +7,9 @@ import { useParams } from "next/navigation";
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { UpdatesIcon } from "@plane/propel/icons";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserProjectRoles } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
// store hooks
import { SettingsContentWrapper } from "@/components/settings/content-wrapper";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/workflows/page.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/workflows/page.tsx
index 0b7f2a8a5e..528e844268 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/workflows/page.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/settings/projects/[projectId]/workflows/page.tsx
@@ -6,8 +6,9 @@ import useSWR from "swr";
// plane imports
import { EUserPermissionsLevel, WORKFLOW_TRACKER_ELEMENTS, WORKFLOW_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { EUserProjectRoles } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
// components
import { NotAuthorizedView } from "@/components/auth-screens/not-authorized-view";
import { PageHead } from "@/components/core/page-title";
diff --git a/apps/web/app/(all)/[workspaceSlug]/(wiki)/wiki/(pageType)/header.tsx b/apps/web/app/(all)/[workspaceSlug]/(wiki)/wiki/(pageType)/header.tsx
index 99b75f2da8..81dcb46040 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(wiki)/wiki/(pageType)/header.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(wiki)/wiki/(pageType)/header.tsx
@@ -7,8 +7,9 @@ import { FileText, ListFilter } from "lucide-react";
// plane imports
import { WORKSPACE_PAGE_TRACKER_EVENTS, EPageAccess } from "@plane/constants";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TPage, TPageNavigationTabs } from "@plane/types";
-import { Breadcrumbs, Header, setToast, TOAST_TYPE } from "@plane/ui";
+import { Breadcrumbs, Header } from "@plane/ui";
import { calculateTotalFilters, capitalizeFirstLetter } from "@plane/utils";
// components
import { BreadcrumbLink } from "@/components/common/breadcrumb-link";
diff --git a/apps/web/app/(all)/profile/connections/page.tsx b/apps/web/app/(all)/profile/connections/page.tsx
index 08c52bf0c6..3525caf096 100644
--- a/apps/web/app/(all)/profile/connections/page.tsx
+++ b/apps/web/app/(all)/profile/connections/page.tsx
@@ -5,7 +5,7 @@ import { useSearchParams } from "next/navigation";
// plane imports
import { SILO_ERROR_CODES } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// components
import { PageHead } from "@/components/core/page-title";
import { ProfileSettingContentHeader } from "@/components/profile/profile-setting-content-header";
diff --git a/apps/web/app/workspace-selector/[feature]/[identifier]/workspace-selector.tsx b/apps/web/app/workspace-selector/[feature]/[identifier]/workspace-selector.tsx
index 5ae53621e2..ff1a0af10c 100644
--- a/apps/web/app/workspace-selector/[feature]/[identifier]/workspace-selector.tsx
+++ b/apps/web/app/workspace-selector/[feature]/[identifier]/workspace-selector.tsx
@@ -3,9 +3,10 @@ import { observer } from "mobx-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { projectTemplateService } from "@plane/services";
import { EUserPermissions, IWorkspace } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { orderWorkspacesList } from "@plane/utils";
// hooks
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/core/components/appearance/theme-switcher.tsx b/apps/web/core/components/appearance/theme-switcher.tsx
index 5eace22bd5..c410d31ea4 100644
--- a/apps/web/core/components/appearance/theme-switcher.tsx
+++ b/apps/web/core/components/appearance/theme-switcher.tsx
@@ -6,8 +6,8 @@ import { useTheme } from "next-themes";
// plane imports
import { I_THEME_OPTION, THEME_OPTIONS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { IUserTheme } from "@plane/types";
-import { setPromiseToast } from "@plane/ui";
import { applyTheme, unsetCustomCssVariables } from "@plane/utils";
// hooks
import { useUserProfile } from "@/hooks/store/user";
diff --git a/apps/web/core/components/pages/editor/page-root.tsx b/apps/web/core/components/pages/editor/page-root.tsx
index 0b3d40b6fb..d1e43d75a9 100644
--- a/apps/web/core/components/pages/editor/page-root.tsx
+++ b/apps/web/core/components/pages/editor/page-root.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import { useSearchParams } from "next/navigation";
// plane imports
import type { EditorRefApi } from "@plane/editor";
+import { TOAST_TYPE, updateToast } from "@plane/propel/toast";
import type { TDocumentPayload, TPage, TPageVersion, TWebhookConnectionQueryParams } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// hooks
import { usePageFallback } from "@/hooks/use-page-fallback";
import { type TCustomEventHandlers } from "@/hooks/use-realtime-page-events";
@@ -121,7 +121,7 @@ export const PageRoot = observer((props: TPageRootProps) => {
if (version && isNestedPagesEnabled(workspaceSlug.toString())) {
page.setVersionToBeRestored(version, descriptionHTML);
page.setRestorationStatus(true);
- setToast({ id: "restoring-version", type: TOAST_TYPE.LOADING_TOAST, title: "Restoring version..." });
+ updateToast("restoring-version", { type: TOAST_TYPE.LOADING_TOAST, title: "Restoring version..." });
if (page.id) {
await handlers.restoreVersion(page.id, version);
}
diff --git a/apps/web/core/components/pages/list/block.tsx b/apps/web/core/components/pages/list/block.tsx
index 8842c6ed5c..e12a094b70 100644
--- a/apps/web/core/components/pages/list/block.tsx
+++ b/apps/web/core/components/pages/list/block.tsx
@@ -6,8 +6,9 @@ import { useParams } from "next/navigation";
import { ChevronRight, FileText, Loader } from "lucide-react";
// plane imports
import { RestrictedPageIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TPageNavigationTabs } from "@plane/types";
-import { Logo, setToast, TOAST_TYPE } from "@plane/ui";
+import { Logo } from "@plane/ui";
import { cn, getPageName } from "@plane/utils";
// components
import { ListItem } from "@/components/core/list";
diff --git a/apps/web/core/components/pages/list/root.tsx b/apps/web/core/components/pages/list/root.tsx
index 7e9ed36d68..2da0942f4a 100644
--- a/apps/web/core/components/pages/list/root.tsx
+++ b/apps/web/core/components/pages/list/root.tsx
@@ -12,8 +12,8 @@ import {
PROJECT_PAGE_TRACKER_EVENTS,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, type TPageNavigationTabs, TPage, TPageDragPayload } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
import { PageListBlockRoot } from "@/components/pages/list/block-root";
diff --git a/apps/web/core/components/pages/modals/delete-page-modal.tsx b/apps/web/core/components/pages/modals/delete-page-modal.tsx
index d1a7dc34dc..84ea6e8a9c 100644
--- a/apps/web/core/components/pages/modals/delete-page-modal.tsx
+++ b/apps/web/core/components/pages/modals/delete-page-modal.tsx
@@ -10,6 +10,7 @@ import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { AlertModalCore } from "@plane/ui";
// constants
import { getPageName } from "@plane/utils";
+// constants
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
// plane web hooks
diff --git a/apps/web/core/components/rich-filters/add-filters-button.tsx b/apps/web/core/components/rich-filters/add-filters-button.tsx
index f9621b3fca..64e3ae5156 100644
--- a/apps/web/core/components/rich-filters/add-filters-button.tsx
+++ b/apps/web/core/components/rich-filters/add-filters-button.tsx
@@ -1,11 +1,12 @@
import React from "react";
import { observer } from "mobx-react";
import { ListFilter } from "lucide-react";
-// plane imports
import { getButtonStyling } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+// plane imports
import { IFilterInstance } from "@plane/shared-state";
import { LOGICAL_OPERATOR, TExternalFilter, TFilterProperty } from "@plane/types";
-import { CustomSearchSelect, setToast, TButtonVariant, TOAST_TYPE } from "@plane/ui";
+import { CustomSearchSelect, TButtonVariant } from "@plane/ui";
import { cn, getOperatorForPayload } from "@plane/utils";
export type TAddFilterButtonProps
= {
diff --git a/apps/web/core/components/work-item-filters/filters-hoc/project-level.tsx b/apps/web/core/components/work-item-filters/filters-hoc/project-level.tsx
index 09526976f7..8db74a1a2f 100644
--- a/apps/web/core/components/work-item-filters/filters-hoc/project-level.tsx
+++ b/apps/web/core/components/work-item-filters/filters-hoc/project-level.tsx
@@ -3,9 +3,8 @@ import { isEqual, cloneDeep } from "lodash-es";
import { observer } from "mobx-react";
// plane imports
import { EUserPermissionsLevel, PROJECT_VIEW_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, EViewAccess, IProjectView, TWorkItemFilterExpression } from "@plane/types";
-// components
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { removeNillKeys } from "@/components/issues/issue-layouts/utils";
import { CreateUpdateProjectViewModal } from "@/components/views/modal";
// hooks
diff --git a/apps/web/core/components/work-item-filters/filters-hoc/workspace-level.tsx b/apps/web/core/components/work-item-filters/filters-hoc/workspace-level.tsx
index 94b3dc07e3..b60bcf524e 100644
--- a/apps/web/core/components/work-item-filters/filters-hoc/workspace-level.tsx
+++ b/apps/web/core/components/work-item-filters/filters-hoc/workspace-level.tsx
@@ -3,9 +3,8 @@ import { isEqual, cloneDeep } from "lodash-es";
import { observer } from "mobx-react";
// plane imports
import { DEFAULT_GLOBAL_VIEWS_LIST, EUserPermissionsLevel, GLOBAL_VIEW_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, EViewAccess, IWorkspaceView, TWorkItemFilterExpression } from "@plane/types";
-// components
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { removeNillKeys } from "@/components/issues/issue-layouts/utils";
import { CreateUpdateWorkspaceViewModal } from "@/components/workspace/views/modal";
// hooks
diff --git a/apps/web/core/hooks/use-page-operations.tsx b/apps/web/core/hooks/use-page-operations.tsx
index 3e1ad26f2e..8647694538 100644
--- a/apps/web/core/hooks/use-page-operations.tsx
+++ b/apps/web/core/hooks/use-page-operations.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import { IS_FAVORITE_MENU_OPEN, PROJECT_PAGE_TRACKER_EVENTS, EPageAccess } from "@plane/constants";
import type { EditorRefApi } from "@plane/editor";
import { useLocalStorage } from "@plane/hooks";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { copyUrlToClipboard } from "@plane/utils";
// helpers
import { captureSuccess, captureError } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/core/hooks/use-realtime-page-events.tsx b/apps/web/core/hooks/use-realtime-page-events.tsx
index 91d581c28a..540eedbf43 100644
--- a/apps/web/core/hooks/use-realtime-page-events.tsx
+++ b/apps/web/core/hooks/use-realtime-page-events.tsx
@@ -1,8 +1,8 @@
import { useCallback, useMemo } from "react";
// plane imports
import type { EventToPayloadMap } from "@plane/editor";
+import { setToast, TOAST_TYPE, dismissToast } from "@plane/propel/toast";
import type { IUserLite, TCollaborator } from "@plane/types";
-import { dismissToast, setToast, TOAST_TYPE } from "@plane/ui";
// components
import type { TEditorBodyHandlers } from "@/components/pages/editor/editor-body";
// hooks
diff --git a/apps/web/ee/components/automations/details/sidebar/actions/root.tsx b/apps/web/ee/components/automations/details/sidebar/actions/root.tsx
index bb68af0f02..4d0958a84e 100644
--- a/apps/web/ee/components/automations/details/sidebar/actions/root.tsx
+++ b/apps/web/ee/components/automations/details/sidebar/actions/root.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
// plane imports
import { AUTOMATION_TRACKER_ELEMENTS, AUTOMATION_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-// helpers
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+// helpers
import {
EActionNodeHandlerName,
EAutomationNodeType,
@@ -12,7 +13,6 @@ import {
TChangePropertyActionConfig,
TChangePropertyActionFormConfig,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { captureClick, captureSuccess, captureError } from "@/helpers/event-tracker.helper";
// plane web imports
import { useAutomations } from "@/plane-web/hooks/store/automations/use-automations";
diff --git a/apps/web/ee/components/automations/details/sidebar/delete-confirmation-modal.tsx b/apps/web/ee/components/automations/details/sidebar/delete-confirmation-modal.tsx
index 6207d3e064..3954ff4075 100644
--- a/apps/web/ee/components/automations/details/sidebar/delete-confirmation-modal.tsx
+++ b/apps/web/ee/components/automations/details/sidebar/delete-confirmation-modal.tsx
@@ -4,8 +4,9 @@ import { useState } from "react";
import { observer } from "mobx-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EAutomationNodeType } from "@plane/types";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
type Props = {
nodeType: EAutomationNodeType;
diff --git a/apps/web/ee/components/automations/modals/delete-modal.tsx b/apps/web/ee/components/automations/modals/delete-modal.tsx
index e8e64346a9..0a30582e0e 100644
--- a/apps/web/ee/components/automations/modals/delete-modal.tsx
+++ b/apps/web/ee/components/automations/modals/delete-modal.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
// plane imports
import { AUTOMATION_TRACKER_ELEMENTS, AUTOMATION_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// helpers
import { captureClick, captureSuccess, captureError } from "@/helpers/event-tracker.helper";
// plane web hooks
diff --git a/apps/web/ee/components/command-palette/command-palette.tsx b/apps/web/ee/components/command-palette/command-palette.tsx
index f0a5ba416b..45cfc55a89 100644
--- a/apps/web/ee/components/command-palette/command-palette.tsx
+++ b/apps/web/ee/components/command-palette/command-palette.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// constants
// hooks
import { useAppTheme } from "@/hooks/store/use-app-theme";
diff --git a/apps/web/ee/components/common/modal/upload-app-image.tsx b/apps/web/ee/components/common/modal/upload-app-image.tsx
index b3f7418a46..e420eeb9c5 100644
--- a/apps/web/ee/components/common/modal/upload-app-image.tsx
+++ b/apps/web/ee/components/common/modal/upload-app-image.tsx
@@ -5,10 +5,10 @@ import { observer } from "mobx-react";
import { useDropzone } from "react-dropzone";
import { UserCircle2 } from "lucide-react";
import { Dialog, Transition } from "@headlessui/react";
-// plane imports
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+// plane imports
import { EFileAssetType } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { checkURLValidity, getAssetIdFromUrl, getFileURL } from "@plane/utils";
// hooks
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/customers/actions/delete-modal.tsx b/apps/web/ee/components/customers/actions/delete-modal.tsx
index 705972090d..95572b6255 100644
--- a/apps/web/ee/components/customers/actions/delete-modal.tsx
+++ b/apps/web/ee/components/customers/actions/delete-modal.tsx
@@ -8,7 +8,8 @@ import { AlertTriangle } from "lucide-react";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { EModalWidth, EModalPosition, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { EModalWidth, EModalPosition, ModalCore } from "@plane/ui";
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useAppRouter } from "@/hooks/use-app-router";
diff --git a/apps/web/ee/components/customers/actions/quick-actions.tsx b/apps/web/ee/components/customers/actions/quick-actions.tsx
index 24c869d2b0..6dfcc9fc47 100644
--- a/apps/web/ee/components/customers/actions/quick-actions.tsx
+++ b/apps/web/ee/components/customers/actions/quick-actions.tsx
@@ -6,8 +6,9 @@ import { Link2, Pencil, Trash2 } from "lucide-react";
// plane imports
import { CUSTOMER_TRACKER_ELEMENTS, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// hooks
import { captureClick } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/customers/actions/request-delete-modal.tsx b/apps/web/ee/components/customers/actions/request-delete-modal.tsx
index e90edf887a..f6f9aa9674 100644
--- a/apps/web/ee/components/customers/actions/request-delete-modal.tsx
+++ b/apps/web/ee/components/customers/actions/request-delete-modal.tsx
@@ -6,7 +6,8 @@ import { useParams } from "next/navigation";
// ui
import { mutate } from "swr";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast, AlertModalCore } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useCustomers } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/customers/actions/requests-quick-actions.tsx b/apps/web/ee/components/customers/actions/requests-quick-actions.tsx
index 676f139fec..9369857c68 100644
--- a/apps/web/ee/components/customers/actions/requests-quick-actions.tsx
+++ b/apps/web/ee/components/customers/actions/requests-quick-actions.tsx
@@ -5,8 +5,9 @@ import { Link2, Pencil, Trash2 } from "lucide-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// plane web constants
import { useUserPermissions } from "@/hooks/store/user";
diff --git a/apps/web/ee/components/customers/additiona-properties/update.tsx b/apps/web/ee/components/customers/additiona-properties/update.tsx
index fbc24b9eb0..150e8e9570 100644
--- a/apps/web/ee/components/customers/additiona-properties/update.tsx
+++ b/apps/web/ee/components/customers/additiona-properties/update.tsx
@@ -3,10 +3,11 @@
import React, { useEffect } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// ui
import { CustomerPropertyValueService } from "@plane/services";
import { TIssuePropertyValues } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
// plane web hooks
import { useCustomerProperties } from "@/plane-web/hooks/store";
import { CustomerAdditionalPropertyValues } from "./root";
diff --git a/apps/web/ee/components/customers/customer-modal/default-properties.tsx b/apps/web/ee/components/customers/customer-modal/default-properties.tsx
index 366f7c1bcc..a2942e7bbc 100644
--- a/apps/web/ee/components/customers/customer-modal/default-properties.tsx
+++ b/apps/web/ee/components/customers/customer-modal/default-properties.tsx
@@ -12,8 +12,9 @@ import {
import { useTranslation } from "@plane/i18n";
// plane types
import { CustomersIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TCustomerPayload } from "@plane/types";
-import { CustomSearchSelect, Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { CustomSearchSelect, Input } from "@plane/ui";
// utils
import { getDescriptionPlaceholderI18n, getFileURL, getTabIndex } from "@plane/utils";
import { RichTextEditor } from "@/components/editor/rich-text";
diff --git a/apps/web/ee/components/customers/customer-modal/form.tsx b/apps/web/ee/components/customers/customer-modal/form.tsx
index d29702fe27..0afae878d4 100644
--- a/apps/web/ee/components/customers/customer-modal/form.tsx
+++ b/apps/web/ee/components/customers/customer-modal/form.tsx
@@ -5,8 +5,8 @@ import { FormProvider, useForm } from "react-hook-form";
import { CUSTOMER_TRACKER_EVENTS, ETabIndices } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TCustomer, TCustomerPayload } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// helpers
import { cn, getTabIndex } from "@plane/utils";
// store
diff --git a/apps/web/ee/components/customers/customer-modal/provider.tsx b/apps/web/ee/components/customers/customer-modal/provider.tsx
index fd2b90c1e4..2c7034c264 100644
--- a/apps/web/ee/components/customers/customer-modal/provider.tsx
+++ b/apps/web/ee/components/customers/customer-modal/provider.tsx
@@ -1,10 +1,10 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
import { mutate } from "swr";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { CustomerPropertyValueService } from "@plane/services";
import { TIssuePropertyValueErrors, TIssuePropertyValues } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { getPropertiesDefaultValues } from "@plane/utils";
// plane web hooks
import { CustomerModalContext, TCreateUpdatePropertyValuesProps } from "@/plane-web/components/customers";
diff --git a/apps/web/ee/components/customers/detail/default-properties.tsx b/apps/web/ee/components/customers/detail/default-properties.tsx
index 7941521737..890efd7ed9 100644
--- a/apps/web/ee/components/customers/detail/default-properties.tsx
+++ b/apps/web/ee/components/customers/detail/default-properties.tsx
@@ -3,8 +3,9 @@ import { Controller, FieldValues, useForm } from "react-hook-form";
// plane imports
import { CUSTOMER_WEBSITE_AND_SOURCE_URL_REGEX } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TCustomer } from "@plane/types";
-import { Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { Input } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
@@ -56,7 +57,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
/>
-
{t("customers.properties.default.website_url.name")}
@@ -77,7 +77,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
/>
-
{t("customers.properties.default.size.name")}
@@ -100,7 +99,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
/>
-
{t("customers.properties.default.domain.name")}
@@ -116,7 +114,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
/>
-
{t("customers.properties.default.contract_status.name")}
@@ -132,7 +129,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
disabled={isDisabled}
/>
-
{t("customers.properties.default.stage.name")}
@@ -148,7 +144,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
disabled={isDisabled}
/>
-
{t("customers.properties.default.revenue.name")}
@@ -169,7 +164,6 @@ export const CustomerDefaultSidebarProperties: FC = (props) => {
disabled={isDisabled}
/>
-
{createdByDetails && (
diff --git a/apps/web/ee/components/customers/detail/main.tsx b/apps/web/ee/components/customers/detail/main.tsx
index 364dc9230a..6044946c92 100644
--- a/apps/web/ee/components/customers/detail/main.tsx
+++ b/apps/web/ee/components/customers/detail/main.tsx
@@ -5,8 +5,9 @@ import { ExternalLink } from "lucide-react";
// plane imports
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TCustomerPayload } from "@plane/types";
-import { setToast, Tabs, TOAST_TYPE } from "@plane/ui";
+import { Tabs } from "@plane/ui";
// hooks
import { formatURLForDisplay } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/customers/detail/sidebar.tsx b/apps/web/ee/components/customers/detail/sidebar.tsx
index 3e310e21ee..966d813e8e 100644
--- a/apps/web/ee/components/customers/detail/sidebar.tsx
+++ b/apps/web/ee/components/customers/detail/sidebar.tsx
@@ -2,8 +2,8 @@ import React, { FC } from "react";
import { observer } from "mobx-react";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { ScrollArea } from "@plane/propel/scrollarea";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TCustomer } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// plane web imports
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { SidebarWrapper } from "@/plane-web/components/common/layout/sidebar/sidebar-wrapper";
diff --git a/apps/web/ee/components/customers/list/root.tsx b/apps/web/ee/components/customers/list/root.tsx
index 89fd22a618..d963a93e3c 100644
--- a/apps/web/ee/components/customers/list/root.tsx
+++ b/apps/web/ee/components/customers/list/root.tsx
@@ -6,8 +6,8 @@ import useSWR from "swr";
import { EUserPermissionsLevel } from "@plane/constants";
// components
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { ListLayout } from "@/components/core/list";
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
import { ListLoaderItemRow } from "@/components/ui/loader/layouts/list-layout-loader";
diff --git a/apps/web/ee/components/customers/requests/attachments/add-attachment-btn.tsx b/apps/web/ee/components/customers/requests/attachments/add-attachment-btn.tsx
index a41ad2e406..a5a889baca 100644
--- a/apps/web/ee/components/customers/requests/attachments/add-attachment-btn.tsx
+++ b/apps/web/ee/components/customers/requests/attachments/add-attachment-btn.tsx
@@ -2,7 +2,7 @@ import React, { FC, ReactNode, useCallback, useState } from "react";
import { FileRejection, useDropzone } from "react-dropzone";
// plane imports
import { useTranslation } from "@plane/i18n";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { useFileSize } from "@/plane-web/hooks/use-file-size";
// helpers
import { useAttachmentOperations } from "./helper";
diff --git a/apps/web/ee/components/customers/requests/attachments/attachment-list.tsx b/apps/web/ee/components/customers/requests/attachments/attachment-list.tsx
index 428f4d9579..c9b9024ca2 100644
--- a/apps/web/ee/components/customers/requests/attachments/attachment-list.tsx
+++ b/apps/web/ee/components/customers/requests/attachments/attachment-list.tsx
@@ -3,8 +3,7 @@ import { observer } from "mobx-react";
import { FileRejection, useDropzone } from "react-dropzone";
import { UploadCloud } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-// hooks
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web hooks
import { cn } from "@plane/utils";
import { useCustomers } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/customers/requests/attachments/helper.tsx b/apps/web/ee/components/customers/requests/attachments/helper.tsx
index 431d98ae1b..671dba6707 100644
--- a/apps/web/ee/components/customers/requests/attachments/helper.tsx
+++ b/apps/web/ee/components/customers/requests/attachments/helper.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
// plane ui
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
+import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/propel/toast";
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useCustomers } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/customers/requests/form.tsx b/apps/web/ee/components/customers/requests/form.tsx
index a58d26ddec..30cebea5b4 100644
--- a/apps/web/ee/components/customers/requests/form.tsx
+++ b/apps/web/ee/components/customers/requests/form.tsx
@@ -7,9 +7,10 @@ import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { LayersIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { CustomerService } from "@plane/services";
import { EFileAssetType, ISearchIssueResponse, TCustomerRequest, TProjectIssuesSearchParams } from "@plane/types";
-import { EModalPosition, EModalWidth, Input, setToast, TOAST_TYPE, ModalCore } from "@plane/ui";
+import { EModalPosition, EModalWidth, Input, ModalCore } from "@plane/ui";
import { getDescriptionPlaceholderI18n } from "@plane/utils";
// components
import { ExistingIssuesListModal } from "@/components/core/modals/existing-issues-list-modal";
diff --git a/apps/web/ee/components/customers/requests/request-list-item.tsx b/apps/web/ee/components/customers/requests/request-list-item.tsx
index b8e1a3e622..537fe9f3a4 100644
--- a/apps/web/ee/components/customers/requests/request-list-item.tsx
+++ b/apps/web/ee/components/customers/requests/request-list-item.tsx
@@ -4,9 +4,9 @@ import { Database, LayersIcon, PlusIcon } from "lucide-react";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { CustomerService } from "@plane/services";
import { ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { ContentOverflowWrapper } from "@/components/core/content-overflow-HOC";
import { ExistingIssuesListModal } from "@/components/core/modals/existing-issues-list-modal";
diff --git a/apps/web/ee/components/customers/work-items/helper.tsx b/apps/web/ee/components/customers/work-items/helper.tsx
index 3f1784c887..9e6d99ed66 100644
--- a/apps/web/ee/components/customers/work-items/helper.tsx
+++ b/apps/web/ee/components/customers/work-items/helper.tsx
@@ -2,8 +2,8 @@
import { useMemo } from "react";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType, TIssue, TIssueServiceType } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// helper
import { copyTextToClipboard } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/customers/work-items/work-items-list.tsx b/apps/web/ee/components/customers/work-items/work-items-list.tsx
index e57cfe1558..749afcdc7e 100644
--- a/apps/web/ee/components/customers/work-items/work-items-list.tsx
+++ b/apps/web/ee/components/customers/work-items/work-items-list.tsx
@@ -4,9 +4,9 @@ import { observer } from "mobx-react";
import { CUSTOMER_TRACKER_EVENTS, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { CustomerService } from "@plane/services";
import { EUserWorkspaceRoles, ISearchIssueResponse, TProjectIssuesSearchParams } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { ExistingIssuesListModal } from "@/components/core/modals/existing-issues-list-modal";
// plane web components
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/cycles/additional-actions.tsx b/apps/web/ee/components/cycles/additional-actions.tsx
index 964c8b82b4..3c950a5b79 100644
--- a/apps/web/ee/components/cycles/additional-actions.tsx
+++ b/apps/web/ee/components/cycles/additional-actions.tsx
@@ -2,7 +2,7 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { E_FEATURE_FLAGS } from "@plane/constants";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { useCycle } from "@/hooks/store/use-cycle";
import { StartCycleModal } from "@/plane-web/components/cycles";
import { CYCLE_ACTION } from "@/plane-web/constants/cycle";
diff --git a/apps/web/ee/components/cycles/end-cycle/modal.tsx b/apps/web/ee/components/cycles/end-cycle/modal.tsx
index e3a6c9fe94..07cb7aed97 100644
--- a/apps/web/ee/components/cycles/end-cycle/modal.tsx
+++ b/apps/web/ee/components/cycles/end-cycle/modal.tsx
@@ -1,10 +1,11 @@
"use client";
-
import { FC, useMemo, useState } from "react";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+
import { EIssuesStoreType } from "@plane/types";
// plane imports
-import { EModalPosition, EModalWidth, Input, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, Input, ModalCore } from "@plane/ui";
// components
import { CycleDropdown } from "@/components/dropdowns/cycle";
// hooks
diff --git a/apps/web/ee/components/dashboards/details/empty-state.tsx b/apps/web/ee/components/dashboards/details/empty-state.tsx
index a85893b83a..23f7ec91c8 100644
--- a/apps/web/ee/components/dashboards/details/empty-state.tsx
+++ b/apps/web/ee/components/dashboards/details/empty-state.tsx
@@ -4,8 +4,8 @@ import { Plus } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { getButtonStyling } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EWidgetChartModels, EWidgetChartTypes } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { SimpleEmptyState } from "@/components/empty-state/simple-empty-state-root";
// hooks
diff --git a/apps/web/ee/components/dashboards/details/widgets-grid-root.tsx b/apps/web/ee/components/dashboards/details/widgets-grid-root.tsx
index e3097d8046..34b219bc54 100644
--- a/apps/web/ee/components/dashboards/details/widgets-grid-root.tsx
+++ b/apps/web/ee/components/dashboards/details/widgets-grid-root.tsx
@@ -4,7 +4,7 @@ import { observer } from "mobx-react";
import { type Layout, Layouts, Responsive, WidthProvider } from "react-grid-layout";
// plane imports
import { EWidgetGridBreakpoints, WIDGET_GRID_BREAKPOINTS } from "@plane/constants";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web hooks
import { useDashboards } from "@/plane-web/hooks/store";
// local imports
diff --git a/apps/web/ee/components/dashboards/list/list-item-actions.tsx b/apps/web/ee/components/dashboards/list/list-item-actions.tsx
index 61bfaeb661..9b121e6334 100644
--- a/apps/web/ee/components/dashboards/list/list-item-actions.tsx
+++ b/apps/web/ee/components/dashboards/list/list-item-actions.tsx
@@ -1,9 +1,10 @@
import { useCallback } from "react";
import { observer } from "mobx-react";
import { Info, Minus } from "lucide-react";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { Avatar, FavoriteStar, setToast, TOAST_TYPE } from "@plane/ui";
+import { Avatar, FavoriteStar } from "@plane/ui";
// plane utils
import { getFileURL, renderFormattedDate } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/dashboards/modals/create-update-modal.tsx b/apps/web/ee/components/dashboards/modals/create-update-modal.tsx
index d0249aad12..3669c666b3 100644
--- a/apps/web/ee/components/dashboards/modals/create-update-modal.tsx
+++ b/apps/web/ee/components/dashboards/modals/create-update-modal.tsx
@@ -5,8 +5,9 @@ import { Controller, useForm } from "react-hook-form";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TDashboard } from "@plane/types";
-import { EModalPosition, EModalWidth, Input, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, Input, ModalCore } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/ee/components/dashboards/modals/delete-modal.tsx b/apps/web/ee/components/dashboards/modals/delete-modal.tsx
index 953a94e5a5..1074faf9fc 100644
--- a/apps/web/ee/components/dashboards/modals/delete-modal.tsx
+++ b/apps/web/ee/components/dashboards/modals/delete-modal.tsx
@@ -4,7 +4,8 @@ import { useState } from "react";
import { observer } from "mobx-react";
// plane imports
import { useTranslation } from "@plane/i18n";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// plane web hooks
import { useDashboards } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/dashboards/quick-actions.tsx b/apps/web/ee/components/dashboards/quick-actions.tsx
index 6526eb6918..e71a48596a 100644
--- a/apps/web/ee/components/dashboards/quick-actions.tsx
+++ b/apps/web/ee/components/dashboards/quick-actions.tsx
@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
import { ExternalLink, Link, Pencil, Trash2 } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
-import { ContextMenu, CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// plane web hooks
import { useDashboards } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/dashboards/sidebar/root.tsx b/apps/web/ee/components/dashboards/sidebar/root.tsx
index 31d263658b..a360c4afaa 100644
--- a/apps/web/ee/components/dashboards/sidebar/root.tsx
+++ b/apps/web/ee/components/dashboards/sidebar/root.tsx
@@ -1,12 +1,12 @@
import { useCallback, useEffect } from "react";
import { observer } from "mobx-react";
-import { FormProvider, useForm } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
// plane imports
import { ALL_WIDGETS_Y_AXIS_METRICS_LIST, WIDGET_X_AXIS_PROPERTIES_LIST } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TDashboardWidget } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web hooks
diff --git a/apps/web/ee/components/dashboards/widgets/delete-modal.tsx b/apps/web/ee/components/dashboards/widgets/delete-modal.tsx
index 052b0bc6e2..3798cfbb19 100644
--- a/apps/web/ee/components/dashboards/widgets/delete-modal.tsx
+++ b/apps/web/ee/components/dashboards/widgets/delete-modal.tsx
@@ -2,8 +2,9 @@
import { useState } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// plane web hooks
import { useDashboards } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/de-dupe/duplicate-popover/root.tsx b/apps/web/ee/components/de-dupe/duplicate-popover/root.tsx
index b1489be6b1..7b3270537b 100644
--- a/apps/web/ee/components/de-dupe/duplicate-popover/root.tsx
+++ b/apps/web/ee/components/de-dupe/duplicate-popover/root.tsx
@@ -7,8 +7,8 @@ import { Popover } from "@headlessui/react";
// plane imports
import { useOutsideClickDetector } from "@plane/hooks";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TDeDupeIssue } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { MultipleSelectGroup } from "@/components/core/multiple-select";
diff --git a/apps/web/ee/components/epics/details/helper.tsx b/apps/web/ee/components/epics/details/helper.tsx
index 3f2855d3b5..64d28f9b53 100644
--- a/apps/web/ee/components/epics/details/helper.tsx
+++ b/apps/web/ee/components/epics/details/helper.tsx
@@ -1,8 +1,8 @@
"use client";
import { useMemo } from "react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType, EIssuesStoreType, TIssue } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
import { useIssuesActions } from "@/hooks/use-issues-actions";
diff --git a/apps/web/ee/components/epics/details/main/overview-section/modals-root.tsx b/apps/web/ee/components/epics/details/main/overview-section/modals-root.tsx
index 358002aa6e..b7e4ca32e0 100644
--- a/apps/web/ee/components/epics/details/main/overview-section/modals-root.tsx
+++ b/apps/web/ee/components/epics/details/main/overview-section/modals-root.tsx
@@ -1,7 +1,7 @@
import React, { FC } from "react";
import { observer } from "mobx-react";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EIssueServiceType, EIssuesStoreType, ISearchIssueResponse, TIssue } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { ExistingIssuesListModal } from "@/components/core/modals/existing-issues-list-modal";
import { CreateUpdateIssueModal } from "@/components/issues/issue-modal/modal";
diff --git a/apps/web/ee/components/epics/details/sidebar/helper.tsx b/apps/web/ee/components/epics/details/sidebar/helper.tsx
index 3f3d23f94c..25788d160d 100644
--- a/apps/web/ee/components/epics/details/sidebar/helper.tsx
+++ b/apps/web/ee/components/epics/details/sidebar/helper.tsx
@@ -1,8 +1,8 @@
import { useMemo } from "react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, EIssueServiceType, TCommentsOperations } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { copyUrlToClipboard, formatTextList, generateWorkItemLink } from "@plane/utils";
// hooks
import { useEditorAsset } from "@/hooks/store/use-editor-asset";
diff --git a/apps/web/ee/components/epics/epic-modal/base.tsx b/apps/web/ee/components/epics/epic-modal/base.tsx
index fc901ee924..5516270dda 100644
--- a/apps/web/ee/components/epics/epic-modal/base.tsx
+++ b/apps/web/ee/components/epics/epic-modal/base.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { WORK_ITEM_TRACKER_EVENTS } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType, EIssuesStoreType, TIssue } from "@plane/types";
-import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// components
import { CreateIssueToastActionItems } from "@/components/issues/create-issue-toast-action-items";
import { IssuesModalProps } from "@/components/issues/issue-modal/modal";
diff --git a/apps/web/ee/components/epics/epic-modal/form.tsx b/apps/web/ee/components/epics/epic-modal/form.tsx
index 331e47d346..f962874393 100644
--- a/apps/web/ee/components/epics/epic-modal/form.tsx
+++ b/apps/web/ee/components/epics/epic-modal/form.tsx
@@ -8,8 +8,8 @@ import { FormProvider, useForm } from "react-hook-form";
import { ETabIndices } from "@plane/constants";
import type { EditorRefApi } from "@plane/editor";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType, EWorkItemTypeEntity, type ISearchIssueResponse, type TIssue } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, getChangedIssuefields, getTabIndex } from "@plane/utils";
// components
import {
diff --git a/apps/web/ee/components/epics/epic-modal/provider.tsx b/apps/web/ee/components/epics/epic-modal/provider.tsx
index 451acb8d16..f6f1beb70e 100644
--- a/apps/web/ee/components/epics/epic-modal/provider.tsx
+++ b/apps/web/ee/components/epics/epic-modal/provider.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
import { mutate } from "swr";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
EIssueServiceType,
EWorkItemConversionType,
@@ -11,7 +12,6 @@ import {
TIssuePropertyValueErrors,
TIssuePropertyValues,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { getPropertiesDefaultValues } from "@plane/utils";
// components
import {
diff --git a/apps/web/ee/components/epics/peek-overview/header.tsx b/apps/web/ee/components/epics/peek-overview/header.tsx
index e120dde804..a3b6068bab 100644
--- a/apps/web/ee/components/epics/peek-overview/header.tsx
+++ b/apps/web/ee/components/epics/peek-overview/header.tsx
@@ -7,9 +7,10 @@ import { Link2, MoveDiagonal, MoveRight, Sidebar } from "lucide-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { CenterPanelIcon, FullScreenPanelIcon, SidePanelIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { EIssueServiceType, EIssuesStoreType, EUserProjectRoles, EWorkItemConversionType, TIssue } from "@plane/types";
-import { CustomSelect, TOAST_TYPE, setToast } from "@plane/ui";
+import { CustomSelect } from "@plane/ui";
import { cn, copyUrlToClipboard, generateWorkItemLink } from "@plane/utils";
import { IssueSubscription } from "@/components/issues/issue-detail/subscription";
import { NameDescriptionUpdateStatus } from "@/components/issues/issue-update-status";
diff --git a/apps/web/ee/components/epics/peek-overview/root.tsx b/apps/web/ee/components/epics/peek-overview/root.tsx
index d96c35045a..f25c0ffbfe 100644
--- a/apps/web/ee/components/epics/peek-overview/root.tsx
+++ b/apps/web/ee/components/epics/peek-overview/root.tsx
@@ -4,8 +4,8 @@ import { FC, useEffect, useState, useMemo, useCallback } from "react";
import { observer } from "mobx-react";
// plane imports
import { EPIC_TRACKER_EVENTS, EUserPermissionsLevel } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType, EUserProjectRoles, TIssue, IWorkItemPeekOverview } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// components
import type { TIssueOperations } from "@/components/issues/issue-detail";
// hooks
diff --git a/apps/web/ee/components/epics/settings/empty-state.tsx b/apps/web/ee/components/epics/settings/empty-state.tsx
index d4cf25ab02..ab21276e08 100644
--- a/apps/web/ee/components/epics/settings/empty-state.tsx
+++ b/apps/web/ee/components/epics/settings/empty-state.tsx
@@ -6,8 +6,8 @@ import { useTheme } from "next-themes";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button, getButtonStyling } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
// plane web hooks
diff --git a/apps/web/ee/components/epics/settings/root.tsx b/apps/web/ee/components/epics/settings/root.tsx
index 8b5ab95467..056b1be119 100644
--- a/apps/web/ee/components/epics/settings/root.tsx
+++ b/apps/web/ee/components/epics/settings/root.tsx
@@ -5,9 +5,10 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { EWorkItemTypeEntity } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
// components
import { SettingsHeading } from "@/components/settings/heading";
// hooks
diff --git a/apps/web/ee/components/estimates/points/delete.tsx b/apps/web/ee/components/estimates/points/delete.tsx
index d18f56aa08..19d35c733b 100644
--- a/apps/web/ee/components/estimates/points/delete.tsx
+++ b/apps/web/ee/components/estimates/points/delete.tsx
@@ -3,8 +3,9 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
import { MoveRight, Trash2, X } from "lucide-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EEstimateSystem, TEstimatePointsObject } from "@plane/types";
-import { Spinner, TOAST_TYPE, setToast } from "@plane/ui";
+import { Spinner } from "@plane/ui";
// ce imports
import { convertMinutesToHoursMinutesString } from "@plane/utils";
import { TEstimatePointDelete } from "@/ce/components/estimates/points/delete";
diff --git a/apps/web/ee/components/estimates/points/edit-root.tsx b/apps/web/ee/components/estimates/points/edit-root.tsx
index 936d774026..c036a1ef29 100644
--- a/apps/web/ee/components/estimates/points/edit-root.tsx
+++ b/apps/web/ee/components/estimates/points/edit-root.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
import { ChevronLeft, Plus } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TEstimatePointsObject, TEstimateTypeError, TEstimateUpdateStageKeys } from "@plane/types";
-import { Sortable, TOAST_TYPE, setToast } from "@plane/ui";
+import { Sortable } from "@plane/ui";
// components
import { EstimatePointCreate } from "@/components/estimates/points/create";
import { EstimatePointItemPreview } from "@/components/estimates/points/preview";
diff --git a/apps/web/ee/components/estimates/points/switch/root.tsx b/apps/web/ee/components/estimates/points/switch/root.tsx
index 09093df2ab..099c6d4399 100644
--- a/apps/web/ee/components/estimates/points/switch/root.tsx
+++ b/apps/web/ee/components/estimates/points/switch/root.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
import { ChevronLeft, MoveRight } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import {
IEstimateFormData,
TEstimatePointsObject,
@@ -11,7 +12,6 @@ import {
TEstimateTypeError,
TEstimateUpdateStageKeys,
} from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useEstimate } from "@/hooks/store/estimates";
// plane web components
diff --git a/apps/web/ee/components/gantt-chart/dependency/dependency-modal.tsx b/apps/web/ee/components/gantt-chart/dependency/dependency-modal.tsx
index 070d45f6e9..e7a7366e56 100644
--- a/apps/web/ee/components/gantt-chart/dependency/dependency-modal.tsx
+++ b/apps/web/ee/components/gantt-chart/dependency/dependency-modal.tsx
@@ -4,9 +4,10 @@ import { useParams } from "next/navigation";
import { CalendarCheck2, CalendarClock, Trash2Icon } from "lucide-react";
// Plane
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { TIssue } from "@plane/types";
-import { ControlLink, EModalPosition, EModalWidth, ModalCore, setToast, Spinner, TOAST_TYPE } from "@plane/ui";
+import { ControlLink, EModalPosition, EModalWidth, ModalCore, Spinner } from "@plane/ui";
// components
import { DateDropdown } from "@/components/dropdowns/date";
// hooks
diff --git a/apps/web/ee/components/global/product-updates-header.tsx b/apps/web/ee/components/global/product-updates-header.tsx
index 9ec9f32fb6..6e34c972fc 100644
--- a/apps/web/ee/components/global/product-updates-header.tsx
+++ b/apps/web/ee/components/global/product-updates-header.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import { ExternalLink, RefreshCw } from "lucide-react";
import { Button } from "@plane/propel/button";
import { PlaneLogo } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/importers/asana/authentication/o-auth.tsx b/apps/web/ee/components/importers/asana/authentication/o-auth.tsx
index 6a3b9d059a..cd66c9ec4f 100644
--- a/apps/web/ee/components/importers/asana/authentication/o-auth.tsx
+++ b/apps/web/ee/components/importers/asana/authentication/o-auth.tsx
@@ -4,7 +4,7 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web hooks
import { useAsanaImporter } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/importers/flatfile/steps/configure-flatfile/root.tsx b/apps/web/ee/components/importers/flatfile/steps/configure-flatfile/root.tsx
index d54324b00f..67fba314b0 100644
--- a/apps/web/ee/components/importers/flatfile/steps/configure-flatfile/root.tsx
+++ b/apps/web/ee/components/importers/flatfile/steps/configure-flatfile/root.tsx
@@ -7,8 +7,9 @@ import { IMPORTER_TRACKER_EVENTS } from "@plane/constants";
import { E_IMPORTER_KEYS, E_JOB_STATUS } from "@plane/etl/core";
import { FlatfileConfig } from "@plane/etl/flatfile";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TImportJob } from "@plane/types";
-import { setToast, TOAST_TYPE, Loader } from "@plane/ui";
+import { Loader } from "@plane/ui";
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import DynamicFlatfileProvider from "@/plane-web/components/importers/flatfile/steps/configure-flatfile/provider";
diff --git a/apps/web/ee/components/importers/jira/authentication/o-auth.tsx b/apps/web/ee/components/importers/jira/authentication/o-auth.tsx
index 3a529de39c..7fa2bc6433 100644
--- a/apps/web/ee/components/importers/jira/authentication/o-auth.tsx
+++ b/apps/web/ee/components/importers/jira/authentication/o-auth.tsx
@@ -4,7 +4,7 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web hooks
import { useJiraImporter } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/importers/linear/authentication/o-auth.tsx b/apps/web/ee/components/importers/linear/authentication/o-auth.tsx
index 333d43f352..1ff39fcf8a 100644
--- a/apps/web/ee/components/importers/linear/authentication/o-auth.tsx
+++ b/apps/web/ee/components/importers/linear/authentication/o-auth.tsx
@@ -4,7 +4,7 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web hooks
import { useLinearImporter } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/importers/zip-importer/steps/upload-zip/root.tsx b/apps/web/ee/components/importers/zip-importer/steps/upload-zip/root.tsx
index e9261c2097..211aec42ba 100644
--- a/apps/web/ee/components/importers/zip-importer/steps/upload-zip/root.tsx
+++ b/apps/web/ee/components/importers/zip-importer/steps/upload-zip/root.tsx
@@ -6,7 +6,8 @@ import { IMPORTER_TRACKER_EVENTS } from "@plane/constants";
import { E_IMPORTER_KEYS } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { CircularProgressIndicator, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { CircularProgressIndicator } from "@plane/ui";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useZipImporter } from "@/plane-web/hooks/store/importers/use-zip-importer";
import { UploadState } from "@/plane-web/store/importers/zip-importer/root.store";
@@ -345,7 +346,6 @@ export const UploadZip: FC = observer(({ driverType, serviceN
)}
)}
-
{/* stepper button */}
diff --git a/apps/web/ee/components/initiatives/common/add-scope-button.tsx b/apps/web/ee/components/initiatives/common/add-scope-button.tsx
index 9b02910595..4cc6443099 100644
--- a/apps/web/ee/components/initiatives/common/add-scope-button.tsx
+++ b/apps/web/ee/components/initiatives/common/add-scope-button.tsx
@@ -5,7 +5,8 @@ import { PlusIcon, BriefcaseIcon } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { EpicIcon } from "@plane/propel/icons";
-import { CustomMenu, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { CustomMenu } from "@plane/ui";
// components
import { ProjectMultiSelectModal } from "@/components/project/multi-select-modal";
// hooks
diff --git a/apps/web/ee/components/initiatives/components/create-update-initiatives-modal.tsx b/apps/web/ee/components/initiatives/components/create-update-initiatives-modal.tsx
index 75c9dbd2f7..d218f9d861 100644
--- a/apps/web/ee/components/initiatives/components/create-update-initiatives-modal.tsx
+++ b/apps/web/ee/components/initiatives/components/create-update-initiatives-modal.tsx
@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane
import { useTranslation } from "@plane/i18n";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// hooks
import useKeypress from "@/hooks/use-keypress";
// Plane web
diff --git a/apps/web/ee/components/initiatives/components/form.tsx b/apps/web/ee/components/initiatives/components/form.tsx
index 4bd7dd8c11..cfa2c25fda 100644
--- a/apps/web/ee/components/initiatives/components/form.tsx
+++ b/apps/web/ee/components/initiatives/components/form.tsx
@@ -5,8 +5,9 @@ import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { EmojiPicker } from "@plane/propel/emoji-icon-picker";
import { InitiativeIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType } from "@plane/types";
-import { Input, setToast, TOAST_TYPE, EmojiIconPickerTypes } from "@plane/ui";
+import { Input, EmojiIconPickerTypes } from "@plane/ui";
import { getDate, getDescriptionPlaceholderI18n, renderFormattedPayloadDate } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/ee/components/initiatives/components/initiative-delete-modal.tsx b/apps/web/ee/components/initiatives/components/initiative-delete-modal.tsx
index 9a39131505..c9bd3cf194 100644
--- a/apps/web/ee/components/initiatives/components/initiative-delete-modal.tsx
+++ b/apps/web/ee/components/initiatives/components/initiative-delete-modal.tsx
@@ -6,7 +6,8 @@ import { useParams } from "next/navigation";
// plane imports
import { PROJECT_ERROR_MESSAGES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// hooks
import { useAppRouter } from "@/hooks/use-app-router";
// plane web
diff --git a/apps/web/ee/components/initiatives/components/quick-actions.tsx b/apps/web/ee/components/initiatives/components/quick-actions.tsx
index 1fb53fb471..b9d5d00b6c 100644
--- a/apps/web/ee/components/initiatives/components/quick-actions.tsx
+++ b/apps/web/ee/components/initiatives/components/quick-actions.tsx
@@ -6,8 +6,9 @@ import { ExternalLink, LinkIcon, Pencil, Trash2 } from "lucide-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// hooks
import { useUser, useUserPermissions } from "@/hooks/store/user";
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/root.tsx b/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/root.tsx
index 0a4dfbb2e4..88a1fa3599 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/root.tsx
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/root.tsx
@@ -3,8 +3,7 @@ import { FC, useCallback, useState } from "react";
import { observer } from "mobx-react";
import { FileRejection, useDropzone } from "react-dropzone";
import { UploadCloud } from "lucide-react";
-// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web hooks
import { useInitiativeAttachments } from "@/plane-web/hooks/store";
import { useInitiatives } from "@/plane-web/hooks/store/use-initiatives";
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/use-attachments.tsx b/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/use-attachments.tsx
index f5578f1880..852d8a729e 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/use-attachments.tsx
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/attachment/use-attachments.tsx
@@ -1,7 +1,6 @@
"use client";
import { useMemo } from "react";
-// plane ui
-import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
+import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/propel/toast";
// hooks
import { useInitiativeAttachments } from "@/plane-web/hooks/store";
// types
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/quick-action.tsx b/apps/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/quick-action.tsx
index 2149761beb..aba5db1732 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/quick-action.tsx
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/quick-action.tsx
@@ -4,8 +4,9 @@ import { observer } from "mobx-react";
import { LinkIcon, MoreHorizontal, Trash2 } from "lucide-react";
// Plane
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EIssueServiceType } from "@plane/types";
-import { CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard, generateWorkItemLink } from "@plane/utils";
// hooks
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/link-item.tsx b/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/link-item.tsx
index c5106c1452..2882e8a872 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/link-item.tsx
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/link-item.tsx
@@ -4,9 +4,10 @@ import { FC } from "react";
import { observer } from "mobx-react";
import { Copy, LinkIcon, Pencil, Trash2 } from "lucide-react";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { CustomMenu, TOAST_TYPE, setToast } from "@plane/ui";
+import { CustomMenu } from "@plane/ui";
// helpers
import { calculateTimeAgoShort, copyTextToClipboard } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/links-helper.ts b/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/links-helper.ts
index 807fc7abea..7a092bbbd0 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/links-helper.ts
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/links/link-items/links-helper.ts
@@ -1,7 +1,7 @@
import { useMemo } from "react";
// Plane
import { useTranslation } from "@plane/i18n";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// PLane-web
import { useInitiatives } from "@/plane-web/hooks/store/use-initiatives";
import { TInitiativeLink } from "@/plane-web/types/initiative";
diff --git a/apps/web/ee/components/initiatives/details/main/collapsible-section/projects/project-list-item/quick-actions.tsx b/apps/web/ee/components/initiatives/details/main/collapsible-section/projects/project-list-item/quick-actions.tsx
index ab4163fad4..38a77cea97 100644
--- a/apps/web/ee/components/initiatives/details/main/collapsible-section/projects/project-list-item/quick-actions.tsx
+++ b/apps/web/ee/components/initiatives/details/main/collapsible-section/projects/project-list-item/quick-actions.tsx
@@ -2,7 +2,8 @@ import { observer } from "mobx-react";
import { LinkIcon, MoreHorizontal, Trash2 } from "lucide-react";
// Plane
import { useTranslation } from "@plane/i18n";
-import { CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// Plane-web
import { useInitiatives } from "@/plane-web/hooks/store/use-initiatives";
diff --git a/apps/web/ee/components/initiatives/details/main/info-section/attachment-button.tsx b/apps/web/ee/components/initiatives/details/main/info-section/attachment-button.tsx
index 7b1775bbc6..030176e92b 100644
--- a/apps/web/ee/components/initiatives/details/main/info-section/attachment-button.tsx
+++ b/apps/web/ee/components/initiatives/details/main/info-section/attachment-button.tsx
@@ -4,8 +4,7 @@ import React, { FC, useCallback, useState } from "react";
import { observer } from "mobx-react";
import { FileRejection, useDropzone } from "react-dropzone";
import { Plus } from "lucide-react";
-// plane ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web
import { useInitiatives } from "@/plane-web/hooks/store/use-initiatives";
import { useFileSize } from "@/plane-web/hooks/use-file-size";
diff --git a/apps/web/ee/components/initiatives/details/main/info-section/reactions.tsx b/apps/web/ee/components/initiatives/details/main/info-section/reactions.tsx
index 9e95a4c778..b394e4bbf6 100644
--- a/apps/web/ee/components/initiatives/details/main/info-section/reactions.tsx
+++ b/apps/web/ee/components/initiatives/details/main/info-section/reactions.tsx
@@ -2,9 +2,9 @@
import { FC, useMemo } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, formatTextList } from "@plane/utils";
// components
import { ReactionSelector } from "@/components/issues/issue-detail/reactions";
diff --git a/apps/web/ee/components/initiatives/details/root.tsx b/apps/web/ee/components/initiatives/details/root.tsx
index ab77d8a2f5..0d08c631a9 100644
--- a/apps/web/ee/components/initiatives/details/root.tsx
+++ b/apps/web/ee/components/initiatives/details/root.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles, TInitiativeStates } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { ProjectMultiSelectModal } from "@/components/project/multi-select-modal";
// hooks
diff --git a/apps/web/ee/components/initiatives/details/sidebar/helper.tsx b/apps/web/ee/components/initiatives/details/sidebar/helper.tsx
index b5bdf67fff..58cc035e65 100644
--- a/apps/web/ee/components/initiatives/details/sidebar/helper.tsx
+++ b/apps/web/ee/components/initiatives/details/sidebar/helper.tsx
@@ -3,8 +3,8 @@
import { useMemo } from "react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TCommentsOperations, TFileSignedURLResponse } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { formatTextList } from "@plane/utils";
// hooks
import { useEditorAsset } from "@/hooks/store/use-editor-asset";
diff --git a/apps/web/ee/components/initiatives/scope/gantt/helper.tsx b/apps/web/ee/components/initiatives/scope/gantt/helper.tsx
index e9ec884145..271eeae6dd 100644
--- a/apps/web/ee/components/initiatives/scope/gantt/helper.tsx
+++ b/apps/web/ee/components/initiatives/scope/gantt/helper.tsx
@@ -1,4 +1,5 @@
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
EGanttBlockType,
EIssuesStoreType,
@@ -7,7 +8,6 @@ import {
TIssue,
TProject,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { IssueGanttBlock } from "@/components/issues/issue-layouts/gantt/blocks";
import { useIssues } from "@/hooks/store/use-issues";
import { useProject } from "@/hooks/store/use-project";
diff --git a/apps/web/ee/components/initiatives/scope/root.tsx b/apps/web/ee/components/initiatives/scope/root.tsx
index 4d3ef71866..8f3ac5d499 100644
--- a/apps/web/ee/components/initiatives/scope/root.tsx
+++ b/apps/web/ee/components/initiatives/scope/root.tsx
@@ -4,8 +4,8 @@ import { useParams } from "next/navigation";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles, EIssueLayoutTypes } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { ProjectMultiSelectModal } from "@/components/project/multi-select-modal";
// hooks
diff --git a/apps/web/ee/components/initiatives/upgrade.tsx b/apps/web/ee/components/initiatives/upgrade.tsx
index 692494c08b..2761ff9d65 100644
--- a/apps/web/ee/components/initiatives/upgrade.tsx
+++ b/apps/web/ee/components/initiatives/upgrade.tsx
@@ -7,9 +7,8 @@ import Link from "next/link";
import { useTheme } from "next-themes";
import { Crown } from "lucide-react";
import { Button, getButtonStyling } from "@plane/propel/button";
+import { setPromiseToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-// plane imports
-import { setPromiseToast } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/integrations/github/authentication/server-app-form.tsx b/apps/web/ee/components/integrations/github/authentication/server-app-form.tsx
index 5d00fd261e..adde912d1f 100644
--- a/apps/web/ee/components/integrations/github/authentication/server-app-form.tsx
+++ b/apps/web/ee/components/integrations/github/authentication/server-app-form.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { useForm } from "react-hook-form";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TGithubAppConfig } from "@plane/types";
-import { Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { Input } from "@plane/ui";
import { useGithubIntegration } from "@/plane-web/hooks/store";
interface IGEAppFormProps {
diff --git a/apps/web/ee/components/integrations/sentry/root.tsx b/apps/web/ee/components/integrations/sentry/root.tsx
index 0153246352..d8a33c4713 100644
--- a/apps/web/ee/components/integrations/sentry/root.tsx
+++ b/apps/web/ee/components/integrations/sentry/root.tsx
@@ -3,7 +3,7 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import useSWR from "swr";
import { useTranslation } from "@plane/i18n";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web components
import { ConnectedAppCard } from "@/plane-web/components/integrations/sentry";
import { InstallationCard } from "@/plane-web/components/integrations/ui";
diff --git a/apps/web/ee/components/integrations/sentry/sections/state-mapping/form/form.tsx b/apps/web/ee/components/integrations/sentry/sections/state-mapping/form/form.tsx
index 1bd7d5f223..ee6a21c766 100644
--- a/apps/web/ee/components/integrations/sentry/sections/state-mapping/form/form.tsx
+++ b/apps/web/ee/components/integrations/sentry/sections/state-mapping/form/form.tsx
@@ -1,8 +1,9 @@
import { FC, useState, useEffect, useCallback } from "react";
import { useTranslation } from "@plane/i18n";
-// Plane components
import { Button } from "@plane/propel/button";
-import { ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+// Plane components
+import { ModalCore } from "@plane/ui";
// hooks
// Assets
import { StateMappingFormProps, SentryStateMappingFormData } from "./types";
diff --git a/apps/web/ee/components/integrations/sentry/sections/state-mapping/root.tsx b/apps/web/ee/components/integrations/sentry/sections/state-mapping/root.tsx
index 14327dd1d4..3e1c55868e 100644
--- a/apps/web/ee/components/integrations/sentry/sections/state-mapping/root.tsx
+++ b/apps/web/ee/components/integrations/sentry/sections/state-mapping/root.tsx
@@ -7,7 +7,8 @@ import { Plus, AlertTriangle, RefreshCw } from "lucide-react";
import { TSentryConfig, TSentryStateMapping } from "@plane/etl/sentry";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { Loader, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { Loader } from "@plane/ui";
// plane web components
import { useProject } from "@/hooks/store/use-project";
import { useSentryIntegration } from "@/plane-web/hooks/store/integrations/use-sentry";
diff --git a/apps/web/ee/components/integrations/slack/root.tsx b/apps/web/ee/components/integrations/slack/root.tsx
index d583dc1569..ed24b8cfb4 100644
--- a/apps/web/ee/components/integrations/slack/root.tsx
+++ b/apps/web/ee/components/integrations/slack/root.tsx
@@ -4,7 +4,7 @@ import { useParams } from "next/navigation";
import useSWR from "swr";
import { INTEGRATION_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web components
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { ConnectedAppCard } from "@/plane-web/components/integrations/slack";
diff --git a/apps/web/ee/components/integrations/slack/sections/project-updates/form/form.tsx b/apps/web/ee/components/integrations/slack/sections/project-updates/form/form.tsx
index b173273ac1..ff7668cc6e 100644
--- a/apps/web/ee/components/integrations/slack/sections/project-updates/form/form.tsx
+++ b/apps/web/ee/components/integrations/slack/sections/project-updates/form/form.tsx
@@ -3,8 +3,9 @@ import useSWR from "swr";
import { SlackConversation, TSlackProjectUpdatesConfig } from "@plane/etl/slack";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { TWorkspaceEntityConnection } from "@plane/types";
-import { ModalCore, Loader, TOAST_TYPE, setToast } from "@plane/ui";
+import { ModalCore, Loader } from "@plane/ui";
import { useSlackIntegration } from "@/plane-web/hooks/store";
import { SlackProjectChannelForm } from "./channel-map";
diff --git a/apps/web/ee/components/integrations/slack/sections/project-updates/root.tsx b/apps/web/ee/components/integrations/slack/sections/project-updates/root.tsx
index b85521057d..3d75cbe708 100644
--- a/apps/web/ee/components/integrations/slack/sections/project-updates/root.tsx
+++ b/apps/web/ee/components/integrations/slack/sections/project-updates/root.tsx
@@ -8,8 +8,8 @@ import { SLACK_INTEGRATION_TRACKER_EVENTS, SLACK_INTEGRATION_TRACKER_ELEMENTS }
import { E_SLACK_ENTITY_TYPE, TSlackProjectUpdatesConfig } from "@plane/etl/slack";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TWorkspaceEntityConnection } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// plane web components
// plane web hooks
// plane web types
diff --git a/apps/web/ee/components/issue-types/create-update/modal.tsx b/apps/web/ee/components/issue-types/create-update/modal.tsx
index b47ea3890a..7906ec2b6e 100644
--- a/apps/web/ee/components/issue-types/create-update/modal.tsx
+++ b/apps/web/ee/components/issue-types/create-update/modal.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
// plane imports
import { WORK_ITEM_TYPE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import type { TIssueType } from "@plane/types";
-import { EModalPosition, EModalWidth, getRandomIconName, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, getRandomIconName, ModalCore } from "@plane/ui";
import { getRandomBackgroundColor } from "@plane/utils";
// plane web imports
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/issue-types/empty-state.tsx b/apps/web/ee/components/issue-types/empty-state.tsx
index 8e210ddbe8..42774d8eb1 100644
--- a/apps/web/ee/components/issue-types/empty-state.tsx
+++ b/apps/web/ee/components/issue-types/empty-state.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
// plane imports
import { WORK_ITEM_TYPE_TRACKER_ELEMENTS, WORK_ITEM_TYPE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-import { AlertModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// helpers
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
// hooks
diff --git a/apps/web/ee/components/issue-types/issue-type-delete-confirmation-modal.tsx b/apps/web/ee/components/issue-types/issue-type-delete-confirmation-modal.tsx
index 79520d1c77..98a9accee9 100644
--- a/apps/web/ee/components/issue-types/issue-type-delete-confirmation-modal.tsx
+++ b/apps/web/ee/components/issue-types/issue-type-delete-confirmation-modal.tsx
@@ -4,7 +4,8 @@ import { AlertTriangle } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
import { useIssueTypes } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/issue-types/properties/property-list-item.tsx b/apps/web/ee/components/issue-types/properties/property-list-item.tsx
index 6729d30461..c75261e081 100644
--- a/apps/web/ee/components/issue-types/properties/property-list-item.tsx
+++ b/apps/web/ee/components/issue-types/properties/property-list-item.tsx
@@ -6,6 +6,7 @@ import { RESTRICTED_WORK_ITEM_PROPERTY_DISPLAY_NAMES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { InfoIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import {
EIssuePropertyType,
@@ -15,7 +16,6 @@ import {
TIssuePropertyPayload,
TOperationMode,
} from "@plane/types";
-import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
import { getIssuePropertyAttributeDisplayNameKey, cn } from "@plane/utils";
// helpers
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/issue-types/quick-actions.tsx b/apps/web/ee/components/issue-types/quick-actions.tsx
index 9549f1c1a1..7f82a17998 100644
--- a/apps/web/ee/components/issue-types/quick-actions.tsx
+++ b/apps/web/ee/components/issue-types/quick-actions.tsx
@@ -6,9 +6,10 @@ import { Pencil, Trash2 } from "lucide-react";
// plane imports
import { WORK_ITEM_TYPE_TRACKER_ELEMENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { IIssueType } from "@plane/types";
-import { CustomMenu, setPromiseToast, TContextMenuItem, ToggleSwitch } from "@plane/ui";
+import { CustomMenu, TContextMenuItem, ToggleSwitch } from "@plane/ui";
import { cn } from "@plane/utils";
import { captureClick } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/issue-types/values/addition-properties-update-base.tsx b/apps/web/ee/components/issue-types/values/addition-properties-update-base.tsx
index 59b1c09b74..ee2beeecae 100644
--- a/apps/web/ee/components/issue-types/values/addition-properties-update-base.tsx
+++ b/apps/web/ee/components/issue-types/values/addition-properties-update-base.tsx
@@ -2,9 +2,10 @@
import React from "react";
import { observer } from "mobx-react";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { EWorkItemTypeEntity, IIssueType, TIssuePropertyValues, TIssueServiceType } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
// plane web imports
import { IssueAdditionalPropertyValues } from "@/plane-web/components/issue-types/values";
diff --git a/apps/web/ee/components/issues/bulk-operations/actions/archive.tsx b/apps/web/ee/components/issues/bulk-operations/actions/archive.tsx
index 9d6989bee1..aa36c35eec 100644
--- a/apps/web/ee/components/issues/bulk-operations/actions/archive.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/actions/archive.tsx
@@ -4,8 +4,8 @@ import { useParams } from "next/navigation";
// plane imports
import { ARCHIVABLE_STATE_GROUPS } from "@plane/constants";
import { ArchiveIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
diff --git a/apps/web/ee/components/issues/bulk-operations/actions/delete.tsx b/apps/web/ee/components/issues/bulk-operations/actions/delete.tsx
index 99ec66d371..1b7b4b084b 100644
--- a/apps/web/ee/components/issues/bulk-operations/actions/delete.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/actions/delete.tsx
@@ -4,9 +4,9 @@ import { useParams } from "next/navigation";
import { Trash2 } from "lucide-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { EUserProjectRoles } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useUserPermissions } from "@/hooks/store/user";
diff --git a/apps/web/ee/components/issues/bulk-operations/modals/bulk-archive-modal.tsx b/apps/web/ee/components/issues/bulk-operations/modals/bulk-archive-modal.tsx
index cd0c093619..9f2a5741e8 100644
--- a/apps/web/ee/components/issues/bulk-operations/modals/bulk-archive-modal.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/modals/bulk-archive-modal.tsx
@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
// plane imports
import { E_BULK_OPERATION_ERROR_CODES, BULK_OPERATION_ERROR_DETAILS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
-import { TOAST_TYPE, setToast, AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
// hooks
import { useIssuesStore } from "@/hooks/use-issue-layout-store";
diff --git a/apps/web/ee/components/issues/bulk-operations/modals/bulk-delete-modal.tsx b/apps/web/ee/components/issues/bulk-operations/modals/bulk-delete-modal.tsx
index 2370932524..849a39e5fe 100644
--- a/apps/web/ee/components/issues/bulk-operations/modals/bulk-delete-modal.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/modals/bulk-delete-modal.tsx
@@ -1,7 +1,8 @@
import { useState } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// ui
-import { TOAST_TYPE, setToast, AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
+import { AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
// constants
// hooks
import { useIssuesStore } from "@/hooks/use-issue-layout-store";
diff --git a/apps/web/ee/components/issues/bulk-operations/modals/bulk-subscribe-modal.tsx b/apps/web/ee/components/issues/bulk-operations/modals/bulk-subscribe-modal.tsx
index 17405d75c8..44b51fb8b5 100644
--- a/apps/web/ee/components/issues/bulk-operations/modals/bulk-subscribe-modal.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/modals/bulk-subscribe-modal.tsx
@@ -4,8 +4,9 @@ import { observer } from "mobx-react";
import { E_BULK_OPERATION_ERROR_CODES, BULK_OPERATION_ERROR_DETAILS } from "@plane/constants";
// ui
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssuesStoreType } from "@plane/types";
-import { TOAST_TYPE, setToast, AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
+import { AlertModalCore, EModalPosition, EModalWidth } from "@plane/ui";
// hooks
import { useIssues } from "@/hooks/store/use-issues";
diff --git a/apps/web/ee/components/issues/bulk-operations/properties.tsx b/apps/web/ee/components/issues/bulk-operations/properties.tsx
index d8fd3cafa9..a065d2790e 100644
--- a/apps/web/ee/components/issues/bulk-operations/properties.tsx
+++ b/apps/web/ee/components/issues/bulk-operations/properties.tsx
@@ -9,8 +9,8 @@ import { CalendarCheck2, CalendarClock } from "lucide-react";
import { BULK_OPERATION_ERROR_DETAILS, E_BULK_OPERATION_ERROR_CODES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import type { TBulkIssueProperties } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// components
import { cn, getDate, renderFormattedPayloadDate } from "@plane/utils";
import { CycleDropdown } from "@/components/dropdowns/cycle";
diff --git a/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/form.tsx b/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/form.tsx
index 72581cdbce..611e89ec7d 100644
--- a/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/form.tsx
+++ b/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/form.tsx
@@ -7,8 +7,9 @@ import { Database, Paperclip } from "lucide-react";
import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TCustomerRequest } from "@plane/types";
-import { EModalPosition, EModalWidth, Input, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, Input, ModalCore } from "@plane/ui";
import { getDescriptionPlaceholderI18n } from "@plane/utils";
import { RichTextEditor } from "@/components/editor/rich-text";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/request-list-item.tsx b/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/request-list-item.tsx
index 0bea18368c..1a74af8445 100644
--- a/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/request-list-item.tsx
+++ b/apps/web/ee/components/issues/issue-detail-widgets/customer-requests/request-list-item.tsx
@@ -5,7 +5,7 @@ import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { CustomersIcon } from "@plane/propel/icons";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { getFileURL } from "@plane/utils";
// components
import { RichTextEditor } from "@/components/editor/rich-text";
diff --git a/apps/web/ee/components/issues/issue-detail-widgets/pages/block.tsx b/apps/web/ee/components/issues/issue-detail-widgets/pages/block.tsx
index 91141de561..d6a3a62bec 100644
--- a/apps/web/ee/components/issues/issue-detail-widgets/pages/block.tsx
+++ b/apps/web/ee/components/issues/issue-detail-widgets/pages/block.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
import Link from "next/link";
import { CircleX, Files, FileText, Link2 } from "lucide-react";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TIssuePage, TIssueServiceType, TLogoProps } from "@plane/types";
-import { setToast, TContextMenuItem, TOAST_TYPE, CustomMenu, Logo } from "@plane/ui";
+import { TContextMenuItem, CustomMenu, Logo } from "@plane/ui";
import { calculateTimeAgo, cn, copyUrlToClipboard } from "@plane/utils";
import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
diff --git a/apps/web/ee/components/issues/issue-detail-widgets/pages/multi-select-modal.tsx b/apps/web/ee/components/issues/issue-detail-widgets/pages/multi-select-modal.tsx
index 44314c3aad..7e3e585fb2 100644
--- a/apps/web/ee/components/issues/issue-detail-widgets/pages/multi-select-modal.tsx
+++ b/apps/web/ee/components/issues/issue-detail-widgets/pages/multi-select-modal.tsx
@@ -8,19 +8,9 @@ import { Earth, FileText, Lock, Search, X } from "lucide-react";
import { Combobox } from "@headlessui/react";
// hooks
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EPageAccess, TIssuePage, TIssueServiceType } from "@plane/types";
-import {
- setToast,
- TOAST_TYPE,
- ToggleSwitch,
- Button,
- Logo,
- ModalCore,
- EModalWidth,
- EModalPosition,
- Loader,
- Checkbox,
-} from "@plane/ui";
+import { ToggleSwitch, Button, Logo, ModalCore, EModalWidth, EModalPosition, Loader, Checkbox } from "@plane/ui";
// types
// components
import { getPageName, getTabIndex } from "@plane/utils";
diff --git a/apps/web/ee/components/issues/issue-details/issue-identifier.tsx b/apps/web/ee/components/issues/issue-details/issue-identifier.tsx
index 70b450b757..0a9f7998eb 100644
--- a/apps/web/ee/components/issues/issue-details/issue-identifier.tsx
+++ b/apps/web/ee/components/issues/issue-details/issue-identifier.tsx
@@ -1,10 +1,11 @@
import { FC } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
import { EWorkItemTypeEntity, IIssueType } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { cn } from "@plane/utils";
// ce components
import {
diff --git a/apps/web/ee/components/issues/issue-details/parent-select-root.tsx b/apps/web/ee/components/issues/issue-details/parent-select-root.tsx
index d8d77a2445..1b9e029ef8 100644
--- a/apps/web/ee/components/issues/issue-details/parent-select-root.tsx
+++ b/apps/web/ee/components/issues/issue-details/parent-select-root.tsx
@@ -3,9 +3,8 @@
import React from "react";
import { observer } from "mobx-react";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssueServiceType } from "@plane/types";
-// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
// components
import type { TIssueOperations } from "@/components/issues/issue-detail";
import { IssueParentSelect } from "@/components/issues/issue-detail/parent-select";
diff --git a/apps/web/ee/components/issues/issue-details/sidebar/customer-select.tsx b/apps/web/ee/components/issues/issue-details/sidebar/customer-select.tsx
index bb407b0d58..0941a467ee 100644
--- a/apps/web/ee/components/issues/issue-details/sidebar/customer-select.tsx
+++ b/apps/web/ee/components/issues/issue-details/sidebar/customer-select.tsx
@@ -8,7 +8,7 @@ import { CUSTOMER_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { CustomersIcon } from "@plane/propel/icons";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web imports
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { CustomerDropDown } from "@/plane-web/components/customers";
diff --git a/apps/web/ee/components/issues/issue-layouts/gantt/workspace-gantt-chart.tsx b/apps/web/ee/components/issues/issue-layouts/gantt/workspace-gantt-chart.tsx
index 834da35a2e..7d7271e087 100644
--- a/apps/web/ee/components/issues/issue-layouts/gantt/workspace-gantt-chart.tsx
+++ b/apps/web/ee/components/issues/issue-layouts/gantt/workspace-gantt-chart.tsx
@@ -3,6 +3,7 @@ import { observer } from "mobx-react";
// plane constants
import { ALL_ISSUES, EUserPermissions, EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
TIssue,
IBlockUpdateData,
@@ -10,7 +11,6 @@ import {
EIssueLayoutTypes,
IBlockUpdateDependencyData,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { GanttChartRoot, IssueGanttSidebar } from "@/components/gantt-chart";
import { ETimeLineTypeType } from "@/components/gantt-chart/contexts";
diff --git a/apps/web/ee/components/issues/issue-layouts/quick-action-dropdowns/duplicate-modal.tsx b/apps/web/ee/components/issues/issue-layouts/quick-action-dropdowns/duplicate-modal.tsx
index 9d4430f8ea..24fcc99cd8 100644
--- a/apps/web/ee/components/issues/issue-layouts/quick-action-dropdowns/duplicate-modal.tsx
+++ b/apps/web/ee/components/issues/issue-layouts/quick-action-dropdowns/duplicate-modal.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
import { Info } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EIssueServiceType, TIssueServiceType } from "@plane/types";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
import { CreateIssueToastActionItems } from "@/components/issues/create-issue-toast-action-items";
import { useIssueDetail } from "@/hooks/store/use-issue-detail";
import { ProjectDropdown } from "./project-dropdown";
diff --git a/apps/web/ee/components/issues/issue-modal/provider.tsx b/apps/web/ee/components/issues/issue-modal/provider.tsx
index 14af640107..da36abe50f 100644
--- a/apps/web/ee/components/issues/issue-modal/provider.tsx
+++ b/apps/web/ee/components/issues/issue-modal/provider.tsx
@@ -4,6 +4,7 @@ import { mutate } from "swr";
// plane imports
import { DEFAULT_WORK_ITEM_FORM_VALUES } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
EWorkItemConversionType,
EWorkItemTypeEntity,
@@ -12,7 +13,6 @@ import {
TIssuePropertyValueErrors,
TIssuePropertyValues,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import {
extractAndSanitizeCustomPropertyValuesFormData,
extractAndSanitizeWorkItemTemplateFormData,
diff --git a/apps/web/ee/components/issues/worklog/create-update/create.tsx b/apps/web/ee/components/issues/worklog/create-update/create.tsx
index f8bc52b983..e05213b8cc 100644
--- a/apps/web/ee/components/issues/worklog/create-update/create.tsx
+++ b/apps/web/ee/components/issues/worklog/create-update/create.tsx
@@ -1,7 +1,7 @@
"use client";
import { FC, useState } from "react";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane web hooks
import { useWorkspaceWorklogs } from "@/plane-web/hooks/store";
// plane web types
diff --git a/apps/web/ee/components/issues/worklog/create-update/update.tsx b/apps/web/ee/components/issues/worklog/create-update/update.tsx
index 59cbde96a3..4d18a21f0e 100644
--- a/apps/web/ee/components/issues/worklog/create-update/update.tsx
+++ b/apps/web/ee/components/issues/worklog/create-update/update.tsx
@@ -1,7 +1,7 @@
"use client";
import { FC, useState } from "react";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// helpers
import { convertMinutesToHoursAndMinutes } from "@plane/utils";
// plane web hooks
diff --git a/apps/web/ee/components/license/activation/helper.tsx b/apps/web/ee/components/license/activation/helper.tsx
index fa40b43427..933c427a8b 100644
--- a/apps/web/ee/components/license/activation/helper.tsx
+++ b/apps/web/ee/components/license/activation/helper.tsx
@@ -3,9 +3,9 @@
import React, { useMemo } from "react";
import { observer } from "mobx-react";
import { Copy } from "lucide-react";
-// plane imports
import { Button } from "@plane/propel/button";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+// plane imports
import { copyTextToClipboard } from "@plane/utils";
// store hooks
import { useInstance } from "@/hooks/store/use-instance";
diff --git a/apps/web/ee/components/license/activation/modal.tsx b/apps/web/ee/components/license/activation/modal.tsx
index 92750402fa..9e0f5dce36 100644
--- a/apps/web/ee/components/license/activation/modal.tsx
+++ b/apps/web/ee/components/license/activation/modal.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
import { getFileURL } from "@plane/utils";
// components
import { WorkspaceLogo } from "@/components/workspace/logo";
diff --git a/apps/web/ee/components/license/modal/trial-button.tsx b/apps/web/ee/components/license/modal/trial-button.tsx
index 6b61d45a19..b0a7591fc2 100644
--- a/apps/web/ee/components/license/modal/trial-button.tsx
+++ b/apps/web/ee/components/license/modal/trial-button.tsx
@@ -5,8 +5,8 @@ import { useParams } from "next/navigation";
// plane imports
import { Loader } from "lucide-react";
import { LICENSE_TRACKER_ELEMENTS, LICENSE_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web imports
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/license/modal/upgrade-modal.tsx b/apps/web/ee/components/license/modal/upgrade-modal.tsx
index a2f56837cf..ffd9b31810 100644
--- a/apps/web/ee/components/license/modal/upgrade-modal.tsx
+++ b/apps/web/ee/components/license/modal/upgrade-modal.tsx
@@ -14,8 +14,9 @@ import {
SUBSCRIPTION_WEBPAGE_URLS,
SUBSCRIPTION_WITH_TRIAL,
} from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum, IPaymentProduct } from "@plane/types";
-import { EModalWidth, ModalCore, TOAST_TYPE, setToast, getSubscriptionTextAndBackgroundColor } from "@plane/ui";
+import { EModalWidth, ModalCore, getSubscriptionTextAndBackgroundColor } from "@plane/ui";
import { cn, getSubscriptionName } from "@plane/utils";
// components
import { FreePlanCard, PlanUpgradeCard } from "@/components/license";
diff --git a/apps/web/ee/components/license/plans-card/business.tsx b/apps/web/ee/components/license/plans-card/business.tsx
index b565ca8489..00beb32588 100644
--- a/apps/web/ee/components/license/plans-card/business.tsx
+++ b/apps/web/ee/components/license/plans-card/business.tsx
@@ -5,9 +5,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { ExternalLink } from "lucide-react";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-// plane imports
-import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { renderFormattedDate } from "@plane/utils";
// plane web imports
diff --git a/apps/web/ee/components/license/plans-card/common/self-managed-license-actions.tsx b/apps/web/ee/components/license/plans-card/common/self-managed-license-actions.tsx
index 23194ad892..eda9583d42 100644
--- a/apps/web/ee/components/license/plans-card/common/self-managed-license-actions.tsx
+++ b/apps/web/ee/components/license/plans-card/common/self-managed-license-actions.tsx
@@ -4,9 +4,10 @@ import { useState } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { CircleAlert, CircleCheck, RefreshCw } from "lucide-react";
-// plane imports
import { Button } from "@plane/propel/button";
-import { AlertModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+// plane imports
+import { AlertModalCore } from "@plane/ui";
import { cn, getSubscriptionName } from "@plane/utils";
// hooks
import { useSelfHostedSubscription } from "@/plane-web/hooks/store/use-self-hosted-subscription";
diff --git a/apps/web/ee/components/license/plans-card/enterprise.tsx b/apps/web/ee/components/license/plans-card/enterprise.tsx
index 5adfea9c86..ed62c4b9b2 100644
--- a/apps/web/ee/components/license/plans-card/enterprise.tsx
+++ b/apps/web/ee/components/license/plans-card/enterprise.tsx
@@ -5,9 +5,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { ExternalLink } from "lucide-react";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-// plane imports
-import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { renderFormattedDate } from "@plane/utils";
// plane web imports
diff --git a/apps/web/ee/components/license/plans-card/pro.tsx b/apps/web/ee/components/license/plans-card/pro.tsx
index d3745331ec..aa2cc9763b 100644
--- a/apps/web/ee/components/license/plans-card/pro.tsx
+++ b/apps/web/ee/components/license/plans-card/pro.tsx
@@ -5,9 +5,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { ExternalLink } from "lucide-react";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EProductSubscriptionEnum } from "@plane/types";
-// plane imports
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, renderFormattedDate } from "@plane/utils";
// plane web imports
import { PlanCard, SelfManagedLicenseActions } from "@/plane-web/components/license";
diff --git a/apps/web/ee/components/marketplace/applications/details/revoke-modal.tsx b/apps/web/ee/components/marketplace/applications/details/revoke-modal.tsx
index 0dd8dcbaed..6c5aa7374e 100644
--- a/apps/web/ee/components/marketplace/applications/details/revoke-modal.tsx
+++ b/apps/web/ee/components/marketplace/applications/details/revoke-modal.tsx
@@ -2,10 +2,11 @@
import { useState } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// types
// ui
import { TUserApplication } from "@plane/types";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// helpers
// hooks
import { useAppRouter } from "@/hooks/use-app-router";
diff --git a/apps/web/ee/components/marketplace/applications/details/tile.tsx b/apps/web/ee/components/marketplace/applications/details/tile.tsx
index 32f00542e7..fb7589608f 100644
--- a/apps/web/ee/components/marketplace/applications/details/tile.tsx
+++ b/apps/web/ee/components/marketplace/applications/details/tile.tsx
@@ -8,8 +8,9 @@ import { E_FEATURE_FLAGS, EUserPermissionsLevel } from "@plane/constants";
import { convertAppSlugToIntegrationKey } from "@plane/etl/core";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EProductSubscriptionEnum, EUserWorkspaceRoles, TUserApplication } from "@plane/types";
-import { cn, setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
+import { cn, Tooltip } from "@plane/ui";
import { getFileURL } from "@plane/utils";
import { useUserPermissions } from "@/hooks/store/user";
import { ApplicationTileMenuOptions } from "@/plane-web/components/marketplace";
diff --git a/apps/web/ee/components/marketplace/applications/form/client-secret-modal.tsx b/apps/web/ee/components/marketplace/applications/form/client-secret-modal.tsx
index eb14d41f66..82d38669fc 100644
--- a/apps/web/ee/components/marketplace/applications/form/client-secret-modal.tsx
+++ b/apps/web/ee/components/marketplace/applications/form/client-secret-modal.tsx
@@ -2,10 +2,10 @@
import { CheckCircle, Copy } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-// plane imports
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
-import { ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { ModalCore } from "@plane/ui";
import { copyTextToClipboard, csvDownload } from "@plane/utils";
// helpers
import { usePlatformOS } from "@/hooks/use-platform-os";
diff --git a/apps/web/ee/components/marketplace/applications/form/create-update.tsx b/apps/web/ee/components/marketplace/applications/form/create-update.tsx
index 1516aa05ce..e70416e73d 100644
--- a/apps/web/ee/components/marketplace/applications/form/create-update.tsx
+++ b/apps/web/ee/components/marketplace/applications/form/create-update.tsx
@@ -8,8 +8,9 @@ import { Book, Camera } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TUserApplication } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE, ToggleSwitch, Tooltip } from "@plane/ui";
+import { Loader, ToggleSwitch, Tooltip } from "@plane/ui";
import { getAssetIdFromUrl, getFileURL } from "@plane/utils";
// components
import { SettingsHeading } from "@/components/settings/heading";
diff --git a/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret-modal.tsx b/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret-modal.tsx
index 33940ff43c..544cad836a 100644
--- a/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret-modal.tsx
+++ b/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret-modal.tsx
@@ -4,10 +4,11 @@ import { useState } from "react";
import { observer } from "mobx-react";
import { Copy } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-// ui
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+// ui
import { TUserApplication } from "@plane/types";
-import { Tooltip, TOAST_TYPE, setToast, ModalCore } from "@plane/ui";
+import { Tooltip, ModalCore } from "@plane/ui";
// helpers
import { copyTextToClipboard } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret.tsx b/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret.tsx
index cada27bd6d..f457824172 100644
--- a/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret.tsx
+++ b/apps/web/ee/components/marketplace/applications/form/regenerate-client-secret.tsx
@@ -3,12 +3,12 @@
import { useState } from "react";
import { observer } from "mobx-react";
import { Copy } from "lucide-react";
-import { useTranslation } from "@plane/i18n";
// plane imports
+import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { TUserApplication } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { copyTextToClipboard } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/marketplace/applications/form/upload-attachments.tsx b/apps/web/ee/components/marketplace/applications/form/upload-attachments.tsx
index 795433f301..546a0683c1 100644
--- a/apps/web/ee/components/marketplace/applications/form/upload-attachments.tsx
+++ b/apps/web/ee/components/marketplace/applications/form/upload-attachments.tsx
@@ -8,8 +8,8 @@ import { Dialog, Transition } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button, getButtonStyling } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EFileAssetType } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, checkURLValidity, getAssetIdFromUrl, getFileURL } from "@plane/utils";
// store hooks
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/marketplace/applications/installation/details.tsx b/apps/web/ee/components/marketplace/applications/installation/details.tsx
index 0f052829e2..524b66e967 100644
--- a/apps/web/ee/components/marketplace/applications/installation/details.tsx
+++ b/apps/web/ee/components/marketplace/applications/installation/details.tsx
@@ -7,8 +7,8 @@ import { CheckCircle } from "lucide-react";
import { API_BASE_URL } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TUserApplication } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { getFileURL } from "@plane/utils";
import { useWorkspace } from "@/hooks/store/use-workspace";
import { OAuthService } from "@/plane-web/services/marketplace";
diff --git a/apps/web/ee/components/marketplace/oauth/app-consent.tsx b/apps/web/ee/components/marketplace/oauth/app-consent.tsx
index 9d639435d5..060af8370b 100644
--- a/apps/web/ee/components/marketplace/oauth/app-consent.tsx
+++ b/apps/web/ee/components/marketplace/oauth/app-consent.tsx
@@ -8,8 +8,9 @@ import { ChevronDown, CircleAlert } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { PlaneLogo } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { IWorkspace, TUserApplication } from "@plane/types";
-import { cn, CustomMenu, setToast, TOAST_TYPE } from "@plane/ui";
+import { cn, CustomMenu } from "@plane/ui";
import { getFileURL } from "@plane/utils";
import { useWorkspace } from "@/hooks/store/use-workspace";
import { useUser } from "@/hooks/store/user";
diff --git a/apps/web/ee/components/pages/comments/comment-display.tsx b/apps/web/ee/components/pages/comments/comment-display.tsx
index 7107688a67..5291afb261 100644
--- a/apps/web/ee/components/pages/comments/comment-display.tsx
+++ b/apps/web/ee/components/pages/comments/comment-display.tsx
@@ -1,9 +1,10 @@
import React, { useCallback, useMemo, useState } from "react";
import { observer } from "mobx-react";
import { CircleCheck, Pencil, Trash2 } from "lucide-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import type { JSONContent } from "@plane/types";
-import { AlertModalCore, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast, Tooltip } from "@plane/ui";
+import { AlertModalCore, CustomMenu, TContextMenuItem, Tooltip } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/pages/comments/comment-form.tsx b/apps/web/ee/components/pages/comments/comment-form.tsx
index 13128cb684..94d5e64aa6 100644
--- a/apps/web/ee/components/pages/comments/comment-form.tsx
+++ b/apps/web/ee/components/pages/comments/comment-form.tsx
@@ -4,9 +4,9 @@ import { observer } from "mobx-react";
import { Controller, useForm } from "react-hook-form";
// editor
import type { EditorRefApi } from "@plane/editor";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// types
import { EFileAssetType, type JSONContent, type TPageComment } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, isCommentEmpty, trimEmptyParagraphsFromJson, trimEmptyParagraphsFromHTML } from "@plane/utils";
// editor
import { LiteTextEditor } from "@/components/editor/lite-text";
diff --git a/apps/web/ee/components/pages/list/root.tsx b/apps/web/ee/components/pages/list/root.tsx
index 45a506f803..6a968c97d1 100644
--- a/apps/web/ee/components/pages/list/root.tsx
+++ b/apps/web/ee/components/pages/list/root.tsx
@@ -6,9 +6,8 @@ import useSWR from "swr";
// plane imports
import { EUserPermissionsLevel, EPageAccess, WORKSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles, TPage, type TPageNavigationTabs } from "@plane/types";
-// components
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
import { PageListBlockRoot } from "@/components/pages/list/block-root";
import { PageLoader } from "@/components/pages/loaders/page-loader";
diff --git a/apps/web/ee/components/pages/modals/confirmation-modal.tsx b/apps/web/ee/components/pages/modals/confirmation-modal.tsx
index 7eaac5432b..1ee632e68f 100644
--- a/apps/web/ee/components/pages/modals/confirmation-modal.tsx
+++ b/apps/web/ee/components/pages/modals/confirmation-modal.tsx
@@ -2,8 +2,9 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// ui
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// helpers
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
// types
diff --git a/apps/web/ee/components/pages/modals/delete-multiple-pages-modal.tsx b/apps/web/ee/components/pages/modals/delete-multiple-pages-modal.tsx
index add50c4af1..10785c62f4 100644
--- a/apps/web/ee/components/pages/modals/delete-multiple-pages-modal.tsx
+++ b/apps/web/ee/components/pages/modals/delete-multiple-pages-modal.tsx
@@ -7,8 +7,9 @@ import { WORKSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
// editor
import type { EditorRefApi } from "@plane/editor";
import { EmptyPageIcon } from "@plane/propel/icons";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// ui
-import { AlertModalCore, Logo, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore, Logo } from "@plane/ui";
// helpers
import { getPageName } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/pages/modals/delete-page-modal.tsx b/apps/web/ee/components/pages/modals/delete-page-modal.tsx
index ecff8b259c..6f3adf0744 100644
--- a/apps/web/ee/components/pages/modals/delete-page-modal.tsx
+++ b/apps/web/ee/components/pages/modals/delete-page-modal.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import { useRouter } from "next/navigation";
// plane imports
import { PROJECT_PAGE_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast, AlertModalCore } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// helpers
import { getPageName } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/pages/modals/move-page-modal.tsx b/apps/web/ee/components/pages/modals/move-page-modal.tsx
index ad4fdd598a..98921b495f 100644
--- a/apps/web/ee/components/pages/modals/move-page-modal.tsx
+++ b/apps/web/ee/components/pages/modals/move-page-modal.tsx
@@ -6,7 +6,8 @@ import { Combobox } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
import { cn } from "@plane/utils";
// component types
import { TMovePageModalProps } from "@/ce/components/pages";
diff --git a/apps/web/ee/components/pages/modals/publish-page-modal.tsx b/apps/web/ee/components/pages/modals/publish-page-modal.tsx
index da8390bf1a..e311eef053 100644
--- a/apps/web/ee/components/pages/modals/publish-page-modal.tsx
+++ b/apps/web/ee/components/pages/modals/publish-page-modal.tsx
@@ -4,7 +4,8 @@ import { ExternalLink, Globe2 } from "lucide-react";
// ui
import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@plane/constants";
import { Button } from "@plane/propel/button";
-import { EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { EModalWidth, ModalCore } from "@plane/ui";
import { copyTextToClipboard } from "@plane/utils";
// plane web types
import { TPagePublishSettings } from "@/plane-web/types";
diff --git a/apps/web/ee/components/pages/modals/share-page-root-modal.tsx b/apps/web/ee/components/pages/modals/share-page-root-modal.tsx
index dc9b0e3192..6519c52ce4 100644
--- a/apps/web/ee/components/pages/modals/share-page-root-modal.tsx
+++ b/apps/web/ee/components/pages/modals/share-page-root-modal.tsx
@@ -3,10 +3,9 @@
import React, { useState, useCallback, useMemo } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
+import { setToast, TOAST_TYPE, dismissToast } from "@plane/propel/toast";
// constants
import { EPageSharedUserAccess, EUserWorkspaceRoles } from "@plane/types";
-// plane imports
-import { setToast, TOAST_TYPE, dismissToast } from "@plane/ui";
// helpers
import { getPageName } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/pages/sidebar/list-item.tsx b/apps/web/ee/components/pages/sidebar/list-item.tsx
index d27593162b..36eba9a29e 100644
--- a/apps/web/ee/components/pages/sidebar/list-item.tsx
+++ b/apps/web/ee/components/pages/sidebar/list-item.tsx
@@ -8,8 +8,8 @@ import { useParams, usePathname } from "next/navigation";
import { ArchiveIcon, ChevronRight, FileText, Loader } from "lucide-react";
// plane imports
import { EmptyPageIcon, RestrictedPageIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EPageAccess, TPageDragPayload, TPageNavigationTabs } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn, getPageName } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/ee/components/pages/sidebar/quick-actions.tsx b/apps/web/ee/components/pages/sidebar/quick-actions.tsx
index 40ac588396..86283702d0 100644
--- a/apps/web/ee/components/pages/sidebar/quick-actions.tsx
+++ b/apps/web/ee/components/pages/sidebar/quick-actions.tsx
@@ -5,8 +5,8 @@ import { FilePlus2 } from "lucide-react";
// plane imports
import { WORKSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EPageAccess, TPage } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useAppRouter } from "@/hooks/use-app-router";
diff --git a/apps/web/ee/components/pages/sidebar/section/section-root.tsx b/apps/web/ee/components/pages/sidebar/section/section-root.tsx
index b033a2d890..9209eb64be 100644
--- a/apps/web/ee/components/pages/sidebar/section/section-root.tsx
+++ b/apps/web/ee/components/pages/sidebar/section/section-root.tsx
@@ -7,8 +7,8 @@ import { Loader } from "lucide-react";
import { Disclosure, Transition } from "@headlessui/react";
// plane imports
import { EPageAccess, WORKSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TPage, TPageNavigationTabs } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
// hooks
diff --git a/apps/web/ee/components/pi-chat/actions/action-status-block.tsx b/apps/web/ee/components/pi-chat/actions/action-status-block.tsx
index b62333b586..2fe30b799f 100644
--- a/apps/web/ee/components/pi-chat/actions/action-status-block.tsx
+++ b/apps/web/ee/components/pi-chat/actions/action-status-block.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import { Info } from "lucide-react";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { usePiChat } from "@/plane-web/hooks/store/use-pi-chat";
import { EExecutionStatus, TDialogue } from "@/plane-web/types";
import { ConfirmBlock } from "./confirm-block";
diff --git a/apps/web/ee/components/pi-chat/conversation/feedback.tsx b/apps/web/ee/components/pi-chat/conversation/feedback.tsx
index ba01bac611..18bede71ae 100644
--- a/apps/web/ee/components/pi-chat/conversation/feedback.tsx
+++ b/apps/web/ee/components/pi-chat/conversation/feedback.tsx
@@ -1,6 +1,7 @@
import { useState } from "react";
import { Copy, ThumbsDown, ThumbsUp } from "lucide-react";
-import { cn, setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { cn, Tooltip } from "@plane/ui";
import { copyTextToClipboard } from "@plane/utils";
import { usePiChat } from "@/plane-web/hooks/store/use-pi-chat";
import { EFeedback } from "@/plane-web/types";
diff --git a/apps/web/ee/components/pi-chat/converse/voice-input.tsx b/apps/web/ee/components/pi-chat/converse/voice-input.tsx
index da70b38b82..0610d7938c 100644
--- a/apps/web/ee/components/pi-chat/converse/voice-input.tsx
+++ b/apps/web/ee/components/pi-chat/converse/voice-input.tsx
@@ -1,7 +1,7 @@
import React, { SetStateAction, Dispatch, useRef, useState } from "react";
import { Check, LoaderCircle, MicIcon, X } from "lucide-react";
import { EditorRefApi } from "@plane/editor";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { cn } from "@plane/utils";
import { PiChatService } from "@/plane-web/services/pi-chat.service";
import { TFocus, TPiLoaders } from "@/plane-web/types";
diff --git a/apps/web/ee/components/pi-chat/list/list-item.tsx b/apps/web/ee/components/pi-chat/list/list-item.tsx
index 4023fb45de..5884dbc4df 100644
--- a/apps/web/ee/components/pi-chat/list/list-item.tsx
+++ b/apps/web/ee/components/pi-chat/list/list-item.tsx
@@ -4,7 +4,8 @@ import Link from "next/link";
import { useParams } from "next/navigation";
import { Pencil, Star, Trash } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-import { CustomMenu, EModalPosition, EModalWidth, ModalCore, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { CustomMenu, EModalPosition, EModalWidth, ModalCore, TContextMenuItem } from "@plane/ui";
import { calculateTimeAgo, cn } from "@plane/utils";
import { useWorkspace } from "@/hooks/store/use-workspace";
import { usePiChat } from "@/plane-web/hooks/store/use-pi-chat";
diff --git a/apps/web/ee/components/pi-chat/modals/delete-modal.tsx b/apps/web/ee/components/pi-chat/modals/delete-modal.tsx
index e0aa6ac52e..c9a163a86e 100644
--- a/apps/web/ee/components/pi-chat/modals/delete-modal.tsx
+++ b/apps/web/ee/components/pi-chat/modals/delete-modal.tsx
@@ -3,7 +3,8 @@
import { useState } from "react";
import { observer } from "mobx-react";
import { useParams, useRouter } from "next/navigation";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
import { usePiChat } from "@/plane-web/hooks/store/use-pi-chat";
interface IChatDelete {
diff --git a/apps/web/ee/components/pi-chat/modals/edit-form.tsx b/apps/web/ee/components/pi-chat/modals/edit-form.tsx
index b6083a04bd..6c380d13ba 100644
--- a/apps/web/ee/components/pi-chat/modals/edit-form.tsx
+++ b/apps/web/ee/components/pi-chat/modals/edit-form.tsx
@@ -3,9 +3,10 @@
import { FormEvent, useState } from "react";
// types
import { ETabIndices } from "@plane/constants";
-// ui
import { Button } from "@plane/propel/button";
-import { Input, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+// ui
+import { Input } from "@plane/ui";
import { getTabIndex } from "@plane/utils";
// hooks
import { usePlatformOS } from "@/hooks/use-platform-os";
diff --git a/apps/web/ee/components/pi-chat/sidebar/sidebar-item.tsx b/apps/web/ee/components/pi-chat/sidebar/sidebar-item.tsx
index 798e931a88..e4d89cd90a 100644
--- a/apps/web/ee/components/pi-chat/sidebar/sidebar-item.tsx
+++ b/apps/web/ee/components/pi-chat/sidebar/sidebar-item.tsx
@@ -3,7 +3,8 @@ import { observer } from "mobx-react";
import Link from "next/link";
import { Pencil, Star, Trash, MoreHorizontal } from "lucide-react";
import { useTranslation } from "@plane/i18n";
-import { CustomMenu, EModalWidth, EModalPosition, ModalCore, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { CustomMenu, EModalWidth, EModalPosition, ModalCore, TContextMenuItem } from "@plane/ui";
import { cn, joinUrlPath } from "@plane/utils";
import { SidebarNavItem } from "@/components/sidebar/sidebar-navigation";
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/preferences/theme-switcher.tsx b/apps/web/ee/components/preferences/theme-switcher.tsx
index 0c1b577b72..d81107f6d7 100644
--- a/apps/web/ee/components/preferences/theme-switcher.tsx
+++ b/apps/web/ee/components/preferences/theme-switcher.tsx
@@ -5,8 +5,8 @@ import { observer } from "mobx-react";
import { useTheme } from "next-themes";
import { I_THEME_OPTION, THEME_OPTIONS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setPromiseToast } from "@plane/propel/toast";
import { IUserTheme } from "@plane/types";
-import { setPromiseToast } from "@plane/ui";
import { applyTheme, unsetCustomCssVariables } from "@plane/utils";
// components
import { CustomThemeSelector } from "@/components/core/theme/custom-theme-selector";
diff --git a/apps/web/ee/components/profile/config-views/slack.tsx b/apps/web/ee/components/profile/config-views/slack.tsx
index b407a7d698..07f1d54d19 100644
--- a/apps/web/ee/components/profile/config-views/slack.tsx
+++ b/apps/web/ee/components/profile/config-views/slack.tsx
@@ -2,7 +2,8 @@
import { useState } from "react";
import useSWR from "swr";
import { useTranslation } from "@plane/i18n";
-import { Checkbox, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Checkbox } from "@plane/ui";
import { useWorkspace } from "@/hooks/store/use-workspace";
import { useSlackIntegration } from "@/plane-web/hooks/store";
import { TPersonalAccountConnectProps } from "../personal-account-view";
diff --git a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/quick-action-button.tsx b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/quick-action-button.tsx
index 91e8dafa6e..2256ecca0d 100644
--- a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/quick-action-button.tsx
+++ b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/quick-action-button.tsx
@@ -6,7 +6,7 @@ import { FileRejection, useDropzone } from "react-dropzone";
import { Plus } from "lucide-react";
// plane ui
import { PROJECT_OVERVIEW_TRACKER_ELEMENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// hooks
// plane web hooks
import { useFileSize } from "@/plane-web/hooks/use-file-size";
diff --git a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/root.tsx b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/root.tsx
index 05ca411754..c60b44e102 100644
--- a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/root.tsx
+++ b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/root.tsx
@@ -3,8 +3,7 @@ import { FC, useCallback, useState } from "react";
import { observer } from "mobx-react";
import { FileRejection, useDropzone } from "react-dropzone";
import { UploadCloud } from "lucide-react";
-// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web hooks
import { useProjectAttachments } from "@/plane-web/hooks/store/projects/use-project-attachments";
import { useFileSize } from "@/plane-web/hooks/use-file-size";
diff --git a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/use-attachments.tsx b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/use-attachments.tsx
index d338203896..ec5fdd4469 100644
--- a/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/use-attachments.tsx
+++ b/apps/web/ee/components/project-overview/details/main/collaspible-section/attachment/use-attachments.tsx
@@ -2,7 +2,7 @@
import { useMemo } from "react";
// plane ui
import { PROJECT_OVERVIEW_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/ui";
+import { TOAST_TYPE, setPromiseToast, setToast } from "@plane/propel/toast";
// hooks
import { captureSuccess, captureError } from "@/helpers/event-tracker.helper";
import { useProject } from "@/hooks/store/use-project";
diff --git a/apps/web/ee/components/project-overview/details/main/collaspible-section/links/link-detail.tsx b/apps/web/ee/components/project-overview/details/main/collaspible-section/links/link-detail.tsx
index 5d5a1e7090..6b77f393ae 100644
--- a/apps/web/ee/components/project-overview/details/main/collaspible-section/links/link-detail.tsx
+++ b/apps/web/ee/components/project-overview/details/main/collaspible-section/links/link-detail.tsx
@@ -4,9 +4,9 @@ import { FC } from "react";
// hooks
import { observer } from "mobx-react";
import { Copy, LinkIcon, Pencil, Trash2 } from "lucide-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { calculateTimeAgo, copyTextToClipboard } from "@plane/utils";
// hooks
import { useMember } from "@/hooks/store/use-member";
diff --git a/apps/web/ee/components/project-overview/details/main/collaspible-section/links/use-links.tsx b/apps/web/ee/components/project-overview/details/main/collaspible-section/links/use-links.tsx
index f9247d384a..d163cfae17 100644
--- a/apps/web/ee/components/project-overview/details/main/collaspible-section/links/use-links.tsx
+++ b/apps/web/ee/components/project-overview/details/main/collaspible-section/links/use-links.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TProjectLink } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { useProject } from "@/hooks/store/use-project";
import { useProjectLinks } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/project-overview/details/main/info-section/hero-section.tsx b/apps/web/ee/components/project-overview/details/main/info-section/hero-section.tsx
index 11d7c73c11..b9179d0893 100644
--- a/apps/web/ee/components/project-overview/details/main/info-section/hero-section.tsx
+++ b/apps/web/ee/components/project-overview/details/main/info-section/hero-section.tsx
@@ -4,8 +4,8 @@ import { Controller, useForm } from "react-hook-form";
// plane imports
import { EUserPermissionsLevel, PROJECT_OVERVIEW_TRACKER_ELEMENTS, PROJECT_TRACKER_EVENTS } from "@plane/constants";
import { EmojiPicker, EmojiIconPickerTypes } from "@plane/propel/emoji-icon-picker";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, IProject, IWorkspace } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { getFileURL } from "@plane/utils";
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/ee/components/project-overview/details/main/info-section/update-reaction.tsx b/apps/web/ee/components/project-overview/details/main/info-section/update-reaction.tsx
index cc4e6fd417..db390d46f7 100644
--- a/apps/web/ee/components/project-overview/details/main/info-section/update-reaction.tsx
+++ b/apps/web/ee/components/project-overview/details/main/info-section/update-reaction.tsx
@@ -3,10 +3,10 @@
import { FC, useMemo } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
import { IUser } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, formatTextList } from "@plane/utils";
// components
import { ReactionSelector } from "@/components/issues/issue-detail/reactions";
diff --git a/apps/web/ee/components/project-overview/details/sidebar/updates/comments/comment-list.tsx b/apps/web/ee/components/project-overview/details/sidebar/updates/comments/comment-list.tsx
index 5177a30dcc..eaa1f0f8f0 100644
--- a/apps/web/ee/components/project-overview/details/sidebar/updates/comments/comment-list.tsx
+++ b/apps/web/ee/components/project-overview/details/sidebar/updates/comments/comment-list.tsx
@@ -2,7 +2,8 @@ import { useMemo, useState } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
import { SendHorizonal } from "lucide-react";
-import { Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Input } from "@plane/ui";
import { cn } from "@plane/utils";
import { useProjectUpdates } from "@/plane-web/hooks/store/projects/use-project-updates";
import { TProjectUpdatesComment } from "@/plane-web/types";
diff --git a/apps/web/ee/components/project-overview/details/sidebar/updates/update-reaction.tsx b/apps/web/ee/components/project-overview/details/sidebar/updates/update-reaction.tsx
index d34e4c3442..852afdcde8 100644
--- a/apps/web/ee/components/project-overview/details/sidebar/updates/update-reaction.tsx
+++ b/apps/web/ee/components/project-overview/details/sidebar/updates/update-reaction.tsx
@@ -2,10 +2,10 @@
import { FC, useMemo } from "react";
import { observer } from "mobx-react";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
import { IUser } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, formatTextList } from "@plane/utils";
// components
import { ReactionSelector } from "@/components/issues/issue-detail/reactions";
diff --git a/apps/web/ee/components/project-overview/details/sidebar/updates/use-updates.tsx b/apps/web/ee/components/project-overview/details/sidebar/updates/use-updates.tsx
index bc866211cc..93b4f275b4 100644
--- a/apps/web/ee/components/project-overview/details/sidebar/updates/use-updates.tsx
+++ b/apps/web/ee/components/project-overview/details/sidebar/updates/use-updates.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
import useSWR from "swr";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { useProjectUpdates } from "@/plane-web/hooks/store/projects/use-project-updates";
import { TProjectUpdate } from "@/plane-web/types";
diff --git a/apps/web/ee/components/projects/create/root.tsx b/apps/web/ee/components/projects/create/root.tsx
index a108a7bed5..c8f1434507 100644
--- a/apps/web/ee/components/projects/create/root.tsx
+++ b/apps/web/ee/components/projects/create/root.tsx
@@ -7,8 +7,8 @@ import { useForm, FormProvider } from "react-hook-form";
import { DEFAULT_PROJECT_FORM_VALUES, PROJECT_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, IProjectBulkAddFormData } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// types
import { TCreateProjectFormProps } from "@/ce/components/projects/create/root";
// constants
diff --git a/apps/web/ee/components/projects/layouts/board/group-item.tsx b/apps/web/ee/components/projects/layouts/board/group-item.tsx
index efabb59806..da2482c6dc 100644
--- a/apps/web/ee/components/projects/layouts/board/group-item.tsx
+++ b/apps/web/ee/components/projects/layouts/board/group-item.tsx
@@ -5,8 +5,7 @@ import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
import { observer } from "mobx-react";
-// plane imports
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { useMember } from "@/hooks/store/use-member";
import { useProject } from "@/hooks/store/use-project";
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/projects/layouts/board/list-item.tsx b/apps/web/ee/components/projects/layouts/board/list-item.tsx
index fa16cb5a50..9d8e38ea62 100644
--- a/apps/web/ee/components/projects/layouts/board/list-item.tsx
+++ b/apps/web/ee/components/projects/layouts/board/list-item.tsx
@@ -7,8 +7,8 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// hooks
import { useProject } from "@/hooks/store/use-project";
import { useUserPermissions } from "@/hooks/store/user";
diff --git a/apps/web/ee/components/projects/layouts/gallery/details.tsx b/apps/web/ee/components/projects/layouts/gallery/details.tsx
index 7f026e4e64..efa7bbbcdb 100644
--- a/apps/web/ee/components/projects/layouts/gallery/details.tsx
+++ b/apps/web/ee/components/projects/layouts/gallery/details.tsx
@@ -5,8 +5,9 @@ import { ArchiveRestoreIcon, LinkIcon, Lock, MoreHorizontal, Settings, Trash2 }
import { EUserPermissionsLevel } from "@plane/constants";
import { useOutsideClickDetector } from "@plane/hooks";
import { ArchiveIcon } from "@plane/propel/icons";
+import { setPromiseToast, setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, EUserWorkspaceRoles } from "@plane/types";
-import { CustomMenu, FavoriteStar, setPromiseToast, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { CustomMenu, FavoriteStar, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard, getFileURL } from "@plane/utils";
// components
import { Logo } from "@/components/common/logo";
diff --git a/apps/web/ee/components/projects/layouts/list/block.tsx b/apps/web/ee/components/projects/layouts/list/block.tsx
index 7ba2ae73c6..fb4f51b436 100644
--- a/apps/web/ee/components/projects/layouts/list/block.tsx
+++ b/apps/web/ee/components/projects/layouts/list/block.tsx
@@ -4,9 +4,10 @@ import { useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { useParams, useRouter } from "next/navigation";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { setToast, TOAST_TYPE, Logo, Row } from "@plane/ui";
+import { Logo, Row } from "@plane/ui";
// helpers
import { cn, joinUrlPath } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/projects/quick-actions.tsx b/apps/web/ee/components/projects/quick-actions.tsx
index e83459f2f7..af944be39a 100644
--- a/apps/web/ee/components/projects/quick-actions.tsx
+++ b/apps/web/ee/components/projects/quick-actions.tsx
@@ -3,9 +3,10 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { ArchiveRestoreIcon, LinkIcon, MoreHorizontal, Settings, Trash2 } from "lucide-react";
import { ArchiveIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles } from "@plane/types";
// plane imports
-import { CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// components
import { DeleteProjectModal } from "@/components/project/delete-project-modal";
diff --git a/apps/web/ee/components/projects/settings/intake/intake-sub-features.tsx b/apps/web/ee/components/projects/settings/intake/intake-sub-features.tsx
index e0aa0c2962..0248805128 100644
--- a/apps/web/ee/components/projects/settings/intake/intake-sub-features.tsx
+++ b/apps/web/ee/components/projects/settings/intake/intake-sub-features.tsx
@@ -5,10 +5,12 @@ import useSWR from "swr";
import { Copy, ExternalLink, RefreshCcw } from "lucide-react";
import { E_FEATURE_FLAGS, EUserPermissionsLevel, SPACE_BASE_PATH, SPACE_BASE_URL } from "@plane/constants";
import { Button } from "@plane/propel/button";
+import { setPromiseToast, setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { EUserProjectRoles, TInboxForm } from "@plane/types";
-import { Loader, setPromiseToast, setToast, TOAST_TYPE, ToggleSwitch } from "@plane/ui";
+import { Loader, ToggleSwitch } from "@plane/ui";
import { cn, copyTextToClipboard } from "@plane/utils";
+// ce imports
import { TProperties } from "@/ce/constants/project";
import { useProject } from "@/hooks/store/use-project";
import { useProjectInbox } from "@/hooks/store/use-project-inbox";
diff --git a/apps/web/ee/components/projects/settings/intake/renew-modal.tsx b/apps/web/ee/components/projects/settings/intake/renew-modal.tsx
index f02cff09f0..6569190750 100644
--- a/apps/web/ee/components/projects/settings/intake/renew-modal.tsx
+++ b/apps/web/ee/components/projects/settings/intake/renew-modal.tsx
@@ -2,9 +2,8 @@
import { useState, Fragment } from "react";
import { Dialog, Transition } from "@headlessui/react";
-// ui
import { Button } from "@plane/propel/button";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
type Props = {
workspaceSlug: string;
diff --git a/apps/web/ee/components/projects/teamspaces/teamspace-list-item.tsx b/apps/web/ee/components/projects/teamspaces/teamspace-list-item.tsx
index 8455625cb7..bf598177fd 100644
--- a/apps/web/ee/components/projects/teamspaces/teamspace-list-item.tsx
+++ b/apps/web/ee/components/projects/teamspaces/teamspace-list-item.tsx
@@ -7,8 +7,9 @@ import { CircleMinus } from "lucide-react";
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { TeamsIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles, TTeamspace } from "@plane/types";
-import { AlertModalCore, Avatar, AvatarGroup, CustomMenu, Logo, setToast, Table, TOAST_TYPE } from "@plane/ui";
+import { AlertModalCore, Avatar, AvatarGroup, CustomMenu, Logo, Table } from "@plane/ui";
import { getFileURL } from "@plane/utils";
// hooks
import { useMember } from "@/hooks/store/use-member";
diff --git a/apps/web/ee/components/projects/teamspaces/teamspace-list.tsx b/apps/web/ee/components/projects/teamspaces/teamspace-list.tsx
index 5e2da3277a..e5a61c2483 100644
--- a/apps/web/ee/components/projects/teamspaces/teamspace-list.tsx
+++ b/apps/web/ee/components/projects/teamspaces/teamspace-list.tsx
@@ -7,8 +7,8 @@ import { Search } from "lucide-react";
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, EUserWorkspaceRoles } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// ce imports
import type { TProjectTeamspaceList } from "@/ce/components/projects/teamspaces/teamspace-list";
diff --git a/apps/web/ee/components/recurring-work-items/settings/create-update/root.tsx b/apps/web/ee/components/recurring-work-items/settings/create-update/root.tsx
index dd439bdc5d..aa2e1e891b 100644
--- a/apps/web/ee/components/recurring-work-items/settings/create-update/root.tsx
+++ b/apps/web/ee/components/recurring-work-items/settings/create-update/root.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
import useSWR from "swr";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EWorkItemTypeEntity, PartialDeep, TRecurringWorkItemForm, TWorkItemBlueprintFormData } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import {
TWorkItemSanitizationResult,
processWorkItemCustomProperties,
diff --git a/apps/web/ee/components/recurring-work-items/settings/list/quick-actions.tsx b/apps/web/ee/components/recurring-work-items/settings/list/quick-actions.tsx
index 73bc17a3d3..a04cc12f2d 100644
--- a/apps/web/ee/components/recurring-work-items/settings/list/quick-actions.tsx
+++ b/apps/web/ee/components/recurring-work-items/settings/list/quick-actions.tsx
@@ -6,7 +6,8 @@ import { observer } from "mobx-react";
import { Pencil, Trash2 } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
-import { AlertModalCore, ContextMenu, CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { AlertModalCore, ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, getCreateUpdateRecurringWorkItemSettingsPath } from "@plane/utils";
// hooks
import { useAppRouter } from "@/hooks/use-app-router";
diff --git a/apps/web/ee/components/teamspaces/actions/delete-modal.tsx b/apps/web/ee/components/teamspaces/actions/delete-modal.tsx
index 3925c488cc..7b1242cee6 100644
--- a/apps/web/ee/components/teamspaces/actions/delete-modal.tsx
+++ b/apps/web/ee/components/teamspaces/actions/delete-modal.tsx
@@ -6,7 +6,8 @@ import { AlertTriangle } from "lucide-react";
// ui
import { TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
import { Button } from "@plane/propel/button";
-import { EModalWidth, EModalPosition, Input, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { EModalWidth, EModalPosition, Input, ModalCore } from "@plane/ui";
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useAppRouter } from "@/hooks/use-app-router";
diff --git a/apps/web/ee/components/teamspaces/actions/join-teamspace.tsx b/apps/web/ee/components/teamspaces/actions/join-teamspace.tsx
index 218d046eb5..7cab6c6f6a 100644
--- a/apps/web/ee/components/teamspaces/actions/join-teamspace.tsx
+++ b/apps/web/ee/components/teamspaces/actions/join-teamspace.tsx
@@ -4,7 +4,8 @@ import { useParams } from "next/navigation";
// ui
import { TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
import { Button } from "@plane/propel/button";
-import { AlertModalCore, setPromiseToast } from "@plane/ui";
+import { setPromiseToast } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
// plane web hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useTeamspaces } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/teamspaces/actions/members/modal.tsx b/apps/web/ee/components/teamspaces/actions/members/modal.tsx
index d2b1a23d8d..6fb1aaf876 100644
--- a/apps/web/ee/components/teamspaces/actions/members/modal.tsx
+++ b/apps/web/ee/components/teamspaces/actions/members/modal.tsx
@@ -4,18 +4,10 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { ChevronDown, Plus, X } from "lucide-react";
import { TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
// ui
-import {
- Avatar,
- Button,
- CustomSearchSelect,
- EModalPosition,
- EModalWidth,
- ModalCore,
- setToast,
- TOAST_TYPE,
-} from "@plane/ui";
+import { Avatar, Button, CustomSearchSelect, EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// helpers
import { getFileURL } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/teamspaces/actions/projects/button.tsx b/apps/web/ee/components/teamspaces/actions/projects/button.tsx
index c81cbce893..b305eaabe0 100644
--- a/apps/web/ee/components/teamspaces/actions/projects/button.tsx
+++ b/apps/web/ee/components/teamspaces/actions/projects/button.tsx
@@ -5,8 +5,8 @@ import { BriefcaseIcon } from "lucide-react";
// components
import { TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
import { Button } from "@plane/propel/button";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/teamspaces/actions/quick-actions.tsx b/apps/web/ee/components/teamspaces/actions/quick-actions.tsx
index f723444ee7..c72acb6603 100644
--- a/apps/web/ee/components/teamspaces/actions/quick-actions.tsx
+++ b/apps/web/ee/components/teamspaces/actions/quick-actions.tsx
@@ -5,7 +5,8 @@ import { observer } from "mobx-react";
import { ExternalLink, Link2, Pencil, Trash2 } from "lucide-react";
// plane imports
import { TEAMSPACE_TRACKER_ELEMENTS } from "@plane/constants";
-import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// hooks
import { captureClick } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/create-update/modal.tsx b/apps/web/ee/components/teamspaces/create-update/modal.tsx
index 70ea3cd0ce..9b4191a9cb 100644
--- a/apps/web/ee/components/teamspaces/create-update/modal.tsx
+++ b/apps/web/ee/components/teamspaces/create-update/modal.tsx
@@ -3,8 +3,9 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// plane imports
import { TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TTeamspace } from "@plane/types";
-import { EModalPosition, EModalWidth, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
import { getRandomEmoji } from "@plane/utils";
import { captureSuccess, captureError } from "@/helpers/event-tracker.helper";
// plane web imports
diff --git a/apps/web/ee/components/teamspaces/headers/detail-header/overview.tsx b/apps/web/ee/components/teamspaces/headers/detail-header/overview.tsx
index 98484338f1..009fb99581 100644
--- a/apps/web/ee/components/teamspaces/headers/detail-header/overview.tsx
+++ b/apps/web/ee/components/teamspaces/headers/detail-header/overview.tsx
@@ -3,7 +3,7 @@ import { useParams } from "next/navigation";
import { Link2, Sidebar } from "lucide-react";
// plane imports
import { TEAMSPACE_TRACKER_ELEMENTS } from "@plane/constants";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { cn, copyUrlToClipboard } from "@plane/utils";
// components
import { NameDescriptionUpdateStatus } from "@/components/issues/issue-update-status";
diff --git a/apps/web/ee/components/teamspaces/headers/detail-header/pages-list.tsx b/apps/web/ee/components/teamspaces/headers/detail-header/pages-list.tsx
index a4c84d10b1..1cb0ba4dd4 100644
--- a/apps/web/ee/components/teamspaces/headers/detail-header/pages-list.tsx
+++ b/apps/web/ee/components/teamspaces/headers/detail-header/pages-list.tsx
@@ -4,7 +4,7 @@ import { useParams } from "next/navigation";
// plane imports
import { EPageAccess, TEAMSPACE_PAGE_TRACKER_ELEMENTS, TEAMSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
import { Button } from "@plane/propel/button";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// components
// hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/overview/progress/root.tsx b/apps/web/ee/components/teamspaces/overview/progress/root.tsx
index 50746716a6..650a1c8616 100644
--- a/apps/web/ee/components/teamspaces/overview/progress/root.tsx
+++ b/apps/web/ee/components/teamspaces/overview/progress/root.tsx
@@ -8,7 +8,8 @@ import useSWR from "swr";
import { TEAMSPACE_ANALYTICS_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { BarIcon } from "@plane/propel/icons";
-import { Collapsible, CollapsibleButton, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Collapsible, CollapsibleButton } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web imports
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/overview/sidebar/helper.tsx b/apps/web/ee/components/teamspaces/overview/sidebar/helper.tsx
index fb56f0b95b..b79feef78b 100644
--- a/apps/web/ee/components/teamspaces/overview/sidebar/helper.tsx
+++ b/apps/web/ee/components/teamspaces/overview/sidebar/helper.tsx
@@ -1,7 +1,7 @@
import { useMemo } from "react";
import { TEAMSPACE_UPDATES_TRACKER_ELEMENTS, TEAMSPACE_UPDATES_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EFileAssetType, TCommentsOperations, TFileSignedURLResponse } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { formatTextList } from "@plane/utils";
import { captureElementAndEvent } from "@/helpers/event-tracker.helper";
import { useEditorAsset } from "@/hooks/store/use-editor-asset";
diff --git a/apps/web/ee/components/teamspaces/overview/sidebar/members.tsx b/apps/web/ee/components/teamspaces/overview/sidebar/members.tsx
index 1c8c25b9b5..5c9a0d2a97 100644
--- a/apps/web/ee/components/teamspaces/overview/sidebar/members.tsx
+++ b/apps/web/ee/components/teamspaces/overview/sidebar/members.tsx
@@ -5,7 +5,8 @@ import { Trash2 } from "lucide-react";
// ui
import { TEAMSPACE_TRACKER_ELEMENTS, TEAMSPACE_TRACKER_EVENTS } from "@plane/constants";
import { LeadIcon } from "@plane/propel/icons";
-import { Avatar, CustomMenu, setPromiseToast } from "@plane/ui";
+import { setPromiseToast } from "@plane/propel/toast";
+import { Avatar, CustomMenu } from "@plane/ui";
// helpers
import { cn, getFileURL } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/teamspaces/overview/statistics/root.tsx b/apps/web/ee/components/teamspaces/overview/statistics/root.tsx
index fc6a59e242..ebfca441e3 100644
--- a/apps/web/ee/components/teamspaces/overview/statistics/root.tsx
+++ b/apps/web/ee/components/teamspaces/overview/statistics/root.tsx
@@ -9,7 +9,8 @@ import { Loader as Spinner } from "lucide-react";
import { TEAMSPACE_ANALYTICS_TRACKER_ELEMENTS, TEAMSPACE_ANALYTICS_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { TreeMapIcon } from "@plane/propel/icons";
-import { Collapsible, CollapsibleButton, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Collapsible, CollapsibleButton } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web imports
import { captureClick, captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/pages/list/index.tsx b/apps/web/ee/components/teamspaces/pages/list/index.tsx
index eb71896fc2..1b09f26e7d 100644
--- a/apps/web/ee/components/teamspaces/pages/list/index.tsx
+++ b/apps/web/ee/components/teamspaces/pages/list/index.tsx
@@ -7,8 +7,8 @@ import useSWR from "swr";
// plane imports
import { EPageAccess, TEAMSPACE_PAGE_TRACKER_ELEMENTS, TEAMSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import type { TPageNavigationTabs, TPage, TPageDragPayload } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
import { PageListBlockRoot } from "@/components/pages/list/block-root";
diff --git a/apps/web/ee/components/teamspaces/pages/pages-list.tsx b/apps/web/ee/components/teamspaces/pages/pages-list.tsx
index 213c272c86..fba5575b73 100644
--- a/apps/web/ee/components/teamspaces/pages/pages-list.tsx
+++ b/apps/web/ee/components/teamspaces/pages/pages-list.tsx
@@ -9,8 +9,8 @@ import {
TEAMSPACE_PAGE_TRACKER_ELEMENTS,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserWorkspaceRoles } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
// components
import { ListLayout } from "@/components/core/list";
import { DetailedEmptyState } from "@/components/empty-state/detailed-empty-state-root";
diff --git a/apps/web/ee/components/teamspaces/projects/block.tsx b/apps/web/ee/components/teamspaces/projects/block.tsx
index 4d1c7b3ba8..cdcadaee95 100644
--- a/apps/web/ee/components/teamspaces/projects/block.tsx
+++ b/apps/web/ee/components/teamspaces/projects/block.tsx
@@ -4,9 +4,10 @@ import { useRef } from "react";
import { observer } from "mobx-react";
import Link from "next/link";
import { useParams, useRouter } from "next/navigation";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { Tooltip } from "@plane/propel/tooltip";
-import { setToast, TOAST_TYPE, Logo, Row } from "@plane/ui";
+import { Logo, Row } from "@plane/ui";
import { cn } from "@plane/utils";
// hooks
import { useAppTheme } from "@/hooks/store/use-app-theme";
diff --git a/apps/web/ee/components/teamspaces/views/modals/create-update/modal.tsx b/apps/web/ee/components/teamspaces/views/modals/create-update/modal.tsx
index 3067c4800b..f016b6f8a4 100644
--- a/apps/web/ee/components/teamspaces/views/modals/create-update/modal.tsx
+++ b/apps/web/ee/components/teamspaces/views/modals/create-update/modal.tsx
@@ -4,8 +4,9 @@ import { FC } from "react";
import { observer } from "mobx-react";
// plane imports
import { TEAMSPACE_VIEW_TRACKER_EVENTS } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EIssuesStoreType, IProjectView, TTeamspaceView } from "@plane/types";
-import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// helpers
import { joinUrlPath } from "@plane/utils";
import { captureSuccess, captureError } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/views/modals/delete.tsx b/apps/web/ee/components/teamspaces/views/modals/delete.tsx
index d51ac89ab5..257e77e8dc 100644
--- a/apps/web/ee/components/teamspaces/views/modals/delete.tsx
+++ b/apps/web/ee/components/teamspaces/views/modals/delete.tsx
@@ -5,9 +5,10 @@ import { observer } from "mobx-react";
import { useParams } from "next/navigation";
// types
import { TEAMSPACE_VIEW_TRACKER_EVENTS } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TTeamspaceView } from "@plane/types";
// ui
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// plan web hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useTeamspaceViews } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/components/teamspaces/views/modals/publish.tsx b/apps/web/ee/components/teamspaces/views/modals/publish.tsx
index b4d7bf57ee..f2f4554ff2 100644
--- a/apps/web/ee/components/teamspaces/views/modals/publish.tsx
+++ b/apps/web/ee/components/teamspaces/views/modals/publish.tsx
@@ -9,8 +9,9 @@ import { ExternalLink, Globe2 } from "lucide-react";
// plane imports
import { SPACE_BASE_PATH, SPACE_BASE_URL, TEAMSPACE_VIEW_TRACKER_EVENTS } from "@plane/constants";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { TPublishViewSettings, TTeamspaceView } from "@plane/types";
-import { EModalWidth, Loader, ModalCore, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
+import { EModalWidth, Loader, ModalCore, ToggleSwitch } from "@plane/ui";
import { copyTextToClipboard } from "@plane/utils";
// plane web hooks
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/teamspaces/views/quick-actions.tsx b/apps/web/ee/components/teamspaces/views/quick-actions.tsx
index 01b40147bc..8588587f82 100644
--- a/apps/web/ee/components/teamspaces/views/quick-actions.tsx
+++ b/apps/web/ee/components/teamspaces/views/quick-actions.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { ExternalLink, Link, Pencil, Trash2 } from "lucide-react";
// plane imports
import { EUserPermissionsLevel, TEAMSPACE_VIEW_TRACKER_ELEMENTS } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserWorkspaceRoles, TTeamspaceView } from "@plane/types";
-import { ContextMenu, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import { cn, copyUrlToClipboard } from "@plane/utils";
// hooks
import { captureClick } from "@/helpers/event-tracker.helper";
diff --git a/apps/web/ee/components/templates/settings/list/action-wrapper.tsx b/apps/web/ee/components/templates/settings/list/action-wrapper.tsx
index 4d415c282c..cd43398a41 100644
--- a/apps/web/ee/components/templates/settings/list/action-wrapper.tsx
+++ b/apps/web/ee/components/templates/settings/list/action-wrapper.tsx
@@ -9,9 +9,9 @@ import {
} from "@plane/constants";
import { getEditorContentWithReplacedAssets } from "@plane/editor";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { FileService } from "@plane/services";
import { EFileAssetType, EIssuesStoreType, ETemplateType, TPage } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { extractPageFormData } from "@plane/utils";
// components
import { CreateUpdateIssueModal } from "@/components/issues/issue-modal/modal";
diff --git a/apps/web/ee/components/templates/settings/list/quick-actions.tsx b/apps/web/ee/components/templates/settings/list/quick-actions.tsx
index bde344892d..9e6cb3d771 100644
--- a/apps/web/ee/components/templates/settings/list/quick-actions.tsx
+++ b/apps/web/ee/components/templates/settings/list/quick-actions.tsx
@@ -15,8 +15,9 @@ import {
WORKITEM_TEMPLATE_TRACKER_EVENTS,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { ETemplateType, TBaseTemplateWithData } from "@plane/types";
-import { AlertModalCore, ContextMenu, CustomMenu, setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { AlertModalCore, ContextMenu, CustomMenu, TContextMenuItem } from "@plane/ui";
import {
cn,
getCreateUpdateTemplateSettingsPath,
diff --git a/apps/web/ee/components/templates/settings/page/create-update.tsx b/apps/web/ee/components/templates/settings/page/create-update.tsx
index 8f9d42455e..47aa394ca3 100644
--- a/apps/web/ee/components/templates/settings/page/create-update.tsx
+++ b/apps/web/ee/components/templates/settings/page/create-update.tsx
@@ -5,8 +5,8 @@ import useSWR from "swr";
import { ETemplateLevel, PAGE_TEMPLATE_TRACKER_EVENTS } from "@plane/constants";
import { extractAssetsFromHTMLContent } from "@plane/editor";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { ETemplateType, PartialDeep, TPageTemplateForm } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import {
getTemplateTypeI18nName,
getTemplateSettingsBasePath,
diff --git a/apps/web/ee/components/templates/settings/project/create-update.tsx b/apps/web/ee/components/templates/settings/project/create-update.tsx
index 06055e2f81..4de4775cc8 100644
--- a/apps/web/ee/components/templates/settings/project/create-update.tsx
+++ b/apps/web/ee/components/templates/settings/project/create-update.tsx
@@ -3,9 +3,8 @@ import useSWR from "swr";
// plane imports
import { ETemplateLevel, PROJECT_TEMPLATE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { ETemplateType } from "@plane/types";
-// hooks
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { getTemplateSettingsBasePath, getTemplateTypeI18nName, projectTemplateFormDataToData } from "@plane/utils";
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { useMember } from "@/hooks/store/use-member";
diff --git a/apps/web/ee/components/templates/settings/project/form/work-item-types/root.tsx b/apps/web/ee/components/templates/settings/project/form/work-item-types/root.tsx
index 2387452e0b..48a6c0be08 100644
--- a/apps/web/ee/components/templates/settings/project/form/work-item-types/root.tsx
+++ b/apps/web/ee/components/templates/settings/project/form/work-item-types/root.tsx
@@ -5,8 +5,9 @@ import { PlusIcon } from "lucide-react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { setPromiseToast } from "@plane/propel/toast";
import { EIssuePropertyType, IIssueProperty, IIssueType, TProjectTemplateForm } from "@plane/types";
-import { setPromiseToast, ToggleSwitch } from "@plane/ui";
+import { ToggleSwitch } from "@plane/ui";
import { cn } from "@plane/utils";
// plane web imports
import { IssueTypeListItem } from "@/plane-web/components/issue-types/issue-type-list-item";
diff --git a/apps/web/ee/components/templates/settings/publish/form/template-cover-image-upload.tsx b/apps/web/ee/components/templates/settings/publish/form/template-cover-image-upload.tsx
index 8245495f3c..eb5e6453a4 100644
--- a/apps/web/ee/components/templates/settings/publish/form/template-cover-image-upload.tsx
+++ b/apps/web/ee/components/templates/settings/publish/form/template-cover-image-upload.tsx
@@ -6,8 +6,8 @@ import { Transition, Dialog } from "@headlessui/react";
// plane imports
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EFileAssetType } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { checkURLValidity, cn, getAssetIdFromUrl, getFileURL } from "@plane/utils";
// store hooks
import { useWorkspace } from "@/hooks/store/use-workspace";
diff --git a/apps/web/ee/components/templates/settings/publish/root.tsx b/apps/web/ee/components/templates/settings/publish/root.tsx
index e1de23cc16..590fb057c9 100644
--- a/apps/web/ee/components/templates/settings/publish/root.tsx
+++ b/apps/web/ee/components/templates/settings/publish/root.tsx
@@ -3,8 +3,8 @@ import { observer } from "mobx-react";
// plane imports
import { ETemplateLevel, PROJECT_TEMPLATE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { TBaseTemplateWithData, TPublishTemplateFormWithData } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import {
ensureUrlHasProtocol,
getAssetIdFromUrl,
diff --git a/apps/web/ee/components/templates/settings/work-item/create-update.tsx b/apps/web/ee/components/templates/settings/work-item/create-update.tsx
index 7173854f91..9594856cf8 100644
--- a/apps/web/ee/components/templates/settings/work-item/create-update.tsx
+++ b/apps/web/ee/components/templates/settings/work-item/create-update.tsx
@@ -4,6 +4,7 @@ import useSWR from "swr";
// plane imports
import { ETemplateLevel, WORKITEM_TEMPLATE_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
ETemplateType,
PartialDeep,
@@ -11,7 +12,6 @@ import {
TWorkItemTemplateFormData,
TIssuePropertyValues,
} from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import {
getTemplateTypeI18nName,
getTemplateSettingsBasePath,
diff --git a/apps/web/ee/components/updates/block.tsx b/apps/web/ee/components/updates/block.tsx
index 74551bf75f..216b1d4b3c 100644
--- a/apps/web/ee/components/updates/block.tsx
+++ b/apps/web/ee/components/updates/block.tsx
@@ -5,8 +5,8 @@ import { MessageCircle } from "lucide-react";
// plane imports
import { EUserPermissionsLevel } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUpdateEntityType, EUserProjectRoles, EUserWorkspaceRoles, TUpdate, TUpdateOperations } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn, renderFormattedDate } from "@plane/utils";
// hooks
import { useMember } from "@/hooks/store/use-member";
diff --git a/apps/web/ee/components/updates/comments/comment-list.tsx b/apps/web/ee/components/updates/comments/comment-list.tsx
index 942850d94a..eef3f9ce1e 100644
--- a/apps/web/ee/components/updates/comments/comment-list.tsx
+++ b/apps/web/ee/components/updates/comments/comment-list.tsx
@@ -2,8 +2,9 @@ import { useState } from "react";
import { observer } from "mobx-react";
import useSWR from "swr";
import { SendHorizonal } from "lucide-react";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUpdateEntityType, TUpdateComment, TUpdateOperations } from "@plane/types";
-import { Input, setToast, TOAST_TYPE } from "@plane/ui";
+import { Input } from "@plane/ui";
import { cn } from "@plane/utils";
import { useUpdateDetail } from "@/plane-web/hooks/use-update-detail";
import { CommentBlock } from "./comment-block";
diff --git a/apps/web/ee/components/updates/delete-update-modal.tsx b/apps/web/ee/components/updates/delete-update-modal.tsx
index c2f9022ed6..ee5d799c94 100644
--- a/apps/web/ee/components/updates/delete-update-modal.tsx
+++ b/apps/web/ee/components/updates/delete-update-modal.tsx
@@ -2,7 +2,8 @@ import { FC, useState } from "react";
import { observer } from "mobx-react";
// ui
import { useTranslation } from "@plane/i18n";
-import { AlertModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { AlertModalCore } from "@plane/ui";
type Props = {
isOpen: boolean;
diff --git a/apps/web/ee/components/updates/root.tsx b/apps/web/ee/components/updates/root.tsx
index dbecf79455..984988d16d 100644
--- a/apps/web/ee/components/updates/root.tsx
+++ b/apps/web/ee/components/updates/root.tsx
@@ -6,8 +6,9 @@ import { Plus } from "lucide-react";
import { E_SORT_ORDER } from "@plane/constants";
import { useLocalStorage } from "@plane/hooks";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUpdateEntityType, TUpdate, TUpdateOperations } from "@plane/types";
-import { Loader, setToast, TOAST_TYPE } from "@plane/ui";
+import { Loader } from "@plane/ui";
import { ActivitySortRoot } from "@/components/issues/issue-detail/issue-activity";
// components
import { useUpdateDetail } from "@/plane-web/hooks/use-update-detail";
diff --git a/apps/web/ee/components/updates/update-reaction.tsx b/apps/web/ee/components/updates/update-reaction.tsx
index bc0b81b5bf..8591d7e398 100644
--- a/apps/web/ee/components/updates/update-reaction.tsx
+++ b/apps/web/ee/components/updates/update-reaction.tsx
@@ -4,9 +4,9 @@ import { FC, useMemo } from "react";
import { observer } from "mobx-react";
// plane imports
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import { EUpdateEntityType, IUser, TUpdateOperations } from "@plane/types";
-import { TOAST_TYPE, setToast } from "@plane/ui";
import { cn, formatTextList } from "@plane/utils";
// components
import { ReactionSelector } from "@/components/issues/issue-detail/reactions";
diff --git a/apps/web/ee/components/views/helper.tsx b/apps/web/ee/components/views/helper.tsx
index fa66373572..2b51fea242 100644
--- a/apps/web/ee/components/views/helper.tsx
+++ b/apps/web/ee/components/views/helper.tsx
@@ -1,8 +1,9 @@
import { useEffect } from "react";
import { Lock, LockIcon, LockOpen } from "lucide-react";
import { E_FEATURE_FLAGS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EIssuesStoreType, EIssueLayoutTypes } from "@plane/types";
-import { setToast, TContextMenuItem, TOAST_TYPE } from "@plane/ui";
+import { TContextMenuItem } from "@plane/ui";
import {
TLayoutSelectionProps,
TMenuItemsFactoryProps,
diff --git a/apps/web/ee/components/views/publish/modal.tsx b/apps/web/ee/components/views/publish/modal.tsx
index a0ed3f34d7..ee9bd06713 100644
--- a/apps/web/ee/components/views/publish/modal.tsx
+++ b/apps/web/ee/components/views/publish/modal.tsx
@@ -9,8 +9,9 @@ import { ExternalLink, Globe2 } from "lucide-react";
// plane imports
import { SPACE_BASE_PATH, SPACE_BASE_URL } from "@plane/constants";
import { Button } from "@plane/propel/button";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { IProjectView, TPublishViewSettings } from "@plane/types";
-import { EModalWidth, Loader, ModalCore, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
+import { EModalWidth, Loader, ModalCore, ToggleSwitch } from "@plane/ui";
import { copyTextToClipboard } from "@plane/utils";
// hooks
import { useProjectView } from "@/hooks/store/use-project-view";
diff --git a/apps/web/ee/components/work-item-filters/filters-hoc/teamspace-level.tsx b/apps/web/ee/components/work-item-filters/filters-hoc/teamspace-level.tsx
index 4599e447e9..5d745e1812 100644
--- a/apps/web/ee/components/work-item-filters/filters-hoc/teamspace-level.tsx
+++ b/apps/web/ee/components/work-item-filters/filters-hoc/teamspace-level.tsx
@@ -3,9 +3,8 @@ import { isEqual, cloneDeep } from "lodash-es";
import { observer } from "mobx-react";
// plane imports
import { EUserPermissionsLevel, TEAMSPACE_VIEW_TRACKER_EVENTS } from "@plane/constants";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { EUserProjectRoles, EViewAccess, TTeamspaceView, TWorkItemFilterExpression } from "@plane/types";
-// components
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { removeNillKeys } from "@/components/issues/issue-layouts/utils";
import { WorkItemFiltersHOC } from "@/components/work-item-filters/filters-hoc/base";
import {
diff --git a/apps/web/ee/components/workflow/page/quick-actions.tsx b/apps/web/ee/components/workflow/page/quick-actions.tsx
index c6b3fe47d6..1d2a19df34 100644
--- a/apps/web/ee/components/workflow/page/quick-actions.tsx
+++ b/apps/web/ee/components/workflow/page/quick-actions.tsx
@@ -5,9 +5,10 @@ import { observer } from "mobx-react";
// plane imports
import { EUserPermissionsLevel, WORKFLOW_TRACKER_ELEMENTS, WORKFLOW_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { EUserProjectRoles } from "@plane/types";
// ui
-import { AlertModalCore, CustomMenu, TContextMenuItem, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore, CustomMenu, TContextMenuItem } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/workflow/state/transitions/add-state-transition.tsx b/apps/web/ee/components/workflow/state/transitions/add-state-transition.tsx
index 3bbe1cb5a2..ed6b8d536d 100644
--- a/apps/web/ee/components/workflow/state/transitions/add-state-transition.tsx
+++ b/apps/web/ee/components/workflow/state/transitions/add-state-transition.tsx
@@ -4,7 +4,8 @@ import { observer } from "mobx-react";
import { WORKFLOW_TRACKER_ELEMENTS, WORKFLOW_TRACKER_EVENTS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { setToast, Spinner, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Spinner } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { StateDropdown } from "@/components/dropdowns/state/dropdown";
diff --git a/apps/web/ee/components/workflow/state/transitions/state-transition-item.tsx b/apps/web/ee/components/workflow/state/transitions/state-transition-item.tsx
index 44727389d6..2ea5e85f3a 100644
--- a/apps/web/ee/components/workflow/state/transitions/state-transition-item.tsx
+++ b/apps/web/ee/components/workflow/state/transitions/state-transition-item.tsx
@@ -6,7 +6,8 @@ import { WORKFLOW_TRACKER_ELEMENTS, WORKFLOW_TRACKER_EVENTS } from "@plane/const
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
import { ApproverIcon } from "@plane/propel/icons";
-import { Collapsible, setToast, TOAST_TYPE, AlertModalCore } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
+import { Collapsible, AlertModalCore } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { MemberDropdown } from "@/components/dropdowns/member/dropdown";
diff --git a/apps/web/ee/components/workspace-notifications/notification-card/options/archive.tsx b/apps/web/ee/components/workspace-notifications/notification-card/options/archive.tsx
index a362dacbd0..c1e318de07 100644
--- a/apps/web/ee/components/workspace-notifications/notification-card/options/archive.tsx
+++ b/apps/web/ee/components/workspace-notifications/notification-card/options/archive.tsx
@@ -6,7 +6,7 @@ import { ArchiveRestore } from "lucide-react";
// plane imports
import { NOTIFICATION_TRACKER_ELEMENTS, NOTIFICATION_TRACKER_EVENTS } from "@plane/constants";
import { ArchiveIcon } from "@plane/propel/icons";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// components
import { NotificationItemOptionButton } from "@/components/workspace-notifications/sidebar/notification-card/options";
// helpers
diff --git a/apps/web/ee/components/workspace-notifications/notification-card/options/read.tsx b/apps/web/ee/components/workspace-notifications/notification-card/options/read.tsx
index 08b3dc80de..012e2856ee 100644
--- a/apps/web/ee/components/workspace-notifications/notification-card/options/read.tsx
+++ b/apps/web/ee/components/workspace-notifications/notification-card/options/read.tsx
@@ -5,7 +5,7 @@ import { observer } from "mobx-react";
import { MessageSquare } from "lucide-react";
// plane imports
import { NOTIFICATION_TRACKER_ELEMENTS, NOTIFICATION_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// components
import { NotificationItemOptionButton } from "@/components/workspace-notifications/sidebar/notification-card/options";
// helpers
diff --git a/apps/web/ee/components/workspace-notifications/notification-card/options/snooze/root.tsx b/apps/web/ee/components/workspace-notifications/notification-card/options/snooze/root.tsx
index d83e2a5b68..9d7b0bbcda 100644
--- a/apps/web/ee/components/workspace-notifications/notification-card/options/snooze/root.tsx
+++ b/apps/web/ee/components/workspace-notifications/notification-card/options/snooze/root.tsx
@@ -7,8 +7,8 @@ import { Popover, Transition } from "@headlessui/react";
// plane imports
import { NOTIFICATION_SNOOZE_OPTIONS } from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { cn } from "@plane/utils";
// components
import { NotificationSnoozeModal } from "@/components/workspace-notifications/sidebar/notification-card/options/snooze/modal";
diff --git a/apps/web/ee/components/workspace-project-states/settings/create-update/create.tsx b/apps/web/ee/components/workspace-project-states/settings/create-update/create.tsx
index 67fb005503..4ec25199f2 100644
--- a/apps/web/ee/components/workspace-project-states/settings/create-update/create.tsx
+++ b/apps/web/ee/components/workspace-project-states/settings/create-update/create.tsx
@@ -3,7 +3,7 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
import { PROJECT_STATE_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web components
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { ProjectStateForm } from "@/plane-web/components/workspace-project-states";
diff --git a/apps/web/ee/components/workspace-project-states/settings/create-update/update.tsx b/apps/web/ee/components/workspace-project-states/settings/create-update/update.tsx
index 937fbcfdaa..7f1f775cbf 100644
--- a/apps/web/ee/components/workspace-project-states/settings/create-update/update.tsx
+++ b/apps/web/ee/components/workspace-project-states/settings/create-update/update.tsx
@@ -3,7 +3,7 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
import { PROJECT_STATE_TRACKER_EVENTS } from "@plane/constants";
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
// plane web components
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
import { ProjectStateForm } from "@/plane-web/components/workspace-project-states";
diff --git a/apps/web/ee/components/workspace-project-states/settings/options/delete.tsx b/apps/web/ee/components/workspace-project-states/settings/options/delete.tsx
index c242832e23..972a47fa11 100644
--- a/apps/web/ee/components/workspace-project-states/settings/options/delete.tsx
+++ b/apps/web/ee/components/workspace-project-states/settings/options/delete.tsx
@@ -5,8 +5,9 @@ import { observer } from "mobx-react";
import { Loader, X } from "lucide-react";
// plane imports
import { PROJECT_STATE_TRACKER_ELEMENTS, PROJECT_STATE_TRACKER_EVENTS } from "@plane/constants";
+import { TOAST_TYPE, setToast } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
-import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// helpers
import { cn } from "@plane/utils";
// hooks
diff --git a/apps/web/ee/components/workspace/billing/manage-seats/add-seats/form.tsx b/apps/web/ee/components/workspace/billing/manage-seats/add-seats/form.tsx
index 4a6d7ac497..8662061bd6 100644
--- a/apps/web/ee/components/workspace/billing/manage-seats/add-seats/form.tsx
+++ b/apps/web/ee/components/workspace/billing/manage-seats/add-seats/form.tsx
@@ -3,9 +3,9 @@
import React, { useEffect, useState } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// plane imports
import { TProrationPreview } from "@plane/types";
-import { setToast, TOAST_TYPE } from "@plane/ui";
import { getSubscriptionName } from "@plane/utils";
// plane web imports
import {
diff --git a/apps/web/ee/components/workspace/billing/manage-seats/remove-seats/remove-unused-seats-modal.tsx b/apps/web/ee/components/workspace/billing/manage-seats/remove-seats/remove-unused-seats-modal.tsx
index 843feb2991..2543931ff1 100644
--- a/apps/web/ee/components/workspace/billing/manage-seats/remove-seats/remove-unused-seats-modal.tsx
+++ b/apps/web/ee/components/workspace/billing/manage-seats/remove-seats/remove-unused-seats-modal.tsx
@@ -1,7 +1,8 @@
import { FC, useState } from "react";
import { useParams } from "next/navigation";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
// ui
-import { AlertModalCore, setToast, TOAST_TYPE } from "@plane/ui";
+import { AlertModalCore } from "@plane/ui";
// plane web hooks
import { useWorkspaceSubscription } from "@/plane-web/hooks/store";
// plane web services
diff --git a/apps/web/ee/components/workspace/billing/root.tsx b/apps/web/ee/components/workspace/billing/root.tsx
index 24c9414762..b566a25356 100644
--- a/apps/web/ee/components/workspace/billing/root.tsx
+++ b/apps/web/ee/components/workspace/billing/root.tsx
@@ -10,6 +10,7 @@ import {
SUBSCRIPTION_WITH_BILLING_FREQUENCY,
} from "@plane/constants";
import { useTranslation } from "@plane/i18n";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import {
EProductSubscriptionEnum,
IPaymentProduct,
@@ -18,7 +19,7 @@ import {
TProductBillingFrequency,
TUpgradeParams,
} from "@plane/types";
-import { Loader, setToast, TOAST_TYPE, getBillingAndPlansCardVariantStyle } from "@plane/ui";
+import { Loader, getBillingAndPlansCardVariantStyle } from "@plane/ui";
import { cn, getSubscriptionProduct, getSubscriptionProductPrice } from "@plane/utils";
// helpers
import { SettingsHeading } from "@/components/settings/heading";
diff --git a/apps/web/ee/components/workspace/cancel-trial.tsx b/apps/web/ee/components/workspace/cancel-trial.tsx
index b2a320c7ce..6346b1111a 100644
--- a/apps/web/ee/components/workspace/cancel-trial.tsx
+++ b/apps/web/ee/components/workspace/cancel-trial.tsx
@@ -3,7 +3,7 @@ import { useParams } from "next/navigation";
import { CircleAlert } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { Button } from "@plane/propel/button";
-import { setToast, TOAST_TYPE } from "@plane/ui";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { cn } from "@plane/utils";
import { useWorkspaceSubscription } from "@/plane-web/hooks/store";
diff --git a/apps/web/ee/hooks/use-editor-embed.tsx b/apps/web/ee/hooks/use-editor-embed.tsx
index efaa9e829c..9742c2bcaa 100644
--- a/apps/web/ee/hooks/use-editor-embed.tsx
+++ b/apps/web/ee/hooks/use-editor-embed.tsx
@@ -4,9 +4,8 @@ import { useParams } from "next/navigation";
import { DEFAULT_PAGE_SORT_ORDER, PAGE_SORT_ORDER_INCREMENT, WORKSPACE_PAGE_TRACKER_EVENTS } from "@plane/constants";
import type { TEmbedConfig, TEmbedItem, TIssueEmbedConfig, TPageEmbedConfig } from "@plane/editor";
import { PriorityIcon } from "@plane/propel/icons";
+import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import type { TPage, TSearchEntityRequestPayload, TSearchResponse } from "@plane/types";
-// plane ui
-import { setToast, TOAST_TYPE } from "@plane/ui";
// helpers
import { captureError, captureSuccess } from "@/helpers/event-tracker.helper";
// plane web components