Declutter: Remove Avatar Decoration From User Area

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;

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,[",

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 () => {

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",