From 3872f0750c41500fa2af61575791cd612112dae3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 27 Jun 2017 17:40:28 +0100
Subject: [PATCH] Only show apps button if labs feature enabled.
---
src/components/views/rooms/MessageComposer.js | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index eb7a00389f..7896a03376 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -315,16 +315,18 @@ export default class MessageComposer extends React.Component {
}
// Apps
- if (this.props.showApps) {
- hideAppsButton =
- <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title="Hide Apps">
- <TintableSvg src="img/icons-apps-active.svg" width="35" height="35"/>
- </div>;
- } else {
- showAppsButton =
- <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title="Show Apps">
- <TintableSvg src="img/icons-apps.svg" width="35" height="35"/>
- </div>;
+ if (UserSettingsStore.isFeatureEnabled('matrix_apps')) {
+ if (this.props.showApps) {
+ hideAppsButton =
+ <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title="Hide Apps">
+ <TintableSvg src="img/icons-apps-active.svg" width="35" height="35"/>
+ </div>;
+ } else {
+ showAppsButton =
+ <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title="Show Apps">
+ <TintableSvg src="img/icons-apps.svg" width="35" height="35"/>
+ </div>;
+ }
}
const canSendMessages = this.props.room.currentState.maySendMessage(