matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge branch 'develop' into experimental

Browse Source
This commit is contained in:
Bruno Windels
2018-10-31 14:54:22 +01:00
parent 33925b2fd1 33e2fc28b7
commit ba83166661
80 changed files with 760 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/MessageComposer.js
View File

@@ -269,7 +269,7 @@ export default class MessageComposer extends React.Component {
);
}
let e2eImg, e2eTitle, e2eClass;
let e2eImg; let e2eTitle; let e2eClass;
const roomIsEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
if (roomIsEncrypted) {
// FIXME: show a /!\ if there are untrusted devices in the room...
@@ -429,7 +429,7 @@ export default class MessageComposer extends React.Component {
className="mx_MessageComposer_formatbar_cancel mx_filterFlipColor"
src="img/icon-text-cancel.svg" />
</div>
</div>
</div>;
}
return (