Skip to content

Commit 845b08b

Browse files
committed
user [nfc]: Rename New1to1PmScreen from UsersScreen
There are lots of screens in the app that show users, or even all users. This screen in reality has a very specific role. Name it accordingly. Also move it next to the parallel NewGroupPmScreen component.
1 parent a6968c2 commit 845b08b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/nav/AppNavigator.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import MessageReactionsScreen from '../reactions/MessageReactionsScreen';
2929
import AccountDetailsScreen from '../account-info/AccountDetailsScreen';
3030
import PmConversationDetailsScreen from '../chat/PmConversationDetailsScreen';
3131
import SearchMessagesScreen from '../search/SearchMessagesScreen';
32-
import UsersScreen from '../users/UsersScreen';
32+
import New1to1PmScreen from '../user-picker/New1to1PmScreen';
3333
import ChatScreen from '../chat/ChatScreen';
3434
import LanguageScreen from '../settings/LanguageScreen';
3535
import PasswordAuthScreen from '../start/PasswordAuthScreen';
@@ -70,7 +70,7 @@ export type AppNavigatorParamList = {|
7070
+'password-auth': RouteParamsOf<typeof PasswordAuthScreen>,
7171
+'realm-input': RouteParamsOf<typeof RealmInputScreen>,
7272
+'search-messages': RouteParamsOf<typeof SearchMessagesScreen>,
73-
+users: RouteParamsOf<typeof UsersScreen>,
73+
+'new-1to1-pm': RouteParamsOf<typeof New1to1PmScreen>,
7474
+language: RouteParamsOf<typeof LanguageScreen>,
7575
+lightbox: RouteParamsOf<typeof LightboxScreen>,
7676
+'new-group-pm': RouteParamsOf<typeof NewGroupPmScreen>,
@@ -178,7 +178,7 @@ export default function AppNavigator(props: Props): Node {
178178
name="search-messages"
179179
component={useHaveServerDataGate(SearchMessagesScreen)}
180180
/>
181-
<Stack.Screen name="users" component={useHaveServerDataGate(UsersScreen)} />
181+
<Stack.Screen name="new-1to1-pm" component={useHaveServerDataGate(New1to1PmScreen)} />
182182
<Stack.Screen name="language" component={useHaveServerDataGate(LanguageScreen)} />
183183
<Stack.Screen name="lightbox" component={useHaveServerDataGate(LightboxScreen)} />
184184
<Stack.Screen name="new-group-pm" component={useHaveServerDataGate(NewGroupPmScreen)} />

src/pm-conversations/PmConversationsScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default function PmConversationsScreen(props: Props): Node {
6363
style={styles.button}
6464
text="New PM"
6565
onPress={() => {
66-
setTimeout(() => navigation.push('users'));
66+
setTimeout(() => navigation.push('new-1to1-pm'));
6767
}}
6868
/>
6969
<ZulipButton

src/users/UsersScreen.js renamed to src/user-picker/New1to1PmScreen.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Node } from 'react';
55
import type { RouteProp } from '../react-navigation';
66
import type { AppNavigationProp } from '../nav/AppNavigator';
77
import Screen from '../common/Screen';
8-
import UserList from './UserList';
8+
import UserList from '../users/UserList';
99
import type { UserOrBot } from '../types';
1010
import { useSelector, useDispatch } from '../react-redux';
1111
import { pm1to1NarrowFromUser } from '../utils/narrow';
@@ -14,11 +14,11 @@ import { navigateBack, doNarrow } from '../actions';
1414
import { useNavigation } from '../react-navigation';
1515

1616
type Props = $ReadOnly<{|
17-
navigation: AppNavigationProp<'users'>,
18-
route: RouteProp<'users', void>,
17+
navigation: AppNavigationProp<'new-1to1-pm'>,
18+
route: RouteProp<'new-1to1-pm', void>,
1919
|}>;
2020

21-
export default function UsersScreen(props: Props): Node {
21+
export default function New1to1PmScreen(props: Props): Node {
2222
const dispatch = useDispatch();
2323
const users = useSelector(getUsers);
2424
const presences = useSelector(getPresence);

0 commit comments

Comments
 (0)