Fix input freeze on sending message (#343)

diff --git a/src/app/organisms/emoji-board/emoji.js b/src/app/organisms/emoji-board/emoji.js
index 878a01986e70eed7d57c3ccd18537880e8be76c3..4f76f7c64fb4fce1d8b51d4209022c0a14259615 100644 (file)
--- a/src/app/organisms/emoji-board/emoji.js
+++ b/src/app/organisms/emoji-board/emoji.js
@@ -53,6 +53,7 @@ function addToGroup(emoji) {
 const emojis = [];
 emojisData.forEach((emoji) => {
   const myShortCodes = shortcodes[emoji.hexcode];
+  if (!myShortCodes) return;
   const em = {
     ...emoji,
     shortcode: Array.isArray(myShortCodes) ? myShortCodes[0] : myShortCodes,

diff --git a/src/app/organisms/view-source/ViewSource.jsx b/src/app/organisms/view-source/ViewSource.jsx
index a79a4d9c098fe5f7ee01776e89c254af12fbe61c..9bd3334f5a6fcd9f2128c1440adf4e9fd0b08a4f 100644 (file)
--- a/src/app/organisms/view-source/ViewSource.jsx
+++ b/src/app/organisms/view-source/ViewSource.jsx
@@ -65,7 +65,7 @@ function ViewSource() {
       onRequestClose={() => setIsOpen(false)}
       contentOptions={<IconButton src={CrossIC} onClick={() => setIsOpen(false)} tooltip="Close" />}
     >
-      {event && renderViewSource()}
+      {event ? renderViewSource() : <div />}
     </PopupWindow>
   );
 }