From 88f719ed6ee834b27cd52eae1e4d9a752b295148 Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Mon, 28 Feb 2022 16:19:48 +1100
Subject: [PATCH] Fix case where error occurs after leaving a group.

---
 ts/components/conversation/ConversationRequestButtons.tsx | 5 ++---
 ts/components/conversation/ConversationRequestInfo.tsx    | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ts/components/conversation/ConversationRequestButtons.tsx b/ts/components/conversation/ConversationRequestButtons.tsx
index 5bfee92b0..606afefb0 100644
--- a/ts/components/conversation/ConversationRequestButtons.tsx
+++ b/ts/components/conversation/ConversationRequestButtons.tsx
@@ -40,9 +40,8 @@ export const ConversationMessageRequestButtons = () => {
     return null;
   }
 
-  const showMsgRequestUI = getConversationController()
-    .get(selectedConversation.id)
-    .isRequest();
+  const convoModel = getConversationController().get(selectedConversation.id);
+  const showMsgRequestUI = convoModel && convoModel.isRequest();
 
   const handleDeclineConversationRequest = () => {
     declineConversationWithConfirm(selectedConversation.id, true);
diff --git a/ts/components/conversation/ConversationRequestInfo.tsx b/ts/components/conversation/ConversationRequestInfo.tsx
index a7e5dfcf1..27464dd55 100644
--- a/ts/components/conversation/ConversationRequestInfo.tsx
+++ b/ts/components/conversation/ConversationRequestInfo.tsx
@@ -8,11 +8,9 @@ import { getSelectedConversation } from '../../state/selectors/conversations';
 
 export const ConversationRequestinfo = () => {
   const selectedConversation = useSelector(getSelectedConversation);
-  const showMsgRequestUI =
-    selectedConversation &&
-    getConversationController()
-      .get(selectedConversation.id)
-      .isRequest();
+  const convoModel =
+    selectedConversation && getConversationController().get(selectedConversation.id);
+  const showMsgRequestUI = selectedConversation && convoModel && convoModel.isRequest();
   const [hasIncomingMessages, setHasIncomingMessages] = useState(false);
   const [incomingChecked, setIncomingChecked] = useState(false);