From c3f2e76b9cc5deb6c76128bfe52cf0bfb099b282 Mon Sep 17 00:00:00 2001
From: sadan4 <117494111+sadan4@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:09:33 -0400
Subject: [PATCH 1/2] BetterFolders: Fix sidebar in wrong location (#2904)

---
 src/plugins/betterFolders/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/betterFolders/index.tsx b/src/plugins/betterFolders/index.tsx
index c2969988b..bb1a67ebb 100644
--- a/src/plugins/betterFolders/index.tsx
+++ b/src/plugins/betterFolders/index.tsx
@@ -200,8 +200,8 @@ export default definePlugin({
             predicate: () => settings.store.sidebar,
             replacement: {
                 // Render the Better Folders sidebar
-                match: /(?<=({className:\i\.guilds,themeOverride:\i})\))/,
-                replace: ",$self.FolderSideBar({...$1})"
+                match: /(container.{0,50}({className:\i\.guilds,themeOverride:\i})\))/,
+                replace: "$1,$self.FolderSideBar({...$2})"
             }
         },
         {

From cb2848f186f3d074d1a3390643aba70fa481eb6b Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 24 Sep 2024 02:13:44 -0300
Subject: [PATCH 2/2] ContextMenuAPI: Fix findGroupChildrenByChildId

---
 src/api/ContextMenu.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/ContextMenu.ts b/src/api/ContextMenu.ts
index fd8c7e100..114942ff6 100644
--- a/src/api/ContextMenu.ts
+++ b/src/api/ContextMenu.ts
@@ -103,7 +103,7 @@ export function findGroupChildrenByChildId(id: string | string[], children: Arra
 
         if (
             (Array.isArray(id) && id.some(id => matchSubstring ? child.props?.id?.includes(id) : child.props?.id === id))
-                || matchSubstring ? child.props?.id?.includes(id) : child.props?.id === id
+            || (matchSubstring ? child.props?.id?.includes(id) : child.props?.id === id)
         ) return children;
 
         let nextChildren = child.props?.children;