From 8dc92ab21c162f804e7e43a20cbbbb57ff0d71d2 Mon Sep 17 00:00:00 2001
From: Szilard Szaloki <szilardszaloki@gmail.com>
Date: Fri, 13 Mar 2026 14:14:17 -0600
Subject: [PATCH] Account: changes the title label for logged-in users (#34707)

---
 android/java/brave-res/values/brave_attrs.xml |  2 +-
 .../brave-res/xml/brave_main_preferences.xml  |  5 +----
 .../settings/BraveAccountPreference.java      | 15 +++++++------
 .../BraveAccountSectionController.java        |  2 +-
 .../brave_account_row.html.ts                 |  2 +-
 .../resources/brave_account_strings.grdp      |  5 +----
 .../Settings/SettingsViewController.swift     | 22 +++++++++----------
 7 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/android/java/brave-res/values/brave_attrs.xml b/android/java/brave-res/values/brave_attrs.xml
index 834035031ef..77bec683588 100644
--- a/android/java/brave-res/values/brave_attrs.xml
+++ b/android/java/brave-res/values/brave_attrs.xml
@@ -2,8 +2,8 @@
 <resources>
     <declare-styleable name="brave_account_preference">
         <attr name="title_text_color" format="color"/>
+        <attr name="title_truncate_middle" format="boolean"/>
         <attr name="summary_text_color" format="color"/>
-        <attr name="summary_truncate_middle" format="boolean"/>
     </declare-styleable>
 
 	<declare-styleable name="brave_list_preference">
diff --git a/android/java/brave-res/xml/brave_main_preferences.xml b/android/java/brave-res/xml/brave_main_preferences.xml
index 4eaaddaf95d..95ebac311a4 100644
--- a/android/java/brave-res/xml/brave_main_preferences.xml
+++ b/android/java/brave-res/xml/brave_main_preferences.xml
@@ -14,10 +14,7 @@
     <org.chromium.chrome.browser.settings.BraveAccountPreference
         android:key="user_info"
         android:order="1"
-        android:icon="@drawable/ic_brave"
-        android:title="@string/settings_brave_account_logged_in_row_title"
-        app:summary_text_color="@color/brave_theme_subtitle_text"
-        app:summary_truncate_middle="true"
+        app:title_truncate_middle="true"
         android:selectable="false"/>
     <org.chromium.chrome.browser.settings.BraveAccountPreference
         android:key="sign_out"
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveAccountPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveAccountPreference.java
index c255613e597..9d08e53562b 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveAccountPreference.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveAccountPreference.java
@@ -22,8 +22,8 @@ import org.chromium.components.browser_ui.settings.ChromeBasePreference;
 @NullMarked
 public class BraveAccountPreference extends ChromeBasePreference {
     private final int mTitleTextColorResId;
+    private final boolean mTitleTruncateMiddle;
     private final int mSummaryTextColorResId;
-    private final boolean mSummaryTruncateMiddle;
 
     public BraveAccountPreference(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
@@ -31,10 +31,10 @@ public class BraveAccountPreference extends ChromeBasePreference {
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.brave_account_preference);
         mTitleTextColorResId =
                 a.getResourceId(R.styleable.brave_account_preference_title_text_color, 0);
+        mTitleTruncateMiddle =
+                a.getBoolean(R.styleable.brave_account_preference_title_truncate_middle, false);
         mSummaryTextColorResId =
                 a.getResourceId(R.styleable.brave_account_preference_summary_text_color, 0);
-        mSummaryTruncateMiddle =
-                a.getBoolean(R.styleable.brave_account_preference_summary_truncate_middle, false);
 
         a.recycle();
     }
@@ -53,14 +53,15 @@ public class BraveAccountPreference extends ChromeBasePreference {
             } else {
                 setColorFromRes(titleView, mTitleTextColorResId);
             }
+
+            if (mTitleTruncateMiddle) {
+                titleView.setSingleLine(true);
+                titleView.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+            }
         }
 
         if (holder.findViewById(android.R.id.summary) instanceof TextView summaryView) {
             setColorFromRes(summaryView, mSummaryTextColorResId);
-            if (mSummaryTruncateMiddle) {
-                summaryView.setSingleLine(true);
-                summaryView.setEllipsize(TextUtils.TruncateAt.MIDDLE);
-            }
         }
     }
 
