From 9b375c1bef2f18e48029c451b6c4bb9f8249ae6e Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Mon, 20 Feb 2023 11:28:38 +1000
Subject: [PATCH] DEV: Fixes after merge

---
 .../discourse/components/chat-message-actions-desktop.hbs | 2 +-
 .../discourse/components/chat-message-actions-desktop.js  | 7 +++++--
 .../discourse/components/chat-message-actions-mobile.js   | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

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 cb665429b0..629cec680c 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
@@ -56,7 +56,7 @@
         @class="more-buttons"
         @options={{hash icon="ellipsis-v" placement="left"}}
         @content={{@secondaryButtons}}
-        @onChange={{action "handleSecondaryButtons"}}
+        @onChange={{action this.handleSecondaryButtons}}
       />
     {{/if}}
   </div>
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 6f252fff5b..6ee70328b0 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
@@ -47,11 +47,14 @@ export default class ChatMessageActionsDesktop extends Component {
   @action
   handleSecondaryButtons(id) {
     if (id === "copyLinkToMessage") {
-      return this.args.messageActionsHandler.copyLink(this.message);
+      return this.args.messageActionsHandler.copyLink(this.args.message);
     }
 
     if (id === "selectMessage") {
-      return this.args.messageActionsHandler.selectMessage(this.message, true);
+      return this.args.messageActionsHandler.selectMessage(
+        this.args.message,
+        true
+      );
     }
 
     this.args.messageActions?.[id]?.();
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
index c33838f7a4..6f36f73a8e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.js
@@ -39,13 +39,13 @@ export default class ChatMessageActionsMobile extends Component {
   @action
   actAndCloseMenu(fnId) {
     if (fnId === "copyLinkToMessage") {
-      this.args.messageActionsHandler.copyLink(this.message);
-      return this.onCloseMenu();
+      this.args.messageActionsHandler.copyLink(this.args.message);
+      return this.#onCloseMenu();
     }
 
     if (fnId === "selectMessage") {
-      this.args.messageActionsHandler.selectMessage(this.message, true);
-      return this.onCloseMenu();
+      this.args.messageActionsHandler.selectMessage(this.args.message, true);
+      return this.#onCloseMenu();
     }
 
     this.args.messageActions[fnId]?.();