From fafd46d2028e702d7341e1eb404c68fede49bdd3 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:31:22 -0300
Subject: [PATCH] FriendsSince: Remove workaround for stable compatibility

---
 src/plugins/friendsSince/index.tsx | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/plugins/friendsSince/index.tsx b/src/plugins/friendsSince/index.tsx
index 69d8e739..d6b7d107 100644
--- a/src/plugins/friendsSince/index.tsx
+++ b/src/plugins/friendsSince/index.tsx
@@ -7,22 +7,12 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
-import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
-import { filters, find, findByPropsLazy, handleModuleNotFound } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { React, RelationshipStore } from "@webpack/common";
 
 const { Heading, Text } = findByPropsLazy("Heading", "Text");
-// Workaround for module differing on stable & canary
-// FIXME: remove once merged into stable
-const getMemberSinceContainer = makeLazy(() => {
-    for (const name of ["memberSinceWrapper", "memberSinceContainer"]) {
-        const mod = find(filters.byProps(name), { isIndirect: true });
-        if (mod) return mod[name];
-    }
-    handleModuleNotFound("findByProps", "memberSinceWrapper/memberSinceContainer");
-    return "";
-});
+const container = findByPropsLazy("memberSinceWrapper");
 const { getCreatedAtDate } = findByPropsLazy("getCreatedAtDate");
 const clydeMoreInfo = findByPropsLazy("clydeMoreInfo");
 const locale = findByPropsLazy("getLocale");
@@ -59,7 +49,7 @@ export default definePlugin({
                     Friends Since
                 </Heading>
 
-                <div className={getMemberSinceContainer()}>
+                <div className={container.memberSinceWrapper}>
                     {!!getCurrentChannel()?.guild_id && (
                         <svg
                             aria-hidden="true"