Clean up ahead of PR.

// FREEBIE

Signal/src/ViewControllers/ContactAccount.h

@@ -16,13 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 // An E164 value identifying the signal account.
 @property (nonatomic) NSString *recipientId;
 
-//// TODO:
-//@property (nonatomic) NSString *displayName;
-//
-//// TODO:
-//@property (nonatomic) NSAttributedString *attributedDisplayName;
-
-// TODO: This might be redundant.
 @property (nonatomic) BOOL isMultipleAccountContact;
 
 // For contacts with more than one signal account,

Signal/src/ViewControllers/ContactsViewHelper.m

@@ -107,9 +107,6 @@ NS_ASSUME_NONNULL_BEGIN
         if (contact.textSecureIdentifiers.count == 1) {
             ContactAccount *contactAccount = [ContactAccount new];
             contactAccount.contact = contact;
-            //            contactAccount.displayName = contact.fullName;
-            //            contactAccount.attributedDisplayName = [self.contactsManager
-            //            formattedFullNameForContact:contact];
             NSString *recipientId = contact.textSecureIdentifiers[0];
             contactAccount.recipientId = recipientId;
             [allRecipientContactAccounts addObject:contactAccount];
@@ -121,7 +118,7 @@ NS_ASSUME_NONNULL_BEGIN
                 contactAccount.contact = contact;
                 contactAccount.recipientId = recipientId;
                 contactAccount.isMultipleAccountContact = YES;
-                // TODO:
+                // TODO: Store the phone number's "label" if possible.
                 contactAccount.multipleAccountLabel = recipientId;
                 [allRecipientContactAccounts addObject:contactAccount];
                 contactAccountMap[recipientId] = contactAccount;
@@ -240,7 +237,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSArray<ContactAccount *> *)contactAccountsMatchingSearchString:(NSString *)searchText
 {
-
     NSArray<NSString *> *searchTerms =
         [[searchText stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]
             componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];

Signal/src/ViewControllers/GroupViewHelper.m

@@ -191,7 +191,7 @@ NS_ASSUME_NONNULL_BEGIN
     UIImage *rawAvatar = [info objectForKey:UIImagePickerControllerOriginalImage];
 
     if (rawAvatar) {
-        // TODO: This is busted.
+        // TODO: There may be a bug here.
         UIImage *resizedAvatar = [rawAvatar resizedImageToFitInSize:CGSizeMake(100.00, 100.00) scaleIfSmaller:NO];
         [self.delegate groupAvatarDidChange:resizedAvatar];
     }

Signal/src/ViewControllers/SelectRecipientViewController.m

@@ -248,9 +248,11 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
         return;
     }
 
+    NSString *rawPhoneNumber = [self.callingCode stringByAppendingString:self.phoneNumberTextField.text.digitsOnly];
+
     NSMutableArray<NSString *> *possiblePhoneNumbers = [NSMutableArray new];
     for (PhoneNumber *phoneNumber in
-        [PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:self.phoneNumberTextField.text.digitsOnly
+        [PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:rawPhoneNumber
                                               clientPhoneNumber:[TSStorageManager localNumber]]) {
         [possiblePhoneNumbers addObject:phoneNumber.toE164];
     }
@@ -258,6 +260,9 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
         OWSAssert(0);
         return;
     }
+    // There should only be one phone number, since we're explicitly specifying
+    // a country code and therefore parsing a number in e164 format.
+    OWSAssert([possiblePhoneNumbers count] == 1);
 
     if ([self.delegate shouldValidatePhoneNumbers]) {
         // Show an alert while validating the recipient.
@@ -305,7 +310,6 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
                                                   }];
             }];
     } else {
-        // Use just the first phone number.
         NSString *recipientId = possiblePhoneNumbers[0];
         [self.delegate phoneNumberWasSelected:recipientId];
     }