diff --git a/package.json b/package.json index 8bcee26e..5916f1fb 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,14 @@ "dependencies": { "@headlessui/react": "^1.3.0", "@heroicons/react": "^1.0.1", - "@meshtastic/meshtasticjs": "^0.6.15", + "@meshtastic/meshtasticjs": "^0.6.16", "@reduxjs/toolkit": "^1.6.0", "boring-avatars": "^1.5.8", "framer-motion": "^4.1.17", "i18next": "^20.3.5", "i18next-browser-languagedetector": "^6.1.2", - "react": "^18.0.0-alpha-6bf111772-20210701", - "react-dom": "^18.0.0-alpha-6bf111772-20210701", + "react": "^17.0.2", + "react-dom": "^17.0.2", "react-flags-select": "^2.1.2", "react-hook-form": "^7.9.0", "react-i18next": "^11.11.4", diff --git a/src/App.tsx b/src/App.tsx index ba02d847..d26b1136 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -11,7 +11,6 @@ import { addNode, setDeviceStatus, setLastMeshInterraction, - setMyId, setMyNodeInfo, setPreferences, setReady, @@ -45,7 +44,6 @@ const App = (): JSX.Element => { connection.onMyNodeInfo.subscribe((nodeInfo) => { dispatch(setMyNodeInfo(nodeInfo)); - dispatch(setMyId(nodeInfo.myNodeNum)); }); connection.onNodeInfoPacket.subscribe((nodeInfoPacket) => diff --git a/src/components/ChatMessage.tsx b/src/components/ChatMessage.tsx index 465f690b..83e172c8 100644 --- a/src/components/ChatMessage.tsx +++ b/src/components/ChatMessage.tsx @@ -15,11 +15,11 @@ interface ChatMessageProps { } export const ChatMessage = (props: ChatMessageProps): JSX.Element => { - const myId = useAppSelector((state) => state.meshtastic.myId); + const myNodeInfo = useAppSelector((state) => state.meshtastic.myNodeInfo); const nodes = useAppSelector((state) => state.meshtastic.nodes); const node = nodes.find((node) => { - node.num === props.message.message.packet.from; + return node.num === props.message.message.packet.from; }); return ( @@ -39,8 +39,8 @@ export const ChatMessage = (props: ChatMessageProps): JSX.Element => { } >