zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

[🐴] Reorg convo files (#3909)

Browse source 
* Remove unused prop

* Reorganize
This commit is contained in:
Eric Bailey 2024-05-07 21:46:59 -05:00 • committed by GitHub
parent 814ec2bd7f
commit 56f713077f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 296 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/screens/Messages/Conversation/index.tsx
View file

@ -13,8 +13,8 @@ import {useGate} from '#/lib/statsig/statsig'
import {useCurrentConvoId} from '#/state/messages/current-convo-id'
import {BACK_HITSLOP} from 'lib/constants'
import {isWeb} from 'platform/detection'
import {ChatProvider, useChat} from 'state/messages'
import {ConvoStatus} from 'state/messages/convo'
import {ConvoProvider, useConvo} from 'state/messages/convo'
import {ConvoStatus} from 'state/messages/convo/types'
import {PreviewableUserAvatar} from 'view/com/util/UserAvatar'
import {CenteredView} from 'view/com/util/Views'
import {MessagesList} from '#/screens/Messages/Conversation/MessagesList'
@ -46,23 +46,23 @@ export function MessagesConversationScreen({route}: Props) {
if (!gate('dms')) return <ClipClopGate />
return (
<ChatProvider convoId={convoId}>
<ConvoProvider convoId={convoId}>
<Inner />
</ChatProvider>
</ConvoProvider>
)
}
function Inner() {
const chat = useChat()
const convo = useConvo()
if (
chat.status === ConvoStatus.Uninitialized ||
chat.status === ConvoStatus.Initializing
convo.status === ConvoStatus.Uninitialized ||
convo.status === ConvoStatus.Initializing
) {
return <ListMaybePlaceholder isLoading />
}
if (chat.status === ConvoStatus.Error) {
if (convo.status === ConvoStatus.Error) {
// TODO
return (
<View>
@ -71,7 +71,7 @@ function Inner() {
<Button
label="Retry"
onPress={() => {
chat.error.retry()
convo.error.retry()
}}>
<ButtonText>Retry</ButtonText>
</Button>
@ -81,13 +81,13 @@ function Inner() {
}
/*
* Any other chat states (atm) are "ready" states
* Any other convo states (atm) are "ready" states
*/
return (
<KeyboardProvider>
<CenteredView style={{flex: 1}} sideBorders>
<Header profile={chat.recipients[0]} />
<Header profile={convo.recipients[0]} />
<MessagesList />
</CenteredView>
</KeyboardProvider>
@ -103,7 +103,7 @@ let Header = ({
const {_} = useLingui()
const {gtTablet} = useBreakpoints()
const navigation = useNavigation<NavigationProp>()
const chat = useChat()
const convo = useConvo()
const onPressBack = useCallback(() => {
if (isWeb) {
@ -157,9 +157,9 @@ let Header = ({
{profile.displayName}
</Text>
</View>
{chat.status === ConvoStatus.Ready ? (
{convo.status === ConvoStatus.Ready ? (
<ConvoMenu
convo={chat.convo}
convo={convo.convo}
profile={profile}
onUpdateConvo={onUpdateConvo}
currentScreen="conversation"