Clean up blocklist views.

// FREEBIE

Signal/src/ViewControllers/AddToBlockListViewController.m

@@ -143,7 +143,9 @@ NSString * const kAddToBlockListViewControllerCellIdentifier = @"kAddToBlockList
     // Block Button Row
     UIView *blockButtonRow = [self createRowWithHeight:60 previousRow:borderRow2];
 
-    // TODO: Eventually
+    // TODO: Eventually we should make a view factory that will allow us to
+    //       create views with consistent appearance across the app and move
+    //       towards a "design language."
     _blockButton = [UIButton buttonWithType:UIButtonTypeCustom];
     _blockButton.titleLabel.font = [UIFont ows_mediumFontWithSize:16.f];
     [_blockButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];

Signal/src/ViewControllers/BlockListViewController.m

@@ -67,11 +67,6 @@ typedef NS_ENUM(NSInteger, BlockListViewControllerSection) {
 {
     [super viewDidLoad];
     [self.navigationController.navigationBar setTranslucent:NO];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        AddToBlockListViewController *vc = [[AddToBlockListViewController alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
-    });
 }
 
 #pragma mark - Table view data source

Signal/src/ViewControllers/CountryCodeViewController.m

@@ -24,6 +24,11 @@ static NSString *const kUnwindToCountryCodeWasSelectedSegue = @"UnwindToCountryC
     _countryCodes = [PhoneNumberUtil countryCodesForSearchTerm:nil];
     self.title    = NSLocalizedString(@"COUNTRYCODE_SELECT_TITLE", @"");
     self.searchBar.delegate = self;
+    if (self.shouldDismissWithoutSegue) {
+        self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop
+                                                                                              target:self
+                                                                                                       action:@selector(dismissWasPressed:)];
+    }
 }
 
 #pragma mark - UITableViewDelegate
@@ -68,6 +73,10 @@ static NSString *const kUnwindToCountryCodeWasSelectedSegue = @"UnwindToCountryC
     }
 }
 
+- (void)dismissWasPressed:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 44.0f;
 }

Signal/src/ViewControllers/SettingsTableViewController.m

@@ -111,11 +111,6 @@ typedef enum {
 
     [self.destroyAccountButton setTitle:NSLocalizedString(@"SETTINGS_DELETE_ACCOUNT_BUTTON", @"")
                                forState:UIControlStateNormal];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        BlockListViewController *vc = [[BlockListViewController alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
-    });
 }
 
 - (void)viewWillAppear:(BOOL)animated

Signal/src/ViewControllers/SignalsViewController.m

@@ -137,10 +137,6 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
                                                object:nil];
     
     [self updateBarButtonItems];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self settingsButtonPressed:nil];
-    });
 }
 
 - (void)updateBarButtonItems {