keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

rename authorPhoneNumber to what ever makes more sense

Browse Source
pull/2131/head
Audric Ackermann 3 years ago
parent 46d838218d
commit 1c46d81a20
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
13 changed files with 69 additions and 80 deletions
Show Stats Download Patch File Download Diff File

4
ts/components/conversation/H5AudioPlayer.tsx
Unescape Escape View File

@ -60,8 +60,8 @@ export const AudioPlayerWithEncryptedFile = (props: {
// justEndedMessageIndex cannot be -1 nor 0, so it is >= 1 // justEndedMessageIndex cannot be -1 nor 0, so it is >= 1
const nextMessageIndex = justEndedMessageIndex - 1; const nextMessageIndex = justEndedMessageIndex - 1;
// stop auto-playing when the audio messages change author. // stop auto-playing when the audio messages change author.
const prevAuthorNumber = messageProps[justEndedMessageIndex].propsForMessage.authorPhoneNumber; const prevAuthorNumber = messageProps[justEndedMessageIndex].propsForMessage.sender;
const nextAuthorNumber = messageProps[nextMessageIndex].propsForMessage.authorPhoneNumber; const nextAuthorNumber = messageProps[nextMessageIndex].propsForMessage.sender;
const differentAuthor = prevAuthorNumber !== nextAuthorNumber; const differentAuthor = prevAuthorNumber !== nextAuthorNumber;
if (differentAuthor) { if (differentAuthor) {
dispatch(setNextMessageToPlayId(undefined)); dispatch(setNextMessageToPlayId(undefined));

1
ts/components/conversation/SessionConversation.tsx
Unescape Escape View File

@ -532,7 +532,6 @@ export class SessionConversation extends React.Component<Props, State> {
return { return {
id: pubKey, id: pubKey,
authorPhoneNumber: pubKey,
authorProfileName: profileName, authorProfileName: profileName,
}; };
}); });

2
ts/components/conversation/SessionMessagesListContainer.tsx
Unescape Escape View File

@ -330,7 +330,7 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
} }
// Look for message in memory first, which would tell us if we could scroll to it // Look for message in memory first, which would tell us if we could scroll to it
const targetMessage = messagesProps.find(item => { const targetMessage = messagesProps.find(item => {
const messageAuthor = item.propsForMessage?.authorPhoneNumber; const messageAuthor = item.propsForMessage?.sender;
if (!messageAuthor || quoteAuthor !== messageAuthor) { if (!messageAuthor || quoteAuthor !== messageAuthor) {
return false; return false;

5
ts/components/conversation/composition/CompositionBox.tsx
Unescape Escape View File

@ -466,7 +466,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
.map(user => { .map(user => {
return { return {
display: user.authorProfileName, display: user.authorProfileName,
id: user.authorPhoneNumber, id: user.id,
}; };
}) || []; }) || [];
callback(filtered); callback(filtered);
@ -509,7 +509,6 @@ class CompositionBoxInner extends React.Component<Props, State> {
} }
return { return {
id: pubKey, id: pubKey,
authorPhoneNumber: pubKey,
authorProfileName: profileName, authorProfileName: profileName,
}; };
}); });
@ -524,7 +523,7 @@ class CompositionBoxInner extends React.Component<Props, State> {
// Transform the users to what react-mentions expects // Transform the users to what react-mentions expects
const mentionsData = members.map(user => ({ const mentionsData = members.map(user => ({
display: user.authorProfileName || window.i18n('anonymous'), display: user.authorProfileName || window.i18n('anonymous'),
id: user.authorPhoneNumber, id: user.id,
})); }));
callback(mentionsData); callback(mentionsData);
} }

8
ts/components/conversation/message/message-content/MessageAttachment.tsx
Unescape Escape View File

