From d237c3cc6d86d27647d7d6878d63eaff2b5d71bf Mon Sep 17 00:00:00 2001
From: Absturztaube <me@absturztaube.ch>
Date: Sat, 11 Jun 2022 11:21:48 +0200
Subject: [PATCH] fix loading crash on emoji reacts

---
 src/components/react_button/react_button.js | 3 +--
 src/services/locale/locale.service.js       | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 7531fbc8..880c5c92 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -62,8 +62,7 @@ const ReactButton = {
         return orderedEmojiList.flat()
       }
       return [
-        ...this.$store.state.instance.emoji,
-        ...this.$store.state.instance.customEmoji
+        ...this.$store.state.instance.emoji
       ] || []
     },
     mergedConfig () {
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 8cef2522..39e023ff 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -3,6 +3,7 @@ import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 
 const specialLanguageCodes = {
+  'en_nyan': 'en-NYAN',
   'ja_easy': 'ja',
   'zh_Hant': 'zh-HANT',
   'zh': 'zh-Hans'
@@ -14,6 +15,7 @@ const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_
 
 const getLanguageName = (code) => {
   const specialLanguageNames = {
+    'en_nyan': 'English (Nyan)',
     'ja_easy': 'やさしいにほんご',
     'zh': '简体中文',
     'zh_Hant': '繁體中文'