diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
index 99be83b02d1..4ad120c431f 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.hbs
@@ -10,7 +10,15 @@
}}
data-id={{this.message.id}}
>
-
+
{{#if this.shouldRenderFavoriteReactions}}
{{#each
this.messageInteractor.emojiReactions
@@ -57,14 +65,14 @@
{{#if
(and
this.messageInteractor.message
- this.messageInteractor.secondaryButtons.length
+ this.messageInteractor.secondaryActions.length
)
}}
{{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
index 7461fbbdf5f..45454acbe13 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.js
@@ -31,12 +31,10 @@ export default class ChatMessageActionsDesktop extends Component {
}
get messageInteractor() {
- const activeMessage = this.chat.activeMessage;
-
return new ChatMessageInteractor(
getOwner(this),
- activeMessage.model,
- activeMessage.context
+ this.message,
+ this.context
);
}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
index 8b15d1e73f3..d61d03ef8fe 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.hbs
@@ -31,7 +31,7 @@