From 5361cd3f25f151e1e057ab323374d882c8935f3b Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 25 May 2018 17:11:08 -0400
Subject: [PATCH] Fix dismissal issue in invite flow.

---
 Signal/src/ViewControllers/InviteFlow.swift | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/InviteFlow.swift b/Signal/src/ViewControllers/InviteFlow.swift
index e184adf76..b88edbce1 100644
--- a/Signal/src/ViewControllers/InviteFlow.swift
+++ b/Signal/src/ViewControllers/InviteFlow.swift
@@ -101,7 +101,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
         switch inviteChannel {
         case .message:
             let phoneNumbers: [String] = contacts.map { $0.userTextPhoneNumbers.first }.filter { $0 != nil }.map { $0! }
-            sendSMSTo(phoneNumbers: phoneNumbers)
+            dismissAndSendSMSTo(phoneNumbers: phoneNumbers)
         case .mail:
             let recipients: [String] = contacts.map { $0.emails.first }.filter { $0 != nil }.map { $0! }
             sendMailTo(emails: recipients)
@@ -164,6 +164,12 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
         }
     }
 
+    public func dismissAndSendSMSTo(phoneNumbers: [String]) {
+        self.presentingViewController.dismiss(animated: true) {
+            self.sendSMSTo(phoneNumbers: phoneNumbers)
+        }
+    }
+
     public func sendSMSTo(phoneNumbers: [String]) {
         if #available(iOS 10.0, *) {
             // iOS10 message compose view doesn't respect some system appearence attributes.
@@ -179,9 +185,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
 
         let inviteText = NSLocalizedString("SMS_INVITE_BODY", comment: "body sent to contacts when inviting to Install Signal")
         messageComposeViewController.body = inviteText.appending(" \(self.installUrl)")
-        self.presentingViewController.dismiss(animated: true) {
-            self.presentingViewController.present(messageComposeViewController, animated: true)
-        }
+        self.presentingViewController.present(messageComposeViewController, animated: true)
     }
 
     // MARK: MessageComposeViewControllerDelegate