Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files

Add a note to use the desktop builds when seshat isn't available
This commit is contained in:
Travis Ralston 2020-09-22 10:25:34 -06:00 committed by GitHub
commit 09dd3cea08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 297 additions and 14 deletions

View file

@ -1866,6 +1866,7 @@ export default class RoomView extends React.Component<IProps, IState> {
searchInProgress={this.state.searchInProgress}
onCancelClick={this.onCancelSearchClick}
onSearch={this.onSearch}
isRoomEncrypted={this.context.isRoomEncrypted(this.state.room.roomId)}
/>;
} else if (showRoomUpgradeBar) {
aux = <RoomUpgradeWarningBar room={this.state.room} recommendation={roomVersionRecommendation} />;