diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs
index a22434b17ed..10c485bc4d2 100644
--- a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.hbs
@@ -28,7 +28,7 @@
             <Input
               @type="checkbox"
               disabled={{not (get user this.penaltyField)}}
-              {{on "click" (action "selectUserId" user.id)}}
+              {{on "click" (fn this.selectUserId user.id)}}
             />
           </td>
           <td>{{avatar user imageSize="small"}} {{user.username}}</td>
diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.hbs b/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
index 23e147f367b..76dd1aeb636 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-report-table.hbs
@@ -8,7 +8,7 @@
             @currentSortDirection={{this.sortDirection}}
             @currentSortLabel={{this.sortLabel}}
             @label={{label}}
-            @sortByLabel={{action "sortByLabel" label}}
+            @sortByLabel={{fn this.sortByLabel label}}
           />
         {{/each}}
       {{else}}
diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
index 24abd75eb06..d396dbbb93d 100644
--- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.hbs
@@ -79,8 +79,8 @@
             <Input
               @type={{this.text}}
               @value={{this.newFieldName}}
-              @enter={{action "addField"}}
-              @escape-press={{action "cancelAddField"}}
+              @enter={{this.addField}}
+              @escape-press={{this.cancelAddField}}
             />
             <DButton
               @action={{fn this.addField this.newFieldName}}
@@ -126,5 +126,5 @@
   @placeholder={{this.placeholder}}
   @htmlPlaceholder={{true}}
   @save={{this.save}}
-  @setWarning={{action "setWarning"}}
+  @setWarning={{this.setWarning}}
 />
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/components/color-input.hbs b/app/assets/javascripts/admin/addon/components/color-input.hbs
index 3687baedeb3..813ad41b466 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.hbs
+++ b/app/assets/javascripts/admin/addon/components/color-input.hbs
@@ -2,7 +2,7 @@
   @class="hex-input"
   @value={{this.hexValue}}
   @maxlength={{this.maxlength}}
-  @input={{action "onHexInput" value="target.value"}}
+  @input={{this.onHexInput}}
 />
 <input
   class="picker"
diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js
index bb225341380..b44123d0f0b 100644
--- a/app/assets/javascripts/admin/addon/components/color-input.js
+++ b/app/assets/javascripts/admin/addon/components/color-input.js
@@ -44,9 +44,9 @@ export default class ColorInput extends Component {
   }
 
   @action
