Merge branch 'develop' into t3chguy/remove_bluebird

2019-11-20 15:21:23 +00:00
parent e144f1c368 1e6472723a
commit 6121420113
47 changed files with 1838 additions and 245 deletions
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -569,11 +569,11 @@ export default class AppTile extends React.Component {
                </div>
            );
            if (!this.state.hasPermissionToLoad) {
-                const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(this.props.room.roomId);
                appTileBody = (
                    <div className={appTileBodyClass}>
                        <AppPermission
-                            isRoomEncrypted={isRoomEncrypted}
+                            roomId={this.props.room.roomId}
+                            creatorUserId={this.props.creatorUserId}
                            url={this.state.widgetUrl}
                            onPermissionGranted={this._grantWidgetPermission}
                        />