matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-16 06:42:26 +03:00
Code Activity

Merge pull request #1194 from matrix-org/rxl881/apps

Browse Source 
Use app ID for element key and pass screen parameter to scalar.
This commit is contained in:
Richard Lewis
2017-07-07 11:28:39 +01:00
committed by GitHub
parent 28c0daf51d d1eab75cfc
commit e970b68859
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ module.exports = React.createClass({
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId) :
this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId, 'add_integ') :
null;
Modal.createDialog(IntegrationsManager, {
src: src,
@@ -187,7 +187,7 @@ module.exports = React.createClass({
const apps = this.state.apps.map(
(app, index, arr) => {
return <AppTile
key={app.name}
key={app.id}
id={app.id}
url={app.url}
name={app.name}