From 9fa945a8631a325a0ab53155f32d5a4db6dfee6d Mon Sep 17 00:00:00 2001
From: Dan Ditomaso <dan.ditomaso@gmail.com>
Date: Thu, 3 Apr 2025 22:37:50 -0400
Subject: [PATCH 1/3] fix: update node details page to use message store

---
 src/components/PageComponents/Map/NodeDetail.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/PageComponents/Map/NodeDetail.tsx b/src/components/PageComponents/Map/NodeDetail.tsx
index 4e57f75a..9c46e642 100644
--- a/src/components/PageComponents/Map/NodeDetail.tsx
+++ b/src/components/PageComponents/Map/NodeDetail.tsx
@@ -27,15 +27,15 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@radix-ui/react-tooltip";
-import { useAppStore } from "@core/stores/appStore.ts";
 import { useDevice } from "@core/stores/deviceStore.ts";
+import { MessageType, useMessageStore } from "@core/stores/messageStore.ts";
 
 export interface NodeDetailProps {
   node: ProtobufType.Mesh.NodeInfo;
 }
 
 export const NodeDetail = ({ node }: NodeDetailProps) => {
-  const { setChatType, setActiveChat } = useAppStore();
+  const { setChatType, setActiveChat } = useMessageStore();
   const { setActivePage } = useDevice();
   const name = node.user?.longName || `!${numberToHexUnpadded(node.num)}`;
   const shortName = node.user?.shortName ?? "UNK";
@@ -44,7 +44,7 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
     Protobuf.Mesh.HardwareModel[hwModel]?.replaceAll("_", " ") ?? `${hwModel}`;
 
   function handleDirectMessage() {
-    setChatType("direct");
+    setChatType(MessageType.Direct);
     setActiveChat(node.num);
     setActivePage("messages");
   }
@@ -54,7 +54,7 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
       <div className="flex gap-2">
         <div className="flex flex-col items-center gap-2 min-w-6 pt-1">
           <Avatar text={shortName} />
-          
+
           <div onFocusCapture={(e) => {
             // Required to prevent DM tooltip auto-appearing on creation
             e.stopPropagation();
@@ -80,11 +80,10 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
             <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger>
-                  <MessageSquareIcon 
+                  <MessageSquareIcon
                     size={14}
                     onClick={handleDirectMessage}
                     className="cursor-pointer hover:text-blue-500"
-                    title="Send Message"
                   />
                 </TooltipTrigger>
                 <TooltipPortal>

From 4dc778898162765708274b8964a53d305be1f61a Mon Sep 17 00:00:00 2001
From: Dan Ditomaso <dan.ditomaso@gmail.com>
Date: Thu, 3 Apr 2025 22:40:30 -0400
Subject: [PATCH 2/3] fixed typo

---
 src/pages/Messages.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 214b1e96..330ddc3f 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -77,7 +77,7 @@ export const MessagesPage = () => {
                 key={otherNode.num}
                 label={otherNode.user?.longName ??
                   `!${numberToHexUnpadded(otherNode.num)}`}
-                active={activeChat === otherNode.num && chatType === "direct"}
+                active={activeChat === otherNode.num && chatType === MessageType.Direct}
                 onClick={() => {
                   setChatType(MessageType.Direct);
                   setActiveChat(otherNode.num);

From 645c758b42f4042c6d436c5ae72930fa3899abb3 Mon Sep 17 00:00:00 2001
From: Dan Ditomaso <dan.ditomaso@gmail.com>
Date: Thu, 3 Apr 2025 22:41:10 -0400
Subject: [PATCH 3/3] fixed: removed unneeded prop

---
 src/pages/Messages.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 330ddc3f..82678241 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -153,7 +153,6 @@ export const MessagesPage = () => {
 
           <div className="shrink-0 p-4 w-full dark:bg-slate-900">
             <MessageInput
-              from={activeChat}
               to={currentChat.type === MessageType.Direct ? activeChat : MessageType.Broadcast}
               channel={currentChat.type === MessageType.Direct ? Types.ChannelNumber.Primary : currentChat.id}
               maxBytes={200}