diff --git a/src/screens/Messages/Conversation/MessageItem.tsx b/src/screens/Messages/Conversation/MessageItem.tsx index 72f74c29..a1aab288 100644 --- a/src/screens/Messages/Conversation/MessageItem.tsx +++ b/src/screens/Messages/Conversation/MessageItem.tsx @@ -3,7 +3,7 @@ import {StyleProp, TextStyle, View} from 'react-native' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {useAgent} from '#/state/session' +import {useSession} from '#/state/session' import {TimeElapsed} from '#/view/com/util/TimeElapsed' import {atoms as a, useTheme} from '#/alf' import {Text} from '#/components/Typography' @@ -17,13 +17,13 @@ export function MessageItem({ next: TempDmChatDefs.MessageView | TempDmChatDefs.DeletedMessage | null }) { const t = useTheme() - const {getAgent} = useAgent() + const {currentAccount} = useSession() - const isFromSelf = item.sender?.did === getAgent().session?.did + const isFromSelf = item.sender?.did === currentAccount?.did const isNextFromSelf = TempDmChatDefs.isMessageView(next) && - next.sender?.did === getAgent().session?.did + next.sender?.did === currentAccount?.did const isLastInGroup = useMemo(() => { // if the next message is from a different sender, then it's the last in the group diff --git a/src/screens/Messages/List/index.tsx b/src/screens/Messages/List/index.tsx index 2dd406fe..ccf0d204 100644 --- a/src/screens/Messages/List/index.tsx +++ b/src/screens/Messages/List/index.tsx @@ -11,8 +11,9 @@ import {MessagesTabNavigatorParams} from '#/lib/routes/types' import {useGate} from '#/lib/statsig/statsig' import {cleanError} from '#/lib/strings/errors' import {logger} from '#/logger' -import {useAgent} from '#/state/session' +import {useSession} from '#/state/session' import {List} from '#/view/com/util/List' +import {TimeElapsed} from '#/view/com/util/TimeElapsed' import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' import {ViewHeader} from '#/view/com/util/ViewHeader' import {useBreakpoints, useTheme} from '#/alf' @@ -168,15 +169,24 @@ export function MessagesListScreen({navigation}: Props) { function ChatListItem({chat}: {chat: TempDmChatDefs.ChatView}) { const t = useTheme() const {_} = useLingui() - const {getAgent} = useAgent() + const {currentAccount} = useSession() let lastMessage = _(msg`No messages yet`) + let lastMessageSentAt: string | null = null if (TempDmChatDefs.isMessageView(chat.lastMessage)) { - lastMessage = chat.lastMessage.text + if (chat.lastMessage.sender?.did === currentAccount?.did) { + lastMessage = _(msg`You: ${chat.lastMessage.text}`) + } else { + lastMessage = chat.lastMessage.text + } + lastMessageSentAt = chat.lastMessage.sentAt + } + if (TempDmChatDefs.isDeletedMessage(chat.lastMessage)) { + lastMessage = _(msg`Message deleted`) } const otherUser = chat.members.find( - member => member.did !== getAgent().session?.did, + member => member.did !== currentAccount?.did, ) if (!otherUser) { @@ -200,19 +210,32 @@ function ChatListItem({chat}: {chat: TempDmChatDefs.ChatView}) { - + 0 && a.font_bold]}> {otherUser.displayName || otherUser.handle} {' '} - - @{otherUser.handle} - + {lastMessageSentAt ? ( + + {({timeElapsed}) => ( + + @{otherUser.handle} · {timeElapsed} + + )} + + ) : ( + + @{otherUser.handle} + + )} 0 + ? a.font_bold + : t.atoms.text_contrast_medium, ]}> {lastMessage} @@ -221,8 +244,8 @@ function ChatListItem({chat}: {chat: TempDmChatDefs.ChatView}) { { - const {getAgent} = useAgent() + const {currentAccount} = useSession() return { get Authorization() { - return getAgent().session!.did + return currentAccount!.did }, } } @@ -196,6 +196,10 @@ export function useChatLogQuery() { const json = (await response.json()) as TempDmChatGetChatLog.OutputSchema + if (json.logs.length > 0) { + queryClient.invalidateQueries({queryKey: ['chats']}) + } + for (const log of json.logs) { if (TempDmChatDefs.isLogCreateMessage(log)) { queryClient.setQueryData(['chat', log.chatId], (prev: Chat) => {