From 392f64d33e23c5087ac5f26a3fa0677ea338c069 Mon Sep 17 00:00:00 2001
From: ilan <31193909+iloveicedgreentea@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:06:57 -0400
Subject: [PATCH] Fix Madvr sensor values on startup (#122479)

* fix: add startup values

* fix: update snap

* fix: use native value to show None
---
 homeassistant/components/madvr/sensor.py | 13 ++++++++++++-
 tests/components/madvr/test_sensors.py   | 13 +++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/madvr/sensor.py b/homeassistant/components/madvr/sensor.py
index 6f0933ac879..047b8bb83e6 100644
--- a/homeassistant/components/madvr/sensor.py
+++ b/homeassistant/components/madvr/sensor.py
@@ -277,4 +277,15 @@ class MadvrSensor(MadVREntity, SensorEntity):
     @property
     def native_value(self) -> float | str | None:
         """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator)
+        val = self.entity_description.value_fn(self.coordinator)
+        # check if sensor is enum
+        if self.entity_description.device_class == SensorDeviceClass.ENUM:
+            if (
+                self.entity_description.options
+                and val in self.entity_description.options
+            ):
+                return val
+            # return None for values that are not in the options
+            return None
+
+        return val
diff --git a/tests/components/madvr/test_sensors.py b/tests/components/madvr/test_sensors.py
index 25dcc1cdcca..ddc01fc737a 100644
--- a/tests/components/madvr/test_sensors.py
+++ b/tests/components/madvr/test_sensors.py
@@ -93,3 +93,16 @@ async def test_sensor_setup_and_states(
 
     # test get_temperature ValueError
     assert get_temperature(None, "temp_key") is None
+
+    # test startup placeholder values
+    update_callback({"outgoing_bit_depth": "0bit"})
+    await hass.async_block_till_done()
+    assert (
+        hass.states.get("sensor.madvr_envy_outgoing_bit_depth").state == STATE_UNKNOWN
+    )
+
+    update_callback({"outgoing_color_space": "?"})
+    await hass.async_block_till_done()
+    assert (
+        hass.states.get("sensor.madvr_envy_outgoing_color_space").state == STATE_UNKNOWN
+    )