From 988c045f5b2dd53e79e2ce0a49b6b4ac24902996 Mon Sep 17 00:00:00 2001
From: philon- <philon-@users.noreply.github.com>
Date: Mon, 1 Sep 2025 11:55:13 +0200
Subject: [PATCH] Update format, move hooks

---
 .../components/PageComponents/Messages/MessageInput.test.tsx | 2 +-
 .../web/src/core/{stores/utils => hooks}/useDeviceContext.ts | 0
 .../web/src/core/{stores/utils => hooks}/useNewNodeNum.ts    | 0
 packages/web/src/core/stores/index.ts                        | 5 ++---
 packages/web/src/core/subscriptions.ts                       | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename packages/web/src/core/{stores/utils => hooks}/useDeviceContext.ts (100%)
 rename packages/web/src/core/{stores/utils => hooks}/useNewNodeNum.ts (100%)

diff --git a/packages/web/src/components/PageComponents/Messages/MessageInput.test.tsx b/packages/web/src/components/PageComponents/Messages/MessageInput.test.tsx
index 8d546428..f22c0130 100644
--- a/packages/web/src/components/PageComponents/Messages/MessageInput.test.tsx
+++ b/packages/web/src/components/PageComponents/Messages/MessageInput.test.tsx
@@ -42,7 +42,7 @@ const mockClearDraft = vi.fn();
 
 vi.mock("@core/stores", () => ({
   CurrentDeviceContext: {
-      _currentValue: { deviceId: 1234 },
+    _currentValue: { deviceId: 1234 },
   },
   useMessages: vi.fn(() => ({
     setDraft: mockSetDraft,
diff --git a/packages/web/src/core/stores/utils/useDeviceContext.ts b/packages/web/src/core/hooks/useDeviceContext.ts
similarity index 100%
rename from packages/web/src/core/stores/utils/useDeviceContext.ts
rename to packages/web/src/core/hooks/useDeviceContext.ts
diff --git a/packages/web/src/core/stores/utils/useNewNodeNum.ts b/packages/web/src/core/hooks/useNewNodeNum.ts
similarity index 100%
rename from packages/web/src/core/stores/utils/useNewNodeNum.ts
rename to packages/web/src/core/hooks/useNewNodeNum.ts
diff --git a/packages/web/src/core/stores/index.ts b/packages/web/src/core/stores/index.ts
index 9dff8004..f58fb3e6 100644
--- a/packages/web/src/core/stores/index.ts
+++ b/packages/web/src/core/stores/index.ts
@@ -1,4 +1,4 @@
-import { useDeviceContext } from "@app/core/stores/utils/useDeviceContext";
+import { useDeviceContext } from "@app/core/hooks/useDeviceContext";
 import { type Device, useDeviceStore } from "@core/stores/deviceStore";
 import { type MessageStore, useMessageStore } from "@core/stores/messageStore";
 import { type NodeDB, useNodeDBStore } from "@core/stores/nodeDBStore";
@@ -7,7 +7,7 @@ export {
   CurrentDeviceContext,
   type DeviceContext,
   useDeviceContext,
-} from "@app/core/stores/utils/useDeviceContext";
+} from "@app/core/hooks/useDeviceContext";
 export { useAppStore } from "@core/stores/appStore";
 export {
   type Device,
@@ -28,7 +28,6 @@ export {
   SidebarProvider,
   useSidebar, // TODO: Bring hook into this file
 } from "@core/stores/sidebarStore";
-export { useNewNodeNum } from "@core/stores/utils/useNewNodeNum";
 
 // Define hooks to access the stores
 export const useNodeDB = (): NodeDB => {
diff --git a/packages/web/src/core/subscriptions.ts b/packages/web/src/core/subscriptions.ts
index b7147ec6..4c4dd4b7 100644
--- a/packages/web/src/core/subscriptions.ts
+++ b/packages/web/src/core/subscriptions.ts
@@ -1,14 +1,13 @@
 import { ensureDefaultUser } from "@core/dto/NodeNumToNodeInfoDTO.ts";
 import PacketToMessageDTO from "@core/dto/PacketToMessageDTO.ts";
+import { useNewNodeNum } from "@core/hooks/useNewNodeNum";
 import {
   type Device,
   type MessageStore,
   MessageType,
   type NodeDB,
-  useNewNodeNum,
 } from "@core/stores";
 import { type MeshDevice, Protobuf } from "@meshtastic/core";
-
 export const subscribeAll = (
   device: Device,
   connection: MeshDevice,