Merge branch 'develop' into feat/update-docs

BottlecapDave · Nov 18, 2023 · d7fa78d · d7fa78d
2 parents 8dd801c + f09faeb
commit d7fa78d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/custom_components/octopus_energy/electricity/current_consumption.py b/custom_components/octopus_energy/electricity/current_consumption.py
@@ -88,7 +88,7 @@ def state(self):
       total_consumption = get_total_consumption(consumption_result)
       self._state = get_current_consumption_delta(current_date,
                                                   total_consumption,
-                                                  self._attributes["last_evaluated"] if self._attributes["last_evaluated"] is not None else current_date,
+                                                  self._attributes["last_evaluated"] if "last_evaluated" in self._attributes and self._attributes["last_evaluated"] is not None else current_date,
                                                   self._previous_total_consumption)
       if (self._state is not None):
         self._latest_date = current_date

diff --git a/custom_components/octopus_energy/gas/current_consumption.py b/custom_components/octopus_energy/gas/current_consumption.py
@@ -88,7 +88,7 @@ def state(self):
       total_consumption = get_total_consumption(consumption_result)
       self._state = get_current_consumption_delta(current_date,
                                                   total_consumption,
-                                                  self._attributes["last_evaluated"] if self._attributes["last_evaluated"] is not None else current_date,
+                                                  self._attributes["last_evaluated"] if "last_evaluated" in self._attributes and self._attributes["last_evaluated"] is not None else current_date,
                                                   self._previous_total_consumption)
       if (self._state is not None):
         self._latest_date = current_date