Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Hide composer and call buttons when the room is tombstoned #7975

Merged
merged 4 commits into from
Mar 4, 2022
Merged

Hide composer and call buttons when the room is tombstoned #7975

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6da18c8
Hide composer buttons when the room is tombstoned
t3chguy Mar 4, 2022
d71c2bc
Add tests
t3chguy Mar 4, 2022
fa10493
Update RoomHeader-test to use Enzyme
t3chguy Mar 4, 2022
dcd19c6
Consolidate tombstone and maySendMessage tracking into RoomContext
t3chguy Mar 4, 2022
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
5 changes: 3 additions & 2 deletions src/components/views/rooms/MessageComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ export default class MessageComposer extends React.Component<IProps, IState> {
menuPosition = aboveLeftOf(contentRect);
}

if (!this.state.tombstone && this.state.canSendMessages) {
const canSendMessages = this.state.canSendMessages && !this.state.tombstone;
if (canSendMessages) {
controls.push(
<SendMessageComposer
ref={this.messageComposerInput}
Expand Down Expand Up @@ -467,7 +468,7 @@ export default class MessageComposer extends React.Component<IProps, IState> {
permalinkCreator={this.props.permalinkCreator} />
<div className="mx_MessageComposer_row">
{ controls }
{ this.state.canSendMessages && <MessageComposerButtons
{ canSendMessages && <MessageComposerButtons
addEmoji={this.addEmoji}
haveRecording={this.state.haveRecording}
isMenuOpen={this.state.isMenuOpen}
Expand Down