From 73904ce1de3858dda2dafbbef117062e4571982d Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Mon, 21 Sep 2026 14:29:17 +0000
Subject: [PATCH] Redesign: Fix custom feed wording in "Delete feed"
 confirmation dialog (#40632)

---
 .../confirmation_modals/delete_list.tsx       | 33 +++++++++++++++----
 app/javascript/mastodon/locales/en.json       |  2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
index 8fd9d8da012..4257095ed8a 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_list.tsx
@@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { useHistory } from 'react-router';
 
+import { isRedesignEnabled } from '@/mastodon/utils/environment';
 import { removeColumn } from 'mastodon/actions/columns';
 import { deleteList } from 'mastodon/actions/lists';
 import { useAppDispatch } from 'mastodon/store';
@@ -11,21 +12,39 @@ import { useAppDispatch } from 'mastodon/store';
 import type { BaseConfirmationModalProps } from './confirmation_modal';
 import { ConfirmationModal } from './confirmation_modal';
 
-const messages = defineMessages({
-  deleteListTitle: {
+const legacyMessages = defineMessages({
+  deleteTitle: {
     id: 'confirmations.delete_list.title',
     defaultMessage: 'Delete list?',
   },
-  deleteListMessage: {
+  deleteMessage: {
     id: 'confirmations.delete_list.message',
     defaultMessage: 'Are you sure you want to permanently delete this list?',
   },
-  deleteListConfirm: {
+  deleteConfirm: {
     id: 'confirmations.delete_list.confirm',
     defaultMessage: 'Delete',
   },
 });
 
+const redesignMessages = defineMessages({
+  deleteTitle: {
+    id: 'confirmations.delete_custom_feed.title',
+    defaultMessage: 'Delete custom feed?',
+  },
+  deleteMessage: {
+    id: 'confirmations.delete_custom_feed.message',
+    defaultMessage:
+      'Are you sure you want to permanently delete this custom feed?',
+  },
+  deleteConfirm: {
+    id: 'confirmations.delete_list.confirm',
+    defaultMessage: 'Delete',
+  },
+});
+
+const messages = isRedesignEnabled() ? redesignMessages : legacyMessages;
+
 export const ConfirmDeleteListModal: React.FC<
   {
     listId: string;
@@ -48,9 +67,9 @@ export const ConfirmDeleteListModal: React.FC<
 
   return (
     <ConfirmationModal
-      title={intl.formatMessage(messages.deleteListTitle)}
-      message={intl.formatMessage(messages.deleteListMessage)}
-      confirm={intl.formatMessage(messages.deleteListConfirm)}
+      title={intl.formatMessage(messages.deleteTitle)}
+      message={intl.formatMessage(messages.deleteMessage)}
+      confirm={intl.formatMessage(messages.deleteConfirm)}
       onConfirm={onConfirm}
       onClose={onClose}
     />
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index f8900569d4d..6e920eae98f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -619,6 +619,8 @@
   "confirmations.delete_collection.confirm": "Delete",
   "confirmations.delete_collection.message": "This action cannot be undone.",
   "confirmations.delete_collection.title": "Delete \"{name}\"?",
+  "confirmations.delete_custom_feed.message": "Are you sure you want to permanently delete this custom feed?",
+  "confirmations.delete_custom_feed.title": "Delete custom feed?",
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.delete_list.title": "Delete list?",