diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx index 9c58b621..3b9a56bd 100644 --- a/src/components/dms/ActionsWrapper.tsx +++ b/src/components/dms/ActionsWrapper.tsx @@ -79,7 +79,7 @@ export function ActionsWrapper({ hitSlop={HITSLOP_10}> {children} - + ) } diff --git a/src/components/dms/MessageMenu.tsx b/src/components/dms/MessageMenu.tsx index 55c3ac21..f4645f28 100644 --- a/src/components/dms/MessageMenu.tsx +++ b/src/components/dms/MessageMenu.tsx @@ -25,7 +25,6 @@ export let MessageMenu = ({ control, triggerOpacity, }: { - hideTrigger?: boolean triggerOpacity?: number message: ChatBskyConvoDefs.MessageView control: Menu.MenuControlProps diff --git a/src/screens/Messages/Conversation/MessageInput.tsx b/src/screens/Messages/Conversation/MessageInput.tsx index d05d6109..2b3ee45d 100644 --- a/src/screens/Messages/Conversation/MessageInput.tsx +++ b/src/screens/Messages/Conversation/MessageInput.tsx @@ -78,7 +78,7 @@ export function MessageInput({ useSaveMessageDraft(message) return ( - + export function MessagesConversationScreen({route}: Props) { const gate = useGate() + const setMinimalShellMode = useSetMinimalShellMode() + const {gtMobile} = useBreakpoints() + const convoId = route.params.conversation const {setCurrentConvoId} = useCurrentConvoId() useFocusEffect( useCallback(() => { setCurrentConvoId(convoId) + + if (isWeb && !gtMobile) { + setMinimalShellMode(true) + } + return () => { setCurrentConvoId(undefined) + setMinimalShellMode(false) } - }, [convoId, setCurrentConvoId]), + }, [convoId, gtMobile, setCurrentConvoId, setMinimalShellMode]), ) if (!gate('dms')) return @@ -67,8 +77,7 @@ function Inner() { const [hasInitiallyRendered, setHasInitiallyRendered] = React.useState(false) const {bottom: bottomInset, top: topInset} = useSafeAreaInsets() - const {gtMobile} = useBreakpoints() - const bottomBarHeight = gtMobile ? 0 : isIOS ? 40 : 60 + const nativeBottomBarHeight = isIOS ? 42 : 60 // HACK: Because we need to scroll to the bottom of the list once initial items are added to the list, we also have // to take into account that scrolling to the end of the list on native will happen asynchronously. This will cause @@ -106,7 +115,10 @@ function Inner() { return (