From 75596e7153130195552526debc94f34d5853d100 Mon Sep 17 00:00:00 2001
From: Dan Ditomaso <dan.ditomaso@gmail.com>
Date: Sun, 2 Mar 2025 14:46:02 -0500
Subject: [PATCH] chore: fixes from deno linting/formatting

---
 src/App.tsx                                   | 38 +++++++++----------
 src/PageRouter.tsx                            |  2 +-
 src/components/DeviceSelector.tsx             |  1 -
 src/components/Dialog/DeviceNameDialog.tsx    |  2 +-
 src/components/Dialog/DialogManager.tsx       |  2 +-
 src/components/Dialog/RemoveNodeDialog.tsx    |  2 +-
 src/components/Form/DynamicForm.tsx           |  2 +-
 .../Config/Security/Security.tsx              | 12 +++---
 .../PageComponents/Connect/HTTP.tsx           |  6 +--
 .../PageComponents/Connect/Serial.tsx         |  5 ++-
 .../PageComponents/Map/NodeDetail.tsx         |  8 ++--
 .../PageComponents/Messages/ChannelChat.tsx   |  5 +--
 .../PageComponents/Messages/Message.tsx       |  6 +--
 .../PageComponents/Messages/TraceRoute.tsx    |  2 +-
 .../ModuleConfig/AmbientLighting.tsx          |  2 +-
 .../ModuleConfig/DetectionSensor.tsx          |  2 +-
 .../PageComponents/ModuleConfig/MQTT.tsx      |  2 +-
 .../ModuleConfig/NeighborInfo.tsx             |  2 +-
 src/components/PageLayout.tsx                 |  2 +-
 src/components/UI/ErrorPage.tsx               |  8 ++--
 src/components/UI/Sidebar/SidebarSection.tsx  |  2 +-
 src/components/UI/Typography/Heading.tsx      |  3 +-
 src/components/UI/Typography/P.tsx            |  2 +-
 src/components/UI/Typography/Subtle.tsx       |  2 +-
 src/core/utils/github.ts                      |  3 +-
 src/pages/Channels.tsx                        |  2 +-
 src/pages/Config/ModuleConfig.tsx             |  6 +--
 src/pages/Config/index.tsx                    |  2 +-
 src/pages/Dashboard/index.tsx                 |  8 ++--
 src/pages/Nodes.tsx                           | 18 ++++-----
 30 files changed, 76 insertions(+), 83 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 164e5743..29e80aa1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -10,11 +10,13 @@ import Footer from "@components/UI/Footer.tsx";
 import { useAppStore } from "@core/stores/appStore.ts";
 import { useDeviceStore } from "@core/stores/deviceStore.ts";
 import { Dashboard } from "@pages/Dashboard/index.tsx";
+import type { JSX } from "react";
 import { ErrorBoundary } from "react-error-boundary";
-import { ErrorPage } from "./components/UI/ErrorPage.tsx";
+import { ErrorPage } from "@components/UI/ErrorPage.tsx";
 import { MapProvider } from "react-map-gl/maplibre";
 
