Skip to content
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

Jump to bottom

Regression: Composer fix join room action #27657

Merged
merged 1 commit into from
Dec 27, 2022
Merged

Regression: Composer fix join room action #27657

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions apps/meteor/client/views/room/components/body/composer/ComposerMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
import type { ContextType, ReactElement } from 'react';
import React, { memo, useCallback, useMemo } from 'react';

Expand Down Expand Up @@ -27,15 +27,11 @@ export type ComposerMessageProps = {
const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props }: ComposerMessageProps): ReactElement => {
const dispatchToastMessage = useToastMessageDispatch();

const joinEndpoint = useEndpoint('POST', '/v1/channels.join');

const composerProps = useMemo(
() => ({
onJoin: async (): Promise<void> => {
try {
await joinEndpoint({
roomId: rid,
});
await chatMessagesInstance?.data?.joinRoom();
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
throw error;
Expand Down Expand Up @@ -68,13 +64,12 @@ const ComposerMessage = ({ rid, chatMessagesInstance, readOnly, onSend, ...props
},
}),
[
chatMessagesInstance?.composer?.text,
chatMessagesInstance?.data,
chatMessagesInstance?.flows,
chatMessagesInstance?.composer?.text,
chatMessagesInstance?.messageEditing,
dispatchToastMessage,
joinEndpoint,
onSend,
rid,
],
);

Expand Down