Render msgOption only if showReadReceipts is enabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
parent
ac00c80efb
commit
ba0384f381
2 changed files with 12 additions and 4 deletions
|
@ -21,6 +21,6 @@ limitations under the License.
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
overflow-y: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -988,6 +988,16 @@ export default class EventTile extends React.Component {
|
||||||
const groupPadlock = !useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
|
const groupPadlock = !useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
|
||||||
const ircPadlock = useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
|
const ircPadlock = useIRCLayout && !isBubbleMessage && this._renderE2EPadlock();
|
||||||
|
|
||||||
|
let msgOption;
|
||||||
|
if (SettingsStore.getValue("showReadReceipts")) {
|
||||||
|
msgOption = (
|
||||||
|
<div className="mx_EventTile_msgOption">
|
||||||
|
{ readAvatars }
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
switch (this.props.tileShape) {
|
switch (this.props.tileShape) {
|
||||||
case 'notif': {
|
case 'notif': {
|
||||||
const room = this.context.getRoom(this.props.mxEvent.getRoomId());
|
const room = this.context.getRoom(this.props.mxEvent.getRoomId());
|
||||||
|
@ -1107,9 +1117,7 @@ export default class EventTile extends React.Component {
|
||||||
{ reactionsRow }
|
{ reactionsRow }
|
||||||
{ actionBar }
|
{ actionBar }
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_EventTile_msgOption">
|
{msgOption}
|
||||||
{ readAvatars }
|
|
||||||
</div>
|
|
||||||
{
|
{
|
||||||
// The avatar goes after the event tile as it's absolutely positioned to be over the
|
// The avatar goes after the event tile as it's absolutely positioned to be over the
|
||||||
// event tile line, so needs to be later in the DOM so it appears on top (this avoids
|
// event tile line, so needs to be later in the DOM so it appears on top (this avoids
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue