From 946e1518e0bcd5fb866750858cae07ed31fa214f Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 2 Nov 2024 15:25:55 +0100
Subject: [PATCH 1/2] Lint

---
 .github/workflows/validate_esphome.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 7659a16ff..7f397c567 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -370,7 +370,7 @@ jobs:
           echo "Extracted Version: ${VERSION}"
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-      
+
       - name: Debug Version Output
         run: |
           echo "Version from setup_dependencies: ${{ steps.extract_version.outputs.version }}"

From 536f3b1d7cecfb2ad7d4f0e683d65c84a1159ed9 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 2 Nov 2024 21:44:26 +0100
Subject: [PATCH 2/2] Use `BOOT_STEP_VERSIONING` for API flag

Solves #2331
---
 esphome/nspanel_esphome_core_hw_wifi.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/esphome/nspanel_esphome_core_hw_wifi.yaml b/esphome/nspanel_esphome_core_hw_wifi.yaml
index 6dfd248e7..ad14a2521 100644
--- a/esphome/nspanel_esphome_core_hw_wifi.yaml
+++ b/esphome/nspanel_esphome_core_hw_wifi.yaml
@@ -93,20 +93,21 @@ script:
     mode: restart
     then:
       - lambda: |-
-          set_variable_value->execute("api", (wifi_component->is_connected() and api_server->is_connected() and is_boot_complete()) ? 1 : 0);
+          const bool is_blueprint_connected = is_boot_step_completed(${BOOT_STEP_VERSIONING});
+          set_variable_value->execute("api",
+                    (is_blueprint_connected and wifi_component->is_connected() and api_server->is_connected()) ? 1 : 0);
           // Update Wi-Fi icon color
           set_component_font_color->execute("home", "wifi_icon",
-                                            (wifi_component->is_connected() and api_server->is_connected() and is_boot_complete()) ?
-                                            (wifi_rssi->state > -70 ? 33808 : 64992) :
-                                            63488);
+                    (is_blueprint_connected and wifi_component->is_connected() and api_server->is_connected()) ?
+                    (wifi_rssi->state > -70 ? 33808 : 64992) : 63488);
           // Update Wi-Fi icon
           set_component_text->execute("home", "wifi_icon",
                                       wifi_component->is_connected() ?
                                         (api_server->is_connected() ?
-                                          ((is_boot_complete()) ? "\uE5A8" :  // mdi:wifi - All right!
-                                          "\uE7CF") :                         // mdi:home-assistant - Boot incomplete
-                                        "\uF256") :                           // mdi:api-off
-                                      "\uE5A9");                              // mdi:wifi-off
+                                          (is_blueprint_connected ? "\uE5A8" :  // mdi:wifi - All right!
+                                          "\uE7CF") :                           // mdi:home-assistant - Boot incomplete
+                                        "\uF256") :                             // mdi:api-off
+                                      "\uE5A9");                                // mdi:wifi-off
 
   - id: !extend stop_all
     then: