From f047e54262b76ed46597384381ff3e4eb7305e46 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:06:46 +0000
Subject: [PATCH] Add MAC address display to WiFi Networks screen

Co-authored-by: lukestein <44452336+lukestein@users.noreply.github.com>
---
 src/activities/network/WifiSelectionActivity.cpp | 15 +++++++++++++++
 src/activities/network/WifiSelectionActivity.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/activities/network/WifiSelectionActivity.cpp b/src/activities/network/WifiSelectionActivity.cpp
index a8653f43..bed1d019 100644
--- a/src/activities/network/WifiSelectionActivity.cpp
+++ b/src/activities/network/WifiSelectionActivity.cpp
@@ -445,6 +445,17 @@ std::string WifiSelectionActivity::getSignalStrengthIndicator(const int32_t rssi
   return "    ";  // Very weak
 }
 
+std::string WifiSelectionActivity::getMacAddressString() const {
+  uint8_t mac[6];
+  WiFi.macAddress(mac);
+  
+  char macStr[24];
+  snprintf(macStr, sizeof(macStr), "MAC address: %02X-%02X-%02X-%02X-%02X-%02X",
+           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  
+  return std::string(macStr);
+}
+
 void WifiSelectionActivity::displayTaskLoop() {
   while (true) {
     // If a subactivity is active, yield CPU time but don't render
@@ -572,6 +583,10 @@ void WifiSelectionActivity::renderNetworkList() const {
     renderer.drawText(SMALL_FONT_ID, 20, pageHeight - 90, countStr);
   }
 
+  // Show MAC address above the network count and legend
+  std::string macAddress = getMacAddressString();
+  renderer.drawText(SMALL_FONT_ID, 20, pageHeight - 105, macAddress.c_str());
+
   // Draw help text
   renderer.drawText(SMALL_FONT_ID, 20, pageHeight - 75, "* = Encrypted | + = Saved");
   const auto labels = mappedInput.mapLabels("« Back", "Connect", "", "");
diff --git a/src/activities/network/WifiSelectionActivity.h b/src/activities/network/WifiSelectionActivity.h
index 33ea26b1..5b46010d 100644
--- a/src/activities/network/WifiSelectionActivity.h
+++ b/src/activities/network/WifiSelectionActivity.h
@@ -90,6 +90,7 @@ class WifiSelectionActivity final : public ActivityWithSubactivity {
   void attemptConnection();
   void checkConnectionStatus();
   std::string getSignalStrengthIndicator(int32_t rssi) const;
+  std::string getMacAddressString() const;
 
  public:
   explicit WifiSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,