From f3bf8a77a6918ab384513f0d50b4863340b6997b Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Wed, 5 Jul 2023 20:27:39 +0200
Subject: resolve Uncaught Typerror and focus-trap warn for reactions

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/components/MessagesList/MessagesGroup/Message/Message.vue | 1 +
 src/store/messagesStore.js                                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 55ea2d0fe..7189a60d5 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -138,6 +138,7 @@ the main body of the message as well as a quote.
 				<NcPopover v-for="reaction in Object.keys(simpleReactions)"
 					:key="reaction"
 					:delay="200"
+					:focus-trap="false"
 					:triggers="['hover']">
 					<template #trigger>
 						<NcButton v-if="simpleReactions[reaction] !== 0"
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index b22bc7b6f..3572618ae 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -246,7 +246,7 @@ const getters = {
 
 	// Returns true if the message has reactions
 	hasReactions: (state) => (token, messageId) => {
-		return Object.keys(state.messages[token][messageId].reactions).length !== 0
+		return Object.keys(Object(state.messages[token]?.[messageId]?.reactions)).length !== 0
 	},
 }
 
-- 
cgit v1.2.3