Enable usernames

This commit is contained in:
Fedor Indutny
2024-02-07 16:34:31 -08:00
committed by GitHub
parent 38da3d3152
commit 43de83f0de
26 changed files with 196 additions and 438 deletions

View File

@@ -65,7 +65,6 @@ export type StatePropsType = {
removeSelectedContact: (_: string) => void;
setSearchTerm: (_: string) => void;
toggleSelectedContact: (conversationId: string) => void;
isUsernamesEnabled: boolean;
} & Pick<
LookupConversationWithoutServiceIdActionsType,
'lookupConversationWithoutServiceId'
@@ -97,29 +96,22 @@ export function ChooseGroupMembersModal({
toggleSelectedContact,
lookupConversationWithoutServiceId,
showUserNotFoundModal,
isUsernamesEnabled,
}: PropsType): JSX.Element {
const [focusRef] = useRestoreFocus();
const parsedUsername = getUsernameFromSearch(searchTerm);
let username: string | undefined;
let isUsernameChecked = false;
let isUsernameVisible = false;
if (isUsernamesEnabled) {
username = parsedUsername;
const username = getUsernameFromSearch(searchTerm);
isUsernameChecked = selectedContacts.some(
contact => contact.username === username
);
const isUsernameChecked = selectedContacts.some(
contact => contact.username === username
);
isUsernameVisible =
Boolean(username) &&
username !== ourUsername &&
candidateContacts.every(contact => contact.username !== username);
}
const isUsernameVisible =
Boolean(username) &&
username !== ourUsername &&
candidateContacts.every(contact => contact.username !== username);
let phoneNumber: ParsedE164Type | undefined;
if (!parsedUsername) {
if (!username) {
phoneNumber = parseAndFormatPhoneNumber(searchTerm, regionCode);
}