From 84972d10e36db493ba009f609cb32d8d44a096f5 Mon Sep 17 00:00:00 2001
From: karwosts <karwosts@gmail.com>
Date: Tue, 12 Mar 2024 16:11:00 -0700
Subject: [PATCH 1/2] Small reorganization of profile settings

---
 src/panels/profile/ha-panel-profile.ts | 48 +++++++++++++++++---------
 src/translations/en.json               |  4 +++
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts
index 932163a92812..09db841873f1 100644
--- a/src/panels/profile/ha-panel-profile.ts
+++ b/src/panels/profile/ha-panel-profile.ts
@@ -74,7 +74,6 @@ class HaPanelProfile extends LitElement {
           .narrow=${this.narrow}
         ></ha-menu-button>
         <div slot="title">${this.hass.localize("panel.profile")}</div>
-
         <div class="content">
           <ha-card .header=${this.hass.user!.name}>
             <div class="card-content">
@@ -85,7 +84,20 @@ class HaPanelProfile extends LitElement {
                 ? this.hass.localize("ui.panel.profile.is_owner")
                 : ""}
             </div>
-
+            <div class="card-actions">
+              <mwc-button class="warning" @click=${this._handleLogOut}>
+                ${this.hass.localize("ui.panel.profile.logout")}
+              </mwc-button>
+            </div>
+          </ha-card>
+          <ha-card
+            .header=${this.hass.localize(
+              "ui.panel.profile.user_settings_header"
+            )}
+          >
+            <div class="card-content">
+              ${this.hass.localize("ui.panel.profile.user_settings_detail")}
+            </div>
             <ha-pick-language-row
               .narrow=${this.narrow}
               .hass=${this.hass}
@@ -110,6 +122,24 @@ class HaPanelProfile extends LitElement {
               .narrow=${this.narrow}
               .hass=${this.hass}
             ></ha-pick-first-weekday-row>
+            ${this.hass.user!.is_admin
+              ? html`
+                  <ha-advanced-mode-row
+                    .hass=${this.hass}
+                    .narrow=${this.narrow}
+                    .coreUserData=${this._coreUserData}
+                  ></ha-advanced-mode-row>
+                `
+              : ""}
+          </ha-card>
+          <ha-card
+            .header=${this.hass.localize(
+              "ui.panel.profile.client_settings_header"
+            )}
+          >
+            <div class="card-content">
+              ${this.hass.localize("ui.panel.profile.client_settings_detail")}
+            </div>
             <ha-pick-theme-row
               .narrow=${this.narrow}
               .hass=${this.hass}
@@ -159,15 +189,6 @@ class HaPanelProfile extends LitElement {
                   ></ha-push-notifications-row>
                 `
               : ""}
-            ${this.hass.user!.is_admin
-              ? html`
-                  <ha-advanced-mode-row
-                    .hass=${this.hass}
-                    .narrow=${this.narrow}
-                    .coreUserData=${this._coreUserData}
-                  ></ha-advanced-mode-row>
-                `
-              : ""}
             <ha-set-suspend-row
               .narrow=${this.narrow}
               .hass=${this.hass}
@@ -176,11 +197,6 @@ class HaPanelProfile extends LitElement {
               .narrow=${this.narrow}
               .hass=${this.hass}
             ></ha-enable-shortcuts-row>
-            <div class="card-actions">
-              <mwc-button class="warning" @click=${this._handleLogOut}>
-                ${this.hass.localize("ui.panel.profile.logout")}
-              </mwc-button>
-            </div>
           </ha-card>
 
           ${this.hass.user!.credentials.some(
diff --git a/src/translations/en.json b/src/translations/en.json
index 6438749b16e8..6809439cd800 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -5875,6 +5875,10 @@
       "profile": {
         "current_user": "You are currently logged in as {fullName}.",
         "is_owner": "You are an owner.",
+        "user_settings_header": "User settings",
+        "user_settings_detail": "The following settings are tied to your account and will persist across all sessions and devices.",
+        "client_settings_header": "Client settings",
+        "client_settings_detail": "The following settings are local to this client only, and may reset to defaults on logout or when local data is cleared.",
         "logout": "Log out",
         "logout_title": "Log out?",
         "logout_text": "Are you sure you want to log out?",

From 8898b9620cfed697c185700d4559211eb5b47f16 Mon Sep 17 00:00:00 2001
From: karwosts <karwosts@gmail.com>
Date: Wed, 13 Mar 2024 14:30:09 -0700
Subject: [PATCH 2/2] use isExternal

---
 src/panels/profile/ha-panel-profile.ts | 4 +++-
 src/translations/en.json               | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/panels/profile/ha-panel-profile.ts b/src/panels/profile/ha-panel-profile.ts
index 09db841873f1..0c4c121aaf95 100644
--- a/src/panels/profile/ha-panel-profile.ts
+++ b/src/panels/profile/ha-panel-profile.ts
@@ -134,7 +134,9 @@ class HaPanelProfile extends LitElement {
           </ha-card>
           <ha-card
             .header=${this.hass.localize(
-              "ui.panel.profile.client_settings_header"
+              isExternal
+                ? "ui.panel.profile.mobile_app_settings"
+                : "ui.panel.profile.browser_settings"
             )}
           >
             <div class="card-content">
diff --git a/src/translations/en.json b/src/translations/en.json
index 6809439cd800..9c734469121c 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -5877,7 +5877,8 @@
         "is_owner": "You are an owner.",
         "user_settings_header": "User settings",
         "user_settings_detail": "The following settings are tied to your account and will persist across all sessions and devices.",
-        "client_settings_header": "Client settings",
+        "mobile_app_settings": "Mobile app settings",
+        "browser_settings": "Browser settings",
         "client_settings_detail": "The following settings are local to this client only, and may reset to defaults on logout or when local data is cleared.",
         "logout": "Log out",
         "logout_title": "Log out?",