From 58850f1d8e9c5bccb5e4c124562d76711012b9e9 Mon Sep 17 00:00:00 2001
From: Sean <sean.meininger@pm.me>
Date: Thu, 3 Feb 2022 05:23:12 +0000
Subject: [PATCH 1/5] Fix icons to show in the picker for promotional items

---
 .../soapbox_config/components/icon_picker_dropdown.js         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
index f5c863858..6c123c2ee 100644
--- a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
+++ b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
@@ -69,7 +69,9 @@ class IconPickerMenu extends React.PureComponent {
 
     // Nice and dirty hack to display the icons
     c.querySelectorAll('button.emoji-mart-emoji > span').forEach(elem => {
-      elem.innerHTML = `<i class="fa fa-${elem.parentNode.getAttribute('title')}"></i>`;
+       const newIcon = document.createElement('span');
+      newIcon.innerHTML = `<i class="fa fa-${elem.parentNode.getAttribute('title')} fa-hack"></i>`;
+      elem.parentNode.replaceChild(newIcon, elem);
     });
   }
 

From e6ca4ba299fa002dc108a138176f5fa83c544210 Mon Sep 17 00:00:00 2001
From: Sean <sean.meininger@pm.me>
Date: Thu, 3 Feb 2022 05:25:59 +0000
Subject: [PATCH 2/5] Add css to center only the icons created by the hack in
 icon_picker_dropdown.js

---
 app/styles/emoji_picker.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/styles/emoji_picker.scss b/app/styles/emoji_picker.scss
index 8e6fe8777..8ba0cfdb4 100644
--- a/app/styles/emoji_picker.scss
+++ b/app/styles/emoji_picker.scss
@@ -344,4 +344,8 @@
     height: 22px;
     text-align: center;
   }
+
+    .fa-hack {
+    margin: 0 auto;
+  }
 }

From ea0d6484a6378172d2609e7b4504d7ce6fbf3a63 Mon Sep 17 00:00:00 2001
From: Sean <10513973-goldendemise@users.noreply.gitlab.com>
Date: Thu, 3 Feb 2022 16:06:41 +0000
Subject: [PATCH 3/5] Update
 app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js

---
 .../features/soapbox_config/components/icon_picker_dropdown.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
index 6c123c2ee..4159d5974 100644
--- a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
+++ b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
@@ -68,7 +68,7 @@ class IconPickerMenu extends React.PureComponent {
     if (!c) return;
 
     // Nice and dirty hack to display the icons
-    c.querySelectorAll('button.emoji-mart-emoji > span').forEach(elem => {
+    c.querySelectorAll('button.emoji-mart-emoji > img').forEach(elem => {
        const newIcon = document.createElement('span');
       newIcon.innerHTML = `<i class="fa fa-${elem.parentNode.getAttribute('title')} fa-hack"></i>`;
       elem.parentNode.replaceChild(newIcon, elem);

From aea44e2ac6df70ffd27d5ed2309ddbe9113f2e16 Mon Sep 17 00:00:00 2001
From: Sean <10513973-goldendemise@users.noreply.gitlab.com>
Date: Thu, 3 Feb 2022 16:14:36 +0000
Subject: [PATCH 4/5] Update
 app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js

---
 .../features/soapbox_config/components/icon_picker_dropdown.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
index 4159d5974..56258f5ad 100644
--- a/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
+++ b/app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js
@@ -69,7 +69,7 @@ class IconPickerMenu extends React.PureComponent {
 
     // Nice and dirty hack to display the icons
     c.querySelectorAll('button.emoji-mart-emoji > img').forEach(elem => {
-       const newIcon = document.createElement('span');
+      const newIcon = document.createElement('span');
       newIcon.innerHTML = `<i class="fa fa-${elem.parentNode.getAttribute('title')} fa-hack"></i>`;
       elem.parentNode.replaceChild(newIcon, elem);
     });

From 4c522ca1488f8dea2120783276b877e007e6aba1 Mon Sep 17 00:00:00 2001
From: Sean <10513973-goldendemise@users.noreply.gitlab.com>
Date: Fri, 4 Feb 2022 17:43:01 +0000
Subject: [PATCH 5/5] fix spacing

---
 app/styles/emoji_picker.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/emoji_picker.scss b/app/styles/emoji_picker.scss
index 8ba0cfdb4..9fb1a326c 100644
--- a/app/styles/emoji_picker.scss
+++ b/app/styles/emoji_picker.scss
@@ -345,7 +345,7 @@
     text-align: center;
   }
 
-    .fa-hack {
+  .fa-hack {
     margin: 0 auto;
   }
 }