From 401a594ec7e0e974bfe3a9d8a38878775c5d9d91 Mon Sep 17 00:00:00 2001
From: server2003user <84295009+Server2003User@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:24:46 -0400
Subject: [PATCH 1/2] Add Firmware

---
 src/components/Sidebar.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 0e8f8a13..68fc9c40 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -1,3 +1,4 @@
+import { DeviceMetadata } from "@buf/meshtastic_protobufs.bufbuild_es/meshtastic/mesh_pb";
 import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
 import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
 import { Subtle } from "@components/UI/Typography/Subtle.js";
@@ -12,7 +13,8 @@ import {
   SettingsIcon,
   UsersIcon,
   ZapIcon,
-  BatteryMediumIcon
+  BatteryMediumIcon,
+  CpuIcon
 } from "lucide-react";
 
 export interface SidebarProps {
@@ -20,8 +22,9 @@ export interface SidebarProps {
 }
 
 export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
-  const { hardware, nodes } = useDevice();
+  const { hardware, nodes, metadata } = useDevice();
   const myNode = nodes.get(hardware.myNodeNum);
+  const myMetadata = metadata.get(hardware.myNodeNum);
   const { activePage, setActivePage, setDialogOpen } = useDevice();
 
   interface NavLink {
@@ -84,6 +87,10 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
             <ZapIcon size={24} viewBox={'0 0 36 24'}/>
             <Subtle>{myNode?.deviceMetrics?.voltage.toPrecision(3) ?? "UNK"} volts</Subtle>
         </div>
+        <div className="flex items-center">
+            <CpuIcon size={24} viewBox={'0 0 36 24'}/>
+            <Subtle>{ myMetadata?.firmwareVersion ?? "UNK"}</Subtle>
+        </div>
       </div>
 
       <SidebarSection label="Navigation">
@@ -103,3 +110,4 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
     </div>
   );
 };
+

From 3aedc7b7c25fb71fcdf1e9b02a04ff07aed62f88 Mon Sep 17 00:00:00 2001
From: Hunter Thornsberry <hunter@hunterthornsberry.com>
Date: Sun, 23 Jun 2024 19:03:59 -0400
Subject: [PATCH 2/2] fixes

---
 src/components/Sidebar.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index 68fc9c40..81c37b07 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -1,4 +1,3 @@
-import { DeviceMetadata } from "@buf/meshtastic_protobufs.bufbuild_es/meshtastic/mesh_pb";
 import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
 import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
 import { Subtle } from "@components/UI/Typography/Subtle.js";
@@ -24,7 +23,7 @@ export interface SidebarProps {
 export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
   const { hardware, nodes, metadata } = useDevice();
   const myNode = nodes.get(hardware.myNodeNum);
-  const myMetadata = metadata.get(hardware.myNodeNum);
+  const myMetadata = metadata.get(0);
   const { activePage, setActivePage, setDialogOpen } = useDevice();
 
   interface NavLink {
@@ -89,7 +88,7 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
         </div>
         <div className="flex items-center">
             <CpuIcon size={24} viewBox={'0 0 36 24'}/>
-            <Subtle>{ myMetadata?.firmwareVersion ?? "UNK"}</Subtle>
+            <Subtle>v{ myMetadata?.firmwareVersion ?? "UNK"}</Subtle>
         </div>
       </div>