@ -38,7 +38,7 @@ export type MessageAttachmentSelectorProps = Pick<
| 'direction' | 'direction'
| 'timestamp' | 'timestamp'
| 'serverTimestamp' | 'serverTimestamp'
| 'authorPhoneNumber' | 'sender'
| 'convoId' | 'convoId'
> & { > & {
attachments: Array<PropsForAttachment>; attachments: Array<PropsForAttachment>;
@ -81,11 +81,11 @@ export const MessageAttachment = (props: Props) => {
} }
const messageTimestamp = attachmentProps?.timestamp || attachmentProps?.serverTimestamp || 0; const messageTimestamp = attachmentProps?.timestamp || attachmentProps?.serverTimestamp || 0;
if (attachmentProps?.authorPhoneNumber && attachmentProps?.convoId) { if (attachmentProps?.sender && attachmentProps?.convoId) {
void saveAttachmentToDisk({ void saveAttachmentToDisk({
attachment: attachments[0], attachment: attachments[0],
messageTimestamp, messageTimestamp,
messageSender: attachmentProps?.authorPhoneNumber, messageSender: attachmentProps?.sender,
conversationId: attachmentProps?.convoId, conversationId: attachmentProps?.convoId,
}); });
} }
@ -94,7 +94,7 @@ export const MessageAttachment = (props: Props) => {
attachmentProps?.attachments, attachmentProps?.attachments,
attachmentProps?.timestamp, attachmentProps?.timestamp,
attachmentProps?.serverTimestamp, attachmentProps?.serverTimestamp,
attachmentProps?.authorPhoneNumber, attachmentProps?.sender,
attachmentProps?.convoId, attachmentProps?.convoId,
] ]
); );

16
ts/components/conversation/message/message-content/MessageAuthorText.tsx
Unescape Escape View File

