From 569a94f99f239b89182ad3e7ec1daff3de8e78d0 Mon Sep 17 00:00:00 2001
From: Qb <github@qbit.moe>
Date: Fri, 24 Jun 2022 23:59:49 +0200
Subject: [PATCH] Fix Addon Error Modal crashing Discord (#1281)

---
 renderer/src/modules/discordclasses.js | 10 ----------
 renderer/src/styles/index.css          |  3 ++-
 renderer/src/ui/addonerrormodal.jsx    |  3 ++-
 renderer/src/ui/divider.jsx            |  3 +++
 renderer/src/ui/settings/divider.jsx   |  7 -------
 renderer/src/ui/settings/group.jsx     |  2 +-
 6 files changed, 8 insertions(+), 20 deletions(-)
 create mode 100644 renderer/src/ui/divider.jsx
 delete mode 100644 renderer/src/ui/settings/divider.jsx

diff --git a/renderer/src/modules/discordclasses.js b/renderer/src/modules/discordclasses.js
index e5d9e509..92120ea7 100644
--- a/renderer/src/modules/discordclasses.js
+++ b/renderer/src/modules/discordclasses.js
@@ -7,16 +7,6 @@ const combineClasses = function (...props) {
 };
 
 const DiscordClassModules = Utilities.memoizeObject({
-    get Divider() {
-        const toolbar = WebpackModules.getByProps("divider", "toolbar");
-        const discovery = WebpackModules.getByProps("divider", "emptyGuilds");
-        
-        return {
-            verticalDivider: toolbar.divider,
-            dividerLarge: discovery.divider,
-            divider: "bd-divider"
-        };
-    },
     get Text() {
         return combineClasses(
             ["size20", "size12"],
diff --git a/renderer/src/styles/index.css b/renderer/src/styles/index.css
index c47a59d0..465c2941 100644
--- a/renderer/src/styles/index.css
+++ b/renderer/src/styles/index.css
@@ -47,5 +47,6 @@
 .bd-divider {
     width: 100%;
     height: 1px;
-    border-top: thin solid hsl(0deg 0% 100% / 6%);
+    border-top: thin solid var(--background-modifier-accent);
+    margin-bottom: 1em;
 }
\ No newline at end of file
diff --git a/renderer/src/ui/addonerrormodal.jsx b/renderer/src/ui/addonerrormodal.jsx
index 96e1360d..c99cf4c0 100644
--- a/renderer/src/ui/addonerrormodal.jsx
+++ b/renderer/src/ui/addonerrormodal.jsx
@@ -1,6 +1,7 @@
 import {React, Strings, WebpackModules, DiscordClasses} from "modules";
 import Extension from "./icons/extension";
 import ThemeIcon from "./icons/theme";
+import Divider from "./divider";
 
 const Parser = Object(WebpackModules.getByProps("defaultRules", "parse")).defaultRules;
 
@@ -21,7 +22,7 @@ class AddonError extends React.Component {
         const stack = err.error && err.stack;
         if (!this.state.expanded || !stack) return null;
         return <div className="bd-addon-error-body">
-            <div className={`${DiscordClasses.Card.topDivider} ${DiscordClasses.Divider.divider}`} />
+            <Divider />
             <div className="bd-addon-error-stack">
                 {Parser ? Parser.codeBlock.react({content: stack, lang: "js"}, null, {}) : stack}
             </div>
diff --git a/renderer/src/ui/divider.jsx b/renderer/src/ui/divider.jsx
new file mode 100644
index 00000000..7f9b2fbd
--- /dev/null
+++ b/renderer/src/ui/divider.jsx
@@ -0,0 +1,3 @@
+import {React} from "modules";
+
+export default ({className}) => <div className={`bd-divider ${className || ""}`}></div>;
\ No newline at end of file
diff --git a/renderer/src/ui/settings/divider.jsx b/renderer/src/ui/settings/divider.jsx
deleted file mode 100644
index 51d4b103..00000000
--- a/renderer/src/ui/settings/divider.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import {React} from "modules";
-
-export default class Divider extends React.Component {
-    render() {
-        return <div className="bd-divider divider-3573oO marginTop8-1DLZ1n marginBottom40-2vIwTv" />;
-    }
-}
\ No newline at end of file
diff --git a/renderer/src/ui/settings/group.jsx b/renderer/src/ui/settings/group.jsx
index 050d08bf..b65b331f 100644
--- a/renderer/src/ui/settings/group.jsx
+++ b/renderer/src/ui/settings/group.jsx
@@ -1,7 +1,7 @@
 import Logger from "common/logger";
 import {React} from "modules";
 import Title from "./title";
-import Divider from "./divider";
+import Divider from "../divider";
 import Switch from "./components/switch";
 import Dropdown from "./components/dropdown";
 import Number from "./components/number";