From 379ac46ec8ba7fd6d45e1533f21644a43f12113c Mon Sep 17 00:00:00 2001 From: Tilen Komel Date: Tue, 25 Feb 2025 20:54:53 +0100 Subject: [PATCH 1/2] Add fix --- src/pages/Nodes.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/Nodes.tsx b/src/pages/Nodes.tsx index e75e2cdc..1d909409 100644 --- a/src/pages/Nodes.tsx +++ b/src/pages/Nodes.tsx @@ -63,9 +63,10 @@ const NodesPage = (): JSX.Element => { const handleLocation = useCallback( (location: Types.PacketMetadata) => { + if (location.to.valueOf() !== hardware.myNodeNum) return; setSelectedLocation(location); }, - [], + [hardware.myNodeNum], ); return ( @@ -107,8 +108,8 @@ const NodesPage = (): JSX.Element => { {node.user?.shortName ?? (node.user?.macaddr ? `${base16 - .stringify(node.user?.macaddr.subarray(4, 6) ?? []) - .toLowerCase()}` + .stringify(node.user?.macaddr.subarray(4, 6) ?? []) + .toLowerCase()}` : `${numberToHexUnpadded(node.num).slice(-4)}`)} , @@ -120,8 +121,8 @@ const NodesPage = (): JSX.Element => { {node.user?.longName ?? (node.user?.macaddr ? `Meshtastic ${base16 - .stringify(node.user?.macaddr.subarray(4, 6) ?? []) - .toLowerCase()}` + .stringify(node.user?.macaddr.subarray(4, 6) ?? []) + .toLowerCase()}` : `!${numberToHexUnpadded(node.num)}`)} , @@ -157,9 +158,8 @@ const NodesPage = (): JSX.Element => { {node.lastHeard !== 0 ? node.viaMqtt === false && node.hopsAway === 0 ? "Direct" - : `${node.hopsAway.toString()} ${ - node.hopsAway > 1 ? "hops" : "hop" - } away` + : `${node.hopsAway.toString()} ${node.hopsAway > 1 ? "hops" : "hop" + } away` : "-"} {node.viaMqtt === true ? ", via MQTT" : ""} , From 079e60677e69a58c9b4647d9a238d86e02c0d488 Mon Sep 17 00:00:00 2001 From: Tilen Komel Date: Tue, 25 Feb 2025 20:55:15 +0100 Subject: [PATCH 2/2] Biome --- src/pages/Nodes.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pages/Nodes.tsx b/src/pages/Nodes.tsx index 1d909409..090f298f 100644 --- a/src/pages/Nodes.tsx +++ b/src/pages/Nodes.tsx @@ -108,8 +108,8 @@ const NodesPage = (): JSX.Element => { {node.user?.shortName ?? (node.user?.macaddr ? `${base16 - .stringify(node.user?.macaddr.subarray(4, 6) ?? []) - .toLowerCase()}` + .stringify(node.user?.macaddr.subarray(4, 6) ?? []) + .toLowerCase()}` : `${numberToHexUnpadded(node.num).slice(-4)}`)} , @@ -121,8 +121,8 @@ const NodesPage = (): JSX.Element => { {node.user?.longName ?? (node.user?.macaddr ? `Meshtastic ${base16 - .stringify(node.user?.macaddr.subarray(4, 6) ?? []) - .toLowerCase()}` + .stringify(node.user?.macaddr.subarray(4, 6) ?? []) + .toLowerCase()}` : `!${numberToHexUnpadded(node.num)}`)} , @@ -158,8 +158,9 @@ const NodesPage = (): JSX.Element => { {node.lastHeard !== 0 ? node.viaMqtt === false && node.hopsAway === 0 ? "Direct" - : `${node.hopsAway.toString()} ${node.hopsAway > 1 ? "hops" : "hop" - } away` + : `${node.hopsAway.toString()} ${ + node.hopsAway > 1 ? "hops" : "hop" + } away` : "-"} {node.viaMqtt === true ? ", via MQTT" : ""} ,