-export const App = () => {
+
+export const App = (): JSX.Element => {
   const { getDevice } = useDeviceStore();
   const { selectedDevice, setConnectDialogOpen, connectDialogOpen } =
     useAppStore();
@@ -35,23 +37,21 @@ export const App = () => {
           <div className="flex grow">
             <DeviceSelector />
             <div className="flex grow flex-col">
-              {device
-                ? (
-                  <div className="flex h-screen">
-                    <DialogManager />
-                    <KeyBackupReminder />
-                    <CommandPalette />
-                    <MapProvider>
-                      <PageRouter />
-                    </MapProvider>
-                  </div>
-                )
-                : (
-                  <>
-                    <Dashboard />
-                    <Footer />
-                  </>
-                )}
+              {device ? (
+                <div className="flex h-screen w-full">
+                  <DialogManager />
+                  <KeyBackupReminder />
+                  <CommandPalette />
+                  <MapProvider>
+                    <PageRouter />
+                  </MapProvider>
+                </div>
+              ) : (
+                <>
+                  <Dashboard />
+                  <Footer />
+                </>
+              )}
             </div>
           </div>
         </div>
diff --git a/src/PageRouter.tsx b/src/PageRouter.tsx
index ceff7bdb..f59cb6fe 100644
--- a/src/PageRouter.tsx
+++ b/src/PageRouter.tsx
@@ -5,7 +5,7 @@ import ConfigPage from "@pages/Config/index.tsx";
 import MessagesPage from "@pages/Messages.tsx";
 import NodesPage from "@pages/Nodes.tsx";
 import { ErrorBoundary } from "react-error-boundary";
-import { ErrorPage } from "./components/UI/ErrorPage";
+import { ErrorPage } from "./components/UI/ErrorPage.tsx";
 
 export const ErrorBoundaryWrapper = ({
   children,
diff --git a/src/components/DeviceSelector.tsx b/src/components/DeviceSelector.tsx
index d53f5051..872b9c04 100644
--- a/src/components/DeviceSelector.tsx
+++ b/src/components/DeviceSelector.tsx
@@ -15,7 +15,6 @@ export const DeviceSelector = () => {
     setCommandPaletteOpen,
     setConnectDialogOpen,
   } = useAppStore();
-  console.log(import.meta.env.VITE_COMMIT_HASH);
 
   return (
     <nav className="flex flex-col justify-between border-r-[0.5px]  border-slate-300 pt-2 dark:border-slate-700">
diff --git a/src/components/Dialog/DeviceNameDialog.tsx b/src/components/Dialog/DeviceNameDialog.tsx
index 655840cc..7a8a08ff 100644
--- a/src/components/Dialog/DeviceNameDialog.tsx
+++ b/src/components/Dialog/DeviceNameDialog.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import { create } from "@bufbuild/protobuf";
 import { Button } from "@components/UI/Button.tsx";
 import {
diff --git a/src/components/Dialog/DialogManager.tsx b/src/components/Dialog/DialogManager.tsx
index f0ac96d6..ba6dd413 100644
--- a/src/components/Dialog/DialogManager.tsx
+++ b/src/components/Dialog/DialogManager.tsx
@@ -1,4 +1,4 @@
-import { RemoveNodeDialog } from "@app/components/Dialog/RemoveNodeDialog.tsx";
+import { RemoveNodeDialog } from "@components/Dialog/RemoveNodeDialog.tsx";
 import { DeviceNameDialog } from "@components/Dialog/DeviceNameDialog.tsx";
 import { ImportDialog } from "@components/Dialog/ImportDialog.tsx";
 import { PkiBackupDialog } from "./PKIBackupDialog.tsx";
diff --git a/src/components/Dialog/RemoveNodeDialog.tsx b/src/components/Dialog/RemoveNodeDialog.tsx
index a0b2db83..41a3b8f1 100644
--- a/src/components/Dialog/RemoveNodeDialog.tsx
+++ b/src/components/Dialog/RemoveNodeDialog.tsx
@@ -1,5 +1,5 @@
 import { useAppStore } from "../../core/stores/appStore.ts";
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import { Button } from "@components/UI/Button.tsx";
 import {
   Dialog,
diff --git a/src/components/Form/DynamicForm.tsx b/src/components/Form/DynamicForm.tsx
index 9e3fa995..f8547114 100644
--- a/src/components/Form/DynamicForm.tsx
+++ b/src/components/Form/DynamicForm.tsx
@@ -13,7 +13,7 @@ import {
   type SubmitHandler,
   useForm,
 } from "react-hook-form";
-import { Heading } from "../UI/Typography/Heading";
+import { Heading } from "../UI/Typography/Heading.tsx";
 
 interface DisabledBy<T> {
   fieldName: Path<T>;
diff --git a/src/components/PageComponents/Config/Security/Security.tsx b/src/components/PageComponents/Config/Security/Security.tsx
index 52bf2cd4..871e0384 100644
--- a/src/components/PageComponents/Config/Security/Security.tsx
+++ b/src/components/PageComponents/Config/Security/Security.tsx
@@ -1,18 +1,18 @@
-import { PkiRegenerateDialog } from "../../../Dialog/PkiRegenerateDialog.tsx";
-import { DynamicForm } from "@app/components/Form/DynamicForm.tsx";
-import { useAppStore } from "../../../../core/stores/appStore.ts";
+import { PkiRegenerateDialog } from "@components/Dialog/PkiRegenerateDialog.tsx";
+import { DynamicForm } from "@components/Form/DynamicForm.tsx";
+import { useAppStore } from "@core/stores/appStore.ts";
 import {
   getX25519PrivateKey,
   getX25519PublicKey,
-} from "../../../../core/utils/x25519.ts";
-import type { SecurityValidation } from "@app/validation/config/security.tsx";
+} from "@core/utils/x25519.ts";
+import type { SecurityValidation } from "@app/validation/config/security.ts";
 import { create } from "@bufbuild/protobuf";
 import { useDevice } from "@core/stores/deviceStore.ts";
 import { Protobuf } from "@meshtastic/core";
 import { fromByteArray, toByteArray } from "base64-js";
 import { Eye, EyeOff } from "lucide-react";
 import { useReducer } from "react";
-import { securityReducer } from "./securityReducer.tsx";
+import { securityReducer } from "@components/PageComponents/Config/Security/securityReducer.tsx";
 
 export const Security = () => {
   const { config, setWorkingConfig, setDialogOpen } = useDevice();
diff --git a/src/components/PageComponents/Connect/HTTP.tsx b/src/components/PageComponents/Connect/HTTP.tsx
index ef604c4e..a0898bdf 100644
--- a/src/components/PageComponents/Connect/HTTP.tsx
+++ b/src/components/PageComponents/Connect/HTTP.tsx
@@ -1,4 +1,4 @@
-import type { TabElementProps } from "@app/components/Dialog/NewDeviceDialog.tsx";
+import type { TabElementProps } from "@components/Dialog/NewDeviceDialog.tsx";
 import { Button } from "@components/UI/Button.tsx";
 import { Input } from "@components/UI/Input.tsx";
 import { Label } from "@components/UI/Label.tsx";
@@ -22,8 +22,8 @@ export const HTTP = ({ closeDialog }: TabElementProps) => {
   }>({
     defaultValues: {
       ip: ["client.meshtastic.org", "localhost"].includes(
-          globalThis.location.hostname,
-        )
+        globalThis.location.hostname,
+      )
         ? "meshtastic.local"
         : globalThis.location.host,
       tls: location.protocol === "https:",
diff --git a/src/components/PageComponents/Connect/Serial.tsx b/src/components/PageComponents/Connect/Serial.tsx
index b6cdf5f9..14c88474 100644
--- a/src/components/PageComponents/Connect/Serial.tsx
+++ b/src/components/PageComponents/Connect/Serial.tsx
@@ -59,8 +59,9 @@ export const Serial = ({ closeDialog }: TabElementProps) => {
                 await onConnect(port);
               }}
             >
-              {`# ${index} - ${usbVendorId ?? "UNK"} - ${usbProductId ?? "UNK"
-                }`}
+              {`# ${index} - ${usbVendorId ?? "UNK"} - ${
+                usbProductId ?? "UNK"
+              }`}
             </Button>
           );
         })}
diff --git a/src/components/PageComponents/Map/NodeDetail.tsx b/src/components/PageComponents/Map/NodeDetail.tsx
index 427804c8..71dbad96 100644
--- a/src/components/PageComponents/Map/NodeDetail.tsx
+++ b/src/components/PageComponents/Map/NodeDetail.tsx
@@ -1,7 +1,7 @@
-import { Separator } from "@app/components/UI/Seperator.tsx";
-import { Heading } from "@app/components/UI/Typography/Heading.tsx";
-import { Subtle } from "@app/components/UI/Typography/Subtle.tsx";
-import { formatQuantity } from "@app/core/utils/string.ts";
+import { Separator } from "@components/UI/Seperator.tsx";
+import { Heading } from "@components/UI/Typography/Heading.tsx";
+import { Subtle } from "@components/UI/Typography/Subtle.tsx";
+import { formatQuantity } from "@core/utils/string.ts";
 import { Avatar } from "@components/UI/Avatar.tsx";
 import { Mono } from "@components/generic/Mono.tsx";
 import { TimeAgo } from "@components/generic/TimeAgo.tsx";
diff --git a/src/components/PageComponents/Messages/ChannelChat.tsx b/src/components/PageComponents/Messages/ChannelChat.tsx
index bc07e712..e7c72474 100644
--- a/src/components/PageComponents/Messages/ChannelChat.tsx
+++ b/src/components/PageComponents/Messages/ChannelChat.tsx
@@ -1,7 +1,4 @@
-import {
-  type MessageWithState,
-  useDevice,
-} from "@app/core/stores/deviceStore.ts";
+import { type MessageWithState, useDevice } from "@core/stores/deviceStore.ts";
 import { Message } from "@components/PageComponents/Messages/Message.tsx";
 import { MessageInput } from "@components/PageComponents/Messages/MessageInput.tsx";
 import type { Types } from "@meshtastic/core";
diff --git a/src/components/PageComponents/Messages/Message.tsx b/src/components/PageComponents/Messages/Message.tsx
index c1c93f66..232bec30 100644
--- a/src/components/PageComponents/Messages/Message.tsx
+++ b/src/components/PageComponents/Messages/Message.tsx
@@ -8,7 +8,7 @@ import {
 import {
   type MessageWithState,
   useDeviceStore,
-} from "@app/core/stores/deviceStore.ts";
+} from "@core/stores/deviceStore.ts";
 import { cn } from "@core/utils/cn.ts";
 import { Avatar } from "@components/UI/Avatar.tsx";
 import type { Protobuf } from "@meshtastic/core";
@@ -44,13 +44,13 @@ const STATUS_TEXT_MAP: Record<MessageState, string> = {
   [MESSAGE_STATES.ACK]: "Message delivered",
   [MESSAGE_STATES.WAITING]: "Waiting for delivery",
   [MESSAGE_STATES.FAILED]: "Delivery failed",
-} as const;
+};
 
 const STATUS_ICON_MAP: Record<MessageState, LucideIcon> = {
   [MESSAGE_STATES.ACK]: CheckCircle2,
   [MESSAGE_STATES.WAITING]: CircleEllipsis,
   [MESSAGE_STATES.FAILED]: AlertCircle,
-} as const;
+};
 
 const getStatusText = (state: MessageState): string => STATUS_TEXT_MAP[state];
 
diff --git a/src/components/PageComponents/Messages/TraceRoute.tsx b/src/components/PageComponents/Messages/TraceRoute.tsx
index 7331448f..92a00fa6 100644
--- a/src/components/PageComponents/Messages/TraceRoute.tsx
+++ b/src/components/PageComponents/Messages/TraceRoute.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import type { Protobuf } from "@meshtastic/core";
 import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
 
diff --git a/src/components/PageComponents/ModuleConfig/AmbientLighting.tsx b/src/components/PageComponents/ModuleConfig/AmbientLighting.tsx
index 6ea06354..c722c6cd 100644
--- a/src/components/PageComponents/ModuleConfig/AmbientLighting.tsx
+++ b/src/components/PageComponents/ModuleConfig/AmbientLighting.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import type { AmbientLightingValidation } from "@app/validation/moduleConfig/ambientLighting.tsx";
 import { create } from "@bufbuild/protobuf";
 import { DynamicForm } from "@components/Form/DynamicForm.tsx";
diff --git a/src/components/PageComponents/ModuleConfig/DetectionSensor.tsx b/src/components/PageComponents/ModuleConfig/DetectionSensor.tsx
index ff698094..00d7def9 100644
--- a/src/components/PageComponents/ModuleConfig/DetectionSensor.tsx
+++ b/src/components/PageComponents/ModuleConfig/DetectionSensor.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import type { DetectionSensorValidation } from "@app/validation/moduleConfig/detectionSensor.tsx";
 import { create } from "@bufbuild/protobuf";
 import { DynamicForm } from "@components/Form/DynamicForm.tsx";
diff --git a/src/components/PageComponents/ModuleConfig/MQTT.tsx b/src/components/PageComponents/ModuleConfig/MQTT.tsx
index c20907cf..e317aa53 100644
--- a/src/components/PageComponents/ModuleConfig/MQTT.tsx
+++ b/src/components/PageComponents/ModuleConfig/MQTT.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import type { MqttValidation } from "@app/validation/moduleConfig/mqtt.tsx";
 import { create } from "@bufbuild/protobuf";
 import { DynamicForm } from "@components/Form/DynamicForm.tsx";
diff --git a/src/components/PageComponents/ModuleConfig/NeighborInfo.tsx b/src/components/PageComponents/ModuleConfig/NeighborInfo.tsx
index aaf154de..79a8d140 100644
--- a/src/components/PageComponents/ModuleConfig/NeighborInfo.tsx
+++ b/src/components/PageComponents/ModuleConfig/NeighborInfo.tsx
@@ -1,4 +1,4 @@
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import type { NeighborInfoValidation } from "@app/validation/moduleConfig/neighborInfo.tsx";
 import { create } from "@bufbuild/protobuf";
 import { DynamicForm } from "@components/Form/DynamicForm.tsx";
diff --git a/src/components/PageLayout.tsx b/src/components/PageLayout.tsx
index f22d9c39..29eaf730 100644
--- a/src/components/PageLayout.tsx
+++ b/src/components/PageLayout.tsx
@@ -1,4 +1,4 @@
-import { cn } from "@app/core/utils/cn.ts";
+import { cn } from "@core/utils/cn.ts";
 import { AlignLeftIcon, type LucideIcon } from "lucide-react";
 import Footer from "@components/UI/Footer.tsx";
 import { Spinner } from "@components/UI/Spinner.tsx";
diff --git a/src/components/UI/ErrorPage.tsx b/src/components/UI/ErrorPage.tsx
index 26df17e8..651809df 100644
--- a/src/components/UI/ErrorPage.tsx
+++ b/src/components/UI/ErrorPage.tsx
@@ -1,8 +1,8 @@
-import newGithubIssueUrl from "@app/core/utils/github";
+import newGithubIssueUrl from "../../core/utils/github.ts";
 import { ExternalLink } from "lucide-react";
-import { Heading } from "./Typography/Heading";
-import { Link } from "./Typography/Link";
-import { P } from "./Typography/P";
+import { Heading } from "./Typography/Heading.tsx";
+import { Link } from "./Typography/Link.tsx";
+import { P } from "./Typography/P.tsx";
 
 export function ErrorPage({ error }: { error: Error }) {
   if (!error) {
diff --git a/src/components/UI/Sidebar/SidebarSection.tsx b/src/components/UI/Sidebar/SidebarSection.tsx
index 6fd53c3f..7eefc0a0 100644
--- a/src/components/UI/Sidebar/SidebarSection.tsx
+++ b/src/components/UI/Sidebar/SidebarSection.tsx
@@ -1,4 +1,4 @@
-import { Heading } from "../Typography/Heading";
+import { Heading } from "../Typography/Heading.tsx";
 
 export interface SidebarSectionProps {
   label: string;
diff --git a/src/components/UI/Typography/Heading.tsx b/src/components/UI/Typography/Heading.tsx
index f8a6f0f0..1efeaa30 100644
--- a/src/components/UI/Typography/Heading.tsx
+++ b/src/components/UI/Typography/Heading.tsx
@@ -2,7 +2,8 @@ import type React from "react";
 
 const headingStyles = {
   h1: "scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl",
-  h2: "scroll-m-20 border-b border-b-slate-200 pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0 dark:border-b-slate-700",
+  h2:
+    "scroll-m-20 border-b border-b-slate-200 pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0 dark:border-b-slate-700",
   h3: "scroll-m-20 text-2xl font-semibold tracking-tight",
   h4: "scroll-m-20 text-xl font-semibold tracking-tight",
   h5: "scroll-m-20 text-lg font-medium tracking-tight",
diff --git a/src/components/UI/Typography/P.tsx b/src/components/UI/Typography/P.tsx
index 4bfe56c3..5e492f60 100644
--- a/src/components/UI/Typography/P.tsx
+++ b/src/components/UI/Typography/P.tsx
@@ -1,4 +1,4 @@
-import { cn } from "@app/core/utils/cn";
+import { cn } from "@core/utils/cn.ts";
 
 export interface PProps {
   children: React.ReactNode;
diff --git a/src/components/UI/Typography/Subtle.tsx b/src/components/UI/Typography/Subtle.tsx
index 8475b2e8..6a2f7568 100644
--- a/src/components/UI/Typography/Subtle.tsx
+++ b/src/components/UI/Typography/Subtle.tsx
@@ -1,4 +1,4 @@
-import { cn } from "@app/core/utils/cn.ts";
+import { cn } from "@core/utils/cn.ts";
 
 export interface SubtleProps {
   className?: string;
diff --git a/src/core/utils/github.ts b/src/core/utils/github.ts
index bed2941b..636577de 100644
--- a/src/core/utils/github.ts
+++ b/src/core/utils/github.ts
@@ -62,8 +62,7 @@ export default function newGithubIssueUrl(
 }
 
 function validateOptions(options: GithubIssueUrlOptions): ValidatedOptions {
-  const repoUrl =
-    options.repoUrl ??
+  const repoUrl = options.repoUrl ??
     (options.user && options.repo
       ? `https://github.com/${options.user}/${options.repo}`
       : undefined);
diff --git a/src/pages/Channels.tsx b/src/pages/Channels.tsx
index bce9e5fb..66dea48b 100644
--- a/src/pages/Channels.tsx
+++ b/src/pages/Channels.tsx
@@ -3,7 +3,7 @@ import {
   TabsContent,
   TabsList,
   TabsTrigger,
-} from "@app/components/UI/Tabs.tsx";
+} from "@components/UI/Tabs.tsx";
 import { Channel } from "@components/PageComponents/Channel.tsx";
 import { PageLayout } from "@components/PageLayout.tsx";
 import { Sidebar } from "@components/Sidebar.tsx";
diff --git a/src/pages/Config/ModuleConfig.tsx b/src/pages/Config/ModuleConfig.tsx
index ca4e38aa..462665bc 100644
--- a/src/pages/Config/ModuleConfig.tsx
+++ b/src/pages/Config/ModuleConfig.tsx
@@ -1,6 +1,6 @@
-import { AmbientLighting } from "@app/components/PageComponents/ModuleConfig/AmbientLighting.tsx";
-import { DetectionSensor } from "@app/components/PageComponents/ModuleConfig/DetectionSensor.tsx";
-import { NeighborInfo } from "@app/components/PageComponents/ModuleConfig/NeighborInfo.tsx";
+import { AmbientLighting } from "@components/PageComponents/ModuleConfig/AmbientLighting.tsx";
+import { DetectionSensor } from "@components/PageComponents/ModuleConfig/DetectionSensor.tsx";
+import { NeighborInfo } from "@components/PageComponents/ModuleConfig/NeighborInfo.tsx";
 import { Audio } from "@components/PageComponents/ModuleConfig/Audio.tsx";
 import { CannedMessage } from "@components/PageComponents/ModuleConfig/CannedMessage.tsx";
 import { ExternalNotification } from "@components/PageComponents/ModuleConfig/ExternalNotification.tsx";
diff --git a/src/pages/Config/index.tsx b/src/pages/Config/index.tsx
index c460f30b..96a4e279 100644
--- a/src/pages/Config/index.tsx
+++ b/src/pages/Config/index.tsx
@@ -1,5 +1,5 @@
 import { useAppStore } from "../../core/stores/appStore.ts";
-import { useDevice } from "@app/core/stores/deviceStore.ts";
+import { useDevice } from "@core/stores/deviceStore.ts";
 import { PageLayout } from "@components/PageLayout.tsx";
 import { Sidebar } from "@components/Sidebar.tsx";
 import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.tsx";
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index 06fb94bf..f0f871ef 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -1,6 +1,6 @@
-import { Heading } from "../../components/UI/Typography/Heading.tsx";
-import { useAppStore } from "@app/core/stores/appStore.ts";
-import { useDeviceStore } from "@app/core/stores/deviceStore.ts";
+import { Heading } from "@components/UI/Typography/Heading.tsx";
+import { useAppStore } from "@core/stores/appStore.ts";
+import { useDeviceStore } from "@core/stores/deviceStore.ts";
 import { Button } from "@components/UI/Button.tsx";
 import { Separator } from "@components/UI/Seperator.tsx";
 import { Subtle } from "@components/UI/Typography/Subtle.tsx";
@@ -99,7 +99,7 @@ export const Dashboard = () => {
                 <Heading as="h3">No Devices</Heading>
                 <Subtle>Connect at least one device to get started</Subtle>
                 <Button
-                  className="gap-2"
+                  className="gap-2 dark:bg-white dark:text-slate-900 dark:hover:text-slate-100"
                   variant="default"
                   onClick={() => setConnectDialogOpen(true)}
                 >
diff --git a/src/pages/Nodes.tsx b/src/pages/Nodes.tsx
index e5dfc046..6a390731 100644
--- a/src/pages/Nodes.tsx
+++ b/src/pages/Nodes.tsx
@@ -11,7 +11,7 @@ import { useDevice } from "@core/stores/deviceStore.ts";
 import { Protobuf, type Types } from "@meshtastic/core";
 import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
 import { LockIcon, LockOpenIcon } from "lucide-react";
-import { Fragment, useCallback, useEffect, useState } from "react";
+import { type JSX, useCallback, useEffect, useState } from "react";
 import { base16 } from "rfc4648";
 
 export interface DeleteNoteDialogProps {
@@ -138,11 +138,9 @@ const NodesPage = () => {
                   ?.join(":") ?? "UNK"}
               </Mono>,
               <Mono className="px-4" key="lastHeard">
-                {node.lastHeard === 0 ? (
-                  <p className="px-4">Never</p>
-                ) : (
-                  <TimeAgo timestamp={node.lastHeard * 1000} />
-                )}
+                {node.lastHeard === 0
+                  ? <p className="px-4">Never</p>
+                  : <TimeAgo timestamp={node.lastHeard * 1000} />}
               </Mono>,
               <Mono key="snr">
                 {node.snr}db/
@@ -150,11 +148,9 @@ const NodesPage = () => {
                 {(node.snr + 10) * 5}raw
               </Mono>,
               <Mono key="pki">
-                {node.user?.publicKey && node.user?.publicKey.length > 0 ? (
-                  <LockIcon className="text-green-600 mx-auto" />
-                ) : (
-                  <LockOpenIcon className="text-yellow-300 mx-auto" />
-                )}
+                {node.user?.publicKey && node.user?.publicKey.length > 0
+                  ? <LockIcon className="text-green-600 mx-auto" />
+                  : <LockOpenIcon className="text-yellow-300 mx-auto" />}
               </Mono>,
               <Mono key="hops">
                 {node?.lastHeard !== 0