diff options
| author |  Vijay A <avijayr@protonmail.com> | 2021-09-08 20:47:39 +0530 |
|---|---|---|
| committer | Vijay A <avijayr@protonmail.com> | 2021-09-08 20:55:44 +0530 |
| commit | 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1 (patch) | |
| tree | 98f5ec36534927581b1b0688837f407774d5f76a /src/components/settings | |
| parent | refactor: expose some more methods for session handling on the main repo (#1887) (diff) | |
| download | ferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.tar.gz ferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.tar.zst ferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.zip | |
chore: proxy feature is always turned on: remove 'enabled' flag
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/services/EditServiceForm.js | 68 |
1 files changed, 32 insertions, 36 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index c41cdd56a..23c667b82 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
| @@ -144,7 +144,6 @@ 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, | ||
| 148 | }; | 147 | }; |
| 149 | 148 | ||
| 150 | static defaultProps = { | 149 | static defaultProps = { |
| @@ -206,7 +205,6 @@ export default @observer class EditServiceForm extends Component { | |||
| 206 | isDeleting, | 205 | isDeleting, |
| 207 | onDelete, | 206 | onDelete, |
| 208 | openRecipeFile, | 207 | openRecipeFile, |
| 209 | isProxyFeatureEnabled, | ||
| 210 | } = this.props; | 208 | } = this.props; |
| 211 | const { intl } = this.context; | 209 | const { intl } = this.context; |
| 212 | 210 | ||
| @@ -370,42 +368,40 @@ export default @observer class EditServiceForm extends Component { | |||
| 370 | </div> | 368 | </div> |
| 371 | )} | 369 | )} |
| 372 | 370 | ||
| 373 | {isProxyFeatureEnabled && ( | 371 | <div className="settings__settings-group"> |
| 374 | <div className="settings__settings-group"> | 372 | <h3> |
| 375 | <h3> | 373 | {intl.formatMessage(messages.headlineProxy)} |
| 376 | {intl.formatMessage(messages.headlineProxy)} | 374 | <span className="badge badge--success">beta</span> |
| 377 | <span className="badge badge--success">beta</span> | 375 | </h3> |
| 378 | </h3> | 376 | <Toggle field={form.$('proxy.isEnabled')} /> |
| 379 | <Toggle field={form.$('proxy.isEnabled')} /> | 377 | {form.$('proxy.isEnabled').value && ( |
| 380 | {form.$('proxy.isEnabled').value && ( | 378 | <> |
| 381 | <> | 379 | <div className="grid"> |
| 382 | <div className="grid"> | 380 | <div className="grid__row"> |
| 383 | <div className="grid__row"> | 381 | <Input field={form.$('proxy.host')} className="proxyHost" /> |
| 384 | <Input field={form.$('proxy.host')} className="proxyHost" /> | 382 | <Input field={form.$('proxy.port')} /> |
| 385 | <Input field={form.$('proxy.port')} /> | ||
| 386 | </div> | ||
| 387 | </div> | 383 | </div> |
| 388 | <div className="grid"> | 384 | </div> |
| 389 | <div className="grid__row"> | 385 | <div className="grid"> |
| 390 | <Input field={form.$('proxy.user')} /> | 386 | <div className="grid__row"> |
| 391 | <Input | 387 | <Input field={form.$('proxy.user')} /> |
| 392 | field={form.$('proxy.password')} | 388 | <Input |
| 393 | showPasswordToggle | 389 | field={form.$('proxy.password')} |
| 394 | /> | 390 | showPasswordToggle |
| 395 | </div> | 391 | /> |
| 396 | </div> | 392 | </div> |
| 397 | <p> | 393 | </div> |
| 398 | <span className="mdi mdi-information" /> | 394 | <p> |
| 399 | {intl.formatMessage(messages.proxyRestartInfo)} | 395 | <span className="mdi mdi-information" /> |
| 400 | </p> | 396 | {intl.formatMessage(messages.proxyRestartInfo)} |
| 401 | <p> | 397 | </p> |
| 402 | <span className="mdi mdi-information" /> | 398 | <p> |
| 403 | {intl.formatMessage(messages.proxyInfo)} | 399 | <span className="mdi mdi-information" /> |
| 404 | </p> | 400 | {intl.formatMessage(messages.proxyInfo)} |
| 405 | </> | 401 | </p> |
| 406 | )} | 402 | </> |
| 407 | </div> | 403 | )} |
| 408 | )} | 404 | </div> |
| 409 | 405 | ||
| 410 | <div className="user-agent"> | 406 | <div className="user-agent"> |
| 411 | <Input field={form.$('userAgentPref')} /> | 407 | <Input field={form.$('userAgentPref')} /> |