@ -12,7 +12,7 @@ import { ContactName } from '../../ContactName';
export type MessageAuthorSelectorProps = Pick< export type MessageAuthorSelectorProps = Pick<
MessageRenderingProps, MessageRenderingProps,
'authorName' | 'authorProfileName' | 'authorPhoneNumber' | 'direction' | 'firstMessageOfSeries' 'authorName' | 'authorProfileName' | 'sender' | 'direction' | 'firstMessageOfSeries'
>; >;
type Props = { type Props = {
@ -27,23 +27,17 @@ export const MessageAuthorText = (props: Props) => {
if (!selected) { if (!selected) {
return null; return null;
} }
const { const { authorName, sender, authorProfileName, direction, firstMessageOfSeries } = selected;
authorName,
authorPhoneNumber,
authorProfileName,
direction,
firstMessageOfSeries,
} = selected;
const title = authorName ? authorName : authorPhoneNumber; const title = authorName ? authorName : sender;
if (direction !== 'incoming' || !isGroup || !title || !firstMessageOfSeries) { if (direction !== 'incoming' || !isGroup || !title || !firstMessageOfSeries) {
return null; return null;
} }
const shortenedPubkey = PubKey.shorten(authorPhoneNumber); const shortenedPubkey = PubKey.shorten(sender);
const displayedPubkey = authorProfileName ? shortenedPubkey : authorPhoneNumber; const displayedPubkey = authorProfileName ? shortenedPubkey : sender;
return ( return (
<Flex container={true}> <Flex container={true}>

16
ts/components/conversation/message/message-content/MessageAvatar.tsx
Unescape Escape View File

@ -10,7 +10,7 @@ export type MessageAvatarSelectorProps = Pick<
MessageRenderingProps, MessageRenderingProps,
| 'authorAvatarPath' | 'authorAvatarPath'
| 'authorName' | 'authorName'
| 'authorPhoneNumber' | 'sender'
| 'authorProfileName' | 'authorProfileName'
| 'isSenderAdmin' | 'isSenderAdmin'
| 'conversationType' | 'conversationType'
@ -33,7 +33,7 @@ export const MessageAvatar = (props: Props) => {
const { const {
authorAvatarPath, authorAvatarPath,
authorName, authorName,
authorPhoneNumber, sender,
authorProfileName, authorProfileName,
conversationType, conversationType,
direction, direction,
@ -45,28 +45,28 @@ export const MessageAvatar = (props: Props) => {
if (conversationType !== 'group' || direction === 'outgoing') { if (conversationType !== 'group' || direction === 'outgoing') {
return null; return null;
} }
const userName = authorName || authorProfileName || authorPhoneNumber; const userName = authorName || authorProfileName || sender;
const onMessageAvatarClick = useCallback(() => { const onMessageAvatarClick = useCallback(() => {
dispatch( dispatch(
updateUserDetailsModal({ updateUserDetailsModal({
conversationId: authorPhoneNumber, conversationId: sender,
userName, userName,
authorAvatarPath, authorAvatarPath,
}) })
); );
}, [userName, authorPhoneNumber, authorAvatarPath]); }, [userName, sender, authorAvatarPath]);
if (!lastMessageOfSeries) { if (!lastMessageOfSeries) {
return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${authorPhoneNumber}`} />; return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${sender}`} />;
} }
return ( return (
<div className="module-message__author-avatar" key={`msg-avatar-${authorPhoneNumber}`}> <div className="module-message__author-avatar" key={`msg-avatar-${sender}`}>
<Avatar <Avatar
size={AvatarSize.S} size={AvatarSize.S}
onAvatarClick={(!isPublic && onMessageAvatarClick) || undefined} onAvatarClick={(!isPublic && onMessageAvatarClick) || undefined}
pubkey={authorPhoneNumber} pubkey={sender}
/> />
{isSenderAdmin && <CrownIcon />} {isSenderAdmin && <CrownIcon />}
</div> </div>

24
ts/components/conversation/message/message-content/MessageContextMenu.tsx
Unescape Escape View File

@ -26,7 +26,7 @@ import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
export type MessageContextMenuSelectorProps = Pick< export type MessageContextMenuSelectorProps = Pick<
MessageRenderingProps, MessageRenderingProps,
| 'attachments' | 'attachments'
| 'authorPhoneNumber' | 'sender'
| 'convoId' | 'convoId'
| 'direction' | 'direction'
| 'status' | 'status'
@ -54,7 +54,7 @@ export const MessageContextMenu = (props: Props) => {
} }
const { const {
attachments, attachments,
authorPhoneNumber, sender,
convoId, convoId,
direction, direction,
status, status,
@ -103,12 +103,12 @@ export const MessageContextMenu = (props: Props) => {
const unsendMessageText = window.i18n('deleteForEveryone'); const unsendMessageText = window.i18n('deleteForEveryone');
const addModerator = useCallback(() => { const addModerator = useCallback(() => {
void addSenderAsModerator(authorPhoneNumber, convoId); void addSenderAsModerator(sender, convoId);
}, [authorPhoneNumber, convoId]); }, [sender, convoId]);
const removeModerator = useCallback(() => { const removeModerator = useCallback(() => {
void removeSenderFromModerator(authorPhoneNumber, convoId); void removeSenderFromModerator(sender, convoId);
}, [authorPhoneNumber, convoId]); }, [sender, convoId]);
const onReply = useCallback(() => { const onReply = useCallback(() => {
if (isBlocked) { if (isBlocked) {
@ -128,11 +128,11 @@ export const MessageContextMenu = (props: Props) => {
void saveAttachmentToDisk({ void saveAttachmentToDisk({
attachment: attachments[0], attachment: attachments[0],
messageTimestamp, messageTimestamp,
messageSender: authorPhoneNumber, messageSender: sender,
conversationId: convoId, conversationId: convoId,
}); });
}, },
[convoId, authorPhoneNumber, timestamp, serverTimestamp, convoId, attachments] [convoId, sender, timestamp, serverTimestamp, convoId, attachments]
); );
const copyText = useCallback(() => { const copyText = useCallback(() => {
@ -147,12 +147,12 @@ export const MessageContextMenu = (props: Props) => {
}, [messageId]); }, [messageId]);
const onBan = useCallback(() => { const onBan = useCallback(() => {
MessageInteraction.banUser(authorPhoneNumber, convoId); MessageInteraction.banUser(sender, convoId);
}, [authorPhoneNumber, convoId]); }, [sender, convoId]);
const onUnban = useCallback(() => { const onUnban = useCallback(() => {
MessageInteraction.unbanUser(authorPhoneNumber, convoId); MessageInteraction.unbanUser(sender, convoId);
}, [authorPhoneNumber, convoId]); }, [sender, convoId]);
const onSelect = useCallback(() => { const onSelect = useCallback(() => {
dispatch(toggleSelectedMessageId(messageId)); dispatch(toggleSelectedMessageId(messageId));

12
ts/components/conversation/message/message-content/MessageQuote.tsx
Unescape Escape View File

@ -40,11 +40,11 @@ export const MessageQuote = (props: Props) => {
return; return;
} }
const { authorPhoneNumber, referencedMessageNotFound, messageId } = selected.quote; const { sender, referencedMessageNotFound, messageId } = selected.quote;
const quoteId = _.toNumber(messageId); const quoteId = _.toNumber(messageId);
scrollToQuote?.({ scrollToQuote?.({
quoteAuthor: authorPhoneNumber, quoteAuthor: sender,
quoteId, quoteId,
referencedMessageNotFound: referencedMessageNotFound || false, referencedMessageNotFound: referencedMessageNotFound || false,
}); });
@ -57,12 +57,12 @@ export const MessageQuote = (props: Props) => {
const { quote, direction } = selected; const { quote, direction } = selected;
if (!quote || !quote.authorPhoneNumber || !quote.messageId) { if (!quote || !quote.sender || !quote.messageId) {
return null; return null;
} }
const shortenedPubkey = PubKey.shorten(quote.authorPhoneNumber); const shortenedPubkey = PubKey.shorten(quote.sender);
const displayedPubkey = quote.authorProfileName ? shortenedPubkey : quote.authorPhoneNumber; const displayedPubkey = quote.authorProfileName ? shortenedPubkey : quote.sender;
return ( return (
<Quote <Quote
@ -70,7 +70,7 @@ export const MessageQuote = (props: Props) => {
text={quote.text || ''} text={quote.text || ''}
attachment={quote.attachment} attachment={quote.attachment}
isIncoming={direction === 'incoming'} isIncoming={direction === 'incoming'}
authorPhoneNumber={displayedPubkey} sender={displayedPubkey}
authorProfileName={quote.authorProfileName} authorProfileName={quote.authorProfileName}
authorName={quote.authorName} authorName={quote.authorName}
referencedMessageNotFound={quote.referencedMessageNotFound || false} referencedMessageNotFound={quote.referencedMessageNotFound || false}

10
ts/components/conversation/message/message-content/Quote.tsx
Unescape Escape View File

@ -20,7 +20,7 @@ import { MessageBody } from './MessageBody';
export type QuotePropsWithoutListener = { export type QuotePropsWithoutListener = {
attachment?: QuotedAttachmentType; attachment?: QuotedAttachmentType;
authorPhoneNumber: string; sender: string;
authorProfileName?: string; authorProfileName?: string;
authorName?: string; authorName?: string;
isFromMe: boolean; isFromMe: boolean;
@ -269,7 +269,7 @@ export const QuoteText = (
}; };
type QuoteAuthorProps = { type QuoteAuthorProps = {
authorPhoneNumber: string; author: string;
authorProfileName?: string; authorProfileName?: string;
authorName?: string; authorName?: string;
isFromMe: boolean; isFromMe: boolean;
@ -278,7 +278,7 @@ type QuoteAuthorProps = {
}; };
const QuoteAuthor = (props: QuoteAuthorProps) => { const QuoteAuthor = (props: QuoteAuthorProps) => {
const { authorProfileName, authorPhoneNumber, authorName, isFromMe, isIncoming } = props; const { authorProfileName, author, authorName, isFromMe, isIncoming } = props;
return ( return (
<div <div
@ -291,7 +291,7 @@ const QuoteAuthor = (props: QuoteAuthorProps) => {
window.i18n('you') window.i18n('you')
) : ( ) : (
<ContactName <ContactName
pubkey={PubKey.shorten(authorPhoneNumber)} pubkey={PubKey.shorten(author)}
name={authorName} name={authorName}
profileName={authorProfileName} profileName={authorProfileName}
compact={true} compact={true}
@ -365,7 +365,7 @@ export const Quote = (props: QuotePropsWithListener) => {
<div className="module-quote__primary"> <div className="module-quote__primary">
<QuoteAuthor <QuoteAuthor
authorName={props.authorName} authorName={props.authorName}
authorPhoneNumber={props.authorPhoneNumber} author={props.sender}
authorProfileName={props.authorProfileName} authorProfileName={props.authorProfileName}
isFromMe={props.isFromMe} isFromMe={props.isFromMe}
isIncoming={props.isIncoming} isIncoming={props.isIncoming}

6
ts/models/message.ts
Unescape Escape View File

@ -421,7 +421,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
id: this.id, id: this.id,
direction: (this.isIncoming() ? 'incoming' : 'outgoing') as MessageModelType, direction: (this.isIncoming() ? 'incoming' : 'outgoing') as MessageModelType,
timestamp: this.get('sent_at') || 0, timestamp: this.get('sent_at') || 0,
authorPhoneNumber: sender, sender,
convoId: this.get('conversationId'), convoId: this.get('conversationId'),
}; };
if (body) { if (body) {
@ -557,14 +557,14 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
const firstAttachment = quote.attachments && quote.attachments[0]; const firstAttachment = quote.attachments && quote.attachments[0];
const quoteProps: { const quoteProps: {
referencedMessageNotFound?: boolean; referencedMessageNotFound?: boolean;
authorPhoneNumber: string; sender: string;
messageId: string; messageId: string;
authorName: string; authorName: string;
text?: string; text?: string;
attachment?: any; attachment?: any;
isFromMe?: boolean; isFromMe?: boolean;
} = { } = {
authorPhoneNumber: author, sender: author,
messageId: id, messageId: id,
authorName: authorName || 'Unknown', authorName: authorName || 'Unknown',
}; };

5
ts/state/ducks/conversations.ts
Unescape Escape View File

@ -165,7 +165,7 @@ export type PropsForMessageWithoutConvoProps = {
id: string; // messageId id: string; // messageId
direction: MessageModelType; direction: MessageModelType;
timestamp: number; timestamp: number;
authorPhoneNumber: string; // this is the sender sender: string; // this is the sender
convoId: string; // this is the conversation in which this message was sent convoId: string; // this is the conversation in which this message was sent
text?: string; text?: string;
@ -179,7 +179,7 @@ export type PropsForMessageWithoutConvoProps = {
text?: string; text?: string;
attachment?: QuotedAttachmentType; attachment?: QuotedAttachmentType;
isFromMe?: boolean; isFromMe?: boolean;
authorPhoneNumber: string; sender: string;
authorProfileName?: string; authorProfileName?: string;
authorName?: string; authorName?: string;
messageId?: string; messageId?: string;
@ -283,7 +283,6 @@ export type ConversationsStateType = {
export type MentionsMembersType = Array<{ export type MentionsMembersType = Array<{
id: string; id: string;
authorPhoneNumber: string;
authorProfileName: string; authorProfileName: string;
}>; }>;

40
ts/state/selectors/conversations.ts
Unescape Escape View File

@ -667,14 +667,13 @@ function updateFirstMessageOfSeries(
const sortedMessageProps: Array<SortedMessageModelProps> = []; const sortedMessageProps: Array<SortedMessageModelProps> = [];
for (let i = 0; i < messageModelsProps.length; i++) { for (let i = 0; i < messageModelsProps.length; i++) {
const currentSender = messageModelsProps[i].propsForMessage?.authorPhoneNumber; const currentSender = messageModelsProps[i].propsForMessage?.sender;
// most recent message is at index 0, so the previous message sender is 1+index // most recent message is at index 0, so the previous message sender is 1+index
const previousSender = const previousSender =
i < messageModelsProps.length - 1 i < messageModelsProps.length - 1
? messageModelsProps[i + 1].propsForMessage?.authorPhoneNumber ? messageModelsProps[i + 1].propsForMessage?.sender
: undefined; : undefined;
const nextSender = const nextSender = i > 0 ? messageModelsProps[i - 1].propsForMessage?.sender : undefined;
i > 0 ? messageModelsProps[i - 1].propsForMessage?.authorPhoneNumber : undefined;
// Handle firstMessageOfSeries for conditional avatar rendering // Handle firstMessageOfSeries for conditional avatar rendering
sortedMessageProps.push({ sortedMessageProps.push({
@ -773,14 +772,14 @@ export const getMessagePropsByMessageId = createSelector(
if (!foundMessageProps || !foundMessageProps.propsForMessage.convoId) { if (!foundMessageProps || !foundMessageProps.propsForMessage.convoId) {
return undefined; return undefined;
} }
const authorPhoneNumber = foundMessageProps?.propsForMessage?.authorPhoneNumber; const sender = foundMessageProps?.propsForMessage?.sender;
const foundMessageConversation = conversations[foundMessageProps.propsForMessage.convoId]; const foundMessageConversation = conversations[foundMessageProps.propsForMessage.convoId];
if (!foundMessageConversation || !authorPhoneNumber) { if (!foundMessageConversation || !sender) {
return undefined; return undefined;
} }
const foundSenderConversation = conversations[authorPhoneNumber]; const foundSenderConversation = conversations[sender];
if (!foundSenderConversation) { if (!foundSenderConversation) {
return undefined; return undefined;
} }
@ -795,16 +794,15 @@ export const getMessagePropsByMessageId = createSelector(
// either we sent it, // either we sent it,
// or the convo is not a public one (in this case, we will only be able to delete for us) // or the convo is not a public one (in this case, we will only be able to delete for us)
// or the convo is public and we are an admin // or the convo is public and we are an admin
const isDeletable = authorPhoneNumber === ourPubkey || !isPublic || (isPublic && !!weAreAdmin); const isDeletable = sender === ourPubkey || !isPublic || (isPublic && !!weAreAdmin);
// A message is deletable for everyone if // A message is deletable for everyone if
// either we sent it no matter what the conversation type, // either we sent it no matter what the conversation type,
// or the convo is public and we are an admin // or the convo is public and we are an admin
const isDeletableForEveryone = const isDeletableForEveryone = sender === ourPubkey || (isPublic && !!weAreAdmin) || false;
authorPhoneNumber === ourPubkey || (isPublic && !!weAreAdmin) || false;
const isSenderAdmin = groupAdmins.includes(authorPhoneNumber); const isSenderAdmin = groupAdmins.includes(sender);
const senderIsUs = authorPhoneNumber === ourPubkey; const senderIsUs = sender === ourPubkey;
const authorName = foundSenderConversation.name || null; const authorName = foundSenderConversation.name || null;
const authorProfileName = senderIsUs ? window.i18n('you') : foundSenderConversation.profileName; const authorProfileName = senderIsUs ? window.i18n('you') : foundSenderConversation.profileName;
@ -821,7 +819,7 @@ export const getMessagePropsByMessageId = createSelector(
isDeletableForEveryone, isDeletableForEveryone,
weAreAdmin, weAreAdmin,
conversationType: foundMessageConversation.type, conversationType: foundMessageConversation.type,
authorPhoneNumber, sender,
authorAvatarPath: foundSenderConversation.avatarPath || null, authorAvatarPath: foundSenderConversation.avatarPath || null,
isKickedFromGroup: foundMessageConversation.isKickedFromGroup || false, isKickedFromGroup: foundMessageConversation.isKickedFromGroup || false,
authorProfileName: authorProfileName || 'Unknown', authorProfileName: authorProfileName || 'Unknown',
@ -843,7 +841,7 @@ export const getMessageAvatarProps = createSelector(getMessagePropsByMessageId,
const { const {
authorAvatarPath, authorAvatarPath,
authorName, authorName,
authorPhoneNumber, sender,
authorProfileName, authorProfileName,
conversationType, conversationType,
direction, direction,
@ -856,7 +854,7 @@ export const getMessageAvatarProps = createSelector(getMessagePropsByMessageId,
const messageAvatarProps: MessageAvatarSelectorProps = { const messageAvatarProps: MessageAvatarSelectorProps = {
authorAvatarPath, authorAvatarPath,
authorName, authorName,
authorPhoneNumber, sender,
authorProfileName, authorProfileName,
conversationType, conversationType,
direction, direction,
@ -949,7 +947,7 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
const { const {
attachments, attachments,
authorPhoneNumber, sender,
convoId, convoId,
direction, direction,
status, status,
@ -967,7 +965,7 @@ export const getMessageContextMenuProps = createSelector(getMessagePropsByMessag
const msgProps: MessageContextMenuSelectorProps = { const msgProps: MessageContextMenuSelectorProps = {
attachments, attachments,
authorPhoneNumber, sender,
convoId, convoId,
direction, direction,
status, status,
@ -993,12 +991,12 @@ export const getMessageAuthorProps = createSelector(getMessagePropsByMessageId,
return undefined; return undefined;
} }
const { authorName, authorPhoneNumber, authorProfileName, direction } = props.propsForMessage; const { authorName, sender, authorProfileName, direction } = props.propsForMessage;
const { firstMessageOfSeries } = props; const { firstMessageOfSeries } = props;
const msgProps: MessageAuthorSelectorProps = { const msgProps: MessageAuthorSelectorProps = {
authorName, authorName,
authorPhoneNumber, sender,
authorProfileName, authorProfileName,
direction, direction,
firstMessageOfSeries, firstMessageOfSeries,
@ -1031,7 +1029,7 @@ export const getMessageAttachmentProps = createSelector(getMessagePropsByMessage
isTrustedForAttachmentDownload, isTrustedForAttachmentDownload,
timestamp, timestamp,
serverTimestamp, serverTimestamp,
authorPhoneNumber, sender,
convoId, convoId,
} = props.propsForMessage; } = props.propsForMessage;
const msgProps: MessageAttachmentSelectorProps = { const msgProps: MessageAttachmentSelectorProps = {
@ -1040,7 +1038,7 @@ export const getMessageAttachmentProps = createSelector(getMessagePropsByMessage
isTrustedForAttachmentDownload, isTrustedForAttachmentDownload,
timestamp, timestamp,
serverTimestamp, serverTimestamp,
authorPhoneNumber, sender,
convoId, convoId,
}; };

Write Preview
Loading…
Cancel
Save