Tweak sender names.

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -683,9 +683,9 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(self.senderNameLabel);
     OWSAssert(self.shouldShowSenderName);
 
-    self.senderNameLabel.text = self.viewItem.senderName.uppercaseString;
-    self.senderNameLabel.textColor = self.bodyTextColor;
+    self.senderNameLabel.text = self.viewItem.senderName;
     self.senderNameLabel.font = UIFont.ows_dynamicTypeCaption2Font;
+    self.senderNameLabel.textColor = self.bodyTextColor;
     self.senderNameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
 }
 

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -4910,7 +4910,7 @@ typedef enum : NSUInteger {
                             || viewItem.shouldShowDate);
                 }
                 if (shouldShowSenderName) {
-                    senderName = [self.contactsManager displayNameForPhoneIdentifier:incomingSenderId];
+                    senderName = [self.contactsManager contactOrProfileNameForPhoneIdentifier:incomingSenderId];
                 }
 
                 // Show the sender avatar for incoming group messages unless

SignalMessaging/contacts/OWSContactsManager.h

@@ -86,7 +86,7 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
 - (nullable NSData *)profileImageDataForPhoneIdentifier:(nullable NSString *)identifier;
 
 - (nullable UIImage *)imageForPhoneIdentifier:(nullable NSString *)identifier;
-- (NSAttributedString *)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *_Nonnull)font;
+- (NSAttributedString *)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *)font;
 - (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font;
 - (NSString *)contactOrProfileNameForPhoneIdentifier:(NSString *)recipientId;
 - (NSAttributedString *)attributedContactOrProfileNameForPhoneIdentifier:(NSString *)recipientId;

SignalMessaging/contacts/OWSContactsManager.m

@@ -617,8 +617,7 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
     return [self displayNameForPhoneIdentifier:signalAccount.recipientId];
 }
 
-- (NSAttributedString *_Nonnull)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount
-                                                                font:(UIFont *_Nonnull)font
+- (NSAttributedString *_Nonnull)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *)font
 {
     OWSAssert(signalAccount);
     OWSAssert(font);