matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-28 09:24:05 +03:00
Code Activity

Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types

Browse Source 
# Conflicts:
#	test/components/structures/MessagePanel-test.js
This commit is contained in:
Michael Telatynski
2019-07-31 12:21:00 +01:00
parent 1087e04bb5 678c9a7213
commit 201d7fb448
4 changed files with 90 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/components/structures/MessagePanel-test.js
View File

@@ -42,11 +42,16 @@ const room = new Matrix.Room();
const WrappedMessagePanel = React.createClass({
childContextTypes: {
matrixClient: PropTypes.object,
room: PropTypes.object,
},
getChildContext: function() {
return {
matrixClient: client,
room: {
canReact: true,
canReply: true,
},
};
},