From e2f49274422ac87e572353b14902d9b25ef4ba81 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:16:26 -0400
Subject: [PATCH] StatusPresets: Canary Fixes

---
 .../statusPresets/fixActionBar.css            |  3 ++
 src/equicordplugins/statusPresets/index.tsx   | 30 +++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 src/equicordplugins/statusPresets/fixActionBar.css

diff --git a/src/equicordplugins/statusPresets/fixActionBar.css b/src/equicordplugins/statusPresets/fixActionBar.css
new file mode 100644
index 000000000..75aa0360a
--- /dev/null
+++ b/src/equicordplugins/statusPresets/fixActionBar.css
@@ -0,0 +1,3 @@
+[class*="outerContainer_"] [class*="container_"] [class*="actionBar_"] {
+    gap: 0;
+}
\ No newline at end of file
diff --git a/src/equicordplugins/statusPresets/index.tsx b/src/equicordplugins/statusPresets/index.tsx
index 26529976b..b10790794 100644
--- a/src/equicordplugins/statusPresets/index.tsx
+++ b/src/equicordplugins/statusPresets/index.tsx
@@ -28,8 +28,9 @@ import { openModalLazy } from "@utils/modal";
 import { useForceUpdater } from "@utils/react";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { extractAndLoadChunksLazy, findByPropsLazy, findComponentByCodeLazy, findModuleId, wreq } from "@webpack";
-import { Button, Clickable, Menu, Toasts, UserStore, useState } from "@webpack/common";
+import { Clickable, Menu, Toasts, UserStore, useState } from "@webpack/common";
 
+import managedStyle from "./fixActionBar.css?managed";
 
 const settings = definePluginSettings({
     StatusPresets: {
@@ -62,7 +63,7 @@ const EmojiComponent = findComponentByCodeLazy(/\.translateSurrogatesToInlineEmo
 
 const CustomStatusSettings = getUserSettingLazy("status", "customStatus")!;
 const StatusModule = proxyLazy(() => {
-    const id = findModuleId("this.renderCustomStatusInput()");
+    const id = findModuleId(".customStatusInputTitle,");
     return wreq(Number(id));
 });
 
@@ -150,12 +151,13 @@ export default definePlugin({
     authors: [EquicordDevs.iamme],
     settings: settings,
     dependencies: ["UserSettingsAPI"],
+    managedStyle,
     patches: [
         {
-            find: "#{intl::CUSTOM_STATUS_SET_CUSTOM_STATUS}",
+            find: '"CustomStatusModalWithPreview"',
             replacement: {
-                match: /cancelButton,(children|text):\i\.\i\.string\(\i\.\i#{intl::CANCEL}\)\}\)/,
-                replace: "$&,$self.renderRememberButton(this.state)"
+                match: /(?<=(\i)\.state\).*?)\{text:\i\.\i\.\i\(\i\.\i\.R3BPHx\)/,
+                replace: "$self.renderRememberButton($1),$&"
             }
         },
         {
@@ -205,21 +207,19 @@ export default definePlugin({
             </ErrorBoundary>
         );
     },
-    renderRememberButton(statue: DiscordStatus) {
-        return <Button
-            look={Button.Looks.LINK}
-            color={Button.Colors.WHITE}
-            size={Button.Sizes.MEDIUM}
-            onClick={e => {
-                settings.store.StatusPresets[statue.text] = statue;
+    renderRememberButton(status: DiscordStatus) {
+        return {
+            text: "Keep",
+            style: { marginLeft: "20px" },
+            onClick: () => {
+                settings.store.StatusPresets[status.text] = status;
                 Toasts.show({
                     message: "Successfully Saved Status",
                     type: Toasts.Type.SUCCESS,
                     id: Toasts.genId()
                 });
-            }}
-            style={{ marginRight: "20px" }}
-        >Remember</Button>;
+            }
+        };
     },
     startAt: StartAt.WebpackReady
 });