OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #540 from matrix-org/rav/fix_npe 

Fix NPE in LoggedInView
pull/21833/head
David Baker 2016-11-07 09:57:46 +00:00 committed by GitHub
parent c973dbf1c4 2ee98e9fdc
commit b86f9f362a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/LoggedInView.js
View File

@ -199,7 +199,7 @@ export default React.createClass({
var topBar;
if (this.props.hasNewVersion) {
topBar = <NewVersionBar version={this.props.version} newVersion={this.props.newVersion}
releaseNotes={this.state.newVersionReleaseNotes}
releaseNotes={this.props.newVersionReleaseNotes}
/>;
}
else if (this.props.matrixClient.isGuest()) {

2
src/wrappers/WithMatrixClient.js
View File

@ -26,7 +26,7 @@ import React from 'react';
*/
export default function(WrappedComponent) {
return React.createClass({
displayName: "MatrixClient<" + WrappedComponent.displayName + ">",
displayName: "WithMatrixClient<" + WrappedComponent.displayName + ">",
contextTypes: {
matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,