DM support

src/components/PageComponents/Messages/Message.tsx

@@ -1,6 +1,3 @@
-import { WaypointMessage } from "@components/PageComponents/Messages/WaypointMessage.js";
-import { useDevice } from "@core/stores/deviceStore.js";
-import type { AllMessageTypes } from "@core/stores/deviceStore.js";
 import { Hashicon } from "@emeraldpay/hashicon-react";
 import {
   CircleEllipsisIcon,
@@ -8,10 +5,11 @@ import {
   CheckCircle2Icon
 } from "lucide-react";
 import type { Protobuf } from "@meshtastic/meshtasticjs";
+import type { MessageWithState } from "@app/core/stores/deviceStore.js";
 
 export interface MessageProps {
   lastMsgSameUser: boolean;
-  message: AllMessageTypes;
+  message: MessageWithState;
   sender?: Protobuf.NodeInfo;
 }
 
@@ -20,13 +18,6 @@ export const Message = ({
   message,
   sender
 }: MessageProps): JSX.Element => {
-  const { setPeerInfoOpen, setActivePeer, connection } = useDevice();
-
-  const openPeer = (): void => {
-    setActivePeer(message.from);
-    setPeerInfoOpen(true);
-  };
-
   return lastMsgSameUser ? (
     <div className="ml-5 flex">
       {message.state === "ack" ? (
@@ -36,28 +27,21 @@ export const Message = ({
       ) : (
         <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
       )}
-      {"waypointID" in message ? (
-        <WaypointMessage waypointID={message.waypointID} />
-      ) : (
-        <span
-          className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
-            message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
-          }`}
-        >
-          {message.data}
-        </span>
-      )}
+      <span
+        className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
+          message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
+        }`}
+      >
+        {message.data}
+      </span>
     </div>
   ) : (
     <div className="mx-4 mt-2 gap-2">
       <div className="flex gap-2">
-        <div className="w-6 cursor-pointer" onClick={openPeer}>
+        <div className="w-6 cursor-pointer">
           <Hashicon value={(sender?.num ?? 0).toString()} size={32} />
         </div>
-        <span
-          className="cursor-pointer font-medium text-textPrimary"
-          onClick={openPeer}
-        >
+        <span className="cursor-pointer font-medium text-textPrimary">
           {sender?.user?.longName ?? "UNK"}
         </span>
         <span className="mt-1 font-mono text-xs text-textSecondary">
@@ -78,19 +62,13 @@ export const Message = ({
         ) : (
           <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
         )}
-        {"waypointID" in message ? (
-          <WaypointMessage waypointID={message.waypointID} />
-        ) : (
-          <span
-            className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
-              message.state === "ack"
-                ? "text-textPrimary"
-                : "text-textSecondary"
-            }`}
-          >
-            {message.data}
-          </span>
-        )}
+        <span
+          className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
+            message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
+          }`}
+        >
+          {message.data}
+        </span>
       </div>
     </div>
   );