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

Sort by recency then alphabetically everywhere

Browse source
This commit is contained in:
Jamie Kyle 2024-03-18 16:31:42 -07:00 • committed by GitHub
parent 9aff86f02b
commit 53ae88c777
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 195 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ts/state/selectors/conversations.ts
View file

@ -30,10 +30,7 @@ import { deconstructLookup } from '../../util/deconstructLookup';
import type { PropsDataType as TimelinePropsType } from '../../components/conversation/Timeline';
import { assertDev } from '../../util/assert';
import { isConversationUnregistered } from '../../util/isConversationUnregistered';
import {
filterAndSortConversationsAlphabetically,
filterAndSortConversationsByRecent,
} from '../../util/filterAndSortConversations';
import { filterAndSortConversations } from '../../util/filterAndSortConversations';
import type { ContactNameColorType } from '../../types/Colors';
import { ContactNameColors } from '../../types/Colors';
import type { AvatarDataType } from '../../types/Avatar';
@ -724,11 +721,7 @@ export const getFilteredComposeContacts = createSelector(
contacts: ReadonlyArray<ConversationType>,
regionCode: string | undefined
): Array<ConversationType> => {
return filterAndSortConversationsAlphabetically(
contacts,
searchTerm,
regionCode
);
return filterAndSortConversations(contacts, searchTerm, regionCode);
}
);
@ -750,18 +743,16 @@ export const getFilteredComposeGroups = createSelector(
}>;
}
> => {
return filterAndSortConversationsAlphabetically(
groups,
searchTerm,
regionCode
).map(group => ({
...group,
// we don't disable groups when composing, already filtered
disabledReason: undefined,
// should always be populated for a group
membersCount: group.membersCount ?? 0,
memberships: group.memberships ?? [],
}));
return filterAndSortConversations(groups, searchTerm, regionCode).map(
group => ({
...group,
// we don't disable groups when composing, already filtered
disabledReason: undefined,
// should always be populated for a group
membersCount: group.membersCount ?? 0,
memberships: group.memberships ?? [],
})
);
}
);
@ -769,7 +760,7 @@ export const getFilteredCandidateContactsForNewGroup = createSelector(
getCandidateContactsForNewGroup,
getNormalizedComposerConversationSearchTerm,
getRegionCode,
filterAndSortConversationsByRecent
filterAndSortConversations
);
const getGroupCreationComposerState = createSelector(