From 541c9410068feb39f9d199ddb5cefea367d40546 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Wed, 12 Jun 2024 22:25:49 +0200
Subject: [PATCH] Add state icons to incomfort water_heater entities (#119527)

---
 homeassistant/components/incomfort/icons.json | 41 +++++++++++++++++++
 .../components/incomfort/water_heater.py      |  5 ---
 .../snapshots/test_water_heater.ambr          |  3 +-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/incomfort/icons.json b/homeassistant/components/incomfort/icons.json
index eb93ed9a319..6e33ac75eee 100644
--- a/homeassistant/components/incomfort/icons.json
+++ b/homeassistant/components/incomfort/icons.json
@@ -19,6 +19,47 @@
           "on": "mdi:water-pump"
         }
       }
+    },
+    "water_heater": {
+      "boiler": {
+        "state": {
+          "unknown": "mdi:water-boiler-alert",
+          "opentherm": "mdi:radiator",
+          "boiler_ext": "mdi:water-boiler",
+          "frost": "mdi:snowflake-thermometer",
+          "central_heating_rf": "mdi:radiator",
+          "tapwater_int": "mdi:faucet",
+          "sensor_test": "mdi:thermometer-check",
+          "central_heating": "mdi:radiator",
+          "standby": "mdi:water-boiler-off",
+          "postrun_boyler": "mdi:water-boiler-auto",
+          "service": "mdi:progress-wrench",
+          "tapwater": "mdi:faucet",
+          "postrun_ch": "mdi:radiator-disabled",
+          "boiler_int": "mdi:water-boiler",
+          "buffer": "mdi:water-boiler-auto",
+          "sensor_fault_after_self_check_e0": "mdi:thermometer-alert",
+          "cv_temperature_too_high_e1": "mdi:thermometer-alert",
+          "s1_and_s2_interchanged_e2": "mdi:thermometer-alert",
+          "no_flame_signal_e4": "mdi:fire-alert",
+          "poor_flame_signal_e5": "mdi:fire-alert",
+          "flame_detection_fault_e6": "mdi:fire-alert",
+          "incorrect_fan_speed_e8": "mdi:water-boiler-alert",
+          "sensor_fault_s1_e10": "mdi:water-boiler-alert",
+          "sensor_fault_s1_e11": "mdi:water-boiler-alert",
+          "sensor_fault_s1_e12": "mdi:water-boiler-alert",
+          "sensor_fault_s1_e13": "mdi:water-boiler-alert",
+          "sensor_fault_s1_e14": "mdi:water-boiler-alert",
+          "sensor_fault_s2_e20": "mdi:water-boiler-alert",
+          "sensor_fault_s2_e21": "mdi:water-boiler-alert",
+          "sensor_fault_s2_e22": "mdi:water-boiler-alert",
+          "sensor_fault_s2_e23": "mdi:water-boiler-alert",
+          "sensor_fault_s2_e24": "mdi:water-boiler-alert",
+          "shortcut_outside_sensor_temperature_e27": "mdi:thermometer-alert",
+          "gas_valve_relay_faulty_e29": "mdi:water-boiler-alert",
+          "gas_valve_relay_faulty_e30": "mdi:water-boiler-alert"
+        }
+      }
     }
   }
 }
diff --git a/homeassistant/components/incomfort/water_heater.py b/homeassistant/components/incomfort/water_heater.py
index 1c1e5d2fc8e..28424069d1c 100644
--- a/homeassistant/components/incomfort/water_heater.py
+++ b/homeassistant/components/incomfort/water_heater.py
@@ -48,11 +48,6 @@ class IncomfortWaterHeater(IncomfortBoilerEntity, WaterHeaterEntity):
         super().__init__(coordinator, heater)
         self._attr_unique_id = heater.serial_no
 
-    @property
-    def icon(self) -> str:
-        """Return the icon of the water_heater device."""
-        return "mdi:thermometer-lines"
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the device state attributes."""
diff --git a/tests/components/incomfort/snapshots/test_water_heater.ambr b/tests/components/incomfort/snapshots/test_water_heater.ambr
index 3ec87c49f3e..06b0d0c1e52 100644
--- a/tests/components/incomfort/snapshots/test_water_heater.ambr
+++ b/tests/components/incomfort/snapshots/test_water_heater.ambr
@@ -25,7 +25,7 @@
     'options': dict({
     }),
     'original_device_class': None,
-    'original_icon': 'mdi:thermometer-lines',
+    'original_icon': None,
     'original_name': None,
     'platform': 'incomfort',
     'previous_unique_id': None,
@@ -42,7 +42,6 @@
       'display_code': <DisplayCode.STANDBY: 126>,
       'display_text': 'standby',
       'friendly_name': 'Boiler',
-      'icon': 'mdi:thermometer-lines',
       'is_burning': False,
       'max_temp': 80.0,
       'min_temp': 30.0,