From 936ac1ebd8256d16368af3a110a82347c3820548 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 11 Feb 2025 07:18:06 -0500
Subject: [PATCH] Canary Fixes

---
 src/equicordplugins/noModalAnimation/index.ts | 22 +++++++++++++++----
 src/plugins/betterFolders/index.tsx           |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/equicordplugins/noModalAnimation/index.ts b/src/equicordplugins/noModalAnimation/index.ts
index 0d0478b9..17433d8d 100644
--- a/src/equicordplugins/noModalAnimation/index.ts
+++ b/src/equicordplugins/noModalAnimation/index.ts
@@ -13,18 +13,32 @@ export default definePlugin({
     authors: [Devs.AutumnVN],
     patches: [
         {
-            find: ".rootWithShadow",
+            find: "DURATION_IN:",
             replacement: {
-                match: /\?300:100/,
-                replace: "?0:0",
+                match: /300,/,
+                replace: "0,",
             }
         },
         {
             find: 'backdropFilter:"blur(0px)"',
             replacement: {
-                match: /\?0:300/,
+                match: /\?0:200/,
                 replace: "?0:0",
             }
+        },
+        {
+            find: '="ABOVE"',
+            replacement: {
+                match: /:300/,
+                replace: ":0",
+            }
+        },
+        {
+            find: "renderLurkerModeUpsellPopout,position:",
+            replacement: {
+                match: /200:300/g,
+                replace: "0:0",
+            },
         }
     ]
 });
diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index 39c10965..403dc834 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -185,7 +185,7 @@ export default definePlugin({
                 {
                     // Decide if we should render the expanded folder background if we are rendering the Better Folders sidebar
                     predicate: () => settings.store.showFolderIcon !== FolderIconDisplay.Always,
-                    match: /(?<=\.isExpanded\),children:\[)/,
+                    match: /(?<=\.isExpanded\),.{0,25}children:\[)/,
                     replace: "$self.shouldShowFolderIconAndBackground(!!arguments[0]?.isBetterFolders,arguments[0]?.betterFoldersExpandedIds)&&"
                 },
                 {