Merge branch 'charlesmchen/reformatPhoneNumberVsCountryCodeChange'

Signal/src/ViewControllers/AddToBlockListViewController.m

@@ -436,6 +436,8 @@ NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseI
     [self updateCountryWithName:countryName
                     callingCode:callingCode
                     countryCode:countryCode];
+
+    [self textField:_phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""];
 }
 
 #pragma mark - UITextFieldDelegate

Signal/src/ViewControllers/RegistrationViewController.m

@@ -223,13 +223,7 @@ static NSString *const kCodeSentSegue = @"codeSent";
                     countryCode:vc.countryCodeSelected];
 
     // Reformat phone number
-    NSString *digits = _phoneNumberTextField.text.digitsOnly;
+    [self textField:_phoneNumberTextField shouldChangeCharactersInRange:NSMakeRange(0, 0) replacementString:@""];
-    NSString *reformattedNumber =
-        [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:digits
-                                                     withSpecifiedCountryCodeString:_countryCodeButton.titleLabel.text];
-    _phoneNumberTextField.text = reformattedNumber;
-    UITextPosition *pos        = _phoneNumberTextField.endOfDocument;
-    [_phoneNumberTextField setSelectedTextRange:[_phoneNumberTextField textRangeFromPosition:pos toPosition:pos]];
 }
 
 #pragma mark iPhone 5s or shorter