diff --git a/ts/components/conversation/conversation-details/PendingInvites.tsx b/ts/components/conversation/conversation-details/PendingInvites.tsx index 6ca802431c4..215c903ad16 100644 --- a/ts/components/conversation/conversation-details/PendingInvites.tsx +++ b/ts/components/conversation/conversation-details/PendingInvites.tsx @@ -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; readonly pendingMemberships: ReadonlyArray; readonly approvePendingMembership: (conversationId: string) => void; diff --git a/ts/state/smart/PendingInvites.tsx b/ts/state/smart/PendingInvites.tsx index bd4dc8892ec..45291fb4516 100644 --- a/ts/state/smart/PendingInvites.tsx +++ b/ts/state/smart/PendingInvites.tsx @@ -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) => void; }; diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts index 66b66f4fa9f..22f2e87ec81 100644 --- a/ts/views/conversation_view.ts +++ b/ts/views/conversation_view.ts @@ -2466,7 +2466,7 @@ export class ConversationView extends window.Backbone.View { 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); },