diff --git a/app/assets/javascripts/admin/addon/components/admin-config-areas/about.gjs b/app/assets/javascripts/admin/addon/components/admin-config-areas/about.gjs
index 6023bb20dc7..a2c4415c556 100644
--- a/app/assets/javascripts/admin/addon/components/admin-config-areas/about.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-config-areas/about.gjs
@@ -63,7 +63,7 @@ export default class AdminConfigAreasAbout extends Component {
   }
 
   #lookupSettingFromData(name) {
-    return this.args.data.findBy("setting", name);
+    return this.args.data.find((value) => value.setting === name);
   }
 
   <template>
diff --git a/app/assets/javascripts/admin/addon/components/admin-report.gjs b/app/assets/javascripts/admin/addon/components/admin-report.gjs
index e6d443c2dce..0b1e582d3cb 100644
--- a/app/assets/javascripts/admin/addon/components/admin-report.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-report.gjs
@@ -386,7 +386,7 @@ export default class AdminReport extends Component {
 
     const sort = (report) => {
       if (report.length > 1) {
-        return report.findBy("type", this.args.dataSourceName);
+        return report.find((value) => value.type === this.args.dataSourceName);
       } else {
         return report;
       }
diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.gjs b/app/assets/javascripts/admin/addon/components/emoji-value-list.gjs
index 3c03472deb0..385cc295166 100644
--- a/app/assets/javascripts/admin/addon/components/emoji-value-list.gjs
+++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.gjs
@@ -43,7 +43,7 @@ export default class EmojiValueList extends Component {
       return;
     }
 
-    const item = this.collection.findBy("isEditing");
+    const item = this.collection.find((emoji) => emoji.isEditing);
     if (item) {
       setProperties(item, {
         value: code,
diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.gjs b/app/assets/javascripts/admin/addon/components/form-template/form.gjs
index 2b8f4fbac3e..17d005f140a 100644
--- a/app/assets/javascripts/admin/addon/components/form-template/form.gjs
+++ b/app/assets/javascripts/admin/addon/components/form-template/form.gjs
@@ -114,7 +114,7 @@ export default class FormTemplateForm extends Component {
 
   @action
   onInsertField(type) {
-    const structure = templateFormFields.findBy("type", type).structure;
+    const structure = templateFormFields.find((v) => v.type === type).structure;
 
     if (this.templateContent.length === 0) {
       this.templateContent += structure;
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
index b5350484f6b..7b78d26b314 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
@@ -70,7 +70,9 @@ export default class AdminApiKeysNewController extends Controller {
 
       this.model.set("scopes", selectedScopes);
     } else if (this.scopeMode === "read_only") {
-      this.model.set("scopes", [this.globalScopes.findBy("key", "read")]);
+      this.model.set("scopes", [
+        this.globalScopes.find((scope) => scope.key === "read"),
+      ]);
     } else if (this.scopeMode === "all") {
       this.model.set("scopes", null);
     }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show-index.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show-index.js
index 679f45963ec..6dab5385535 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show-index.js
@@ -381,7 +381,7 @@ export default class AdminCustomizeThemesShowIndexController extends Controller
   @action
   addChildTheme() {
     let themeId = parseInt(this.selectedChildThemeId, 10);
-    let theme = this.allThemes.findBy("id", themeId);
+    let theme = this.allThemes.find((t) => t.id === themeId);
     this.model.addChildTheme(theme).then(() => this.store.findAll("theme"));
   }
 
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
index 737d43e865b..296c97cb03b 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js
@@ -97,8 +97,9 @@ export default class AdminLogsStaffActionLogsController extends Controller {
     if (filterActionId) {
       this.changeFilters({
         action_name: filterActionId,
-        action_id: this.userHistoryActions.findBy("id", filterActionId)
-          .action_id,
+        action_id: this.userHistoryActions.find(
+          (value) => value.id === filterActionId
+        ).action_id,
       });
     }
   }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
index 8a9afd4bb50..addeca5b711 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js
@@ -602,7 +602,9 @@ export default class AdminUserIndexController extends Controller {
 
     bufferedIds
       .filter((id) => !currentIds.includes(id))
-      .forEach((id) => this.groupAdded(availableGroups.findBy("id", id)));
+      .forEach((id) =>
+        this.groupAdded(availableGroups.find((value) => value.id === id))
+      );
 
     currentIds
       .filter((id) => !bufferedIds.includes(id))
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
index 078f8ca989f..e8b671318ca 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js
@@ -24,7 +24,9 @@ export default class AdminWatchedWordsActionController extends Controller {
   showWordsList;
 
   findAction(actionName) {
-    return (this.adminWatchedWords.model || []).findBy("nameKey", actionName);
+    return (this.adminWatchedWords.model || []).find(
+      (item) => item.nameKey === actionName
+    );
   }
 
   @discourseComputed("actionNameKey", "adminWatchedWords.model")
@@ -63,7 +65,7 @@ export default class AdminWatchedWordsActionController extends Controller {
           continue;
         }
 
-        const match = otherAction.words.findBy("id", arg.id);
+        const match = otherAction.words.find((w) => w.id === arg.id);
         if (match) {
           otherAction.words.removeObject(match);
           break;
diff --git a/app/assets/javascripts/admin/addon/lib/color-scheme-manager.js b/app/assets/javascripts/admin/addon/lib/color-scheme-manager.js
index f6803407d43..ae05137383e 100644
--- a/app/assets/javascripts/admin/addon/lib/color-scheme-manager.js
+++ b/app/assets/javascripts/admin/addon/lib/color-scheme-manager.js
@@ -127,7 +127,7 @@ export async function setDefaultColorScheme(scheme, store, options = {}) {
     }
 
     const themes = await store.findAll("theme");
-    const defaultTheme = themes.findBy("default", true);
+    const defaultTheme = themes.find((value) => value.default === true);
 
     if (!defaultTheme) {
       throw new Error("Could not find default theme");
diff --git a/app/assets/javascripts/admin/addon/models/user-field.js b/app/assets/javascripts/admin/addon/models/user-field.js
index 453ca281699..b1e0cbcbd51 100644
--- a/app/assets/javascripts/admin/addon/models/user-field.js
+++ b/app/assets/javascripts/admin/addon/models/user-field.js
@@ -19,7 +19,7 @@ export default class UserField extends RestModel {
   }
 
   static fieldTypeById(id) {
-    return this.fieldTypes().findBy("id", id);
+    return this.fieldTypes().find((value) => value.id === id);
   }
 
   @tracked field_type;
diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges/award.js b/app/assets/javascripts/admin/addon/routes/admin-badges/award.js
index a4bb5ae8d27..5d3b73b5b85 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-badges/award.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-badges/award.js
@@ -11,6 +11,8 @@ export default class AdminBadgesAwardRoute extends Route {
       return;
     }
 
-    return this.adminBadges.badges.findBy("id", parseInt(params.badge_id, 10));
+    return this.adminBadges.badges.find(
+      (value) => value.id === parseInt(params.badge_id, 10)
+    );
   }
 }
diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js
index 18fc271fe41..1ca793d4805 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js
@@ -25,6 +25,8 @@ export default class AdminBadgesShowRoute extends Route {
       });
     }
 
-    return this.adminBadges.badges.findBy("id", parseInt(params.badge_id, 10));
+    return this.adminBadges.badges.find(
+      (value) => value.id === parseInt(params.badge_id, 10)
+    );
   }
 }
diff --git a/app/assets/javascripts/admin/addon/routes/admin-config-flags-edit.js b/app/assets/javascripts/admin/addon/routes/admin-config-flags-edit.js
index cb92c7ff386..09fd2f4355a 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-config-flags-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-config-flags-edit.js
@@ -6,7 +6,9 @@ export default class AdminConfigFlagsEditRoute extends DiscourseRoute {
   @service site;
 
   model(params) {
-    return this.site.flagTypes.findBy("id", parseInt(params.flag_id, 10));
+    return this.site.flagTypes.find(
+      (value) => value.id === parseInt(params.flag_id, 10)
+    );
   }
 
   titleToken() {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
index ad5efcecd06..b3645aa3fdf 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js
@@ -9,7 +9,9 @@ export default class AdminCustomizeThemesEditRoute extends Route {
 
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
-    const model = all.findBy("id", parseInt(params.theme_id, 10));
+    const model = all.find(
+      (value) => value.id === parseInt(params.theme_id, 10)
+    );
     if (model) {
       return {
         model,
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show-schema.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show-schema.js
index 5cff32ce875..0a267275f1a 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show-schema.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show-schema.js
@@ -3,7 +3,9 @@ import Route from "@ember/routing/route";
 export default class AdminCustomizeThemesShowSchemaRoute extends Route {
   async model(params) {
     const theme = this.modelFor("adminCustomizeThemesShow");
-    const setting = theme.settings.findBy("setting", params.setting_name);
+    const setting = theme.settings.find(
+      (value) => value.setting === params.setting_name
+    );
 
     await setting.loadMetadata(theme.id);
 
diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
index e65f01c419e..9764f289cc5 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js
@@ -10,7 +10,9 @@ export default class AdminCustomizeThemesShowRoute extends DiscourseRoute {
 
   model(params) {
     const all = this.modelFor("adminCustomizeThemes");
-    const model = all.findBy("id", parseInt(params.theme_id, 10));
+    const model = all.find(
+      (value) => value.id === parseInt(params.theme_id, 10)
+    );
     if (model) {
       return model;
     } else {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-templates-edit.js b/app/assets/javascripts/admin/addon/routes/admin-email-templates-edit.js
index b3e85f39ea3..5440ede6b44 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-email-templates-edit.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-email-templates-edit.js
@@ -4,7 +4,7 @@ import { scrollTop } from "discourse/lib/scroll-top";
 export default class AdminEmailTemplatesEditRoute extends Route {
   model(params) {
     const all = this.modelFor("adminEmailTemplates");
-    return all.findBy("id", params.id);
+    return all.find((value) => value.id === params.id);
   }
 
   setupController(controller, emailTemplate) {
diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
index edecbaf1f45..ed1b9cae74e 100644
--- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
+++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js
@@ -5,9 +5,8 @@ export default class AdminSiteSettingsCategoryRoute extends DiscourseRoute {
   @service router;
 
   model(params) {
-    return this.modelFor("adminSiteSettings").filteredSettings.findBy(
-      "nameKey",
-      params.category_id
+    return this.modelFor("adminSiteSettings").filteredSettings.find(
+      (setting) => setting.nameKey === params.category_id
     )?.siteSettings;
   }
 
diff --git a/app/assets/javascripts/discourse/app/components/badge-title.gjs b/app/assets/javascripts/discourse/app/components/badge-title.gjs
index d774f317eee..d289f7f4547 100644
--- a/app/assets/javascripts/discourse/app/components/badge-title.gjs
+++ b/app/assets/javascripts/discourse/app/components/badge-title.gjs
@@ -54,11 +54,11 @@ export default class BadgeTitle extends Component {
   }
 
   _findBadgeById(badges, id) {
-    return (badges || []).findBy("id", id);
+    return (badges || []).find((b) => b.id === id);
   }
 
   _findBadgeByTitle(badges, title) {
-    return (badges || []).findBy("badge.name", title);
+    return (badges || []).find((b) => b.badge.name === title);
   }
 
   <template>
diff --git a/app/assets/javascripts/discourse/app/components/basic-topic-list.gjs b/app/assets/javascripts/discourse/app/components/basic-topic-list.gjs
index 55a92e4774a..8d99b007b10 100644
--- a/app/assets/javascripts/discourse/app/components/basic-topic-list.gjs
+++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.gjs
@@ -109,7 +109,9 @@ export default class BasicTopicList extends Component {
           }
         }
 
-        const topic = this.topics.findBy("id", parseInt(topicId, 10));
+        const topic = this.topics.find(
+          (value) => value.id === parseInt(topicId, 10)
+        );
         this.appEvents.trigger("topic-entrance:show", {
           topic,
           position: target.offset(),
diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.gjs b/app/assets/javascripts/discourse/app/components/composer-editor.gjs
index 46a8142b0ff..92d06a8cf2b 100644
--- a/app/assets/javascripts/discourse/app/components/composer-editor.gjs
+++ b/app/assets/javascripts/discourse/app/components/composer-editor.gjs
@@ -188,7 +188,7 @@ export default class ComposerEditor extends Component {
 
         const posts = topic.get("postStream.posts");
         if (posts && topicId === topic.get("id")) {
-          const quotedPost = posts.findBy("post_number", postNumber);
+          const quotedPost = posts.find((p) => p.post_number === postNumber);
           if (quotedPost) {
             const avatarTemplate = applyValueTransformer(
               "composer-editor-quoted-post-avatar-template",
@@ -208,7 +208,7 @@ export default class ComposerEditor extends Component {
 
         const posts = topic.get("postStream.posts");
         if (posts && topicId === topic.get("id")) {
-          const quotedPost = posts.findBy("post_number", postNumber);
+          const quotedPost = posts.find((p) => p.post_number === postNumber);
           if (quotedPost) {
             return quotedPost.primary_group_name;
           }
diff --git a/app/assets/javascripts/discourse/app/components/edit-category-security.gjs b/app/assets/javascripts/discourse/app/components/edit-category-security.gjs
index 3c26983f651..d20d6867239 100644
--- a/app/assets/javascripts/discourse/app/components/edit-category-security.gjs
+++ b/app/assets/javascripts/discourse/app/components/edit-category-security.gjs
@@ -19,7 +19,7 @@ export default class EditCategorySecurity extends buildCategoryPanel(
 
   @discourseComputed("category.permissions.@each.permission_type")
   everyonePermission(permissions) {
-    return permissions.findBy("group_name", "everyone");
+    return permissions.find((p) => p.group_name === "everyone");
   }
 
   @discourseComputed("category.permissions.@each.permission_type")
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs b/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs
index 6ea2d0a0932..ccb0aed2ca0 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs
@@ -266,7 +266,7 @@ export default class EmojiPicker extends Component {
 
       const nextEmoji = allEmojis()
         .filter((c) => c.offsetTop > event.target.offsetTop)
-        .findBy("offsetLeft", event.target.offsetLeft);
+        .find((value) => value.offsetLeft === event.target.offsetLeft);
 
       if (nextEmoji) {
         nextEmoji.focus();
@@ -287,7 +287,7 @@ export default class EmojiPicker extends Component {
       const prevEmoji = allEmojis()
         .reverse()
         .filter((c) => c.offsetTop < event.target.offsetTop)
-        .findBy("offsetLeft", event.target.offsetLeft);
+        .find((value) => value.offsetLeft === event.target.offsetLeft);
 
       if (prevEmoji) {
         prevEmoji.focus();
diff --git a/app/assets/javascripts/discourse/app/components/invite-panel.gjs b/app/assets/javascripts/discourse/app/components/invite-panel.gjs
index ea77e542533..8a6c541d855 100644
--- a/app/assets/javascripts/discourse/app/components/invite-panel.gjs
+++ b/app/assets/javascripts/discourse/app/components/invite-panel.gjs
@@ -435,7 +435,7 @@ export default class InvitePanel extends Component {
 
   @action
   updateInvitee(selected, content) {
-    let invitee = content.findBy("id", selected[0]);
+    let invitee = content.find((c) => c.id === selected[0]);
     if (!invitee && content.length) {
       invitee =
         typeof content[0] === "string" ? { id: content[0] } : content[0];
diff --git a/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs b/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs
index df865896aea..71a150f1545 100644
--- a/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs
@@ -103,7 +103,9 @@ export default class BulkTopicActions extends Component {
     return new Promise((resolve, reject) => {
       const resolveNextTask = async () => {
         if (tasks.length === 0) {
-          const topics = topicIds.map((id) => allTopics.findBy("id", id));
+          const topics = topicIds.map((id) =>
+            allTopics.find((value) => value.id === id)
+          );
           return resolve(topics);
         }
 
diff --git a/app/assets/javascripts/discourse/app/components/modal/reorder-categories.gjs b/app/assets/javascripts/discourse/app/components/modal/reorder-categories.gjs
index 02e4df26e8a..df15a501a4e 100644
--- a/app/assets/javascripts/discourse/app/components/modal/reorder-categories.gjs
+++ b/app/assets/javascripts/discourse/app/components/modal/reorder-categories.gjs
@@ -107,9 +107,8 @@ export default class ReorderCategories extends Component {
       const ancestors = this.sortedEntries[targetPosition]?.category?.ancestors;
       if (ancestors) {
         // Target category is a subcategory, adjust targetPosition to account for ancestors
-        const highestAncestorEntry = this.sortedEntries.findBy(
-          "category.id",
-          ancestors[0].id
+        const highestAncestorEntry = this.sortedEntries.find(
+          (value) => value.category.id === ancestors[0].id
         );
         targetPosition = highestAncestorEntry.position;
       }
diff --git a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs
index cf3d8576702..0968cc86c68 100644
--- a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs
+++ b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs
@@ -188,9 +188,8 @@ export default class TimeShortcutPicker extends Component {
 
     let specialOptions = specialShortcutOptions();
     if (this.lastCustomDate && this.lastCustomTime) {
-      let lastCustom = specialOptions.findBy(
-        "id",
-        TIME_SHORTCUT_TYPES.LAST_CUSTOM
+      let lastCustom = specialOptions.find(
+        (option) => option.id === TIME_SHORTCUT_TYPES.LAST_CUSTOM
       );
       lastCustom.time = this.parsedLastCustomDatetime;
       lastCustom.timeFormatKey = "dates.long_no_year";
@@ -254,7 +253,7 @@ export default class TimeShortcutPicker extends Component {
         this.keyValueStore.lastCustomDate = this.customDate;
       }
     } else {
-      dateTime = this.options.findBy("id", type).time;
+      dateTime = this.options.find((option) => option.id === type).time;
     }
 
     this.setProperties({
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs b/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
index 3b8856aeaad..b2e32078e43 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
@@ -278,9 +278,8 @@ export default class TopicTimelineScrollArea extends Component {
 
     let date;
     if (daysAgo === undefined) {
-      const post = postStream.posts.findBy(
-        "id",
-        postStream.stream[this.current]
+      const post = postStream.posts.find(
+        (p) => p.id === postStream.stream[this.current]
       );
 
       if (post) {
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
index 31c29962abb..dc33c11c930 100644
--- a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
+++ b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -96,7 +96,7 @@ export default class InterfaceController extends Controller {
 
   @discourseComputed("currentThemeId")
   defaultDarkSchemeId(themeId) {
-    const theme = this.userSelectableThemes?.findBy("id", themeId);
+    const theme = this.userSelectableThemes?.find((t) => t.id === themeId);
     return theme?.dark_color_scheme_id || -1;
   }
 
@@ -167,12 +167,14 @@ export default class InterfaceController extends Controller {
       return false;
     }
 
-    const theme = userThemes.findBy("id", themeId);
+    const theme = userThemes.find((t) => t.id === themeId);
     if (!theme) {
       return false;
     }
 
-    return userColorSchemes.findBy("id", theme.color_scheme_id);
+    return userColorSchemes.find(
+      (colorScheme) => colorScheme.id === theme.color_scheme_id
+    );
   }
 
   @discourseComputed("model.user_option.theme_ids", "themeId")
@@ -279,7 +281,7 @@ export default class InterfaceController extends Controller {
 
   @discourseComputed("selectedDarkColorSchemeId", "currentThemeId")
   showInterfaceColorModeSelector(selectedDarkColorSchemeId, themeId) {
-    const theme = this.userSelectableThemes?.findBy("id", themeId);
+    const theme = this.userSelectableThemes?.find((t) => t.id === themeId);
     return (
       (this.defaultDarkSchemeId > 0 &&
         theme.color_scheme_id &&
@@ -357,15 +359,14 @@ export default class InterfaceController extends Controller {
       return;
     }
 
-    const theme = this.userSelectableThemes?.findBy("id", this.themeId);
+    const theme = this.userSelectableThemes?.find((t) => t.id === this.themeId);
 
     // we don't want to display the numeric ID of a scheme
     // when it is set by the theme but not marked as user selectable
     if (
       theme?.color_scheme_id === this.session.userColorSchemeId &&
-      !this.userSelectableColorSchemes.findBy(
-        "id",
-        this.session.userColorSchemeId
+      !this.userSelectableColorSchemes.find(
+        (t) => t.id === this.session.userColorSchemeId
       )
     ) {
       return;
diff --git a/app/assets/javascripts/discourse/app/controllers/topic.js b/app/assets/javascripts/discourse/app/controllers/topic.js
index 93715130f32..d213cac9a0d 100644
--- a/app/assets/javascripts/discourse/app/controllers/topic.js
+++ b/app/assets/javascripts/discourse/app/controllers/topic.js
@@ -299,9 +299,8 @@ export default class TopicController extends Controller {
           this.model.removeBookmark(post.bookmark_id);
         });
     }
-    const forTopicBookmark = this.model.bookmarks.findBy(
-      "bookmarkable_type",
-      "Topic"
+    const forTopicBookmark = this.model.bookmarks.find(
+      (b) => b.bookmarkable_type === "Topic"
     );
     if (
       forTopicBookmark?.auto_delete_preference ===
@@ -1405,7 +1404,9 @@ export default class TopicController extends Controller {
 
   _jumpToPostNumber(postNumber) {
     const postStream = this.get("model.postStream");
-    const post = postStream.get("posts").findBy("post_number", postNumber);
+    const post = postStream
+      .get("posts")
+      .find((item) => item.post_number === postNumber);
 
     if (post) {
       DiscourseURL.routeTo(
@@ -1512,7 +1513,7 @@ export default class TopicController extends Controller {
       this.model.set("bookmarks", []);
     }
 
-    const bookmark = this.model.bookmarks.findBy("id", data.id);
+    const bookmark = this.model.bookmarks.find((b) => b.id === data.id);
     if (!bookmark) {
       this.model.bookmarks.pushObject(Bookmark.create(data));
     } else {
@@ -1532,9 +1533,8 @@ export default class TopicController extends Controller {
     }
 
     if (this.model.bookmarkCount === 1) {
-      const topicBookmark = this.model.bookmarks.findBy(
-        "bookmarkable_type",
-        "Topic"
+      const topicBookmark = this.model.bookmarks.find(
+        (b) => b.bookmarkable_type === "Topic"
       );
       if (topicBookmark) {
         return this._modifyTopicBookmark(topicBookmark);
diff --git a/app/assets/javascripts/discourse/app/deprecation-workflow.js b/app/assets/javascripts/discourse/app/deprecation-workflow.js
index 99a59f4fc8e..35b4afd8f49 100644
--- a/app/assets/javascripts/discourse/app/deprecation-workflow.js
+++ b/app/assets/javascripts/discourse/app/deprecation-workflow.js
@@ -254,6 +254,10 @@ const DeprecationWorkflow = new DiscourseDeprecationWorkflow([
     handler: "silence",
     matchId: "deprecate-import-meta-from-ember",
   },
+  {
+    handler: "log",
+    matchId: "discourse.native-array-extensions.findBy",
+  },
   {
     handler: ["silence", "counter"],
     matchId: /^discourse\.native-array-extensions\..+$/,
diff --git a/app/assets/javascripts/discourse/app/lib/avatar-flair.js b/app/assets/javascripts/discourse/app/lib/avatar-flair.js
index ead1eafa365..c47ff616574 100644
--- a/app/assets/javascripts/discourse/app/lib/avatar-flair.js
+++ b/app/assets/javascripts/discourse/app/lib/avatar-flair.js
@@ -52,7 +52,7 @@ function initializeAutoGroupFlair(site) {
     "trust_level_3",
     "trust_level_4",
   ].forEach((groupName) => {
-    const group = site.groups?.findBy("name", groupName);
+    const group = site.groups?.find((item) => item.name === groupName);
     if (group && group.flair_url) {
       _noAutoFlair = false;
       _autoGroupFlair[groupName] = {
diff --git a/app/assets/javascripts/discourse/app/lib/flag-targets/post-flag.js b/app/assets/javascripts/discourse/app/lib/flag-targets/post-flag.js
index 19e33afeb0d..2976c8e880a 100644
--- a/app/assets/javascripts/discourse/app/lib/flag-targets/post-flag.js
+++ b/app/assets/javascripts/discourse/app/lib/flag-targets/post-flag.js
@@ -45,9 +45,8 @@ export default class PostFlag extends Flag {
   }
 
   postActionFor(flagModal) {
-    return flagModal.args.model.flagModel.actions_summary.findBy(
-      "id",
-      flagModal.selected.id
+    return flagModal.args.model.flagModel.actions_summary.find(
+      (item) => item.id === flagModal.selected.id
     );
   }
 }
diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
index 613d531740c..db4c4a108c0 100644
--- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
@@ -596,7 +596,7 @@ export default {
       const topicController = getOwner(this).lookup("controller:topic");
       const post = topicController
         .get("model.postStream.posts")
-        .findBy("id", selectedPostId);
+        .find((p) => p.id === selectedPostId);
       if (post) {
         // TODO: Use ember closure actions
 
diff --git a/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js b/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js
index 08781c0b849..2b4e4198270 100644
--- a/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js
+++ b/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js
@@ -91,7 +91,9 @@ export default class PostBookmarkManager {
       this.topicController.set("bookmarks", []);
     }
 
-    const bookmark = this.topicController.bookmarks.findBy("id", data.id);
+    const bookmark = this.topicController.bookmarks.find(
+      (b) => b.id === data.id
+    );
     if (!bookmark) {
       this.topicController.bookmarks.pushObject(Bookmark.create(data));
     } else {
diff --git a/app/assets/javascripts/discourse/app/lib/reports-loader.js b/app/assets/javascripts/discourse/app/lib/reports-loader.js
index 4076a8d0bed..74f079a9916 100644
--- a/app/assets/javascripts/discourse/app/lib/reports-loader.js
+++ b/app/assets/javascripts/discourse/app/lib/reports-loader.js
@@ -60,7 +60,7 @@ export default {
     ajax(BULK_REPORTS_ENDPOINT, { data: { reports } })
       .then((response) => {
         jobs.forEach((job) => {
-          const report = response.reports.findBy("type", job.type);
+          const report = response.reports.find((r) => r.type === job.type);
           job.runnable()(report);
         });
       })
diff --git a/app/assets/javascripts/discourse/app/lib/search.js b/app/assets/javascripts/discourse/app/lib/search.js
index 239b8f2cd85..4aa02695bbe 100644
--- a/app/assets/javascripts/discourse/app/lib/search.js
+++ b/app/assets/javascripts/discourse/app/lib/search.js
@@ -69,7 +69,9 @@ export function translateResults(results, opts) {
 
   results.categories = results.categories
     .map(function (category) {
-      return Category.list().findBy("id", category.id || category.model.id);
+      return Category.list().find(
+        (c) => c.id === (category.id || category.model.id)
+      );
     })
     .compact();
 
diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
index c0c1df268e2..23ac6d79967 100644
--- a/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
+++ b/app/assets/javascripts/discourse/app/lib/sidebar/custom-sections.js
@@ -35,7 +35,7 @@ export function addSidebarPanel(func) {
 }
 
 export function addSidebarSection(func, panelKey) {
-  const panel = customPanels.findBy("key", panelKey);
+  const panel = customPanels.find((p) => p.key === panelKey);
   if (!panel) {
     // eslint-disable-next-line no-console
     return console.warn(
@@ -52,7 +52,7 @@ export function resetPanelSections(
   newSections = null,
   sectionBuilder = null
 ) {
-  const panel = customPanels.findBy("key", panelKey);
+  const panel = customPanels.find((item) => item.key === panelKey);
   if (newSections) {
     panel.sections = [];
     sectionBuilder(newSections);
diff --git a/app/assets/javascripts/discourse/app/lib/theme-selector.js b/app/assets/javascripts/discourse/app/lib/theme-selector.js
index 2110a5bebca..3d1bd5e3a6a 100644
--- a/app/assets/javascripts/discourse/app/lib/theme-selector.js
+++ b/app/assets/javascripts/discourse/app/lib/theme-selector.js
@@ -64,7 +64,7 @@ export function listThemes(site) {
     return null;
   }
 
-  let hasDefault = !!themes.findBy("default", true);
+  let hasDefault = !!themes.find((theme) => theme.default);
 
   let results = [];
   if (!hasDefault) {
diff --git a/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js b/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js
index 1cfdfdad032..dc901136e8b 100644
--- a/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js
+++ b/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js
@@ -77,7 +77,9 @@ export default class TopicBookmarkManager {
       this.topicController.set("bookmarks", []);
     }
 
-    const bookmark = this.topicController.bookmarks.findBy("id", data.id);
+    const bookmark = this.topicController.bookmarks.find(
+      (b) => b.id === data.id
+    );
     if (!bookmark) {
       this.topicController.bookmarks.pushObject(Bookmark.create(data));
     } else {
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 6873d689446..d564f54fdd4 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -64,9 +64,9 @@ export default class Category extends RestModel {
   static findUncategorized() {
     _uncategorized =
       _uncategorized ||
-      Category.list().findBy(
-        "id",
-        Site.currentProp("uncategorized_category_id")
+      Category.list().find(
+        (category) =>
+          category.id === Site.currentProp("uncategorized_category_id")
       );
     return _uncategorized;
   }
@@ -297,7 +297,7 @@ export default class Category extends RestModel {
 
     // In case the slug didn't work, try to find it by id instead.
     if (!category) {
-      category = categories.findBy("id", parseInt(slug, 10));
+      category = categories.find((c) => c.id === parseInt(slug, 10));
     }
 
     return category;
@@ -835,7 +835,9 @@ export default class Category extends RestModel {
   }
 
   removePermission(group_name) {
-    const permission = this.permissions.findBy("group_name", group_name);
+    const permission = this.permissions.find(
+      (p) => p.group_name === group_name
+    );
     if (permission) {
       this.permissions.removeObject(permission);
       this.availableGroups.addObject(group_name);
diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 0e170b4915c..cdfbb272b2e 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -381,7 +381,7 @@ export default class Composer extends RestModel {
 
   @discourseComputed("archetypeId")
   archetype(archetypeId) {
-    return this.archetypes.findBy("id", archetypeId);
+    return this.archetypes.find((archetype) => archetype.id === archetypeId);
   }
 
   @observes("archetype")
diff --git a/app/assets/javascripts/discourse/app/models/post-stream.js b/app/assets/javascripts/discourse/app/models/post-stream.js
index c8f49a724b7..36c3230594e 100644
--- a/app/assets/javascripts/discourse/app/models/post-stream.js
+++ b/app/assets/javascripts/discourse/app/models/post-stream.js
@@ -117,7 +117,7 @@ export default class PostStream extends RestModel {
       return false;
     }
 
-    return !!this.posts.findBy("post_number", 1);
+    return !!this.posts.find((item) => item.post_number === 1);
   }
 
   @discourseComputed("isMegaTopic", "stream.lastObject", "lastId")
@@ -134,7 +134,7 @@ export default class PostStream extends RestModel {
       return true;
     }
 
-    return !!this.posts.findBy("id", lastPostId);
+    return !!this.posts.find((item) => item.id === lastPostId);
   }
 
   /**
@@ -342,7 +342,9 @@ export default class PostStream extends RestModel {
     if (opts.forceLoad) {
       this.set("loaded", false);
     } else {
-      const postWeWant = this.posts.findBy("post_number", opts.nearPost);
+      const postWeWant = this.posts.find(
+        (p) => p.post_number === opts.nearPost
+      );
       if (postWeWant) {
         return Promise.resolve().then(() => this._checkIfShouldShowRevisions());
       }
@@ -914,7 +916,7 @@ export default class PostStream extends RestModel {
     }
 
     return Promise.resolve().then(() => {
-      const firstPost = this.posts.findBy("post_number", 1);
+      const firstPost = this.posts.find((p) => p.post_number === 1);
       return firstPost.id;
     });
   }
diff --git a/app/assets/javascripts/discourse/app/models/site.js b/app/assets/javascripts/discourse/app/models/site.js
index 58a72a4a6f8..68f0dc37fe9 100644
--- a/app/assets/javascripts/discourse/app/models/site.js
+++ b/app/assets/javascripts/discourse/app/models/site.js
@@ -317,7 +317,7 @@ export default class Site extends RestModel {
 
   removeCategory(id) {
     const categories = this.categories;
-    const existingCategory = categories.findBy("id", id);
+    const existingCategory = categories.find((c) => c.id === id);
     if (existingCategory) {
       categories.removeObject(existingCategory);
     }
@@ -326,7 +326,7 @@ export default class Site extends RestModel {
   updateCategory(newCategory) {
     const categories = this.categories;
     const categoryId = get(newCategory, "id");
-    const existingCategory = categories.findBy("id", categoryId);
+    const existingCategory = categories.find((c) => c.id === categoryId);
 
     // Don't update null permissions
     if (newCategory.permission === null) {
diff --git a/app/assets/javascripts/discourse/app/models/topic-details.js b/app/assets/javascripts/discourse/app/models/topic-details.js
index 2b3bc126ba4..1ee0537e175 100644
--- a/app/assets/javascripts/discourse/app/models/topic-details.js
+++ b/app/assets/javascripts/discourse/app/models/topic-details.js
@@ -62,7 +62,7 @@ export default class TopicDetails extends RestModel {
       type: "PUT",
       data: { name },
     }).then(() => {
-      groups.removeObject(groups.findBy("name", name));
+      groups.removeObject(groups.find((item) => item.name === name));
     });
   }
 
@@ -74,7 +74,7 @@ export default class TopicDetails extends RestModel {
       type: "PUT",
       data: { username },
     }).then(() => {
-      users.removeObject(users.findBy("username", username));
+      users.removeObject(users.find((item) => item.username === username));
     });
   }
 }
diff --git a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
index 706029a8ece..36006de862e 100644
--- a/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+++ b/app/assets/javascripts/discourse/app/models/topic-tracking-state.js
@@ -206,11 +206,11 @@ export default class TopicTrackingState extends EmberObject {
   }
 
   isMutedTopic(topicId) {
-    return !!this.mutedTopics.findBy("topicId", topicId);
+    return !!this.mutedTopics.find((t) => t.topicId === topicId);
   }
 
   isUnmutedTopic(topicId) {
-    return !!this.unmutedTopics.findBy("topicId", topicId);
+    return !!this.unmutedTopics.find((t) => t.topicId === topicId);
   }
 
   /**
diff --git a/app/assets/javascripts/discourse/app/models/topic.js b/app/assets/javascripts/discourse/app/models/topic.js
index d5b05c9e946..99dd38799f2 100644
--- a/app/assets/javascripts/discourse/app/models/topic.js
+++ b/app/assets/javascripts/discourse/app/models/topic.js
@@ -626,7 +626,7 @@ export default class Topic extends RestModel {
 
   @discourseComputed("archetype")
   archetypeObject(archetype) {
-    return Site.currentProp("archetypes").findBy("id", archetype);
+    return Site.currentProp("archetypes").find((item) => item.id === archetype);
   }
 
   toggleStatus(property) {
diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js
index dc16227122c..a009a9a8247 100644
--- a/app/assets/javascripts/discourse/app/models/user.js
+++ b/app/assets/javascripts/discourse/app/models/user.js
@@ -384,7 +384,7 @@ export default class User extends RestModel.extend(Evented) {
     const groups = details?.allowed_groups;
 
     // directly targeted so go to inbox
-    if (!groups || allowedUsers?.findBy("id", this.id)) {
+    if (!groups || allowedUsers?.find((user) => user.id === this.id)) {
       return userPath(`${username}/messages`);
     } else if (groups) {
       const firstAllowedGroup = groups.find((allowedGroup) =>
@@ -425,9 +425,8 @@ export default class User extends RestModel.extend(Evented) {
 
   @discourseComputed("trust_level")
   trustLevel(trustLevel) {
-    return Site.currentProp("trustLevels").findBy(
-      "id",
-      parseInt(trustLevel, 10)
+    return Site.currentProp("trustLevels").find(
+      (l) => l.id === parseInt(trustLevel, 10)
     );
   }
 
diff --git a/app/assets/javascripts/discourse/app/routes/build-category-route.js b/app/assets/javascripts/discourse/app/routes/build-category-route.js
index 67405c83473..69168295e16 100644
--- a/app/assets/javascripts/discourse/app/routes/build-category-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-category-route.js
@@ -119,7 +119,9 @@ class AbstractCategoryRoute extends DiscourseRoute {
     let categoryName = category.displayName;
     if (category.parent_category_id) {
       const list = Category.list();
-      const parentCategory = list.findBy("id", category.parent_category_id);
+      const parentCategory = list.find(
+        (c) => c.id === category.parent_category_id
+      );
       categoryName = `${parentCategory.displayName}/${categoryName}`;
     }
 
diff --git a/app/assets/javascripts/discourse/app/routes/new-category.js b/app/assets/javascripts/discourse/app/routes/new-category.js
index e50e92af8e4..d0cee7e6f0f 100644
--- a/app/assets/javascripts/discourse/app/routes/new-category.js
+++ b/app/assets/javascripts/discourse/app/routes/new-category.js
@@ -75,7 +75,7 @@ export default class NewCategory extends DiscourseRoute {
   defaultGroupPermissions() {
     return [
       {
-        group_name: this.site.groups.findBy("id", 0).name,
+        group_name: this.site.groups.find((g) => g.id === 0).name,
         permission_type: 1,
       },
     ];
diff --git a/app/assets/javascripts/discourse/app/routes/new-topic.js b/app/assets/javascripts/discourse/app/routes/new-topic.js
index d3e94780407..114c806c745 100644
--- a/app/assets/javascripts/discourse/app/routes/new-topic.js
+++ b/app/assets/javascripts/discourse/app/routes/new-topic.js
@@ -87,10 +87,12 @@ export default class extends DiscourseRoute {
     let category = null;
 
     if (!sub) {
-      category = this.site.categories.findBy(type, main.toLowerCase());
+      category = this.site.categories.find(
+        (c) => c[type] === main.toLowerCase()
+      );
     } else {
       const { categories } = this.site;
-      const parent = categories.findBy(type, main.toLowerCase());
+      const parent = categories.find((c) => c[type] === main.toLowerCase());
 
       if (parent) {
         category = categories.find((item) => {
diff --git a/app/assets/javascripts/discourse/app/services/composer.js b/app/assets/javascripts/discourse/app/services/composer.js
index 8c870bb8d35..d60ee978b63 100644
--- a/app/assets/javascripts/discourse/app/services/composer.js
+++ b/app/assets/javascripts/discourse/app/services/composer.js
@@ -866,9 +866,8 @@ export default class ComposerService extends Service {
     if (this.get("model.editingPost")) {
       const replyToPostNumber = this.get("model.post.reply_to_post_number");
       if (replyToPostNumber) {
-        const replyPost = postStream.posts.findBy(
-          "post_number",
-          replyToPostNumber
+        const replyPost = postStream.posts.find(
+          (item) => item.post_number === replyToPostNumber
         );
 
         if (replyPost) {
diff --git a/app/assets/javascripts/discourse/app/services/store.js b/app/assets/javascripts/discourse/app/services/store.js
index 3f1880a40cf..855441f1833 100644
--- a/app/assets/javascripts/discourse/app/services/store.js
+++ b/app/assets/javascripts/discourse/app/services/store.js
@@ -157,7 +157,9 @@ export default class StoreService extends Service {
     hydrated.set(
       "content",
       hydrated.get("content").map((item) => {
-        let staleItem = stale.content.findBy(primaryKey, item.get(primaryKey));
+        let staleItem = stale.content.find(
+          (i) => i.primaryKey === item.get(primaryKey)
+        );
         if (staleItem) {
           for (const [key, value] of Object.entries(
             Object.getOwnPropertyDescriptors(staleItem)
diff --git a/app/assets/javascripts/discourse/app/widgets/post-stream.js b/app/assets/javascripts/discourse/app/widgets/post-stream.js
index c238a1dd0ab..5b47c540b6b 100644
--- a/app/assets/javascripts/discourse/app/widgets/post-stream.js
+++ b/app/assets/javascripts/discourse/app/widgets/post-stream.js
@@ -108,9 +108,8 @@ createWidget("posts-filtered-notice", {
         this.attach("filter-show-all", attrs),
       ];
     } else if (filters.replies_to_post_number) {
-      const sourcePost = attrs.posts.findBy(
-        "post_number",
-        filters.replies_to_post_number
+      const sourcePost = attrs.posts.find(
+        (item) => item.post_number === filters.replies_to_post_number
       );
 
       return [
diff --git a/app/assets/javascripts/discourse/tests/helpers/store-pretender.js b/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
index e6b6d3f0e11..39859e42cdf 100644
--- a/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
+++ b/app/assets/javascripts/discourse/tests/helpers/store-pretender.js
@@ -79,7 +79,9 @@ export default function (helpers) {
   });
 
   this.get("/widgets/:widget_id", function (request) {
-    const w = _widgets.findBy("id", parseInt(request.params.widget_id, 10));
+    const w = _widgets.find(
+      (widget) => widget.id === parseInt(request.params.widget_id, 10)
+    );
     if (w) {
       return response({ widget: w, extras: { hello: "world" } });
     } else {
diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.gjs
index 4b9ed1424ba..115c351b879 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/tag-drop-test.gjs
@@ -26,7 +26,7 @@ module("Integration | Component | select-kit/tag-drop", function (hooks) {
 
   test("default", async function (assert) {
     const categories = this.site.categoriesList;
-    const category = categories.findBy("id", 2);
+    const category = categories.find((item) => item.id === 2);
 
     await render(
       <template>
diff --git a/app/assets/javascripts/discourse/tests/unit/services/store-test.js b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
index 3191bb5658f..b86075a1d02 100644
--- a/app/assets/javascripts/discourse/tests/unit/services/store-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/services/store-test.js
@@ -147,7 +147,7 @@ module("Unit | Service | store", function (hooks) {
     const result = await store.findAll("widget");
     assert.strictEqual(result.length, 2);
 
-    const widget = result.findBy("id", 124);
+    const widget = result.find((item) => item.id === 124);
     assert.false(widget.isNew, "found records are not new");
     assert.strictEqual(widget.name, "Evil Repellant");
   });
diff --git a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.gjs b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.gjs
index 53bb786de3b..e1ff22ec047 100644
--- a/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.gjs
+++ b/app/assets/javascripts/select-kit/addon/components/color-palettes/color-palettes-row.gjs
@@ -21,7 +21,9 @@ export default class ColorPalettesRow extends SelectKitRowComponent {
 
   @computed("item.colors.[]")
   get backgroundColor() {
-    const secondary = (this.item.colors || []).findBy("name", "secondary");
+    const secondary = (this.item.colors || []).find(
+      (color) => color.name === "secondary"
+    );
 
     if (secondary && secondary.hex) {
       return htmlSafe(`background-color:#${escape(secondary.hex)}`);
diff --git a/app/assets/javascripts/select-kit/addon/components/flair-chooser.js b/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
index 239e654a5e7..45c126096c1 100644
--- a/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
@@ -20,9 +20,8 @@ export default class FlairChooser extends ComboBoxComponent {
 
   @computed("value", "content.[]", "selectKit.noneItem")
   get selectedContent() {
-    const content = (this.content || []).findBy(
-      this.selectKit.valueProperty,
-      this.value
+    const content = (this.content || []).find(
+      (value) => value[this.selectKit.valueProperty] === this.value
     );
 
     if (content) {
diff --git a/app/assets/javascripts/select-kit/addon/components/multi-select.gjs b/app/assets/javascripts/select-kit/addon/components/multi-select.gjs
index 61cca6f02e9..00ed3b6f135 100644
--- a/app/assets/javascripts/select-kit/addon/components/multi-select.gjs
+++ b/app/assets/javascripts/select-kit/addon/components/multi-select.gjs
@@ -148,9 +148,8 @@ export default class MultiSelect extends SelectKitComponent {
 
       value.forEach((v) => {
         if (this.selectKit.valueProperty) {
-          const c = makeArray(this.content).findBy(
-            this.selectKit.valueProperty,
-            v
+          const c = makeArray(this.content).find(
+            (item) => item[this.selectKit.valueProperty] === v
           );
           if (c) {
             content.push(c);
diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js
index 3c002a084a8..babccdd4831 100644
--- a/app/assets/javascripts/select-kit/addon/components/select-kit.js
+++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js
@@ -1117,9 +1117,8 @@ export default class SelectKit extends Component {
     if (this.value && this.mainCollection) {
       let highlighted;
       if (this.valueProperty) {
-        highlighted = this.mainCollection.findBy(
-          this.valueProperty,
-          this.value
+        highlighted = this.mainCollection.find(
+          (item) => item[this.valueProperty] === this.value
         );
       } else {
         const index = this.mainCollection.indexOf(this.value);
diff --git a/app/assets/javascripts/select-kit/addon/components/single-select.gjs b/app/assets/javascripts/select-kit/addon/components/single-select.gjs
index ea921731b07..048bfe08893 100644
--- a/app/assets/javascripts/select-kit/addon/components/single-select.gjs
+++ b/app/assets/javascripts/select-kit/addon/components/single-select.gjs
@@ -33,9 +33,8 @@ export default class SingleSelect extends SelectKitComponent {
           : this.value;
 
       if (this.selectKit.valueProperty) {
-        content = (this.content || []).findBy(
-          this.selectKit.valueProperty,
-          value
+        content = (this.content || []).find(
+          (item) => item[this.selectKit.valueProperty] === value
         );
 
         return this.selectKit.modifySelection(
diff --git a/app/assets/javascripts/select-kit/addon/lib/select-kit-prop-utils.js b/app/assets/javascripts/select-kit/addon/lib/select-kit-prop-utils.js
index e1627f876d1..2e8969dd234 100644
--- a/app/assets/javascripts/select-kit/addon/lib/select-kit-prop-utils.js
+++ b/app/assets/javascripts/select-kit/addon/lib/select-kit-prop-utils.js
@@ -16,7 +16,7 @@ export default function selectKitPropUtils(target) {
   target.prototype.itemForValue = function (value, content) {
     const { valueProperty } = this.selectKit;
     if (valueProperty) {
-      return content.findBy(valueProperty, value);
+      return content.find((item) => item[valueProperty] === value);
     }
     return value;
   };
@@ -73,7 +73,7 @@ export default function selectKitPropUtils(target) {
     }
 
     if (typeof property === "string") {
-      return content.findBy(property, getterFunc(item));
+      return content.find((c) => c[property] === getterFunc(item));
     }
 
     const name = getterFunc(item);
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs
index 572db2876a9..de936e01b62 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs
@@ -33,14 +33,18 @@ export default class ChatComposerUploads extends Component {
       }
 
       this.uppyUpload.uppyWrapper.onPreProcessProgress((file) => {
-        const inProgressUpload = this.inProgressUploads.findBy("id", file.id);
+        const inProgressUpload = this.inProgressUploads.find(
+          (item) => item.id === file.id
+        );
         if (!inProgressUpload?.processing) {
           inProgressUpload?.set("processing", true);
         }
       });
 
       this.uppyUpload.uppyWrapper.onPreProcessComplete((file) => {
-        const inProgressUpload = this.inProgressUploads.findBy("id", file.id);
+        const inProgressUpload = this.inProgressUploads.find(
+          (item) => item.id === file.id
+        );
         inProgressUpload?.set("processing", false);
       });
     },
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs
index eda0e29a4b6..4720f0645e6 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs
@@ -161,9 +161,8 @@ export default class ChatThreadList extends Component {
   }
 
   handleDeleteMessage(data) {
-    const deletedOriginalMessageThread = this.threadsManager.threads.findBy(
-      "originalMessage.id",
-      data.deleted_id
+    const deletedOriginalMessageThread = this.threadsManager.threads.find(
+      (item) => item.originalMessage.id === data.deleted_id
     );
 
     if (!deletedOriginalMessageThread) {
@@ -174,9 +173,8 @@ export default class ChatThreadList extends Component {
   }
 
   handleRestoreMessage(data) {
-    const restoredOriginalMessageThread = this.threadsManager.threads.findBy(
-      "originalMessage.id",
-      data.chat_message.id
+    const restoredOriginalMessageThread = this.threadsManager.threads.find(
+      (item) => item.originalMessage.id === data.chat_message.id
     );
 
     if (!restoredOriginalMessageThread) {
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
index c714af968b7..56c4bf29492 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-sidebar.js
@@ -1,4 +1,5 @@
 import { tracked } from "@glimmer/tracking";
+import { get } from "@ember/object";
 import { service } from "@ember/service";
 import { dasherize } from "@ember/string";
 import { htmlSafe } from "@ember/template";
@@ -423,8 +424,10 @@ export default {
               const user = this.channel.chatable.users[0];
 
               if (
-                !!activeUsers?.findBy("id", user?.id) ||
-                !!activeUsers?.findBy("username", user?.username)
+                !!activeUsers?.find((item) => get(item, "id") === user?.id) ||
+                !!activeUsers?.find(
+                  (item) => get(item, "username") === user?.username
+                )
               ) {
                 return "active";
               }
diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-show.js b/plugins/discourse-adplugin/admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-show.js
index 9be0a366c9c..1c8af9bb098 100644
--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-show.js
+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/controllers/admin-plugins-house-ads-show.js
@@ -127,7 +127,9 @@ export default class adminPluginsHouseAdsShow extends Controller {
         }
       );
       this.houseAdsController.model.removeObject(
-        this.houseAdsController.model.findBy("id", this.buffered.id)
+        this.houseAdsController.model.find(
+          (item) => item.id === this.buffered.id
+        )
       );
       this.router.transitionTo("adminPlugins.houseAds.index");
     } catch (error) {
diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/routes/admin-plugins-house-ads-show.js b/plugins/discourse-adplugin/admin/assets/javascripts/admin/routes/admin-plugins-house-ads-show.js
index 8d405ba1052..41b9b41b709 100644
--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/routes/admin-plugins-house-ads-show.js
+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/routes/admin-plugins-house-ads-show.js
@@ -13,9 +13,8 @@ export default class AdminPluginsHouseAdsShow extends DiscourseRoute {
       });
     } else {
       return new TrackedObject(
-        this.modelFor("adminPlugins.houseAds").findBy(
-          "id",
-          parseInt(params.ad_id, 10)
+        this.modelFor("adminPlugins.houseAds").find(
+          (item) => item.id === parseInt(params.ad_id, 10)
         )
       );
     }
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-embeddings-edit.js b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-embeddings-edit.js
index 46a7bc30cc6..7fcf63fb1d6 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-embeddings-edit.js
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-embeddings-edit.js
@@ -6,7 +6,7 @@ export default class AdminPluginsShowDiscourseAiEmbeddingsEdit extends Discourse
       "adminPlugins.show.discourse-ai-embeddings"
     );
     const id = parseInt(params.id, 10);
-    const record = allEmbeddings.findBy("id", id);
+    const record = allEmbeddings.find((item) => item.id === id);
     record.provider_params = record.provider_params || {};
     return record;
   }
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js
index f7b5de4c90b..8d360f89499 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-llms-edit.js
@@ -13,7 +13,7 @@ export default class AdminPluginsShowDiscourseAiLlmsEdit extends DiscourseRoute
     }
 
     const allLlms = this.modelFor("adminPlugins.show.discourse-ai-llms");
-    const record = allLlms.findBy("id", id);
+    const record = allLlms.find((item) => item.id === id);
     record.provider_params = record.provider_params || {};
     return record;
   }
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js
index 8b5fdd02154..74d16023cd6 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-ai-personas-edit.js
@@ -6,7 +6,7 @@ export default class AdminPluginsShowDiscourseAiPersonasEdit extends DiscourseRo
       "adminPlugins.show.discourse-ai-personas"
     );
     const id = parseInt(params.id, 10);
-    return allPersonas.findBy("id", id);
+    return allPersonas.find((item) => item.id === id);
   }
 
   setupController(controller, model) {
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-embedding-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-embedding-editor.gjs
index 1edce8589fe..306d1efbf6c 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-embedding-editor.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-embedding-editor.gjs
@@ -126,9 +126,8 @@ export default class AiEmbeddingEditor extends Component {
   @action
   configurePreset(preset) {
     this.selectedPreset =
-      this.args.embeddings.resultSetMeta.presets.findBy(
-        "preset_id",
-        preset.id
+      this.args.embeddings.resultSetMeta.presets.find(
+        (item) => item.preset_id === preset.id
       ) || {};
 
     if (this.selectedPreset.provider) {
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-llm-editor-form.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-llm-editor-form.gjs
index f7941f12a97..c582a398b3a 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-llm-editor-form.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-llm-editor-form.gjs
@@ -36,8 +36,10 @@ export default class AiLlmEditorForm extends Component {
         return { provider_params: {} };
       }
 
-      const info = this.args.llms.resultSetMeta.presets.findBy("id", id);
-      const modelInfo = info.models.findBy("name", modelName);
+      const info = this.args.llms.resultSetMeta.presets.find(
+        (item) => item.id === id
+      );
+      const modelInfo = info.models.find((item) => item.name === modelName);
 
       return {
         max_prompt_tokens: modelInfo.tokens,
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-editor.gjs
index 38535dd69e0..d47ef74b8ee 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-editor.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-editor.gjs
@@ -240,7 +240,7 @@ export default class PersonaEditor extends Component {
     const updatedOptions = Object.assign({}, currentOptions);
 
     toolNames.forEach((toolId) => {
-      const tool = this.allTools.findBy("id", toolId);
+      const tool = this.allTools.find((item) => item.id === toolId);
       const toolOptions = tool?.options;
 
       if (!toolOptions || updatedOptions[toolId]) {
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-list-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
index 875d894f4ad..5a90edf103b 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
@@ -163,7 +163,9 @@ export default class AiPersonaListEditor extends Component {
     })
       .then((result) => {
         let persona = AiPersona.create(result);
-        let existingPersona = this.args.personas.findBy("id", persona.id);
+        let existingPersona = this.args.personas.find(
+          (item) => item.id === persona.id
+        );
         if (existingPersona) {
           this.args.personas.removeObject(existingPersona);
         }
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-tool-options.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-tool-options.gjs
index 9d93f457421..ab8560dc7cf 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-tool-options.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-persona-tool-options.gjs
@@ -11,7 +11,7 @@ export default class AiPersonaToolOptions extends Component {
       return false;
     }
     return this.args.data?.tools.any(
-      (tool) => allTools.findBy("id", tool)?.options
+      (tool) => allTools.find((item) => item.id === tool)?.options
     );
   }
 
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor.gjs
index 98fffe5b736..2489f5eab3b 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor.gjs
@@ -8,10 +8,12 @@ export default class AiToolEditor extends Component {
 
   get selectedPreset() {
     if (!this.args.selectedPreset) {
-      return this.args.presets.findBy("preset_id", "empty_tool");
+      return this.args.presets.find((item) => item.preset_id === "empty_tool");
     }
 
-    return this.args.presets.findBy("preset_id", this.args.selectedPreset);
+    return this.args.presets.find(
+      (item) => item.preset_id === this.args.selectedPreset
+    );
   }
 
   get editingModel() {
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-list-editor.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
index 6012401a02e..b122f2c078b 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
@@ -84,7 +84,7 @@ export default class AiToolListEditor extends Component {
     })
       .then((result) => {
         let tool = AiTool.create(result.ai_tool);
-        let existingTool = this.args.tools.findBy("id", tool.id);
+        let existingTool = this.args.tools.find((item) => item.id === tool.id);
         if (existingTool) {
           this.args.tools.removeObject(existingTool);
         }
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs
index 3c82d88aa4b..373b78c12c5 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs
@@ -15,7 +15,9 @@ export default class AiLlmQuotaModal extends Component {
   @action
   save(data) {
     const quota = { ...data };
-    quota.group_name = this.site.groups.findBy("id", data.group_id).name;
+    quota.group_name = this.site.groups.find(
+      (item) => item.id === data.group_id
+    )?.name;
     quota.llm_model_id = this.args.model.id;
 
     this.args.model.addItemToCollection(quota);
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs
index aa66d99589f..bef635ebdda 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs
@@ -105,7 +105,9 @@ export default class CategoryCalendar extends Component {
         return data;
       });
 
-    return settings.findBy("categoryId", this.category.id.toString());
+    return settings.find(
+      (item) => item.categoryId === this.category.id.toString()
+    );
   }
 
   @action
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs
index 1a1910d030c..74b2d839a1a 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs
@@ -26,7 +26,9 @@ export default class GroupTimezones extends Component {
       if (this.#shouldAddMemberToGroup(this.filter, member)) {
         const timezone = member.timezone;
         const identifier = parseInt(moment.tz(timezone).format("YYYYMDHm"), 10);
-        let groupedTimezone = groupedTimezones.findBy("identifier", identifier);
+        let groupedTimezone = groupedTimezones.find(
+          (item) => item.identifier === identifier
+        );
 
         if (groupedTimezone) {
           groupedTimezone.members.push(member);
diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
index d1446560939..f1bb8776992 100644
--- a/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/admin/routes/admin-plugins-chat-integration-provider.js
@@ -7,9 +7,8 @@ export default class AdminPluginsChatIntegrationProvider extends DiscourseRoute
   async model(params) {
     const [channels, provider, groups] = await Promise.all([
       this.store.findAll("channel", { provider: params.provider }),
-      this.modelFor("admin-plugins-chat-integration").findBy(
-        "id",
-        params.provider
+      this.modelFor("admin-plugins-chat-integration").find(
+        (item) => item.id === params.provider
       ),
       Group.findAll(),
     ]);
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-gamification-leaderboards-show.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-gamification-leaderboards-show.js
index ce1fded24a2..16d261174a7 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-gamification-leaderboards-show.js
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins-show-discourse-gamification-leaderboards-show.js
@@ -12,7 +12,9 @@ export default class DiscourseGamificationLeaderboardShow extends DiscourseRoute
     );
     const id = parseInt(params.id, 10);
 
-    const leaderboard = leaderboardsData.leaderboards.findBy("id", id);
+    const leaderboard = leaderboardsData.leaderboards.find(
+      (item) => item.id === id
+    );
     if (leaderboard) {
       return leaderboard;
     }
diff --git a/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs b/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs
index 31d6196505a..a2ffe8a7959 100644
--- a/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs
+++ b/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs
@@ -132,7 +132,9 @@ export default class PostPolicy extends Component {
       this.post.policy_not_accepted_by_count + 1
     );
 
-    const obj = this.post.policy_accepted_by.findBy("id", this.currentUser.id);
+    const obj = this.post.policy_accepted_by.find(
+      (item) => item.id === this.currentUser.id
+    );
     if (obj) {
       this.post.policy_accepted_by.removeObject(obj);
       this.post.set(
@@ -161,9 +163,8 @@ export default class PostPolicy extends Component {
       this.post.policy_accepted_by_count + 1
     );
 
-    const obj = this.post.policy_not_accepted_by.findBy(
-      "id",
-      this.currentUser.id
+    const obj = this.post.policy_not_accepted_by.find(
+      (item) => item.id === this.currentUser.id
     );
 
     if (obj) {
diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/initializers/discourse-reactions.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/initializers/discourse-reactions.gjs
index 0edfe792f13..059c6e5b49b 100644
--- a/plugins/discourse-reactions/assets/javascripts/discourse/initializers/discourse-reactions.gjs
+++ b/plugins/discourse-reactions/assets/javascripts/discourse/initializers/discourse-reactions.gjs
@@ -54,9 +54,10 @@ function initializeDiscourseReactions(api) {
             value: this.siteSettings.discourse_reactions_reaction_for_like,
           });
         } else {
-          const mainEmoji = this.collection.findBy(
-            "value",
-            this.siteSettings.discourse_reactions_reaction_for_like
+          const mainEmoji = this.collection.find(
+            (item) =>
+              item.value ===
+              this.siteSettings.discourse_reactions_reaction_for_like
           );
 
           if (mainEmoji) {