From c8bb667c53a138ed6d5b08569da3b4887666de5a Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 27 Jul 2021 22:51:04 -0400
Subject: [PATCH] 4.28.3

* Fixed: Issue rendering Twitch badges for some users.
* Fixed: The FFZ Emote Menu icon not replacing the default emote menu icon.
---
 package.json                                              | 2 +-
 src/modules/chat/badges.jsx                               | 8 +++++---
 src/modules/chat/room.js                                  | 4 +---
 src/settings/index.js                                     | 1 -
 .../modules/css_tweaks/styles/emote-menu.scss             | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d464da17..ba301270 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "frankerfacez",
   "author": "Dan Salvato LLC",
-  "version": "4.28.2",
+  "version": "4.28.3",
   "description": "FrankerFaceZ is a Twitch enhancement suite.",
   "private": true,
   "license": "Apache-2.0",
diff --git a/src/modules/chat/badges.jsx b/src/modules/chat/badges.jsx
index f82b0765..53397bb5 100644
--- a/src/modules/chat/badges.jsx
+++ b/src/modules/chat/badges.jsx
@@ -1086,10 +1086,8 @@ export default class Badges extends Module {
 							__cat: getBadgeCategory(sid)
 						};
 
-					fixBadgeData(data);
-
 					this.twitch_badge_count++;
-					bs[data.version] = data;
+					bs[data.version] = fixBadgeData(data);
 				}
 			}
 
@@ -1221,6 +1219,10 @@ export function fixBadgeData(badge) {
 	if ( ! badge )
 		return badge;
 
+	// Duplicate the badge object, because
+	// Apollo results are frozen.
+	badge = {...badge};
+
 	// Click Behavior
 	if ( ! badge.clickAction && badge.onClickAction )
 		badge.clickAction = badge.onClickAction;
diff --git a/src/modules/chat/room.js b/src/modules/chat/room.js
index 59b6eb4d..183a64fa 100644
--- a/src/modules/chat/room.js
+++ b/src/modules/chat/room.js
@@ -446,9 +446,7 @@ export default class Room {
 						__cat: getBadgeCategory(sid)
 					};
 
-				fixBadgeData(data);
-
-				bs[data.version] = data;
+				bs[data.version] = fixBadgeData(data);
 				this.badge_count++;
 			}
 
diff --git a/src/settings/index.js b/src/settings/index.js
index a09d11ca..990d0f79 100644
--- a/src/settings/index.js
+++ b/src/settings/index.js
@@ -154,7 +154,6 @@ export default class SettingsManager extends Module {
 			if ( type === 'request-context' ) {
 				this._context_proxies.add(event.source);
 				this._updateContextProxies(event.source);
-
 			}
 		});
 
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/emote-menu.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/emote-menu.scss
index 149f9990..03879368 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/emote-menu.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/emote-menu.scss
@@ -1,8 +1,8 @@
 button[data-a-target="emote-picker-button"] {
-    div[class^="ScButtonIcon"] {
+    & { //div[class^="ScButtonIcon"] {
         padding: .2rem .2rem 0 0;
 
-        div > div {
+        & > div > div {
             overflow: unset !important;
 
             &:before {