Merge branch 'charlesmchen/newNonContactConversationVsBlocking'

Signal/src/ViewControllers/NewNonContactConversationViewController.m

@@ -50,42 +50,14 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert(phoneNumber.length > 0);
 
-    __weak NewNonContactConversationViewController *weakSelf = self;
+    [self selectRecipient:phoneNumber];
-    ContactsViewHelper *helper = self.contactsViewHelper;
-    if ([helper isRecipientIdBlocked:phoneNumber]) {
-        [BlockListUIUtils showUnblockPhoneNumberActionSheet:phoneNumber
-                                         fromViewController:self
-                                            blockingManager:helper.blockingManager
-                                            contactsManager:helper.contactsManager
-                                            completionBlock:^(BOOL isBlocked) {
-                                                if (!isBlocked) {
-                                                    [weakSelf selectRecipient:phoneNumber];
-                                                }
-                                            }];
-    } else {
-        [self selectRecipient:phoneNumber];
-    }
 }
 
 - (void)signalAccountWasSelected:(SignalAccount *)signalAccount
 {
     OWSAssert(signalAccount);
 
-    __weak NewNonContactConversationViewController *weakSelf = self;
+    [self selectRecipient:signalAccount.recipientId];
-    ContactsViewHelper *helper = self.contactsViewHelper;
-    if ([helper isRecipientIdBlocked:signalAccount.recipientId]) {
-        [BlockListUIUtils showUnblockSignalAccountActionSheet:signalAccount
-                                           fromViewController:self
-                                              blockingManager:helper.blockingManager
-                                              contactsManager:helper.contactsManager
-                                              completionBlock:^(BOOL isBlocked) {
-                                                  if (!isBlocked) {
-                                                      [weakSelf selectRecipient:signalAccount.recipientId];
-                                                  }
-                                              }];
-    } else {
-        [self selectRecipient:signalAccount.recipientId];
-    }
 }
 
 - (void)selectRecipient:(NSString *)recipientId