From 41c940835d63c7a3dc68b73dcce1b91886113caf Mon Sep 17 00:00:00 2001 From: Norman Meier Date: Mon, 8 Feb 2021 12:56:24 +0100 Subject: [PATCH] fix(messenger): IsMine rebase fail Signed-off-by: Norman Meier --- .../chat/message/MessageInvitation.tsx | 2 +- .../components/chat/message/UserMessage.tsx | 30 +++++++++---------- .../chat/message/UserMessageComponents.tsx | 16 +++++----- js/packages/components/chat/message/index.tsx | 4 +-- .../components/main/home/Conversations.tsx | 10 +++---- js/packages/store/faker.js | 8 ++--- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/js/packages/components/chat/message/MessageInvitation.tsx b/js/packages/components/chat/message/MessageInvitation.tsx index f23f7e8a30..a574666378 100644 --- a/js/packages/components/chat/message/MessageInvitation.tsx +++ b/js/packages/components/chat/message/MessageInvitation.tsx @@ -202,7 +202,7 @@ export const MessageInvitation: React.FC<{ message: InteractionGroupInvitation } return ( - {message.isMe ? ( + {message.isMine ? ( diff --git a/js/packages/components/chat/message/UserMessage.tsx b/js/packages/components/chat/message/UserMessage.tsx index f1c57d527c..50fb04ba41 100644 --- a/js/packages/components/chat/message/UserMessage.tsx +++ b/js/packages/components/chat/message/UserMessage.tsx @@ -31,7 +31,7 @@ const useStylesMessage = () => { } const interactionsFilter = (inte: any) => - inte.type === beapi.messenger.AppMessage.Type.TypeUserMessage && inte.isMe + inte.type === beapi.messenger.AppMessage.Type.TypeUserMessage && inte.isMine const getUserMessageState = ( inte: any, @@ -54,19 +54,19 @@ const getUserMessageState = ( const cmd = null /*messenger.message.isCommandMessage(payload.body)*/ if (convKind === beapi.messenger.Conversation.Type.ContactType) { // State of OneToOne conversation - msgTextColor = inte.isMe + msgTextColor = inte.isMine ? inte.acknowledged ? color.white : cmd ? color.grey : color.blue : color.blue - msgBackgroundColor = inte.isMe ? (inte.acknowledged ? color.blue : color.white) : '#CED2FF99' - msgBorderColor = inte.isMe && (cmd ? border.color.grey : border.color.blue) + msgBackgroundColor = inte.isMine ? (inte.acknowledged ? color.blue : color.white) : '#CED2FF99' + msgBorderColor = inte.isMine && (cmd ? border.color.grey : border.color.blue) isWithinCollapseDuration = nextMessage && - inte?.isMe === nextMessage?.isMe && + inte.isMine === nextMessage?.isMine && sentDate && nextMessage.sentDate && (parseInt(nextMessage?.sentDate.toString(), 10) || 0) - (sentDate || 0) < 60000 // one minute @@ -76,9 +76,9 @@ const getUserMessageState = ( name = members[inte.memberPublicKey].displayName } isFollowupMessage = - previousMessage && !inte.isMe && inte.memberPublicKey === previousMessage.memberPublicKey + previousMessage && !inte.isMine && inte.memberPublicKey === previousMessage.memberPublicKey isFollowedMessage = - nextMessage && !inte.isMe && inte.memberPublicKey === nextMessage.memberPublicKey + nextMessage && !inte.isMine && inte.memberPublicKey === nextMessage.memberPublicKey isWithinCollapseDuration = nextMessage && @@ -87,24 +87,24 @@ const getUserMessageState = ( nextMessage.sentDate && (parseInt(nextMessage?.sentDate.toString(), 10) || 0) - (sentDate || 0) < 60000 // one minute - if (!inte.isMe && inte.memberPublicKey) { + if (!inte.isMine && inte.memberPublicKey) { const h = new SHA3(256).update(inte.memberPublicKey).digest() baseColor = '#' + pal[h[0]] } - msgTextColor = inte.isMe + msgTextColor = inte.isMine ? inte.acknowledged ? color.white : cmd ? color.grey : baseColor : baseColor - msgBackgroundColor = inte.isMe + msgBackgroundColor = inte.isMine ? inte.acknowledged ? baseColor : color.white : Color(baseColor).alpha(0.1).string() - msgBorderColor = inte.isMe && (cmd ? border.color.grey : { borderColor: baseColor }) - msgSenderColor = inte.isMe ? 'red' : baseColor + msgBorderColor = inte.isMine && (cmd ? border.color.grey : { borderColor: baseColor }) + msgSenderColor = inte.isMine ? 'red' : baseColor } return { @@ -153,12 +153,12 @@ export const UserMessage: React.FC<{ - {!inte.isMe && isGroup && !isFollowedMessage && ( + {!inte.isMine && isGroup && !isFollowedMessage && ( - {!inte.isMe && isGroup && !isFollowupMessage && ( + {!inte.isMine && isGroup && !isFollowupMessage && ( @@ -136,7 +136,7 @@ export const TimestampStatusUserMessage: React.FC<{ {!cmd && lastInte?.cid?.toString() === inte.cid?.toString() && ( <> - {inte.isMe && ( + {inte.isMine && ( )} - {inte.isMe && ( + {inte.isMine && ( {inte.acknowledged ? 'sent' : 'sending...'} diff --git a/js/packages/components/chat/message/index.tsx b/js/packages/components/chat/message/index.tsx index af4e51a557..bb64018e47 100644 --- a/js/packages/components/chat/message/index.tsx +++ b/js/packages/components/chat/message/index.tsx @@ -52,7 +52,7 @@ export const Message: React.FC<{ - + ) diff --git a/js/packages/components/main/home/Conversations.tsx b/js/packages/components/main/home/Conversations.tsx index 526c7c420f..1a05877c8f 100644 --- a/js/packages/components/main/home/Conversations.tsx +++ b/js/packages/components/main/home/Conversations.tsx @@ -96,13 +96,13 @@ const ConversationsItem: React.FC = (props) => { if (lastInte?.medias?.length) { if (lastInte.medias[0].mimeType?.startsWith('image')) { messageType = 'picture' - description = `${lastInte.isMe ? 'You' : userDisplayName} sent ${ - lastInte.isMe ? userDisplayName : 'you' + description = `${lastInte.isMine ? 'You' : userDisplayName} sent ${ + lastInte.isMine ? userDisplayName : 'you' } ${lastInte.medias.length > 1 ? `${lastInte.medias.length} pics` : 'a pic'}` } else if (lastInte.medias[0].mimeType?.startsWith('audio')) { messageType = 'audio' - description = `${lastInte.isMe ? 'You' : userDisplayName} sent ${ - lastInte.isMe ? userDisplayName : 'you' + description = `${lastInte.isMine ? 'You' : userDisplayName} sent ${ + lastInte.isMine ? userDisplayName : 'you' } ${lastInte.medias.length > 1 ? `${lastInte.medias.length} audio files` : 'an audio file'}` } } @@ -247,7 +247,7 @@ const ConversationsItem: React.FC = (props) => { }, ]} > - {lastInte && lastInte.isMe && ( + {lastInte && lastInte.isMine && ( { - let isMe = true + let isMine = true let memberPublicKey = '' if (conversation.type === beapi.messenger.Conversation.Type.MultiMemberType) { const memberIndex = Math.floor(Math.random() * (membersCount + 1)) if (memberIndex < membersCount) { - isMe = false + isMine = false memberPublicKey = membersListList[i][memberIndex].publicKey } } else { - isMe = faker.random.boolean() + isMine = faker.random.boolean() } return { @@ -124,7 +124,7 @@ export const fakeMessages = (length, conversationList = [], membersListList, sta conversationPublicKey: conversation.publicKey, memberPublicKey, payload: { body: faker.lorem.sentences() }, - isMe, + isMine, sentDate: ( Date.now() - Math.floor(Math.random() * (50 * 24 * 60 * 60 * 1000)) ).toString(),