From 4960927289b88bcacbf7af2baa9c551deac64072 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Wed, 8 Sep 2021 23:44:24 +0530
Subject: Revert "chore: proxy feature is always turned on: remove 'enabled'
 flag"

This reverts commit 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.
---
 .../settings/services/EditServiceForm.js           | 68 ++++++++++++----------
 1 file changed, 36 insertions(+), 32 deletions(-)

(limited to 'src/components/settings/services/EditServiceForm.js')

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">
-              <h3>
-                {intl.formatMessage(messages.headlineProxy)}
-                <span className="badge badge--success">beta</span>
-              </h3>
-              <Toggle field={form.$('proxy.isEnabled')} />
-              {form.$('proxy.isEnabled').value && (
-                <>
-                  <div className="grid">
-                    <div className="grid__row">
-                      <Input field={form.$('proxy.host')} className="proxyHost" />
-                      <Input field={form.$('proxy.port')} />
+            {isProxyFeatureEnabled && (
+              <div className="settings__settings-group">
+                <h3>
+                  {intl.formatMessage(messages.headlineProxy)}
+                  <span className="badge badge--success">beta</span>
+                </h3>
+                <Toggle field={form.$('proxy.isEnabled')} />
+                {form.$('proxy.isEnabled').value && (
+                  <>
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input field={form.$('proxy.port')} />
+                      </div>
                     </div>
-                  </div>
-                  <div className="grid">
-                    <div className="grid__row">
-                      <Input field={form.$('proxy.user')} />
-                      <Input
-                        field={form.$('proxy.password')}
-                        showPasswordToggle
-                      />
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.user')} />
+                        <Input
+                          field={form.$('proxy.password')}
+                          showPasswordToggle
+                        />
+                      </div>
                     </div>
-                  </div>
-                  <p>
-                    <span className="mdi mdi-information" />
-                    {intl.formatMessage(messages.proxyRestartInfo)}
-                  </p>
-                  <p>
-                    <span className="mdi mdi-information" />
-                    {intl.formatMessage(messages.proxyInfo)}
-                  </p>
-                </>
-              )}
-            </div>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyRestartInfo)}
+                    </p>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyInfo)}
+                    </p>
+                  </>
+                )}
+              </div>
+            )}
 
             <div className="user-agent">
               <Input field={form.$('userAgentPref')} />
-- 
cgit v1.2.3-70-g09d2