diff options
author | 2021-09-08 23:44:24 +0530 | |
---|---|---|
committer | 2021-09-08 23:52:06 +0530 | |
commit | 4960927289b88bcacbf7af2baa9c551deac64072 (patch) | |
tree | 4a338c63d2d42e06d37e6f01d14c5f2048c76ace /src/components | |
parent | fix: U2F devices not recognised in snapcraft image (#1892) (diff) | |
download | ferdium-app-4960927289b88bcacbf7af2baa9c551deac64072.tar.gz ferdium-app-4960927289b88bcacbf7af2baa9c551deac64072.tar.zst ferdium-app-4960927289b88bcacbf7af2baa9c551deac64072.zip |
Revert "chore: proxy feature is always turned on: remove 'enabled' flag"
This reverts commit 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 68 |
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 { | |||
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')} /> |