jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken Pending Invites screen 

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2021-11-10 16:38:21 -08:00 committed by GitHub
parent a76059eac5
commit 90fc848f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats 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 = {
readonly conversation?: ConversationType;
readonly i18n: LocalizerType;
readonly ourUuid?: UUIDStringType;
readonly ourUuid: UUIDStringType;
readonly pendingApprovalMemberships: ReadonlyArray<GroupV2RequestingMembership>;
readonly pendingMemberships: ReadonlyArray<GroupV2PendingMembership>;
readonly approvePendingMembership: (conversationId: string) => void;

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

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

2
ts/views/conversation_view.ts
View File

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