+6 -6

src/Navigation.tsx

reviewed

··· 48 48 import {attachRouteToLogEvents, logEvent} from './lib/statsig/statsig' 49 49 import {router} from './routes' 50 50 import {MessagesConversationScreen} from './screens/Messages/Conversation' 51 51 - import {MessagesListScreen} from './screens/Messages/List' 51 51 + import {MessagesScreen} from './screens/Messages/List' 52 52 import {MessagesSettingsScreen} from './screens/Messages/Settings' 53 53 import {useModalControls} from './state/modals' 54 54 import {useUnreadNotifications} from './state/queries/notifications/unread' ··· 462 462 contentStyle: pal.view, 463 463 }}> 464 464 <MessagesTab.Screen 465 465 - name="MessagesList" 466 466 - getComponent={() => MessagesListScreen} 465 465 + name="Messages" 466 466 + getComponent={() => MessagesScreen} 467 467 options={{requireAuth: true}} 468 468 /> 469 469 {commonScreens(MessagesTab as typeof HomeTab)} ··· 512 512 options={{title: title(msg`Notifications`), requireAuth: true}} 513 513 /> 514 514 <Flat.Screen 515 515 - name="MessagesList" 516 516 - getComponent={() => MessagesListScreen} 515 515 + name="Messages" 516 516 + getComponent={() => MessagesScreen} 517 517 options={{title: title(msg`Messages`), requireAuth: true}} 518 518 /> 519 519 {commonScreens(Flat as typeof HomeTab, numUnread)} ··· 570 570 return buildStateObject('HomeTab', 'Home', params) 571 571 } 572 572 if (name === 'Messages') { 573 573 - return buildStateObject('MessagesTab', 'MessagesList', params) 573 573 + return buildStateObject('MessagesTab', 'Messages', params) 574 574 } 575 575 // if the path is something else, like a post, profile, or even settings, we need to initialize the home tab as pre-existing state otherwise the back button will not work 576 576 return buildStateObject('HomeTab', name, params, [

+1 -1

src/components/dms/ConvoMenu.tsx

reviewed

··· 72 72 const {mutate: leaveConvo} = useLeaveConvo(convo.id, { 73 73 onSuccess: () => { 74 74 if (currentScreen === 'conversation') { 75 75 - navigation.replace('MessagesList') 75 75 + navigation.replace('Messages') 76 76 } 77 77 }, 78 78 onError: () => {

+2 -1

src/lib/hooks/useNavigationTabState.ts

reviewed

··· 11 11 isAtNotifications: 12 12 getTabState(state, 'Notifications') !== TabState.Outside, 13 13 isAtMyProfile: getTabState(state, 'MyProfile') !== TabState.Outside, 14 14 - isAtMessages: getTabState(state, 'MessagesList') !== TabState.Outside, 14 14 + isAtMessages: getTabState(state, 'Messages') !== TabState.Outside, 15 15 } 16 16 + 16 17 if ( 17 18 !res.isAtHome && 18 19 !res.isAtSearch &&

+2

src/lib/hooks/useNavigationTabState.web.ts

reviewed

··· 1 1 import {useNavigationState} from '@react-navigation/native' 2 2 + 2 3 import {getCurrentRoute} from 'lib/routes/helpers' 3 4 4 5 export function useNavigationTabState() { ··· 9 10 isAtSearch: currentRoute === 'Search', 10 11 isAtNotifications: currentRoute === 'Notifications', 11 12 isAtMyProfile: currentRoute === 'MyProfile', 13 13 + isAtMessages: currentRoute === 'Messages', 12 14 } 13 15 }) 14 16 }

+3 -3

src/lib/routes/types.ts

reviewed

··· 72 72 } 73 73 74 74 export type MessagesTabNavigatorParams = CommonNavigatorParams & { 75 75 - MessagesList: undefined 75 75 + Messages: undefined 76 76 } 77 77 78 78 export type FlatNavigatorParams = CommonNavigatorParams & { ··· 81 81 Feeds: undefined 82 82 Notifications: undefined 83 83 Hashtag: {tag: string; author?: string} 84 84 - MessagesList: undefined 84 84 + Messages: undefined 85 85 } 86 86 87 87 export type AllNavigatorParams = CommonNavigatorParams & { ··· 96 96 MyProfileTab: undefined 97 97 Hashtag: {tag: string; author?: string} 98 98 MessagesTab: undefined 99 99 - MessagesList: undefined 99 99 + Messages: undefined 100 100 } 101 101 102 102 // NOTE

+1 -1

src/routes.ts

reviewed

··· 37 37 CommunityGuidelines: '/support/community-guidelines', 38 38 CopyrightPolicy: '/support/copyright', 39 39 Hashtag: '/hashtag/:tag', 40 40 - MessagesList: '/messages', 40 40 + Messages: '/messages', 41 41 MessagesSettings: '/messages/settings', 42 42 MessagesConversation: '/messages/:conversation', 43 43 })

+1 -1

src/screens/Messages/Conversation/index.tsx

reviewed

··· 82 82 83 83 const onPressBack = useCallback(() => { 84 84 if (isWeb) { 85 85 - navigation.replace('MessagesList') 85 85 + navigation.replace('Messages') 86 86 } else { 87 87 navigation.pop() 88 88 }

+2 -2

src/screens/Messages/List/index.tsx

reviewed

··· 33 33 import {Text} from '#/components/Typography' 34 34 import {ClipClopGate} from '../gate' 35 35 36 36 - type Props = NativeStackScreenProps<MessagesTabNavigatorParams, 'MessagesList'> 37 37 - export function MessagesListScreen({navigation}: Props) { 36 36 + type Props = NativeStackScreenProps<MessagesTabNavigatorParams, 'Messages'> 37 37 + export function MessagesScreen({navigation}: Props) { 38 38 const {_} = useLingui() 39 39 const t = useTheme() 40 40 const newChatControl = useDialogControl()