refactor: add user info to authData

src/routes/chat/ChannelChat/index.tsx

@@ -58,15 +58,13 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
     userIds,
     data,
     messageData,
-    loginUid,
     loginUser,
     footprint
   } = useSelector((store) => {
     return {
       selects: store.ui.selectMessages[`channel_${cid}`],
       footprint: store.footprint,
-      loginUser: store.contacts.byId[store.authData.uid],
-      loginUid: store.authData.uid,
+      loginUser: store.authData.user,
       // msgIds: store.channelMessage[cid] || [],
       userIds: store.contacts.ids,
       data: store.channels.byId[cid] || {},
@@ -93,7 +91,7 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
   if (!data) return null;
   const { name, description, is_public, members = [], owner } = data;
   const memberIds = is_public ? userIds : members.slice(0).sort((n) => (n == owner ? -1 : 0));
-  const addVisible = loginUser?.is_admin || owner == loginUid;
+  const addVisible = loginUser?.is_admin || owner == loginUser.uid;
   console.log("channel message list", msgIds);
   const readIndex = footprint.readChannels[cid];
   const pinCount = data?.pinned_messages?.length || 0;
@@ -236,7 +234,7 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
             if (!curr) return null;
             const isFirst = idx == 0;
             const prev = isFirst ? null : messageData[feeds[idx - 1]];
-            const read = curr?.from_uid == loginUid || mid <= readIndex;
+            const read = curr?.from_uid == loginUser.uid || mid <= readIndex;
             return renderMessageFragment({
               selectMode: !!selects,
               updateReadIndex: updateReadDebounced,

src/routes/chat/ChannelList/NavItem.tsx

@@ -29,21 +29,12 @@ const NavItem = ({ id, setFiles, toggleRemoveConfirm }) => {
     handleContextMenuEvent,
     hideContextMenu
   } = useContextMenu();
-  const {
-    channel,
-    mids,
-    messageData,
-    readIndex,
-    muted,
-    loginUid
-    //  loginUser,
-  } = useSelector((store) => {
+  const { channel, mids, messageData, readIndex, muted, loginUid } = useSelector((store) => {
     return {
-      // loginUser: store.contacts.byId[store.authData.uid],
       channel: store.channels.byId[id],
       mids: store.channelMessage[id],
       messageData: store.message,
-      loginUid: store.authData.uid,
+      loginUid: store.authData.user?.uid,
       readIndex: store.footprint.readChannels[id],
       muted: store.footprint.muteChannels[id]
     };

src/routes/chat/DMChat/index.tsx

@@ -1,5 +1,4 @@
 // import { useState, useEffect } from "react";
-import { useSelector } from "react-redux";
 import { useDebounce } from "rooks";
 import Tippy from "@tippyjs/react";
 import FavList from "../FavList";
@@ -15,6 +14,7 @@ import { StyledHeader, StyledDMChat } from "./styled";
 import LoadMore from "../LoadMore";
 import { renderMessageFragment } from "../utils";
 import useMessageFeed from "../../../common/hook/useMessageFeed";
+import { useAppSelector } from "../../../app/store";
 
 export default function DMChat({ uid = "", dropFiles = [] }) {
   const {
@@ -29,10 +29,10 @@ export default function DMChat({ uid = "", dropFiles = [] }) {
   const [updateReadIndex] = useReadMessageMutation();
   const updateReadDebounced = useDebounce(updateReadIndex, 300);
   console.log("dm files", dropFiles);
-  const { currUser, messageData, footprint, loginUid, selects } = useSelector((store) => {
+  const { currUser, messageData, footprint, loginUid, selects } = useAppSelector((store) => {
     return {
       selects: store.ui.selectMessages[`user_${uid}`],
-      loginUid: store.authData.uid,
+      loginUid: store.authData.user?.uid,
       footprint: store.footprint,
       currUser: store.contacts.byId[uid],
       messageData: store.message

src/routes/chat/DMList/index.tsx

@@ -11,7 +11,7 @@ interface Props {
 const DMList: FC<Props> = ({ uids, setDropFiles }) => {
   const { userMessage, messageData, readUsers, loginUid } = useAppSelector((store) => {
     return {
-      loginUid: store.authData.uid,
+      loginUid: store.authData.user?.uid,
       readUsers: store.footprint.readUsers,
       contactData: store.contacts.byId,
       userMessage: store.userMessage.byId,

src/routes/chat/SessionList/Session.tsx

@@ -55,7 +55,7 @@ export default function Session({
     (store) => {
       return {
         mids: type == "user" ? store.userMessage.byId[id] : store.channelMessage[id],
-        loginUid: store.authData.uid,
+        loginUid: store.authData.user?.uid,
         readIndex:
           type == "user" ? store.footprint.readUsers[id] : store.footprint.readChannels[id],
         messageData: store.message,

src/routes/chat/SessionList/index.tsx

@@ -12,7 +12,7 @@ export default function SessionList({ tempSession = null }) {
   const { channelIDs, DMs, readChannels, readUsers, channelMessage, userMessage, loginUid } =
     useAppSelector((store) => {
       return {
-        loginUid: store.authData.uid,
+        loginUid: store.authData.user?.uid,
         channelIDs: store.channels.ids,
         DMs: store.userMessage.ids,
         userMessage: store.userMessage.byId,