From 39d4e123b1c781eb3ffbe1cd2bc4a6c1534022a1 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 3 Sep 2020 18:25:49 -0300
Subject: [PATCH] Fix edge case around dismissing message request view.

---
 .../ConversationView/ConversationViewController.m         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index b0ba02e0fa..ce6e3782aa 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -186,7 +186,7 @@ typedef enum : NSUInteger {
 @property (nonatomic, readonly) ConversationSearchController *searchController;
 @property (nonatomic, nullable) NSString *lastSearchedText;
 
-@property (nonatomic, nullable) MessageRequestView *messageRequestView;
+@property (nonatomic, nullable) UIView *messageRequestView;
 
 @property (nonatomic) UITapGestureRecognizer *tapGestureRecognizer;
 
@@ -5347,8 +5347,10 @@ typedef enum : NSUInteger {
         return;
     }
 
-    self.messageRequestView = [[MessageRequestView alloc] initWithThreadViewModel:self.threadViewModel];
-    self.messageRequestView.delegate = self;
+    [self.messageRequestView removeFromSuperview];
+    MessageRequestView *messageRequestView = [[MessageRequestView alloc] initWithThreadViewModel:self.threadViewModel];
+    messageRequestView.delegate = self;
+    self.messageRequestView = messageRequestView;
     [self reloadBottomBar];
 }