mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix adding to group by username

Browse source
This commit is contained in:
Fedor Indutny 2023-01-02 09:25:44 -08:00 committed by GitHub
parent 98ffdc2823
commit 53fbc85b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
View file

@ -14,11 +14,13 @@ import Measure from 'react-measure';
import type { LocalizerType, ThemeType } from '../../../../types/Util';
import { getUsernameFromSearch } from '../../../../types/Username';
import { strictAssert } from '../../../../util/assert';
import { refMerger } from '../../../../util/refMerger';
import { useRestoreFocus } from '../../../../hooks/useRestoreFocus';
import { missingCaseError } from '../../../../util/missingCaseError';
import type { LookupConversationWithoutUuidActionsType } from '../../../../util/lookupConversationWithoutUuid';
import { parseAndFormatPhoneNumber } from '../../../../util/libphonenumberInstance';
import type { ParsedE164Type } from '../../../../util/libphonenumberInstance';
import { filterAndSortConversationsByRecent } from '../../../../util/filterAndSortConversations';
import type { ConversationType } from '../../../../state/ducks/conversations';
import type { PreferredBadgeSelectorType } from '../../../../state/selectors/badges';
@ -91,8 +93,6 @@ export function ChooseGroupMembersModal({
}: PropsType): JSX.Element {
const [focusRef] = useRestoreFocus();
const phoneNumber = parseAndFormatPhoneNumber(searchTerm, regionCode);
let username: string | undefined;
let isUsernameChecked = false;
let isUsernameVisible = false;
@ -108,16 +108,23 @@ export function ChooseGroupMembersModal({
candidateContacts.every(contact => contact.username !== username);
}
let isPhoneNumberChecked = false;
if (!username && phoneNumber) {
isPhoneNumberChecked =
phoneNumber.isValid &&
selectedContacts.some(contact => contact.e164 === phoneNumber.e164);
let phoneNumber: ParsedE164Type | undefined;
if (!username) {
phoneNumber = parseAndFormatPhoneNumber(searchTerm, regionCode);
}
const isPhoneNumberVisible =
phoneNumber &&
candidateContacts.every(contact => contact.e164 !== phoneNumber.e164);
let isPhoneNumberChecked = false;
let isPhoneNumberVisible = false;
if (phoneNumber) {
const { e164 } = phoneNumber;
isPhoneNumberChecked =
phoneNumber.isValid &&
selectedContacts.some(contact => contact.e164 === e164);
isPhoneNumberVisible = candidateContacts.every(
contact => contact.e164 !== e164
);
}
const inputRef = useRef<null | HTMLInputElement>(null);
@ -229,6 +236,10 @@ export function ChooseGroupMembersModal({
virtualIndex -= filteredContacts.length;
if (isPhoneNumberVisible) {
strictAssert(
phoneNumber !== undefined,
"phone number can't be visible if not present"
);
if (virtualIndex === 0) {
return {
type: RowType.Header,