From a4477e9f83cad716e9330e3b1310adaad8e14223 Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Mon, 30 Sep 2019 21:21:16 +0300
Subject: [PATCH] Resolves #472 entity-filter fix

---
 lib/home_assistant.class.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index e2efd6c..beaeab4 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -217,7 +217,8 @@ class HomeAssistant {
         if (rawCardInfo["cards"] != null) {
           card.childCards = _createLovelaceCards(rawCardInfo["cards"]);
         }
-        rawCardInfo["entities"]?.forEach((rawEntity) {
+        var rawEntities = rawCard["entities"] ?? rawCardInfo["entities"];
+        rawEntities?.forEach((rawEntity) {
           if (rawEntity is String) {
             if (entities.isExist(rawEntity)) {
               card.entities.add(EntityWrapper(entity: entities.get(rawEntity)));
@@ -280,8 +281,9 @@ class HomeAssistant {
             }
           }
         });
-        if (rawCardInfo["entity"] != null) {
-          var en = rawCardInfo["entity"];
+        var rawSingleEntity = rawCard["entity"] ?? rawCardInfo["entity"];
+        if (rawSingleEntity != null) {
+          var en = rawSingleEntity;
           if (en is String) {
             if (entities.isExist(en)) {
               Entity e = entities.get(en);