Respond to CR.

// FREEBIE

Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m

@@ -13,6 +13,7 @@
 #import "OWSContactsManager.h"
 #import "PhoneNumber.h"
 #import "ShowGroupMembersViewController.h"
+#import "Signal-Swift.h"
 #import "UIFont+OWS.h"
 #import "UIUtil.h"
 #import "UIView+OWS.h"
@@ -191,8 +192,7 @@ NS_ASSUME_NONNULL_BEGIN
                             if (!strongSelf) {
                                 return;
                             }
-                            FingerprintViewController *fingerprintViewController =
+                            FingerprintViewController *fingerprintViewController = [[UIStoryboard main]
-                                [[UIStoryboard storyboardWithName:@"Main" bundle:NULL]
                                 instantiateViewControllerWithIdentifier:@"FingerprintViewController"];
 
                             OWSFingerprintBuilder *fingerprintBuilder =
@@ -332,8 +332,7 @@ NS_ASSUME_NONNULL_BEGIN
                         return;
                     }
                     NewGroupViewController *newGroupViewController =
-                        [[UIStoryboard storyboardWithName:@"Main" bundle:NULL]
+                        [[UIStoryboard main] instantiateViewControllerWithIdentifier:@"NewGroupViewController"];
-                            instantiateViewControllerWithIdentifier:@"NewGroupViewController"];
                     [newGroupViewController configWithThread:(TSGroupThread *)strongSelf.thread];
                     [strongSelf.navigationController pushViewController:newGroupViewController animated:YES];
                 }],
@@ -366,8 +365,7 @@ NS_ASSUME_NONNULL_BEGIN
                         return;
                     }
                     ShowGroupMembersViewController *showGroupMembersViewController =
-                        [[UIStoryboard storyboardWithName:@"Main" bundle:NULL]
+                        [[UIStoryboard main] instantiateViewControllerWithIdentifier:@"ShowGroupMembersViewController"];
-                            instantiateViewControllerWithIdentifier:@"ShowGroupMembersViewController"];
                     [showGroupMembersViewController configWithThread:(TSGroupThread *)strongSelf.thread];
                     [strongSelf.navigationController pushViewController:showGroupMembersViewController animated:YES];
                 }],
@@ -561,8 +559,8 @@ NS_ASSUME_NONNULL_BEGIN
 {
     if (sender.state == UIGestureRecognizerStateBegan || sender.state == UIGestureRecognizerStateRecognized) {
         if (self.isGroupThread) {
-            NewGroupViewController *newGroupViewController = [[UIStoryboard storyboardWithName:@"Main" bundle:NULL]
+            NewGroupViewController *newGroupViewController =
-                instantiateViewControllerWithIdentifier:@"NewGroupViewController"];
+                [[UIStoryboard main] instantiateViewControllerWithIdentifier:@"NewGroupViewController"];
             [newGroupViewController configWithThread:(TSGroupThread *)self.thread];
 
             CGPoint location = [sender locationInView:self.avatarView];