Skip to content

Commit fd01989

Browse files
authored
Bugfix: Use simple logic to calculate isByMe (#23)
1 parent b67ae35 commit fd01989

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/ui/MessageContent/index.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ import {
2525
isTextMessage,
2626
isOGMessage,
2727
isThumbnailMessage,
28-
isMessageSentByMe,
2928
getOutgoingMessageState,
3029
getSenderName,
3130
getMessageCreatedAt,
32-
isSentMessage,
33-
isPendingMessage,
3431
} from '../../utils';
3532
import { UserProfileContext } from '../../lib/UserProfileContext';
3633

@@ -79,10 +76,9 @@ export default function MessageContent({
7976
const [mouseHover, setMouseHover] = useState(false);
8077
const [supposedHover, setSupposedHover] = useState(false);
8178

82-
const isByMe: boolean = isPendingMessage(channel, message as UserMessage | FileMessage)
83-
|| isSentMessage(channel, message as UserMessage | FileMessage)
84-
|| isMessageSentByMe(userId, message as UserMessage | FileMessage);
85-
79+
const isByMe = (userId === (message as UserMessage | FileMessage)?.sender?.userId)
80+
|| ((message as UserMessage | FileMessage).sendingStatus === 'pending')
81+
|| ((message as UserMessage | FileMessage).sendingStatus === 'failed');
8682
const isByMeClassName = isByMe ? 'outgoing' : 'incoming';
8783
const chainTopClassName = chainTop ? 'chain-top' : '';
8884
const useReactionClassName = useReaction ? 'use-reactions' : '';

0 commit comments

Comments
 (0)