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

Fix broken Pending Invites screen

Browse source
This commit is contained in:
Scott Nonnenberg 2021-11-10 15:01:06 -08:00 • committed by GitHub
parent d2592de366
commit 6445a01f2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ import { ConversationDetailsIcon, IconType } from './ConversationDetailsIcon';
export type PropsType = { export type PropsType = {
readonly conversation?: ConversationType; readonly conversation?: ConversationType;
readonly i18n: LocalizerType; readonly i18n: LocalizerType;
readonly ourUuid?: UUIDStringType; readonly ourUuid: UUIDStringType;
readonly pendingApprovalMemberships: ReadonlyArray<GroupV2RequestingMembership>; readonly pendingApprovalMemberships: ReadonlyArray<GroupV2RequestingMembership>;
readonly pendingMemberships: ReadonlyArray<GroupV2PendingMembership>; readonly pendingMemberships: ReadonlyArray<GroupV2PendingMembership>;
readonly approvePendingMembership: (conversationId: string) => void; readonly approvePendingMembership: (conversationId: string) => void;

3
ts/state/smart/PendingInvites.tsx
View file

@ -14,10 +14,11 @@ import {
} from '../selectors/conversations'; } from '../selectors/conversations';
import { getGroupMemberships } from '../../util/getGroupMemberships'; import { getGroupMemberships } from '../../util/getGroupMemberships';
import { assert } from '../../util/assert'; import { assert } from '../../util/assert';
import type { UUIDStringType } from '../../types/UUID';
export type SmartPendingInvitesProps = { export type SmartPendingInvitesProps = {
conversationId: string; conversationId: string;
ourConversationId?: string; ourUuid: UUIDStringType;
readonly approvePendingMembership: (conversationid: string) => void; readonly approvePendingMembership: (conversationid: string) => void;
readonly revokePendingMemberships: (membershipIds: Array<string>) => void; readonly revokePendingMemberships: (membershipIds: Array<string>) => void;
}; };

2
ts/views/conversation_view.ts
View file

@ -2466,7 +2466,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
className: 'panel', className: 'panel',
JSX: window.Signal.State.Roots.createPendingInvites(window.reduxStore, { JSX: window.Signal.State.Roots.createPendingInvites(window.reduxStore, {
conversationId: this.model.id, conversationId: this.model.id,
ourConversationId: window.ConversationController.getOurConversationId(), ourUuid: window.textsecure.storage.user.getCheckedUuid().toString(),
approvePendingMembership: (conversationId: string) => { approvePendingMembership: (conversationId: string) => {
this.model.approvePendingMembershipFromGroupV2(conversationId); this.model.approvePendingMembershipFromGroupV2(conversationId);
}, },