Merge branch 'heart-react' into 'develop'

Fix heart emoji react for Pleroma develop branch; let emojis be customizable the admin Closes #538 See merge request soapbox-pub/soapbox-fe!398
2020-12-30 02:36:22 +00:00 · 2020-12-30 02:36:22 +00:00 · bdbc6eb79c
commit bdbc6eb79c
parent 10c9a90701 58504aa710
13 changed files with 1 additions and 1 deletions
--- a/app/soapbox/actions/soapbox.js
+++ b/app/soapbox/actions/soapbox.js
--- a/app/soapbox/components/tests/snapshots/emoji_selector-test.js.snap
+++ b/app/soapbox/components/tests/snapshots/emoji_selector-test.js.snap
@ -16,7 +16,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
    className="emoji-react-selector__emoji"
    dangerouslySetInnerHTML={
      Object {
-        "__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
+        "__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤️\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
      }
    }
  />
--- a/app/soapbox/components/tests/emoji_selector-test.js
+++ b/app/soapbox/components/tests/emoji_selector-test.js
--- a/app/soapbox/components/emoji_selector.js
+++ b/app/soapbox/components/emoji_selector.js
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
--- a/app/soapbox/components/status_action_bar.js
+++ b/app/soapbox/components/status_action_bar.js
--- a/app/soapbox/containers/status_container.js
+++ b/app/soapbox/containers/status_container.js
--- a/app/soapbox/features/status/components/action_bar.js
+++ b/app/soapbox/features/status/components/action_bar.js
--- a/app/soapbox/features/status/components/detailed_status.js
+++ b/app/soapbox/features/status/components/detailed_status.js
--- a/app/soapbox/features/status/components/status_interaction_bar.js
+++ b/app/soapbox/features/status/components/status_interaction_bar.js
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
--- a/app/soapbox/utils/tests/emoji_reacts-test.js
+++ b/app/soapbox/utils/tests/emoji_reacts-test.js
--- a/app/soapbox/utils/emoji_reacts.js
+++ b/app/soapbox/utils/emoji_reacts.js