From c98df36b75d351789b2bc0dfd4127ab7d1d480b4 Mon Sep 17 00:00:00 2001
From: Arie Catsman <120491684+catsmanac@users.noreply.github.com>
Date: Thu, 23 Jan 2025 19:05:57 +0100
Subject: [PATCH] Bump pyenphase to 1.23.1 (#136200)

---
 .../components/enphase_envoy/manifest.json    |  2 +-
 .../components/enphase_envoy/select.py        |  8 +++---
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 tests/components/enphase_envoy/test_select.py | 25 +++++++++++++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/enphase_envoy/manifest.json b/homeassistant/components/enphase_envoy/manifest.json
index bdc90e6c634..0b1fd8b04b9 100644
--- a/homeassistant/components/enphase_envoy/manifest.json
+++ b/homeassistant/components/enphase_envoy/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/enphase_envoy",
   "iot_class": "local_polling",
   "loggers": ["pyenphase"],
-  "requirements": ["pyenphase==1.23.0"],
+  "requirements": ["pyenphase==1.23.1"],
   "zeroconf": [
     {
       "type": "_enphase-envoy._tcp.local."
diff --git a/homeassistant/components/enphase_envoy/select.py b/homeassistant/components/enphase_envoy/select.py
index d9729a16683..7dc275aab37 100644
--- a/homeassistant/components/enphase_envoy/select.py
+++ b/homeassistant/components/enphase_envoy/select.py
@@ -37,7 +37,7 @@ class EnvoyRelaySelectEntityDescription(SelectEntityDescription):
 class EnvoyStorageSettingsSelectEntityDescription(SelectEntityDescription):
     """Describes an Envoy storage settings select entity."""
 
-    value_fn: Callable[[EnvoyStorageSettings], str]
+    value_fn: Callable[[EnvoyStorageSettings], str | None]
     update_fn: Callable[[Envoy, str], Awaitable[dict[str, Any]]]
 
 
@@ -118,7 +118,9 @@ STORAGE_MODE_ENTITY = EnvoyStorageSettingsSelectEntityDescription(
     key="storage_mode",
     translation_key="storage_mode",
     options=STORAGE_MODE_OPTIONS,
-    value_fn=lambda storage_settings: STORAGE_MODE_MAP[storage_settings.mode],
+    value_fn=lambda storage_settings: (
+        None if not storage_settings.mode else STORAGE_MODE_MAP[storage_settings.mode]
+    ),
     update_fn=lambda envoy, value: envoy.set_storage_mode(
         REVERSE_STORAGE_MODE_MAP[value]
     ),
@@ -235,7 +237,7 @@ class EnvoyStorageSettingsSelectEntity(EnvoyBaseEntity, SelectEntity):
             )
 
     @property
-    def current_option(self) -> str:
+    def current_option(self) -> str | None:
         """Return the state of the select entity."""
         assert self.data.tariff is not None
         assert self.data.tariff.storage_settings is not None
diff --git a/requirements_all.txt b/requirements_all.txt
index ce52715cb36..c8386290b54 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1923,7 +1923,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==1.23.0
+pyenphase==1.23.1
 
 # homeassistant.components.envisalink
 pyenvisalink==4.7
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 1d892ff34e0..78adfd85cdc 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1567,7 +1567,7 @@ pyeiscp==0.0.7
 pyemoncms==0.1.1
 
 # homeassistant.components.enphase_envoy
-pyenphase==1.23.0
+pyenphase==1.23.1
 
 # homeassistant.components.everlights
 pyeverlights==0.1.0
diff --git a/tests/components/enphase_envoy/test_select.py b/tests/components/enphase_envoy/test_select.py
index 071dbcb2fe2..9b3a63d1e23 100644
--- a/tests/components/enphase_envoy/test_select.py
+++ b/tests/components/enphase_envoy/test_select.py
@@ -226,3 +226,28 @@ async def test_select_storage_modes(
     mock_envoy.set_storage_mode.assert_called_once_with(
         REVERSE_STORAGE_MODE_MAP[current_state]
     )
+
+
+@pytest.mark.parametrize(
+    ("mock_envoy", "use_serial"),
+    [
+        ("envoy_metered_batt_relay", "enpower_654321"),
+        ("envoy_eu_batt", "envoy_1234"),
+    ],
+    indirect=["mock_envoy"],
+)
+async def test_select_storage_modes_if_none(
+    hass: HomeAssistant,
+    mock_envoy: AsyncMock,
+    config_entry: MockConfigEntry,
+    use_serial: str,
+) -> None:
+    """Test select platform entity storage mode when tariff storage_mode is none."""
+    mock_envoy.data.tariff.storage_settings.mode = None
+    with patch("homeassistant.components.enphase_envoy.PLATFORMS", [Platform.SELECT]):
+        await setup_integration(hass, config_entry)
+
+    test_entity = f"{Platform.SELECT}.{use_serial}_storage_mode"
+
+    assert (entity_state := hass.states.get(test_entity))
+    assert entity_state.state == "unknown"