Skip to content

Commit

Permalink
Merge branch 'rm/346575' into 'master'
Browse files Browse the repository at this point in the history
add join button in thread instead of readonly message

See merge request kchat/webapp!868
  • Loading branch information
antonbuks committed Aug 9, 2024
2 parents 991dad7 + f980fb2 commit c630db4
Showing 1 changed file with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ import type {ServerError} from '@mattermost/types/errors';
import type {FileInfo} from '@mattermost/types/files';
import type {Post} from '@mattermost/types/posts';

import * as GlobalActions from 'actions/global_actions';
import {emitShortcutReactToLastPostFrom} from 'actions/post_actions';
import LocalStorageStore from 'stores/local_storage_store';

import {BannerJoinChannel} from 'components/banner_join_channel';
import AutoHeightSwitcher from 'components/common/auto_height_switcher';
import DndBanner from 'components/dnd_banner';
import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay';
Expand Down Expand Up @@ -714,6 +716,12 @@ const AdvanceTextEditor = ({
/>
);

if (readOnlyChannel) {
return (
<BannerJoinChannel onButtonClick={() => GlobalActions.joinChannel(channelId)}/>
);
}

return (
<>
<div
Expand Down

0 comments on commit c630db4

Please sign in to comment.