diff --git a/src/screens/Messages/Conversation/index.tsx b/src/screens/Messages/Conversation/index.tsx
index efa64f5f85..d069138570 100644
--- a/src/screens/Messages/Conversation/index.tsx
+++ b/src/screens/Messages/Conversation/index.tsx
@@ -1,13 +1,26 @@
import React from 'react'
-import {msg} from '@lingui/macro'
+import {TouchableOpacity, View} from 'react-native'
+import {AppBskyActorDefs} from '@atproto/api'
+import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
+import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react'
+import {useNavigation} from '@react-navigation/native'
import {NativeStackScreenProps} from '@react-navigation/native-stack'
-import {CommonNavigatorParams} from '#/lib/routes/types'
+import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types'
import {useGate} from '#/lib/statsig/statsig'
-import {ViewHeader} from '#/view/com/util/ViewHeader'
+import {BACK_HITSLOP} from 'lib/constants'
+import {isWeb} from 'platform/detection'
+import {useSession} from 'state/session'
+import {UserAvatar} from 'view/com/util/UserAvatar'
import {CenteredView} from 'view/com/util/Views'
import {MessagesList} from '#/screens/Messages/Conversation/MessagesList'
+import {useChatQuery} from '#/screens/Messages/Temp/query/query'
+import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+import {Button, ButtonIcon} from '#/components/Button'
+import {DotGrid_Stroke2_Corner0_Rounded} from '#/components/icons/DotGrid'
+import {ListMaybePlaceholder} from '#/components/Lists'
+import {Text} from '#/components/Typography'
import {ClipClopGate} from '../gate'
type Props = NativeStackScreenProps<
@@ -15,20 +28,101 @@ type Props = NativeStackScreenProps<
'MessagesConversation'
>
export function MessagesConversationScreen({route}: Props) {
- const chatId = route.params.conversation
- const {_} = useLingui()
const gate = useGate()
+ const chatId = route.params.conversation
+ const {currentAccount} = useSession()
+ const myDid = currentAccount?.did
+
+ const {data: chat, isError: isError} = useChatQuery(chatId)
+ const otherProfile = React.useMemo(() => {
+ return chat?.members?.find(m => m.did !== myDid)
+ }, [chat?.members, myDid])
if (!gate('dms')) return
+ if (!chat || !otherProfile) {
+ return (
+
+
+
+ )
+ }
+
return (
-
+
)
}
+
+function Header({profile}: {profile: AppBskyActorDefs.ProfileViewBasic}) {
+ const t = useTheme()
+ const {_} = useLingui()
+ const {gtTablet} = useBreakpoints()
+ const navigation = useNavigation()
+
+ const onPressBack = React.useCallback(() => {
+ if (isWeb) {
+ navigation.replace('MessagesList')
+ } else {
+ navigation.pop()
+ }
+ }, [navigation])
+
+ return (
+
+ {!gtTablet ? (
+
+
+
+ ) : (
+
+ )}
+
+
+
+ {profile.displayName}
+
+
+
+
+
+
+ )
+}
diff --git a/src/screens/Messages/Temp/query/query.ts b/src/screens/Messages/Temp/query/query.ts
index a51929bcab..a4d78e0bb7 100644
--- a/src/screens/Messages/Temp/query/query.ts
+++ b/src/screens/Messages/Temp/query/query.ts
@@ -73,6 +73,8 @@ export function useChat(chatId: string) {
const chatJson =
(await chatResponse.json()) as TempDmChatGetChat.OutputSchema
+ queryClient.setQueryData(['chatQuery', chatId], chatJson.chat)
+
const newChat = {
chatId,
messages: messagesJson.messages,
@@ -275,3 +277,25 @@ export function useListChats() {
getNextPageParam: lastPage => lastPage.cursor,
})
}
+
+export function useChatQuery(chatId: string) {
+ const headers = useHeaders()
+ const {serviceUrl} = useDmServiceUrlStorage()
+
+ return useQuery({
+ queryKey: ['chatQuery', chatId],
+ queryFn: async () => {
+ const chatResponse = await fetch(
+ `${serviceUrl}/xrpc/temp.dm.getChat?chatId=${chatId}`,
+ {
+ headers,
+ },
+ )
+
+ if (!chatResponse.ok) throw new Error('Failed to fetch chat')
+
+ const json = (await chatResponse.json()) as TempDmChatGetChat.OutputSchema
+ return json.chat
+ },
+ })
+}
diff --git a/src/screens/Messages/Temp/useDmServiceUrlStorage.tsx b/src/screens/Messages/Temp/useDmServiceUrlStorage.tsx
index 3679858f4c..d78128b5c7 100644
--- a/src/screens/Messages/Temp/useDmServiceUrlStorage.tsx
+++ b/src/screens/Messages/Temp/useDmServiceUrlStorage.tsx
@@ -35,7 +35,6 @@ export function DmServiceUrlProvider({children}: {children: React.ReactNode}) {
React.useEffect(() => {
;(async () => {
const v = await getItem()
- console.log(v)
setServiceUrl(v ?? '')
})()
}, [getItem])