Merge pull request #543 from matrix-org/luke/feature-show-integration-error-popup

Show the error that occured when trying to reach scalar
2016-11-08 11:27:32 +00:00
parent c0c662aeaf de83e578e7
commit 5a61a1e6e1
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -681,7 +681,7 @@ module.exports = React.createClass({
            console.error(this.state.scalar_error);
            integrationsError = (
                <span className="mx_RoomSettings_integrationsButton_errorPopup">
-                    { this.state.scalar_error.message }
+                    Could not connect to the integration server
                </span>
            );
        }