Skip to content

fix: OpenChannel Context menu click leak #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2023
Merged

fix: OpenChannel Context menu click leak #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/OpenChannel/components/OpenChannelMessage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export default function MessagOpenChannelMessageeHoc(props: OpenChannelMessagePr
// <OpenChannelUnknownMessage message={message} />
// );
})(),
}[getMessageType(message)]
}[getMessageType(message, { isOgMessageEnabledInOpenChannel })]
}
{/* Modal */}
{
Expand Down
12 changes: 10 additions & 2 deletions src/modules/OpenChannel/components/OpenChannelMessage/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ export const SendingMessageStatus = {
PENDING: 'pending',
};

export const getMessageType = (message: UserMessage | FileMessage | AdminMessage): string => {
type MessageTypeOptions = {
isOgMessageEnabledInOpenChannel?: boolean;
};

export const getMessageType = (
message: UserMessage | FileMessage | AdminMessage,
options?: MessageTypeOptions,
): string => {
const isOgMessageEnabledInOpenChannel = options?.isOgMessageEnabledInOpenChannel;
Comment on lines +20 to +28
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @AhyoungRyu , its better to fallback to text message when og message is not present

if ((message?.isUserMessage?.()) || message?.messageType === 'user') {
return (message?.ogMetaData)
return (message?.ogMetaData && isOgMessageEnabledInOpenChannel)
? MessageTypes.OG
: MessageTypes.USER;
}
Expand Down
Loading