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

Fix UI in PendingInvites

Browse source
This commit is contained in:
Fedor Indutny 2022-09-27 13:31:55 -07:00 • committed by GitHub
parent 698c7a7739
commit 0ab85a6094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/components/conversation/conversation-details/PendingInvites.tsx
View file

@ -15,6 +15,7 @@ import { PanelSection } from './PanelSection';
import { PanelRow } from './PanelRow';
import { ConversationDetailsIcon, IconType } from './ConversationDetailsIcon';
import { isAccessControlEnabled } from '../../../groups/util';
import { assertDev } from '../../../util/assert';
export type PropsType = {
readonly conversation?: ConversationType;
@ -291,7 +292,7 @@ function getConfirmationMessage({
}
const inviter = members.find(
({ id }) => id === firstPendingMembership.metadata.addedByUserId
({ uuid }) => uuid === firstPendingMembership.metadata.addedByUserId
);
if (inviter === undefined) {
@ -413,12 +414,15 @@ function MembersPendingProfileKey({
groupedPendingMemberships;
const otherPendingMemberships = Object.keys(otherPendingMembershipGroups)
.map(id => members.find(member => member.id === id))
.map(id => members.find(member => member.uuid === id))
.filter((member): member is ConversationType => member !== undefined)
.map(member => ({
member,
pendingMemberships: otherPendingMembershipGroups[member.id],
}));
.map(member => {
assertDev(member.uuid, 'We just verified that member has uuid above');
return {
member,
pendingMemberships: otherPendingMembershipGroups[member.uuid],
};
});
return (
<PanelSection>