Fix error on room leave

Signed-off-by: Ajay Bura <ajbura@gmail.com>

src/app/organisms/emoji-board/EmojiBoard.jsx

@@ -188,16 +188,19 @@ function EmojiBoard({ onSelect }) {
 
   const [availableEmojis, setAvailableEmojis] = useState([]);
 
-  // This should be called whenever the room changes, so that we can switch out the emoji
+  useEffect(() => {
-  // for whatever packs are relevant to this room
+    const updateAvailableEmoji = (selectedRoomId) => {
-  function updateAvailableEmoji(selectedRoomId) {
+      if (!selectedRoomId) {
+        setAvailableEmojis([]);
+        return;
+      }
       // Retrieve the packs for the new room
+      // Remove packs that aren't marked as emoji packs
+      // Remove packs without emojis
       const packs = getRelevantPacks(
         initMatrix.matrixClient.getRoom(selectedRoomId),
       )
-    // Remove packs that aren't marked as emoji packs
         .filter((pack) => pack.usage.indexOf('emoticon') !== -1)
-    // Remove packs without emojis
         .filter((pack) => pack.getEmojis().length !== 0);
 
       // Set an index for each pack so that we know where to jump when the user uses the nav
@@ -205,12 +208,9 @@ function EmojiBoard({ onSelect }) {
         packs[i].packIndex = i;
       }
 
-    // Update the component state
       setAvailableEmojis(packs);
-  }
+    };
 
-  // Register the above function as an event listener
-  useEffect(() => {
     navigation.on(cons.events.navigation.ROOM_SELECTED, updateAvailableEmoji);
     return () => {
       navigation.removeListener(cons.events.navigation.ROOM_SELECTED, updateAvailableEmoji);

src/client/state/navigation.js

@@ -73,6 +73,8 @@ class Navigation extends EventEmitter {
         this.emit(cons.events.navigation.SPACE_SELECTED, this.selectedSpaceId);
       },
       [cons.actions.navigation.SELECT_ROOM]: () => {
+        if (this.selectedRoomId === action.roomId) return;
+
         const prevSelectedRoomId = this.selectedRoomId;
         this.selectedRoomId = action.roomId;
         this.removeRecentRoom(prevSelectedRoomId);