Merge branch 'dev' into disappearing-message-redesign

Session/Conversations/ConversationVC+Interaction.swift

@@ -1566,6 +1566,7 @@ extension ConversationVC:
             }
         }
         
+        Modal.setupForIPadIfNeeded(sheet, targetView: self.view)
         present(sheet, animated: true, completion: nil)
     }
     
@@ -2416,6 +2417,7 @@ extension ConversationVC {
         })
         alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
         
+        Modal.setupForIPadIfNeeded(alertVC, targetView: self.view)
         self.present(alertVC, animated: true, completion: nil)
     }
     
@@ -2463,6 +2465,7 @@ extension ConversationVC {
         })
         alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
         
+        Modal.setupForIPadIfNeeded(alertVC, targetView: self.view)
         self.present(alertVC, animated: true, completion: nil)
     }
 }

Session/Home/Message Requests/MessageRequestsViewController.swift

@@ -449,6 +449,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
             }
         })
         alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
+        
+        Modal.setupForIPadIfNeeded(alertVC, targetView: self.view)
         self.present(alertVC, animated: true, completion: nil)
     }
 
@@ -470,6 +472,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
         })
         
         alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
+        
+        Modal.setupForIPadIfNeeded(alertVC, targetView: self.view)
         self.present(alertVC, animated: true, completion: nil)
     }
     
@@ -501,6 +505,8 @@ class MessageRequestsViewController: BaseVC, UITableViewDelegate, UITableViewDat
         })
         
         alertVC.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
+        
+        Modal.setupForIPadIfNeeded(alertVC, targetView: self.view)
         self.present(alertVC, animated: true, completion: nil)
     }
 }