1 files changed, 36 insertions, 32 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 23c667b82..c41cdd56a 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -144,6 +144,7 @@ export default @observer class EditServiceForm extends Component {
    openRecipeFile: PropTypes.func.isRequired,
    isSaving: PropTypes.bool.isRequired,
    isDeleting: PropTypes.bool.isRequired,
+    isProxyFeatureEnabled: PropTypes.bool.isRequired,
  };
  static defaultProps = {
@@ -205,6 +206,7 @@ export default @observer class EditServiceForm extends Component {
      isDeleting,
      onDelete,
      openRecipeFile,
+      isProxyFeatureEnabled,
    } = this.props;
    const { intl } = this.context;
@@ -368,40 +370,42 @@ export default @observer class EditServiceForm extends Component {
              </div>
            )}
-            <div className="settings__settings-group">
+            {isProxyFeatureEnabled && (
-              <h3>
+              <div className="settings__settings-group">
-                {intl.formatMessage(messages.headlineProxy)}
+                <h3>
-                <span className="badge badge--success">beta</span>
+                  {intl.formatMessage(messages.headlineProxy)}
-              </h3>
+                  <span className="badge badge--success">beta</span>
-              <Toggle field={form.$('proxy.isEnabled')} />
+                </h3>
-              {form.$('proxy.isEnabled').value && (
+                <Toggle field={form.$('proxy.isEnabled')} />
-                <>
+                {form.$('proxy.isEnabled').value && (
-                  <div className="grid">
+                  <>
-                    <div className="grid__row">
+                    <div className="grid">
-                      <Input field={form.$('proxy.host')} className="proxyHost" />
+                      <div className="grid__row">
-                      <Input field={form.$('proxy.port')} />
+                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input field={form.$('proxy.port')} />
+                      </div>
                    </div>
-                  </div>
+                    <div className="grid">
-                  <div className="grid">
+                      <div className="grid__row">
-                    <div className="grid__row">
+                        <Input field={form.$('proxy.user')} />
-                      <Input field={form.$('proxy.user')} />
+                        <Input
-                      <Input
+                          field={form.$('proxy.password')}
-                        field={form.$('proxy.password')}
+                          showPasswordToggle
-                        showPasswordToggle
+                        />
-                      />
+                      </div>
                    </div>
-                  </div>
+                    <p>
-                  <p>
+                      <span className="mdi mdi-information" />
-                    <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyRestartInfo)}
-                    {intl.formatMessage(messages.proxyRestartInfo)}
+                    </p>
-                  </p>
+                    <p>
-                  <p>
+                      <span className="mdi mdi-information" />
-                    <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyInfo)}
-                    {intl.formatMessage(messages.proxyInfo)}
+                    </p>
-                  </p>
+                  </>
-                </>
+                )}
-              )}
+              </div>
-            </div>
+            )}
            <div className="user-agent">
              <Input field={form.$('userAgentPref')} />

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 23c667b82..c41cdd56a 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js
@@ -144,6 +144,7 @@ export default @observer class EditServiceForm extends Component {
144	openRecipeFile: PropTypes.func.isRequired,	144	openRecipeFile: PropTypes.func.isRequired,
145	isSaving: PropTypes.bool.isRequired,	145	isSaving: PropTypes.bool.isRequired,
146	isDeleting: PropTypes.bool.isRequired,	146	isDeleting: PropTypes.bool.isRequired,
		147	isProxyFeatureEnabled: PropTypes.bool.isRequired,
147	};	148	};
148		149
149	static defaultProps = {	150	static defaultProps = {
@@ -205,6 +206,7 @@ export default @observer class EditServiceForm extends Component {
205	isDeleting,	206	isDeleting,
206	onDelete,	207	onDelete,
207	openRecipeFile,	208	openRecipeFile,
		209	isProxyFeatureEnabled,
208	} = this.props;	210	} = this.props;
209	const { intl } = this.context;	211	const { intl } = this.context;
210		212
@@ -368,40 +370,42 @@ export default @observer class EditServiceForm extends Component {
368	</div>	370	</div>
369	)}	371	)}
370		372
371	<div className="settings__settings-group">	373	{isProxyFeatureEnabled && (
372	<h3>	374	<div className="settings__settings-group">
373	{intl.formatMessage(messages.headlineProxy)}	375	<h3>
374	<span className="badge badge--success">beta</span>	376	{intl.formatMessage(messages.headlineProxy)}
375	</h3>	377	<span className="badge badge--success">beta</span>
376	<Toggle field={form.$('proxy.isEnabled')} />	378	</h3>
377	{form.$('proxy.isEnabled').value && (	379	<Toggle field={form.$('proxy.isEnabled')} />
378	<>	380	{form.$('proxy.isEnabled').value && (
379	<div className="grid">	381	<>
380	<div className="grid__row">	382	<div className="grid">
381	<Input field={form.$('proxy.host')} className="proxyHost" />	383	<div className="grid__row">
382	<Input field={form.$('proxy.port')} />	384	<Input field={form.$('proxy.host')} className="proxyHost" />
		385	<Input field={form.$('proxy.port')} />
		386	</div>
383	</div>	387	</div>
384	</div>	388	<div className="grid">
385	<div className="grid">	389	<div className="grid__row">
386	<div className="grid__row">	390	<Input field={form.$('proxy.user')} />
387	<Input field={form.$('proxy.user')} />	391	<Input
388	<Input	392	field={form.$('proxy.password')}
389	field={form.$('proxy.password')}	393	showPasswordToggle
390	showPasswordToggle	394	/>
391	/>	395	</div>
392	</div>	396	</div>
393	</div>	397	<p>
394	<p>	398	<span className="mdi mdi-information" />
395	<span className="mdi mdi-information" />	399	{intl.formatMessage(messages.proxyRestartInfo)}
396	{intl.formatMessage(messages.proxyRestartInfo)}	400	</p>
397	</p>	401	<p>
398	<p>	402	<span className="mdi mdi-information" />
399	<span className="mdi mdi-information" />	403	{intl.formatMessage(messages.proxyInfo)}
400	{intl.formatMessage(messages.proxyInfo)}	404	</p>
401	</p>	405	</>
402	</>	406	)}
403	)}	407	</div>
404	</div>	408	)}
405		409
406	<div className="user-agent">	410	<div className="user-agent">
407	<Input field={form.$('userAgentPref')} />	411	<Input field={form.$('userAgentPref')} />