From 37b8b368a6a170a9cd92a41fb2c1c446017eb2ca Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 10 May 2018 12:24:39 -0400
Subject: [PATCH 1/2] Show "share contact" flow in single presented navigation
 controller.

---
 .../ConversationView/ConversationViewController.m         | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 8f05412e5..dabbb0743 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4995,8 +4995,6 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
 
     DDLogDebug(@"%@ in %s with contact: %@", self.logTag, __PRETTY_FUNCTION__, contact);
 
-    [self dismissViewControllerAnimated:YES completion:nil];
-
     OWSContact *_Nullable contactShareRecord = [OWSContacts contactForSystemContact:contact.cnContact];
     if (!contactShareRecord) {
         DDLogError(@"%@ Could not convert system contact.", self.logTag);
@@ -5024,11 +5022,7 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
         [[ApproveContactShareViewController alloc] initWithContactShare:contactShare
                                                         contactsManager:self.contactsManager
                                                                delegate:self];
-
-    UINavigationController *navigationController =
-        [[UINavigationController alloc] initWithRootViewController:approveContactShare];
-    [self dismissKeyBoard];
-    [self presentViewController:navigationController animated:YES completion:nil];
+    [contactsPicker.navigationController pushViewController:approveContactShare animated:YES];
 }
 
 - (void)contactsPicker:(ContactsPicker *)contactsPicker didSelectMultipleContacts:(NSArray<Contact *> *)contacts

From acdc51ba3dda029b67a4e4c6437c116abbd5d91e Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 10 May 2018 13:17:34 -0400
Subject: [PATCH 2/2] Respond to CR.

---
 .../ConversationView/ConversationViewController.m                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index dabbb0743..a3cb40789 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -5022,6 +5022,7 @@ interactionControllerForAnimationController:(id<UIViewControllerAnimatedTransiti
         [[ApproveContactShareViewController alloc] initWithContactShare:contactShare
                                                         contactsManager:self.contactsManager
                                                                delegate:self];
+    OWSAssert(contactsPicker.navigationController);
     [contactsPicker.navigationController pushViewController:approveContactShare animated:YES];
 }