From 90fc848f6d6ecc51126266777acbb01fdc9ffc5d Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 10 Nov 2021 16:38:21 -0800
Subject: [PATCH] Fix broken Pending Invites screen

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 .../conversation/conversation-details/PendingInvites.tsx       | 2 +-
 ts/state/smart/PendingInvites.tsx                              | 3 ++-
 ts/views/conversation_view.ts                                  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ts/components/conversation/conversation-details/PendingInvites.tsx b/ts/components/conversation/conversation-details/PendingInvites.tsx
index 6ca802431..215c903ad 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<GroupV2RequestingMembership>;
   readonly pendingMemberships: ReadonlyArray<GroupV2PendingMembership>;
   readonly approvePendingMembership: (conversationId: string) => void;
diff --git a/ts/state/smart/PendingInvites.tsx b/ts/state/smart/PendingInvites.tsx
index bd4dc8892..45291fb45 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<string>) => void;
 };
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 1fe0e6423..9c4727ed7 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -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);
         },