From 6a71891790874e62f775fe8b0b76106627c3cdc9 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Mon, 6 Oct 2025 16:31:43 -0500
Subject: [PATCH] feat: Always Display voltage (#3362)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
---
 .../ui/connections/components/CurrentlyConnectedInfo.kt     | 2 +-
 .../org/meshtastic/core/ui/component/MaterialBatteryInfo.kt | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt
index abec83eef..fc5c36d5e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/connections/components/CurrentlyConnectedInfo.kt
@@ -62,7 +62,7 @@ fun CurrentlyConnectedInfo(
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            MaterialBatteryInfo(level = node.batteryLevel)
+            MaterialBatteryInfo(level = node.batteryLevel, voltage = node.voltage)
             if (bluetoothRssi != null) {
                 MaterialBluetoothSignalInfo(rssi = bluetoothRssi)
             }
diff --git a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/MaterialBatteryInfo.kt b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/MaterialBatteryInfo.kt
index b43ece092..48016d99b 100644
--- a/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/MaterialBatteryInfo.kt
+++ b/core/ui/src/main/kotlin/org/meshtastic/core/ui/component/MaterialBatteryInfo.kt
@@ -117,14 +117,16 @@ fun MaterialBatteryInfo(modifier: Modifier = Modifier, level: Int?, voltage: Flo
                 color = MaterialTheme.colorScheme.onSurface,
                 style = MaterialTheme.typography.labelMedium,
             )
-            voltage?.let {
+        }
+        voltage
+            ?.takeIf { it > 0 }
+            ?.let {
                 Text(
                     text = "%.2fV".format(it),
                     color = MaterialTheme.colorScheme.onSurface,
                     style = MaterialTheme.typography.labelMedium,
                 )
             }
-        }
     }
 }