From e222b9df6889c50039edd63551d15d2caa2334ac Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 12 Sep 2017 17:52:23 -0400
Subject: [PATCH] Normalize conversation presentation logic.

// FREEBIE
---
 Signal/src/AppDelegate.m | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 2e94ca9ee..66dd750b2 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -555,11 +555,12 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
                                                      handler:^(UIAlertAction *_Nonnull action){
 
                                                      }]];
-        [[Environment getCurrent].homeViewController.presentedViewController presentViewController:controller
-                                                                                          animated:YES
-                                                                                        completion:^{
-                                                                                            completionHandler(NO);
-                                                                                        }];
+        UIViewController *fromViewController = [[UIApplication sharedApplication] frontmostViewController];
+        [fromViewController presentViewController:controller
+                                         animated:YES
+                                       completion:^{
+                                           completionHandler(NO);
+                                       }];
     }
 }