diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js index c95895def..8bb2afd93 100644 --- a/src/components/chat_list_item/chat_list_item.js +++ b/src/components/chat_list_item/chat_list_item.js @@ -39,7 +39,7 @@ const ChatListItem = { messageForStatusContent() { const message = this.chat.lastMessage const messageEmojis = message ? message.emojis : [] - const isYou = message && message.account_id === this.currentUser.id + const isYou = message?.account_id === this.currentUser.id const content = message ? this.attachmentInfo || message.content : '' const messagePreview = isYou ? `${this.$t('chats.you')} ${content}` diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js index 78be870b4..aabdec31f 100644 --- a/src/components/chat_message/chat_message.js +++ b/src/components/chat_message/chat_message.js @@ -111,7 +111,7 @@ const ChatMessage = { const user = this.$store.getters.findUser( this.message.in_reply_to_user_id, ) - return user && user.screen_name_ui + return user?.screen_name_ui } }, replyProfileLink() { diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue index b772a9b20..394cce4b7 100644 --- a/src/components/chat_message/chat_message.vue +++ b/src/components/chat_message/chat_message.vue @@ -53,7 +53,7 @@ :user-screen-name="message.in_reply_to_screen_name" /> -