diff --git a/android/java/org/chromium/chrome/browser/settings/BraveAccountSectionController.java b/android/java/org/chromium/chrome/browser/settings/BraveAccountSectionController.java
index a2117424665..e17518c6b38 100644
--- a/android/java/org/chromium/chrome/browser/settings/BraveAccountSectionController.java
+++ b/android/java/org/chromium/chrome/browser/settings/BraveAccountSectionController.java
@@ -192,7 +192,7 @@ public class BraveAccountSectionController implements PrefObserver, ConnectionEr
         Preference getStartedPref = mFragment.findPreference(PREF_GET_STARTED);
 
         if (hasPrefValue(BravePref.BRAVE_ACCOUNT_AUTHENTICATION_TOKEN)) { // logged in
-            userInfoPref.setSummary(
+            userInfoPref.setTitle(
                     UserPrefs.get(mProfile).getString(BravePref.BRAVE_ACCOUNT_EMAIL_ADDRESS));
             setVisibility(userInfoPref, true);
             setVisibility(signOutPref, true);
diff --git a/browser/resources/settings/getting_started_page/brave_account_row.html.ts b/browser/resources/settings/getting_started_page/brave_account_row.html.ts
index 20d250e2c19..9c32942cc29 100644
--- a/browser/resources/settings/getting_started_page/brave_account_row.html.ts
+++ b/browser/resources/settings/getting_started_page/brave_account_row.html.ts
@@ -41,7 +41,7 @@ export function getHtml(this: SettingsBraveAccountRow) {
     [AccountStateFieldTags.LOGGED_IN]: () => createFirstRow(
       this.i18n(
           BraveAccountSettingsStrings
-               .SETTINGS_BRAVE_ACCOUNT_LOGGED_IN_ROW_TITLE),
+               .BRAVE_ACCOUNT_TITLE),
       html`<div id="email">${this.state!.loggedIn!.email}</div>`,
       html`
         <leo-button kind="outline"
diff --git a/components/brave_account/resources/brave_account_strings.grdp b/components/brave_account/resources/brave_account_strings.grdp
index 86fdfb17af9..e274d3a73a2 100644
--- a/components/brave_account/resources/brave_account_strings.grdp
+++ b/components/brave_account/resources/brave_account_strings.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit-part>
-  <message name="IDS_BRAVE_ACCOUNT_TITLE" translateable="false" desc="Title for the Brave Account page/section" formatter_data="webui=BraveAccount android_java">
+  <message name="IDS_BRAVE_ACCOUNT_TITLE" translateable="false" desc="Title for the Brave Account page/section" formatter_data="webui=BraveAccount,BraveAccountSettings android_java">
     Brave Account
   </message>
   <message name="IDS_SETTINGS_BRAVE_ACCOUNT_LOGGED_OUT_ROW_TITLE" translateable="false" desc="Title inviting users to sign in or create a Brave Account, shown in the Get started settings page" formatter_data="webui=BraveAccountSettings">
@@ -24,9 +24,6 @@
   <message name="IDS_SETTINGS_BRAVE_ACCOUNT_CANCEL_REGISTRATION_BUTTON_LABEL" translateable="false" desc="Label for the button that cancels the pending registration when clicked" formatter_data="webui=BraveAccountSettings android_java">
     Cancel registration
   </message>
-  <message name="IDS_SETTINGS_BRAVE_ACCOUNT_LOGGED_IN_ROW_TITLE" translateable="false" desc="Title shown when user is logged in" formatter_data="webui=BraveAccountSettings android_java">
-    Email address
-  </message>
   <message name="IDS_SETTINGS_BRAVE_ACCOUNT_LOG_OUT_BUTTON_LABEL" translateable="false" desc="Label for the button that signs the user out of their account when clicked" formatter_data="webui=BraveAccountSettings android_java">
     Sign out
   </message>
diff --git a/ios/brave-ios/Sources/Brave/Frontend/Settings/SettingsViewController.swift b/ios/brave-ios/Sources/Brave/Frontend/Settings/SettingsViewController.swift
index ebfe9b99787..21ea205c073 100644
--- a/ios/brave-ios/Sources/Brave/Frontend/Settings/SettingsViewController.swift
+++ b/ios/brave-ios/Sources/Brave/Frontend/Settings/SettingsViewController.swift
@@ -394,14 +394,12 @@ class SettingsViewController: TableViewController {
         header: .title(L10nUtils.string(messageId: .BRAVE_ACCOUNT_TITLE)),
         rows: [
           Row(
-            text: L10nUtils.string(messageId: .SETTINGS_BRAVE_ACCOUNT_LOGGED_IN_ROW_TITLE),
-            detailText: braveCore.profile.prefs.string(
+            text: braveCore.profile.prefs.string(
               forPath: BraveAccountEmailAddressPref
             ),
-            image: UIImage(sharedNamed: "brave.logo"),
             cellClass: BraveAccountIconCell.self,
             context: [
-              BraveAccountIconCell.detailTextTruncateMiddle: true
+              BraveAccountIconCell.textTruncateMiddle: true
             ]
           ),
           Row(
@@ -1835,7 +1833,7 @@ class SettingsViewController: TableViewController {
 
 private final class BraveAccountIconCell: UITableViewCell, Cell {
   static let textColor = "textColor"
-  static let detailTextTruncateMiddle = "detailTextTruncateMiddle"
+  static let textTruncateMiddle = "textTruncateMiddle"
 
   func configure(row: Row) {
     var content = defaultContentConfiguration()
@@ -1846,18 +1844,18 @@ private final class BraveAccountIconCell: UITableViewCell, Cell {
     }
 
     content.text = row.text
-    content.textProperties.numberOfLines = 0
+    if let truncateMiddle = row.context?[Self.textTruncateMiddle] as? Bool, truncateMiddle {
+      content.textProperties.numberOfLines = 1
+      content.textProperties.lineBreakMode = .byTruncatingMiddle
+    } else {
+      content.textProperties.numberOfLines = 0
+    }
     if let color = row.context?[Self.textColor] as? UIColor {
       content.textProperties.color = color
     }
 
     content.secondaryText = row.detailText
-    if let truncateMiddle = row.context?[Self.detailTextTruncateMiddle] as? Bool, truncateMiddle {
-      content.secondaryTextProperties.numberOfLines = 1
-      content.secondaryTextProperties.lineBreakMode = .byTruncatingMiddle
-    } else {
-      content.secondaryTextProperties.numberOfLines = 0
-    }
+    content.secondaryTextProperties.numberOfLines = 0
     content.secondaryTextProperties.color = .secondaryBraveLabel
 
     contentConfiguration = content