fix merge issue

_locales/en/messages.json

@@ -1398,17 +1398,10 @@
       }
     }
   },
-<<<<<<< HEAD
-  "audioNotificationDescription": {
-    "message": "Play audio notification",
-    "description": "Description for audio notification setting"
-  },
   "safetyNumber": {
     "message": "Safety Number",
     "description": "Title to the safety number view"
   },
-=======
->>>>>>> upstream/clearnet
   "safetyNumberChanged": {
     "message": "Safety Number has changed",
     "description": "A notification shown in the conversation when a contact reinstalls"

ts/components/conversation/ContactName.tsx

@@ -28,7 +28,7 @@ export class ContactName extends React.Component<Props> {
     const prefix = module ? module : 'module-contact-name';
 
     const title = name ? name : phoneNumber;
-    const shouldShowProfile = Boolean(profileName && !profileName);
+    const shouldShowProfile = Boolean(profileName && !name);
 
     const styles = (boldProfileName
       ? {

ts/components/conversation/ConversationHeader.tsx

@@ -35,7 +35,6 @@ interface Props {
   isClosable?: boolean;
   isGroup: boolean;
   isPrivate: boolean;
-  isArchived: boolean;
   isPublic: boolean;
   isRss: boolean;
   amMod: boolean;

ts/components/session/conversation/SessionConversation.tsx

@@ -495,6 +495,7 @@ export class SessionConversation extends React.Component<any, State> {
       isClosable: conversation.isClosable(),
       isBlocked: conversation.isBlocked(),
       isGroup: !conversation.isPrivate(),
+      isPrivate: conversation.isPrivate(),
       isOnline: conversation.isOnline(),
       isPublic: conversation.isPublic(),
       isRss: conversation.isRss(),