diff --git a/apps/web/core/components/core/description-versions/modal.tsx b/apps/web/core/components/core/description-versions/modal.tsx
index 66abb6a87e2..713e056475a 100644
--- a/apps/web/core/components/core/description-versions/modal.tsx
+++ b/apps/web/core/components/core/description-versions/modal.tsx
@@ -4,18 +4,19 @@ import { Copy } from "lucide-react";
// plane imports
import type { EditorRefApi } from "@plane/editor";
import { useTranslation } from "@plane/i18n";
-import { Button, getButtonStyling } from "@plane/propel/button";
+import { Button } from "@plane/propel/button";
import { ChevronLeftIcon, ChevronRightIcon } from "@plane/propel/icons";
import { setToast, TOAST_TYPE } from "@plane/propel/toast";
import { Tooltip } from "@plane/propel/tooltip";
import type { TDescriptionVersion } from "@plane/types";
import { Avatar, EModalPosition, EModalWidth, Loader, ModalCore } from "@plane/ui";
-import { calculateTimeAgo, cn, copyTextToClipboard, getFileURL } from "@plane/utils";
+import { calculateTimeAgo, cn, getFileURL } from "@plane/utils";
// components
import { RichTextEditor } from "@/components/editor/rich-text";
// hooks
import { useMember } from "@/hooks/store/use-member";
import { useWorkspace } from "@/hooks/store/use-workspace";
+import { IconButton } from "@plane/propel/icon-button";
type Props = {
activeVersionDescription: string | undefined;
@@ -151,25 +152,16 @@ export const DescriptionVersionsModal = observer(function DescriptionVersionsMod
{/* Footer */}
-
-
-
+
-
+
{t("common.cancel")}
{!isRestoreDisabled && (
{
handleRestore(activeVersionDescription ?? "
");
handleClose();
diff --git a/apps/web/core/components/core/filters/date-filter-modal.tsx b/apps/web/core/components/core/filters/date-filter-modal.tsx
index 5d7e7a3bf4f..5563825afec 100644
--- a/apps/web/core/components/core/filters/date-filter-modal.tsx
+++ b/apps/web/core/components/core/filters/date-filter-modal.tsx
@@ -142,11 +142,12 @@ export function DateFilterModal({ title, handleClose, isOpen, onSelect }: Props)
)}
-
+
Cancel
0 && (
-
+
Cancel
-
+
{isSubmitting ? "Deleting..." : "Delete selected work items"}
diff --git a/apps/web/core/components/cycles/archived-cycles/modal.tsx b/apps/web/core/components/cycles/archived-cycles/modal.tsx
index bd30ce6b05a..38b6aa66abd 100644
--- a/apps/web/core/components/cycles/archived-cycles/modal.tsx
+++ b/apps/web/core/components/cycles/archived-cycles/modal.tsx
@@ -101,10 +101,10 @@ export function ArchiveCycleModal(props: Props) {
Are you sure you want to archive the cycle? All your archives can be restored later.
-
+
Cancel
-
+
{isArchiving ? "Archiving" : "Archive"}
diff --git a/apps/web/core/components/cycles/form.tsx b/apps/web/core/components/cycles/form.tsx
index 4fea2cd454d..289bfbf8a92 100644
--- a/apps/web/core/components/cycles/form.tsx
+++ b/apps/web/core/components/cycles/form.tsx
@@ -178,10 +178,10 @@ export function CycleForm(props: Props) {
-
+
{t("common.cancel")}
-
+
{data
? isSubmitting
? t("common.updating")
diff --git a/apps/web/core/components/estimates/create/modal.tsx b/apps/web/core/components/estimates/create/modal.tsx
index 375be315d6a..830c35fad87 100644
--- a/apps/web/core/components/estimates/create/modal.tsx
+++ b/apps/web/core/components/estimates/create/modal.tsx
@@ -195,11 +195,11 @@ export const CreateEstimateModal = observer(function CreateEstimateModal(props:
-
+
{t("common.cancel")}
{estimatePoints && (
-
+
{buttonLoader ? t("common.creating") : t("project_settings.estimates.create.label")}
)}
diff --git a/apps/web/core/components/estimates/delete/modal.tsx b/apps/web/core/components/estimates/delete/modal.tsx
index f40f690aeab..e348495bf68 100644
--- a/apps/web/core/components/estimates/delete/modal.tsx
+++ b/apps/web/core/components/estimates/delete/modal.tsx
@@ -86,10 +86,10 @@ export const DeleteEstimateModal = observer(function DeleteEstimateModal(props:
-
+
Cancel
-
+
{buttonLoader ? "Deleting" : "Delete Estimate"}
diff --git a/apps/web/core/components/home/widgets/links/create-update-link-modal.tsx b/apps/web/core/components/home/widgets/links/create-update-link-modal.tsx
index ec5b312a597..3310dd9d712 100644
--- a/apps/web/core/components/home/widgets/links/create-update-link-modal.tsx
+++ b/apps/web/core/components/home/widgets/links/create-update-link-modal.tsx
@@ -121,10 +121,10 @@ export const LinkCreateUpdateModal = observer(function LinkCreateUpdateModal(pro
-
+
{t("Cancel")}
-
+
{preloadedData?.id ? (isSubmitting ? t("updating") : t("update")) : isSubmitting ? t("adding") : t("add")}{" "}
{t("home.quick_links.title")}
diff --git a/apps/web/core/components/inbox/modals/create-modal/create-root.tsx b/apps/web/core/components/inbox/modals/create-modal/create-root.tsx
index 6c24d0684f7..6691cca6916 100644
--- a/apps/web/core/components/inbox/modals/create-modal/create-root.tsx
+++ b/apps/web/core/components/inbox/modals/create-modal/create-root.tsx
@@ -254,6 +254,7 @@ export const InboxIssueCreateRoot = observer(function InboxIssueCreateRoot(props
{
if (descriptionEditorRef.current?.isEditorReadyToDiscard()) {
@@ -277,6 +278,7 @@ export const InboxIssueCreateRoot = observer(function InboxIssueCreateRoot(props
loading={formSubmitting}
disabled={isTitleLengthMoreThan255Character}
tabIndex={getIndex("submit_button")}
+ size="lg"
>
{formSubmitting ? t("creating") : t("create_work_item")}
diff --git a/apps/web/core/components/integration/delete-import-modal.tsx b/apps/web/core/components/integration/delete-import-modal.tsx
index f222baa5917..bf665a3102b 100644
--- a/apps/web/core/components/integration/delete-import-modal.tsx
+++ b/apps/web/core/components/integration/delete-import-modal.tsx
@@ -123,11 +123,12 @@ export function DeleteImportModal({ isOpen, handleClose, data }: Props) {
/>
-
+
Cancel
-
+
{t("common.cancel")}
-
+
{`${
preloadedData?.id
? isSubmitting
diff --git a/apps/web/core/components/issues/issue-modal/form.tsx b/apps/web/core/components/issues/issue-modal/form.tsx
index cd984b5d7c4..4d5945f7cdd 100644
--- a/apps/web/core/components/issues/issue-modal/form.tsx
+++ b/apps/web/core/components/issues/issue-modal/form.tsx
@@ -525,6 +525,7 @@ export const IssueFormRoot = observer(function IssueFormRoot(props: IssueFormPro
{
if (editorRef.current?.isEditorReadyToDiscard()) {
onClose();
@@ -543,6 +544,7 @@ export const IssueFormRoot = observer(function IssueFormRoot(props: IssueFormPro
{t("add_to_project")}
diff --git a/apps/web/core/components/modules/archived-modules/modal.tsx b/apps/web/core/components/modules/archived-modules/modal.tsx
index eb47bb4305f..0194f9aed3a 100644
--- a/apps/web/core/components/modules/archived-modules/modal.tsx
+++ b/apps/web/core/components/modules/archived-modules/modal.tsx
@@ -87,10 +87,16 @@ export function ArchiveModuleModal(props: Props) {
Are you sure you want to archive the module? All your archives can be restored later.
-
+
Cancel
-
+
{isArchiving ? "Archiving" : "Archive"}
diff --git a/apps/web/core/components/modules/form.tsx b/apps/web/core/components/modules/form.tsx
index 376953c03f5..322f62b3d67 100644
--- a/apps/web/core/components/modules/form.tsx
+++ b/apps/web/core/components/modules/form.tsx
@@ -227,10 +227,10 @@ export function ModuleForm(props: Props) {
-
+
{t("cancel")}
-
+
{status
? isSubmitting
? t("updating")
diff --git a/apps/web/core/components/modules/links/create-update-modal.tsx b/apps/web/core/components/modules/links/create-update-modal.tsx
index 22f0723a125..35eac054b37 100644
--- a/apps/web/core/components/modules/links/create-update-modal.tsx
+++ b/apps/web/core/components/modules/links/create-update-modal.tsx
@@ -132,10 +132,10 @@ export function CreateUpdateModuleLinkModal(props: Props) {
-
+
Cancel
-
+
{data ? (isSubmitting ? "Updating link" : "Update link") : isSubmitting ? "Adding link" : "Add link"}
diff --git a/apps/web/core/components/pages/modals/export-page-modal.tsx b/apps/web/core/components/pages/modals/export-page-modal.tsx
index fc1d6d86e6e..861e5c1526d 100644
--- a/apps/web/core/components/pages/modals/export-page-modal.tsx
+++ b/apps/web/core/components/pages/modals/export-page-modal.tsx
@@ -276,10 +276,10 @@ export function ExportPageModal(props: Props) {
-
+
Cancel
-
+
{isExporting ? "Exporting" : "Export"}
diff --git a/apps/web/core/components/pages/modals/page-form.tsx b/apps/web/core/components/pages/modals/page-form.tsx
index f781d7ee222..2a98f671c10 100644
--- a/apps/web/core/components/pages/modals/page-form.tsx
+++ b/apps/web/core/components/pages/modals/page-form.tsx
@@ -135,11 +135,12 @@ export function PageForm(props: Props) {
{t(i18n_access_label || "")}
-
+
Cancel
-
+
Cancel
-
+
{t("common.cancel")}
-
+
{isSubmitting ? t("creating") : t("create_project")}
diff --git a/apps/web/core/components/project/delete-project-modal.tsx b/apps/web/core/components/project/delete-project-modal.tsx
index 9d1090d0c98..e3e2b4a7fed 100644
--- a/apps/web/core/components/project/delete-project-modal.tsx
+++ b/apps/web/core/components/project/delete-project-modal.tsx
@@ -180,10 +180,10 @@ export function DeleteProjectModal(props: DeleteProjectModal) {
/>
-
+
Cancel
-
+
{isSubmitting ? "Deleting" : "Delete project"}
diff --git a/apps/web/core/components/project/join-project-modal.tsx b/apps/web/core/components/project/join-project-modal.tsx
index 9082c5f6664..3bb8aca5f81 100644
--- a/apps/web/core/components/project/join-project-modal.tsx
+++ b/apps/web/core/components/project/join-project-modal.tsx
@@ -81,11 +81,12 @@ export function JoinProjectModal(props: TJoinProjectModalProps) {
-
+
Cancel
-
+
Cancel
-
+
{isSubmitting ? "Leaving..." : "Leave Project"}
diff --git a/apps/web/core/components/project/publish-project/modal.tsx b/apps/web/core/components/project/publish-project/modal.tsx
index 07cc3223069..ef3dd1f1a6f 100644
--- a/apps/web/core/components/project/publish-project/modal.tsx
+++ b/apps/web/core/components/project/publish-project/modal.tsx
@@ -311,17 +311,17 @@ export const PublishProjectModal = observer(function PublishProjectModal(props:
{!fetchSettingsLoader && (
-
+
Cancel
{isProjectPublished ? (
isDirty && (
-
+
{isSubmitting ? "Updating" : "Update settings"}
)
) : (
-
+
{isSubmitting ? "Publishing" : "Publish"}
)}
diff --git a/apps/web/core/components/project/send-project-invitation-modal.tsx b/apps/web/core/components/project/send-project-invitation-modal.tsx
index c1d312feecf..51b22574c3f 100644
--- a/apps/web/core/components/project/send-project-invitation-modal.tsx
+++ b/apps/web/core/components/project/send-project-invitation-modal.tsx
@@ -343,10 +343,10 @@ export const SendProjectInvitationModal = observer(function SendProjectInvitatio
{t("common.add_more")}
-
+
{t("cancel")}
-
+
{isSubmitting
? `${fields && fields.length > 1 ? `${t("add_members")}...` : `${t("add_member")}...`}`
: `${fields && fields.length > 1 ? t("add_members") : t("add_member")}`}
diff --git a/apps/web/core/components/project/settings/archive-project/archive-restore-modal.tsx b/apps/web/core/components/project/settings/archive-project/archive-restore-modal.tsx
index 607e3322333..76613aff7f9 100644
--- a/apps/web/core/components/project/settings/archive-project/archive-restore-modal.tsx
+++ b/apps/web/core/components/project/settings/archive-project/archive-restore-modal.tsx
@@ -114,10 +114,12 @@ export function ArchiveRestoreProjectModal(props: Props) {
: "Restoring a project will activate it and make it visible to all members of the project. Are you sure you want to continue?"}
-
+
Cancel
-
+
{t("common.cancel")}
-
+
{data
? isSubmitting
? t("common.updating")
diff --git a/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx b/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
index 1e27182c26e..b481fba2a60 100644
--- a/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
+++ b/apps/web/core/components/workspace-notifications/sidebar/notification-card/options/snooze/modal.tsx
@@ -245,10 +245,10 @@ export function NotificationSnoozeModal(props: TNotificationSnoozeModal) {
-
+
Cancel
-
+
{isSubmitting ? "Submitting..." : "Submit"}
diff --git a/apps/web/core/components/workspace/invite-modal/actions.tsx b/apps/web/core/components/workspace/invite-modal/actions.tsx
index b495996d5ed..fa9f1864c02 100644
--- a/apps/web/core/components/workspace/invite-modal/actions.tsx
+++ b/apps/web/core/components/workspace/invite-modal/actions.tsx
@@ -50,10 +50,10 @@ export const InvitationModalActions = observer(function InvitationModalActions(p
{addMoreButtonText || t("common.add_more")}
-
+
{cancelButtonText || t("cancel")}
-
+
{isSubmitting
? submitButtonText?.loading || t("workspace_settings.settings.members.modal.button_loading")
: submitButtonText?.default || t("workspace_settings.settings.members.modal.button")}
diff --git a/packages/editor/src/core/extensions/callout/block.tsx b/packages/editor/src/core/extensions/callout/block.tsx
index 5c04294d2bc..f5a156d900a 100644
--- a/packages/editor/src/core/extensions/callout/block.tsx
+++ b/packages/editor/src/core/extensions/callout/block.tsx
@@ -29,7 +29,7 @@ export function CustomCalloutBlock(props: CustomCalloutNodeViewProps) {
return (