From dd8602a928f2fbe1d89fc3bf4d159ea5d39a8df7 Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Thu, 26 Mar 2026 12:03:40 +0100
Subject: [PATCH] Profile editing: Add notice in profile preferences (#38404)

---
 app/javascript/styles/mastodon/admin.scss  | 47 ++++++++++++++++++++++
 app/views/settings/profiles/show.html.haml |  9 +++++
 config/locales/en.yml                      |  3 ++
 3 files changed, 59 insertions(+)

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 47f3ff080c..5a879faf7f 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -442,6 +442,53 @@ $content-width: 840px;
       }
     }
   }
+
+  .callout {
+    display: flex;
+    align-items: start;
+    padding: 12px;
+    gap: 8px;
+    background-color: var(--color-bg-brand-softest);
+    color: var(--color-text-primary);
+    border-radius: 12px;
+    font-size: 15px;
+    margin-bottom: 30px;
+
+    .icon {
+      padding: 4px;
+      border-radius: 9999px;
+      width: 1rem;
+      height: 1rem;
+      margin-top: -2px;
+      background-color: var(--color-bg-brand-soft);
+    }
+
+    .content {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+      flex-grow: 1;
+      padding: 0;
+
+      @media screen and (width >= 630px) {
+        flex-direction: row;
+      }
+    }
+
+    .body {
+      flex-grow: 1;
+    }
+
+    .title {
+      font-weight: 600;
+      margin-bottom: 8px;
+    }
+
+    a {
+      color: inherit;
+      font-weight: 600;
+    }
+  }
 }
 
 hr.spacer {
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 4f59c04747..7d7eab3545 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -5,6 +5,15 @@
   %h1= t('settings.profile')
   = render partial: 'settings/shared/profile_navigation'
 
+- if Mastodon::Feature.profile_redesign_enabled?
+  %aside.callout
+    = material_symbol 'info'
+    .content
+      .body
+        %p.title= t('edit_profile.redesign_title')
+        %p= t('edit_profile.redesign_body')
+      = link_to t('edit_profile.redesign_button'), '/profile/edit'
+
 = simple_form_for @account, url: settings_profile_path, html: { id: :edit_profile } do |f|
   = render 'shared/error_messages', object: @account
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97c4809aa3..76b25667df 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1421,6 +1421,9 @@ en:
     basic_information: Basic information
     hint_html: "<strong>Customize what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
     other: Other
+    redesign_body: Profile editing can now be accessed directly from the profile page.
+    redesign_button: Go there
+    redesign_title: There’s a new profile editing experience
   email_subscription_mailer:
     confirmation:
       action: Confirm email address