From 2c5079b49fb3731acaa73ada69ec282a1eeb4428 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Sat, 8 Jun 2024 04:15:29 +0200
Subject: [PATCH 1/3] MessageLogger: fix potential error

---
 src/plugins/messageLogger/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx
index daafeb2dc..39a059b8c 100644
--- a/src/plugins/messageLogger/index.tsx
+++ b/src/plugins/messageLogger/index.tsx
@@ -147,7 +147,7 @@ export default definePlugin({
             [MessageStore],
             () => MessageStore.getMessage(channelId, messageId) as MLMessage,
             null,
-            (oldMsg, newMsg) => oldMsg.editHistory === newMsg.editHistory
+            (oldMsg, newMsg) => oldMsg?.editHistory === newMsg?.editHistory
         );
 
         return (

From 914b211a91f21e827ffe9d333f19c1d8d31cb193 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 8 Jun 2024 09:21:01 +0700
Subject: [PATCH 2/3] betterRoleDot: fix click to copy role color in profile
 (#2551)

Co-authored-by: vee <vendicated@riseup.net>
---
 src/plugins/betterRoleDot/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/betterRoleDot/index.ts b/src/plugins/betterRoleDot/index.ts
index 3886de3f7..a8cadd8b0 100644
--- a/src/plugins/betterRoleDot/index.ts
+++ b/src/plugins/betterRoleDot/index.ts
@@ -48,6 +48,7 @@ export default definePlugin({
 
         {
             find: ".ADD_ROLE_A11Y_LABEL",
+            all: true,
             predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
             noWarn: true,
             replacement: {
@@ -57,6 +58,7 @@ export default definePlugin({
         },
         {
             find: ".roleVerifiedIcon",
+            all: true,
             predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
             noWarn: true,
             replacement: {

From 810ff894dc9cb5ec5d62d16851b705cb0e88ef31 Mon Sep 17 00:00:00 2001
From: AutumnVN <autumnvnchino@gmail.com>
Date: Sat, 8 Jun 2024 09:21:27 +0700
Subject: [PATCH 3/3] ui(RestartCard): fix yellow button now being blue (#2550)

---
 src/components/PluginSettings/index.tsx  | 2 +-
 src/components/PluginSettings/styles.css | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 9c26a9cf1..978d2e85a 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -69,7 +69,7 @@ function ReloadRequiredCard({ required }: { required: boolean; }) {
                     <Forms.FormText className={cl("dep-text")}>
                         Restart now to apply new plugins and their settings
                     </Forms.FormText>
-                    <Button color={Button.Colors.YELLOW} onClick={() => location.reload()}>
+                    <Button onClick={() => location.reload()}>
                         Restart
                     </Button>
                 </>
diff --git a/src/components/PluginSettings/styles.css b/src/components/PluginSettings/styles.css
index 66b2a2158..d3d182e58 100644
--- a/src/components/PluginSettings/styles.css
+++ b/src/components/PluginSettings/styles.css
@@ -78,6 +78,7 @@
 
 .vc-plugins-restart-card button {
     margin-top: 0.5em;
+    background: var(--info-warning-foreground) !important;
 }
 
 .vc-plugins-info-button svg:not(:hover, :focus) {