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 remote-tracking branch 'upstream/develop' into hs/upload-limits

Browse Source
This commit is contained in:
Will Hunt
2018-12-01 16:24:43 +00:00
parent 67d39a40d3 e3f2e69087
commit 2b077b4f5d
142 changed files with 5235 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,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...
@@ -465,7 +465,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 (