Skip to content

Commit

Permalink
fix(messenger): IsMine rebase fail
Browse files Browse the repository at this point in the history 
Signed-off-by: Norman Meier <norman@berty.tech>
  • Loading branch information
Norman Meier committed Feb 8, 2021
1 parent 57ccdc0 commit 41c9408
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion js/packages/components/chat/message/MessageInvitation.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ export const MessageInvitation: React.FC<{ message: InteractionGroupInvitation }

return (
<View style={[row.center, padding.horizontal.medium, margin.bottom.small, { paddingTop: 2 }]}>
{message.isMe ? (
{message.isMine ? (
<MessageSystemWrapper logo={false}>
<MessageInvitationSent message={message} />
</MessageSystemWrapper>
Expand Down
30 changes: 15 additions & 15 deletions js/packages/components/chat/message/UserMessage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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 &&
Expand All @@ -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 {
Expand Down Expand Up @@ -153,12 +153,12 @@ export const UserMessage: React.FC<{
<View
style={[
row.left,
inte.isMe ? _styles.isMeMessage : _styles.isOtherMessage,
inte.isMine ? _styles.isMeMessage : _styles.isOtherMessage,
padding.horizontal.medium,
padding.top.scale(2),
]}
>
{!inte.isMe && isGroup && !isFollowedMessage && (
{!inte.isMine && isGroup && !isFollowedMessage && (
<View
style={{
paddingRight: 5 * scaleSize,
Expand All @@ -177,7 +177,7 @@ export const UserMessage: React.FC<{
)}

<View style={[column.top, _styles.messageItem]}>
{!inte.isMe && isGroup && !isFollowupMessage && (
{!inte.isMine && isGroup && !isFollowupMessage && (
<View style={[isFollowedMessage && margin.left.scale(40)]}>
<Text
style={[
Expand Down
16 changes: 8 additions & 8 deletions js/packages/components/chat/message/UserMessageComponents.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ export const HyperlinkUserMessage: React.FC<{
<View
style={[
border.radius.top.medium,
inte.isMe ? border.radius.left.medium : border.radius.right.medium,
inte.isMine ? border.radius.left.medium : border.radius.right.medium,
msgBorderColor,
inte.isMe && border.scale(2),
padding.horizontal.scale(inte.isMe ? 11 : 13),
padding.vertical.scale(inte.isMe ? 7 : 9),
inte.isMe ? column.item.right : column.item.left,
inte.isMine && border.scale(2),
padding.horizontal.scale(inte.isMine ? 11 : 13),
padding.vertical.scale(inte.isMine ? 7 : 9),
inte.isMine ? column.item.right : column.item.left,
isFollowedMessage && margin.left.scale(35),
{
backgroundColor: msgBackgroundColor,
Expand Down Expand Up @@ -128,15 +128,15 @@ export const TimestampStatusUserMessage: React.FC<{
flex.align.center,
margin.top.tiny,
margin.bottom.tiny,
inte.isMe && row.item.bottom,
inte.isMine && row.item.bottom,
]}
>
<Text style={[_styles.dateMessage, isFollowedMessage && margin.left.scale(35)]}>
{sentDate > 0 ? timeFormat.fmtTimestamp3(sentDate) : ''}
</Text>
{!cmd && lastInte?.cid?.toString() === inte.cid?.toString() && (
<>
{inte.isMe && (
{inte.isMine && (
<Icon
name={inte.acknowledged ? 'navigation-2' : 'navigation-2-outline'}
width={12}
Expand All @@ -145,7 +145,7 @@ export const TimestampStatusUserMessage: React.FC<{
style={[padding.left.tiny, { marginTop: 1 * scaleSize }]}
/>
)}
{inte.isMe && (
{inte.isMine && (
<Text style={[_styles.stateMessageValueMe]}>
{inte.acknowledged ? 'sent' : 'sending...'}
</Text>
Expand Down
4 changes: 2 additions & 2 deletions js/packages/components/chat/message/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const Message: React.FC<{
<View style={[padding.horizontal.medium]}>
<Text
style={[
inte.isMe ? text.align.right : text.align.left,
inte.isMine ? text.align.right : text.align.left,
text.color.grey,
text.size.scale(11),
text.bold.small,
Expand All @@ -69,7 +69,7 @@ export const Message: React.FC<{
return (
<>
<View style={[padding.horizontal.medium]}>
<QuickReplyOptions convPk={convPK} options={inte.payload.options} />
<QuickReplyOptions convPk={convPK} options={inte.payload.options || []} />
</View>
</>
)
Expand Down
10 changes: 5 additions & 5 deletions js/packages/components/main/home/Conversations.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ const ConversationsItem: React.FC<ConversationsItemProps> = (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'}`
}
}
Expand Down Expand Up @@ -247,7 +247,7 @@ const ConversationsItem: React.FC<ConversationsItemProps> = (props) => {
},
]}
>
{lastInte && lastInte.isMe && (
{lastInte && lastInte.isMine && (
<MessageStatus
interaction={lastInte}
isAccepted={
Expand Down
8 changes: 4 additions & 4 deletions js/packages/store/faker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ export const fakeMessages = (length, conversationList = [], membersListList, sta
return null
}
return fakeArray(length).map((_, idx) => {
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 {
Expand All @@ -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(),
Expand Down

0 comments on commit 41c9408

Please sign in to comment.