From 570c63c50a49cbe0d5f24a9167ab9d292d2c8256 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 26 Jun 2025 12:17:00 +0200
Subject: [PATCH] Prevent overflow of ripple on device row on integration page
 (#25922)

---
 src/panels/config/integrations/ha-config-entry-row.ts | 11 +++++++++++
 src/translations/en.json                              |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/panels/config/integrations/ha-config-entry-row.ts b/src/panels/config/integrations/ha-config-entry-row.ts
index 9fd08a91a1..bd460a7a57 100644
--- a/src/panels/config/integrations/ha-config-entry-row.ts
+++ b/src/panels/config/integrations/ha-config-entry-row.ts
@@ -410,6 +410,9 @@ class HaConfigEntryRow extends LitElement {
                   <ha-md-list-item
                     @click=${this._toggleOwnDevices}
                     type="button"
+                    class="toggle-devices-row ${this._devicesExpanded
+                      ? "expanded"
+                      : ""}"
                   >
                     <ha-icon-button
                       class="expand-button"
@@ -755,6 +758,14 @@ class HaConfigEntryRow extends LitElement {
           var(--md-sys-color-on-surface-variant, #49454f)
         );
       }
+      .toggle-devices-row {
+        overflow: hidden;
+        border-radius: var(--ha-card-border-radius, 12px);
+      }
+      .toggle-devices-row.expanded {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+      }
     `,
   ];
 }
diff --git a/src/translations/en.json b/src/translations/en.json
index 8bca733f1f..9189b23ba3 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -5129,7 +5129,7 @@
             "hidden": "Hidden"
           },
           "confirm_disable_config_entry_title": "Disable config entry?",
-          "confirm_disable_config_entry_message": "There are no more devices for the config entry {name}, do you want to instead disable the config entry?",
+          "confirm_disable_config_entry_message": "There are no more devices for the config entry {name}, do you want to disable the config entry instead?",
           "update_device_error": "Updating the device failed",
           "disabled": "Disabled",
           "data_table": {
@@ -5381,7 +5381,7 @@
               "enable": "Enable device",
               "disable": "Disable device",
               "confirm_disable_title": "Disable device?",
-              "confirm_disable_message": "Are you sure you want to disable {name} and all of it’s entities?",
+              "confirm_disable_message": "Are you sure you want to disable {name} and all of its entities?",
               "configure": "Configure device",
               "delete": "Remove device"
             },