Remove unused name on Avatar

ts/components/Avatar.stories.tsx

@@ -86,7 +86,6 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   i18n,
   isMe: false,
   loading: Boolean(overrideProps.loading),
-  name: overrideProps.name || '',
   noteToSelf: Boolean(overrideProps.noteToSelf),
   onClick: action('onClick'),
   onClickBadge: action('onClickBadge'),

ts/components/Avatar.tsx

@@ -56,7 +56,6 @@ export type Props = {
   acceptedMessageRequest: boolean;
   conversationType: 'group' | 'direct';
   isMe: boolean;
-  name?: string;
   noteToSelf?: boolean;
   phoneNumber?: string;
   profileName?: string;
@@ -302,7 +301,6 @@ export const Avatar: FunctionComponent<Props> = ({
       aria-label={i18n('contactAvatarAlt', [title])}
       className={classNames(
         'module-Avatar',
-        hasImage ? 'module-Avatar--with-image' : 'module-Avatar--no-image',
         Boolean(storyRing) && 'module-Avatar--with-story',
         storyRing === HasStories.Unread && 'module-Avatar--with-story--unread',
         className

ts/components/AvatarPopup.stories.tsx

@@ -43,7 +43,6 @@ const useProps = (overrideProps: Partial<Props> = {}): Props => ({
   hasPendingUpdate: Boolean(overrideProps.hasPendingUpdate),
   i18n,
   isMe: true,
-  name: text('name', overrideProps.name || ''),
   noteToSelf: boolean('noteToSelf', overrideProps.noteToSelf || false),
   onEditProfile: action('onEditProfile'),
   onViewArchive: action('onViewArchive'),

ts/components/AvatarPopup.tsx

@@ -25,6 +25,7 @@ export type Props = {
   // Matches Popper's RefHandler type
   innerRef?: React.Ref<HTMLDivElement>;
   style: React.CSSProperties;
+  name?: string;
 } & Omit<AvatarProps, 'onClick'>;
 
 export const AvatarPopup = (props: Props): JSX.Element => {

ts/components/CallNeedPermissionScreen.tsx

@@ -53,7 +53,6 @@ export const CallNeedPermissionScreen: React.FC<Props> = ({
         conversationType="direct"
         i18n={i18n}
         isMe={conversation.isMe}
-        name={conversation.name}
         phoneNumber={conversation.phoneNumber}
         profileName={conversation.profileName}
         title={conversation.title}

ts/components/CallScreen.tsx

@@ -352,7 +352,6 @@ export const CallScreen: React.FC<PropsType> = ({
               conversationType="direct"
               i18n={i18n}
               isMe
-              name={me.name}
               phoneNumber={me.phoneNumber}
               profileName={me.profileName}
               title={me.title}
@@ -390,7 +389,6 @@ export const CallScreen: React.FC<PropsType> = ({
           conversationType="direct"
           i18n={i18n}
           isMe
-          name={me.name}
           phoneNumber={me.phoneNumber}
           profileName={me.profileName}
           title={me.title}

ts/components/CallingPipRemoteVideo.tsx

@@ -39,7 +39,6 @@ const NoVideo = ({
     avatarPath,
     color,
     isMe,
-    name,
     phoneNumber,
     profileName,
     sharedGroupNames,
@@ -59,7 +58,6 @@ const NoVideo = ({
             conversationType="direct"
             i18n={i18n}
             isMe={isMe}
-            name={name}
             phoneNumber={phoneNumber}
             profileName={profileName}
             title={title}

ts/components/CallingPreCallInfo.tsx

@@ -23,7 +23,6 @@ type PropsType = {
     | 'avatarPath'
     | 'color'
     | 'isMe'
-    | 'name'
     | 'phoneNumber'
     | 'profileName'
     | 'sharedGroupNames'
@@ -169,7 +168,6 @@ export const CallingPreCallInfo: FunctionComponent<PropsType> = ({
         acceptedMessageRequest={conversation.acceptedMessageRequest}
         conversationType={conversation.type}
         isMe={conversation.isMe}
-        name={conversation.name}
         noteToSelf={false}
         phoneNumber={conversation.phoneNumber}
         profileName={conversation.profileName}

ts/components/ContactPill.tsx

@@ -21,7 +21,6 @@ export type PropsType = {
   | 'firstName'
   | 'id'
   | 'isMe'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -37,7 +36,6 @@ export const ContactPill: FunctionComponent<PropsType> = ({
   i18n,
   isMe,
   id,
-  name,
   phoneNumber,
   profileName,
   sharedGroupNames,
@@ -58,7 +56,6 @@ export const ContactPill: FunctionComponent<PropsType> = ({
         conversationType="direct"
         i18n={i18n}
         isMe={isMe}
-        name={name}
         phoneNumber={phoneNumber}
         profileName={profileName}
         title={title}

ts/components/ConversationList.stories.tsx

@@ -259,7 +259,7 @@ const createConversation = (
   id: overrideProps.id || '',
   isSelected: boolean('isSelected', overrideProps.isSelected || false),
   title: text('title', overrideProps.title || 'Some Person'),
-  name: overrideProps.name || 'Some Person',
+  profileName: overrideProps.profileName || 'Some Person',
   type: overrideProps.type || 'direct',
   markedUnread: boolean('markedUnread', overrideProps.markedUnread || false),
   lastMessage: overrideProps.lastMessage || {
@@ -313,7 +313,7 @@ export const ConversationWithYourself = (): JSX.Element =>
       status: 'read',
       deletedForEveryone: false,
     },
-    name: 'Myself',
+    profileName: 'Myself',
     title: 'Myself',
     isMe: true,
   });
@@ -451,7 +451,6 @@ export const ConversationLongName = (): JSX.Element => {
     'Long contact name. Esquire. The third. And stuff. And more! And more!';
 
   return renderConversation({
-    name,
     title: name,
   });
 };

ts/components/ConversationList.tsx

@@ -338,7 +338,6 @@ export const ConversationList: React.FC<PropsType> = ({
             'lastUpdated',
             'markedUnread',
             'muteExpiresAt',
-            'name',
             'phoneNumber',
             'profileName',
             'sharedGroupNames',

ts/components/DirectCallRemoteParticipant.tsx

@@ -47,7 +47,6 @@ function renderAvatar(
     avatarPath,
     color,
     isMe,
-    name,
     phoneNumber,
     profileName,
     sharedGroupNames,
@@ -58,7 +57,6 @@ function renderAvatar(
     | 'avatarPath'
     | 'color'
     | 'isMe'
-    | 'name'
     | 'phoneNumber'
     | 'profileName'
     | 'sharedGroupNames'
@@ -76,7 +74,6 @@ function renderAvatar(
         conversationType="direct"
         i18n={i18n}
         isMe={isMe}
-        name={name}
         phoneNumber={phoneNumber}
         profileName={profileName}
         title={title}

ts/components/IncomingCallBar.tsx

@@ -173,7 +173,6 @@ export const IncomingCallBar = (props: PropsType): JSX.Element | null => {
     avatarPath,
     color,
     isMe,
-    name,
     phoneNumber,
     profileName,
     sharedGroupNames,
@@ -257,7 +256,6 @@ export const IncomingCallBar = (props: PropsType): JSX.Element | null => {
               conversationType={conversationType}
               i18n={i18n}
               isMe={isMe}
-              name={name}
               phoneNumber={phoneNumber}
               profileName={profileName}
               title={title}

ts/components/Lightbox.tsx

@@ -691,7 +691,6 @@ function LightboxHeader({
           conversationType={conversation.type}
           i18n={i18n}
           isMe={conversation.isMe}
-          name={conversation.name}
           phoneNumber={conversation.e164}
           profileName={conversation.profileName}
           sharedGroupNames={conversation.sharedGroupNames}

ts/components/MainHeader.tsx

@@ -168,7 +168,6 @@ export class MainHeader extends React.Component<PropsType, StateType> {
                   conversationType="direct"
                   i18n={i18n}
                   isMe
-                  name={name}
                   phoneNumber={phoneNumber}
                   profileName={profileName}
                   theme={theme}

ts/components/MyStoriesButton.tsx

@@ -41,7 +41,6 @@ export const MyStoriesButton = ({
     avatarPath,
     color,
     isMe,
-    name,
     profileName,
     sharedGroupNames,
     title,
@@ -64,7 +63,6 @@ export const MyStoriesButton = ({
             conversationType="direct"
             i18n={i18n}
             isMe={Boolean(isMe)}
-            name={name}
             profileName={profileName}
             sharedGroupNames={sharedGroupNames}
             size={AvatarSize.FORTY_EIGHT}
@@ -106,7 +104,6 @@ export const MyStoriesButton = ({
             conversationType="direct"
             i18n={i18n}
             isMe={Boolean(isMe)}
-            name={name}
             profileName={profileName}
             sharedGroupNames={sharedGroupNames}
             size={AvatarSize.FORTY_EIGHT}

ts/components/SafetyNumberChangeDialog.tsx

@@ -112,7 +112,6 @@ export const SafetyNumberChangeDialog = ({
                 conversationType="direct"
                 i18n={i18n}
                 isMe={contact.isMe}
-                name={contact.name}
                 phoneNumber={contact.phoneNumber}
                 profileName={contact.profileName}
                 theme={theme}

ts/components/StoriesSettingsModal.tsx

@@ -823,7 +823,6 @@ export const EditDistributionList = ({
                 i18n={i18n}
                 id={contact.id}
                 isMe={contact.isMe}
-                name={contact.name}
                 phoneNumber={contact.phoneNumber}
                 profileName={contact.profileName}
                 sharedGroupNames={contact.sharedGroupNames}

ts/components/StoryDetailsModal.tsx

@@ -122,7 +122,6 @@ export const StoryDetailsModal = ({
                       conversationType="direct"
                       i18n={i18n}
                       isMe={contact.isMe}
-                      name={contact.profileName}
                       phoneNumber={contact.phoneNumber}
                       profileName={contact.profileName}
                       sharedGroupNames={contact.sharedGroupNames}
@@ -166,7 +165,6 @@ export const StoryDetailsModal = ({
               conversationType="direct"
               i18n={i18n}
               isMe={sender.isMe}
-              name={sender.profileName}
               profileName={sender.profileName}
               sharedGroupNames={sender.sharedGroupNames}
               size={AvatarSize.THIRTY_SIX}

ts/components/StoryListItem.tsx

@@ -37,7 +37,6 @@ function StoryListItemAvatar({
   getPreferredBadge,
   i18n,
   isMe,
-  name,
   profileName,
   sharedGroupNames,
   title,
@@ -46,7 +45,6 @@ function StoryListItemAvatar({
   | 'acceptedMessageRequest'
   | 'avatarPath'
   | 'color'
-  | 'name'
   | 'profileName'
   | 'sharedGroupNames'
   | 'title'
@@ -66,7 +64,6 @@ function StoryListItemAvatar({
       conversationType="direct"
       i18n={i18n}
       isMe={Boolean(isMe)}
-      name={name}
       profileName={profileName}
       sharedGroupNames={sharedGroupNames}
       size={AvatarSize.FORTY_EIGHT}

ts/components/StoryViewer.tsx

@@ -152,7 +152,6 @@ export const StoryViewer = ({
     color,
     isMe,
     firstName,
-    name,
     profileName,
     sharedGroupNames,
     title,
@@ -614,7 +613,6 @@ export const StoryViewer = ({
                   conversationType="direct"
                   i18n={i18n}
                   isMe={Boolean(isMe)}
-                  name={name}
                   profileName={profileName}
                   sharedGroupNames={sharedGroupNames}
                   size={AvatarSize.TWENTY_EIGHT}
@@ -630,7 +628,6 @@ export const StoryViewer = ({
                     conversationType="group"
                     i18n={i18n}
                     isMe={false}
-                    name={group.name}
                     profileName={group.profileName}
                     sharedGroupNames={group.sharedGroupNames}
                     size={AvatarSize.TWENTY_EIGHT}

ts/components/StoryViewsNRepliesModal.tsx

@@ -287,7 +287,6 @@ export const StoryViewsNRepliesModal = ({
                   conversationType="direct"
                   i18n={i18n}
                   isMe={Boolean(reply.author.isMe)}
-                  name={reply.author.name}
                   profileName={reply.author.profileName}
                   sharedGroupNames={reply.author.sharedGroupNames || []}
                   size={AvatarSize.TWENTY_EIGHT}
@@ -384,7 +383,6 @@ export const StoryViewsNRepliesModal = ({
                 conversationType="direct"
                 i18n={i18n}
                 isMe={Boolean(view.recipient.isMe)}
-                name={view.recipient.name}
                 profileName={view.recipient.profileName}
                 sharedGroupNames={view.recipient.sharedGroupNames || []}
                 size={AvatarSize.TWENTY_EIGHT}

ts/components/conversation/ContactModal.tsx

@@ -182,7 +182,6 @@ export const ContactModal = ({
               conversationType="direct"
               i18n={i18n}
               isMe={contact.isMe}
-              name={contact.name}
               onClick={() => {
                 if (conversation && hasStories) {
                   viewUserStories({

ts/components/conversation/ConversationHeader.tsx

@@ -209,7 +209,6 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
       i18n,
       type,
       isMe,
-      name,
       phoneNumber,
       profileName,
       sharedGroupNames,
@@ -229,7 +228,6 @@ export class ConversationHeader extends React.Component<PropsType, StateType> {
           conversationType={type}
           i18n={i18n}
           isMe={isMe}
-          name={name}
           noteToSelf={isMe}
           onClick={
             hasStories

ts/components/conversation/ConversationHero.stories.tsx

@@ -102,7 +102,6 @@ DirectNoGroupsJustProfile.story = {
 
 export const DirectNoGroupsJustPhoneNumber = Template.bind({});
 DirectNoGroupsJustPhoneNumber.args = {
-  name: '',
   phoneNumber: casual.phone,
   profileName: '',
   title: '',
@@ -114,7 +113,6 @@ DirectNoGroupsJustPhoneNumber.story = {
 export const DirectNoGroupsNoData = Template.bind({});
 DirectNoGroupsNoData.args = {
   avatarPath: undefined,
-  name: '',
   phoneNumber: '',
   profileName: '',
   title: '',
@@ -127,7 +125,6 @@ export const DirectNoGroupsNoDataNotAccepted = Template.bind({});
 DirectNoGroupsNoDataNotAccepted.args = {
   acceptedMessageRequest: false,
   avatarPath: undefined,
-  name: '',
   phoneNumber: '',
   profileName: '',
   title: '',
@@ -187,7 +184,6 @@ export const GroupNoName = Template.bind({});
 GroupNoName.args = {
   conversationType: 'group',
   membersCount: 0,
-  name: '',
   title: '',
 };
 GroupNoName.story = {

ts/components/conversation/ConversationHero.tsx

@@ -26,6 +26,7 @@ export type Props = {
   i18n: LocalizerType;
   isMe: boolean;
   membersCount?: number;
+  name?: string;
   phoneNumber?: string;
   sharedGroupNames?: Array<string>;
   unblurAvatar: () => void;
@@ -173,7 +174,6 @@ export const ConversationHero = ({
           conversationType={conversationType}
           i18n={i18n}
           isMe={isMe}
-          name={name}
           noteToSelf={isMe}
           onClick={avatarOnClick}
           profileName={profileName}

ts/components/conversation/Message.tsx

@@ -221,7 +221,6 @@ export type PropsData = {
     | 'color'
     | 'id'
     | 'isMe'
-    | 'name'
     | 'phoneNumber'
     | 'profileName'
     | 'sharedGroupNames'
@@ -1715,7 +1714,6 @@ export class Message extends React.PureComponent<Props, State> {
             conversationType="direct"
             i18n={i18n}
             isMe={author.isMe}
-            name={author.name}
             onClick={event => {
               event.stopPropagation();
               event.preventDefault();

ts/components/conversation/MessageDetail.tsx

@@ -34,7 +34,6 @@ export type Contact = Pick<
   | 'color'
   | 'id'
   | 'isMe'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -138,7 +137,6 @@ export class MessageDetail extends React.Component<Props> {
       badges,
       color,
       isMe,
-      name,
       phoneNumber,
       profileName,
       sharedGroupNames,
@@ -155,7 +153,6 @@ export class MessageDetail extends React.Component<Props> {
         conversationType="direct"
         i18n={i18n}
         isMe={isMe}
-        name={name}
         phoneNumber={phoneNumber}
         profileName={profileName}
         theme={theme}

ts/components/conversation/ReactionViewer.tsx

@@ -27,7 +27,6 @@ export type Reaction = {
     | 'color'
     | 'id'
     | 'isMe'
-    | 'name'
     | 'phoneNumber'
     | 'profileName'
     | 'sharedGroupNames'
@@ -234,7 +233,6 @@ export const ReactionViewer = React.forwardRef<HTMLDivElement, Props>(
                   size={32}
                   isMe={from.isMe}
                   color={from.color}
-                  name={from.name}
                   profileName={from.profileName}
                   phoneNumber={from.phoneNumber}
                   theme={theme}

ts/components/conversation/Timeline.stories.tsx

@@ -478,7 +478,6 @@ const renderContactSpoofingReviewDialog = (
 
 const getAbout = () => text('about', '👍 Free to chat');
 const getTitle = () => text('name', 'Cayce Bollard');
-const getName = () => text('name', 'Cayce Bollard');
 const getProfileName = () => text('profileName', 'Cayce Bollard (profile)');
 const getAvatarPath = () =>
   text('avatarPath', '/fixtures/kitten-4-112-112.jpg');
@@ -497,7 +496,6 @@ const renderHeroRow = () => {
         id={getDefaultConversation().id}
         i18n={i18n}
         isMe={false}
-        name={getName()}
         phoneNumber={getPhoneNumber()}
         profileName={getProfileName()}
         sharedGroupNames={['NYC Rock Climbers', 'Dinner Party']}

ts/components/conversation/TypingBubble.tsx

@@ -18,7 +18,6 @@ export type Props = Pick<
   | 'avatarPath'
   | 'color'
   | 'isMe'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -38,7 +37,6 @@ export function TypingBubble({
   conversationType,
   i18n,
   isMe,
-  name,
   phoneNumber,
   profileName,
   sharedGroupNames,
@@ -65,7 +63,6 @@ export function TypingBubble({
             conversationType="direct"
             i18n={i18n}
             isMe={isMe}
-            name={name}
             phoneNumber={phoneNumber}
             profileName={profileName}
             theme={theme}

ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx

@@ -311,7 +311,6 @@ export const ChooseGroupMembersModal: FunctionComponent<PropsType> = ({
                 i18n={i18n}
                 isMe={contact.isMe}
                 id={contact.id}
-                name={contact.name}
                 phoneNumber={contact.phoneNumber}
                 profileName={contact.profileName}
                 sharedGroupNames={contact.sharedGroupNames}

ts/components/conversationList/BaseConversationListItem.tsx

@@ -59,7 +59,6 @@ type PropsType = {
   | 'color'
   | 'isMe'
   | 'markedUnread'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -93,7 +92,6 @@ export const BaseConversationListItem: FunctionComponent<PropsType> =
       messageStatusIcon,
       messageText,
       messageTextIsAlwaysFullSize,
-      name,
       onClick,
       phoneNumber,
       profileName,
@@ -165,7 +163,6 @@ export const BaseConversationListItem: FunctionComponent<PropsType> =
             searchResult={isUsernameSearchResult}
             i18n={i18n}
             isMe={isMe}
-            name={name}
             phoneNumber={phoneNumber}
             profileName={profileName}
             title={title}

ts/components/conversationList/ContactCheckbox.tsx

@@ -32,7 +32,6 @@ export type PropsDataType = {
   | 'color'
   | 'id'
   | 'isMe'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -64,7 +63,6 @@ export const ContactCheckbox: FunctionComponent<PropsType> = React.memo(
     id,
     isChecked,
     isMe,
-    name,
     onClick,
     phoneNumber,
     profileName,
@@ -112,7 +110,6 @@ export const ContactCheckbox: FunctionComponent<PropsType> = React.memo(
         isMe={isMe}
         isSelected={false}
         messageText={messageText}
-        name={name}
         onClick={onClickItem}
         phoneNumber={phoneNumber}
         profileName={profileName}

ts/components/conversationList/ContactListItem.tsx

@@ -23,7 +23,6 @@ export type ContactListItemConversationType = Pick<
   | 'color'
   | 'id'
   | 'isMe'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -56,7 +55,6 @@ export const ContactListItem: FunctionComponent<PropsType> = React.memo(
     i18n,
     id,
     isMe,
-    name,
     onClick,
     phoneNumber,
     profileName,
@@ -90,7 +88,6 @@ export const ContactListItem: FunctionComponent<PropsType> = React.memo(
         isMe={isMe}
         isSelected={false}
         messageText={messageText}
-        name={name}
         onClick={onClick ? () => onClick(id) : undefined}
         phoneNumber={phoneNumber}
         profileName={profileName}

ts/components/conversationList/ConversationListItem.tsx

@@ -49,7 +49,6 @@ export type PropsData = Pick<
   | 'lastUpdated'
   | 'markedUnread'
   | 'muteExpiresAt'
-  | 'name'
   | 'phoneNumber'
   | 'profileName'
   | 'sharedGroupNames'
@@ -86,7 +85,6 @@ export const ConversationListItem: FunctionComponent<Props> = React.memo(
     lastUpdated,
     markedUnread,
     muteExpiresAt,
-    name,
     onClick,
     phoneNumber,
     profileName,
@@ -185,7 +183,6 @@ export const ConversationListItem: FunctionComponent<Props> = React.memo(
         messageStatusIcon={messageStatusIcon}
         messageText={messageText}
         messageTextIsAlwaysFullSize
-        name={name}
         onClick={onClickItem}
         phoneNumber={phoneNumber}
         profileName={profileName}

ts/components/conversationList/MessageSearchResult.tsx

@@ -40,7 +40,6 @@ export type PropsDataType = {
     | 'badges'
     | 'color'
     | 'isMe'
-    | 'name'
     | 'phoneNumber'
     | 'profileName'
     | 'sharedGroupNames'
@@ -53,7 +52,6 @@ export type PropsDataType = {
     phoneNumber?: string;
     title: string;
     isMe?: boolean;
-    name?: string;
     profileName?: string;
   };
 };
@@ -200,7 +198,6 @@ export const MessageSearchResult: FunctionComponent<PropsType> = React.memo(
         isMe={from.isMe}
         isSelected={false}
         messageText={messageText}
-        name={from.name}
         onClick={onClickItem}
         phoneNumber={from.phoneNumber}
         profileName={from.profileName}

ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx

@@ -223,7 +223,6 @@ export class LeftPaneChooseGroupMembersHelper extends LeftPaneHelper<LeftPaneCho
                 i18n={i18n}
                 id={contact.id}
                 isMe={contact.isMe}
-                name={contact.name}
                 phoneNumber={contact.phoneNumber}
                 profileName={contact.profileName}
                 sharedGroupNames={contact.sharedGroupNames}