diff --git a/packages/discord-types/src/utils.d.ts b/packages/discord-types/src/utils.d.ts index 1dbebbb26..3afad0d95 100644 --- a/packages/discord-types/src/utils.d.ts +++ b/packages/discord-types/src/utils.d.ts @@ -58,6 +58,7 @@ export interface Alerts { confirmColor?: string; cancelText?: string; confirmText?: string; + confirmVariant?: string; secondaryConfirmText?: string; onCancel?(): void; onConfirm?(): void; diff --git a/src/equicordplugins/declutter/index.tsx b/src/equicordplugins/declutter/index.tsx index 22a62711d..1159dbc4e 100644 --- a/src/equicordplugins/declutter/index.tsx +++ b/src/equicordplugins/declutter/index.tsx @@ -147,7 +147,6 @@ export default definePlugin({ title: "Declutter", body: "Avatar decoration removal has been disabled to prevent conflicts with Decor plugin.", confirmText: "OK", - // @ts-expect-error not typed confirmVariant: "critical-primary" }); } @@ -172,6 +171,14 @@ export default definePlugin({ }, predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name), }, + { + find: ".DISPLAY_NAME_STYLES_COACHMARK)", + replacement: { + match: /((\i)=\i\?\.avatarDecoration,\i=)\(0,\i\.\i\)\(\2\)/, + replace: "$1null" + }, + predicate: () => settings.store.removeAvatarDecoration && !isPluginEnabled(decor.name), + }, { // Nameplate find: ".MINI_PREVIEW,[", diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx index 53bda1f58..6e0514a62 100644 --- a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx @@ -135,7 +135,6 @@ export function LogsModal({ modalProps, initalQuery }: Props) { title: "Clear Logs", body: `Are you sure you want to clear ${messages.length} logs`, confirmText: "Clear", - // @ts-expect-error not typed confirmVariant: "critical-primary", cancelText: "Cancel", onConfirm: async () => { @@ -151,7 +150,6 @@ export function LogsModal({ modalProps, initalQuery }: Props) { title: "Clear Logs", body: "Are you sure you want to clear all the logs", confirmText: "Clear", - // @ts-expect-error not typed confirmVariant: "critical-primary", cancelText: "Cancel", onConfirm: async () => { diff --git a/src/equicordplugins/messageLoggerEnhanced/settings.tsx b/src/equicordplugins/messageLoggerEnhanced/settings.tsx index 1c39df9e4..abb0d925d 100644 --- a/src/equicordplugins/messageLoggerEnhanced/settings.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/settings.tsx @@ -298,7 +298,6 @@ export const settings = definePluginSettings({ onClick={() => Alerts.show({ title: "Clear Logs", body: "Are you sure you want to clear all logs?", - // @ts-expect-error not typed confirmVariant: "critical-primary", confirmText: "Clear", cancelText: "Cancel",