Skip to content

Commit a6968c2

Browse files
committed
user [nfc]: Rename NewGroupPmScreen from CreateGroupScreen
The old name was highly misleading about what this does. Not to mention the directory it was in -- Zulip user groups are completely unrelated to group-PM threads, which is what this screen is actually about.
1 parent cf73534 commit a6968c2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/nav/AppNavigator.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import VariablesScreen from '../diagnostics/VariablesScreen';
3939
import TimingScreen from '../diagnostics/TimingScreen';
4040
import StorageScreen from '../diagnostics/StorageScreen';
4141
import LightboxScreen from '../lightbox/LightboxScreen';
42-
import CreateGroupScreen from '../user-groups/CreateGroupScreen';
42+
import NewGroupPmScreen from '../user-picker/NewGroupPmScreen';
4343
import InviteUsersScreen from '../streams/InviteUsersScreen';
4444
import StreamSettingsScreen from '../streams/StreamSettingsScreen';
4545
import CreateStreamScreen from '../streams/CreateStreamScreen';
@@ -73,7 +73,7 @@ export type AppNavigatorParamList = {|
7373
+users: RouteParamsOf<typeof UsersScreen>,
7474
+language: RouteParamsOf<typeof LanguageScreen>,
7575
+lightbox: RouteParamsOf<typeof LightboxScreen>,
76-
+'create-group': RouteParamsOf<typeof CreateGroupScreen>,
76+
+'new-group-pm': RouteParamsOf<typeof NewGroupPmScreen>,
7777
+'invite-users': RouteParamsOf<typeof InviteUsersScreen>,
7878
+diagnostics: RouteParamsOf<typeof DiagnosticsScreen>,
7979
+variables: RouteParamsOf<typeof VariablesScreen>,
@@ -181,7 +181,7 @@ export default function AppNavigator(props: Props): Node {
181181
<Stack.Screen name="users" component={useHaveServerDataGate(UsersScreen)} />
182182
<Stack.Screen name="language" component={useHaveServerDataGate(LanguageScreen)} />
183183
<Stack.Screen name="lightbox" component={useHaveServerDataGate(LightboxScreen)} />
184-
<Stack.Screen name="create-group" component={useHaveServerDataGate(CreateGroupScreen)} />
184+
<Stack.Screen name="new-group-pm" component={useHaveServerDataGate(NewGroupPmScreen)} />
185185
<Stack.Screen name="invite-users" component={useHaveServerDataGate(InviteUsersScreen)} />
186186
<Stack.Screen name="diagnostics" component={useHaveServerDataGate(DiagnosticsScreen)} />
187187
<Stack.Screen name="variables" component={useHaveServerDataGate(VariablesScreen)} />

src/pm-conversations/PmConversationsScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default function PmConversationsScreen(props: Props): Node {
7272
style={styles.button}
7373
text="New group PM"
7474
onPress={() => {
75-
setTimeout(() => navigation.push('create-group'));
75+
setTimeout(() => navigation.push('new-group-pm'));
7676
}}
7777
/>
7878
</View>

src/user-groups/CreateGroupScreen.js renamed to src/user-picker/NewGroupPmScreen.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ import Screen from '../common/Screen';
1010
import { doNarrow, navigateBack } from '../actions';
1111
import { pmNarrowFromRecipients } from '../utils/narrow';
1212
import { pmKeyRecipientsFromUsers } from '../utils/recipient';
13-
import UserPickerCard from '../user-picker/UserPickerCard';
13+
import UserPickerCard from './UserPickerCard';
1414
import { getOwnUserId } from '../users/userSelectors';
1515

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

21-
export default function CreateGroupScreen(props: Props): Node {
21+
export default function NewGroupPmScreen(props: Props): Node {
2222
const { navigation } = props;
2323
const dispatch = useDispatch();
2424
const ownUserId = useSelector(getOwnUserId);
2525

2626
const [filter, setFilter] = useState<string>('');
2727

28-
const handleCreateGroup = useCallback(
28+
const handlePickerComplete = useCallback(
2929
(selected: $ReadOnlyArray<UserOrBot>) => {
3030
navigation.dispatch(navigateBack());
3131
dispatch(doNarrow(pmNarrowFromRecipients(pmKeyRecipientsFromUsers(selected, ownUserId))));
@@ -35,7 +35,7 @@ export default function CreateGroupScreen(props: Props): Node {
3535

3636
return (
3737
<Screen search scrollEnabled={false} searchBarOnChange={setFilter}>
38-
<UserPickerCard filter={filter} onComplete={handleCreateGroup} showOwnUser={false} />
38+
<UserPickerCard filter={filter} onComplete={handlePickerComplete} showOwnUser={false} />
3939
</Screen>
4040
);
4141
}

0 commit comments

Comments
 (0)