-  onHexInput(color) {
+  onHexInput(event) {
     if (this.attrs.onChangeColor) {
-      this.attrs.onChangeColor(this.normalize(color || ""));
+      this.attrs.onChangeColor(this.normalize(event.target.value || ""));
     }
   }
 
diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
index f6cd35599f8..88f698c47ce 100644
--- a/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/components/embeddable-host.hbs
@@ -4,7 +4,7 @@
     <Input
       @value={{this.buffered.host}}
       placeholder="example.com"
-      @enter={{action "save"}}
+      @enter={{this.save}}
       class="host-name"
       autofocus={{true}}
     />
@@ -14,7 +14,7 @@
     <Input
       @value={{this.buffered.allowed_paths}}
       placeholder="/blog/.*"
-      @enter={{action "save"}}
+      @enter={{this.save}}
       class="path-allowlist"
     />
   </td>
diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.hbs b/app/assets/javascripts/admin/addon/components/permalink-form.hbs
index 7e2023a90d3..f0c43c110a6 100644
--- a/app/assets/javascripts/admin/addon/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/addon/components/permalink-form.hbs
@@ -25,7 +25,7 @@
       @placeholderKey={{this.permalinkTypePlaceholder}}
       @autocorrect="off"
       @autocapitalize="off"
-      @keyDown={{action "submitFormOnEnter"}}
+      @keyDown={{this.submitFormOnEnter}}
     />
 
     <DButton
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/group.hbs b/app/assets/javascripts/admin/addon/components/report-filters/group.hbs
index 9844a3a5d69..f9dbdb32fd3 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/group.hbs
+++ b/app/assets/javascripts/admin/addon/components/report-filters/group.hbs
@@ -2,7 +2,7 @@
   @valueProperty="value"
   @content={{this.groupOptions}}
   @value={{this.groupId}}
-  @onChange={{action "onChange"}}
+  @onChange={{this.onChange}}
   @options={{hash
     allowAny=this.filter.allow_any
     filterable=true
diff --git a/app/assets/javascripts/admin/addon/components/report-filters/list.hbs b/app/assets/javascripts/admin/addon/components/report-filters/list.hbs
index ebcd82d3b83..c642a0ec7ae 100644
--- a/app/assets/javascripts/admin/addon/components/report-filters/list.hbs
+++ b/app/assets/javascripts/admin/addon/components/report-filters/list.hbs
@@ -1,7 +1,7 @@
 <ComboBox
   @content={{this.filter.choices}}
   @value={{this.filter.default}}
-  @onChange={{action "onChange"}}
+  @onChange={{this.onChange}}
   @options={{hash
     allowAny=this.filter.allow_any
     filterable=true
diff --git a/app/assets/javascripts/admin/addon/components/simple-list.hbs b/app/assets/javascripts/admin/addon/components/simple-list.hbs
index edf710c8652..2e75aab1059 100644
--- a/app/assets/javascripts/admin/addon/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/simple-list.hbs
@@ -12,7 +12,7 @@
           title={{value}}
           @value={{value}}
           class="value-input"
-          {{on "focusout" (fn (action "changeValue") index)}}
+          {{on "focusout" (fn this.changeValue index)}}
         />
 
         {{#if this.showUpDownButtons}}
diff --git a/app/assets/javascripts/admin/addon/components/themes-list.hbs b/app/assets/javascripts/admin/addon/components/themes-list.hbs
index 8513c86d508..706273f75fd 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/components/themes-list.hbs
@@ -34,7 +34,7 @@
       {{#each this.activeThemes as |theme|}}
         <ThemesListItem
           @theme={{theme}}
-          @navigateToTheme={{action "navigateToTheme" theme}}
+          @navigateToTheme={{fn this.navigateToTheme theme}}
         />
       {{/each}}
 
@@ -106,7 +106,7 @@
         <ThemesListItem
           @classNames="inactive-theme"
           @theme={{theme}}
-          @navigateToTheme={{action "navigateToTheme" theme}}
+          @navigateToTheme={{fn this.navigateToTheme theme}}
           @selectInactiveMode={{this.selectInactiveMode}}
         />
       {{/each}}
diff --git a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
index eaa9a86e92e..30f3fddb798 100644
--- a/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/bookmark.hbs
@@ -62,7 +62,7 @@
         <TimeShortcutPicker
           @timeShortcuts={{this.timeOptions}}
           @prefilledDatetime={{this.prefilledDatetime}}
-          @onTimeSelected={{action "onTimeSelected"}}
+          @onTimeSelected={{this.onTimeSelected}}
           @hiddenOptions={{this.hiddenTimeShortcutOptions}}
           @customLabels={{this.customTimeShortcutLabels}}
           @_itsatrap={{this._itsatrap}}
@@ -82,7 +82,7 @@
       id="save-bookmark"
       class="btn-primary"
     />
-    <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
+    <DModalCancel @close={{this.closeWithoutSavingBookmark}} />
     {{#if this.showDelete}}
       <DButton
         @icon="trash-alt"
diff --git a/app/assets/javascripts/discourse/app/components/modal/create-account.hbs b/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
index 53828095520..570c6a8e3d7 100644
--- a/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/components/modal/create-account.hbs
@@ -40,7 +40,7 @@
             {{/if}}
             <div class="input-group create-account-email">
               <Input
-                {{on "focusout" (action "checkEmailAvailability")}}
+                {{on "focusout" this.checkEmailAvailability}}
                 @type="email"
                 @value={{this.model.accountEmail}}
                 disabled={{this.emailDisabled}}
@@ -253,7 +253,7 @@
           </div>
 
           <DButton
-            @action={{action "createAccount"}}
+            @action={{this.createAccount}}
             @disabled={{this.submitDisabled}}
             @label="create_account.title"
             @isLoading={{this.formSubmitted}}
@@ -279,7 +279,7 @@
 
       {{#if this.showExternalLoginButtons}}
         <div class="create-account-login-buttons">
-          <LoginButtons @externalLogin={{action "externalLogin"}} />
+          <LoginButtons @externalLogin={{this.externalLogin}} />
         </div>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs
index c5beecf2200..ca9559cd9dd 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.hbs
@@ -59,7 +59,7 @@
                   disabled={{not
                     (includes this.filteredCategoryIds category.id)
                   }}
-                  {{on "click" (action "toggleCategory" category.id)}}
+                  {{on "click" (fn this.toggleCategory category.id)}}
                 />
               </label>
             </div>
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
index 72d15f71cb1..712c1b88bad 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.hbs
@@ -34,7 +34,7 @@
               class="sidebar-tags-form__input"
               @type="checkbox"
               @checked={{includes this.selectedTags tag.name}}
-              {{on "click" (action "toggleTag" tag.name)}}
+              {{on "click" (fn this.toggleTag tag.name)}}
             />
 
             <label
diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs b/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
index 8c033e3352a..628d53c9c59 100644
--- a/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list.hbs
@@ -26,7 +26,7 @@
           id="public-channels-caret"
           role="button"
           title="toggle nav list"
-          {{on "click" (action "toggleChannelSection" "public-channels")}}
+          {{on "click" (fn this.toggleChannelSection "public-channels")}}
           data-toggleable="public-channels"
         >
           {{d-icon "angle-up"}}
@@ -86,7 +86,7 @@
           title="toggle nav list"
           {{on
             "click"
-            (action "toggleChannelSection" "direct-message-channels")
+            (fn this.toggleChannelSection "direct-message-channels")
           }}
           data-toggleable="direct-message-channels"
         >
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
index bf6fb5d8134..6ed4538dfd1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-browse-view.hbs
@@ -43,7 +43,7 @@
 
     <DcFilterInput
       @class="filter-input"
-      @filterAction={{action "debouncedFiltering"}}
+      @filterAction={{this.debouncedFiltering}}
       @icons={{hash right="search"}}
       placeholder={{i18n "chat.browse.filter_input_placeholder"}}
       {{did-insert (action this.focusFilterInput)}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
index 2838b84ed5a..b06c6caf96b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.hbs
@@ -18,7 +18,7 @@
         }}
         @type="text"
         @value={{this.editedName}}
-        {{on "input" (action "onChangeChatChannelName" value="target.value")}}
+        {{on "input" this.onChangeChatChannelName}}
       />
     </div>
 
@@ -34,7 +34,7 @@
         name="channel-slug"
         class="chat-channel-edit-name-slug-modal__slug-input"
         placeholder={{this.autoGeneratedSlug}}
-        {{on "input" (action "onChangeChatChannelSlug" value="target.value")}}
+        {{on "input" this.onChangeChatChannelSlug}}
         @type="text"
         @value={{this.editedSlug}}
       />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
index 381433ac582..3f5e71ce55b 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.js
@@ -57,9 +57,9 @@ export default class ChatModalEditChannelName extends Component {
   }
 
   @action
-  onChangeChatChannelName(title) {
+  onChangeChatChannelName(event) {
     this.flash = null;
-    this.#debouncedGenerateSlug(title);
+    this.#debouncedGenerateSlug(event?.target?.value);
   }
 
   @action
diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
index 4191350acb1..341c601d69e 100644
--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.hbs
@@ -53,7 +53,7 @@
             }}</label>
           <Textarea
             @value={{this.pollOptionsText}}
-            {{on "input" (action "onOptionsTextChange")}}
+            {{on "input" this.onOptionsTextChange}}
           />
           {{#if this.showMinNumOfOptionsValidation}}
             {{#unless this.minNumOfOptionsValidation.ok}}