diff options
author | 2021-08-13 00:45:01 +0530 | |
---|---|---|
committer | 2021-08-13 00:45:01 +0530 | |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/containers/settings/EditServiceScreen.js | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/containers/settings/EditServiceScreen.js')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index ddf2d2d25..c880e97ae 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -19,7 +19,6 @@ import { required, url, oneRequired } from '../../helpers/validation-helpers'; | |||
19 | import { getSelectOptions } from '../../helpers/i18n-helpers'; | 19 | import { getSelectOptions } from '../../helpers/i18n-helpers'; |
20 | 20 | ||
21 | import { config as proxyFeature } from '../../features/serviceProxy'; | 21 | import { config as proxyFeature } from '../../features/serviceProxy'; |
22 | import { config as spellcheckerFeature } from '../../features/spellchecker'; | ||
23 | 22 | ||
24 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; | 23 | import { SPELLCHECKER_LOCALES } from '../../i18n/languages'; |
25 | 24 | ||
@@ -346,7 +345,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
346 | 345 | ||
347 | render() { | 346 | render() { |
348 | const { | 347 | const { |
349 | recipes, services, user, settings, | 348 | recipes, services, user, |
350 | } = this.props.stores; | 349 | } = this.props.stores; |
351 | const { action } = this.props.router.params; | 350 | const { action } = this.props.router.params; |
352 | 351 | ||
@@ -395,13 +394,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
395 | status={services.actionStatus} | 394 | status={services.actionStatus} |
396 | isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting} | 395 | isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting} |
397 | isDeleting={services.deleteServiceRequest.isExecuting} | 396 | isDeleting={services.deleteServiceRequest.isExecuting} |
398 | onSubmit={d => this.onSubmit(d)} | 397 | onSubmit={(d) => this.onSubmit(d)} |
399 | onDelete={() => this.deleteService()} | 398 | onDelete={() => this.deleteService()} |
400 | openRecipeFile={file => this.openRecipeFile(file)} | 399 | openRecipeFile={(file) => this.openRecipeFile(file)} |
401 | isProxyFeatureEnabled={proxyFeature.isEnabled} | 400 | isProxyFeatureEnabled={proxyFeature.isEnabled} |
402 | isServiceProxyIncludedInCurrentPlan={proxyFeature.isIncludedInCurrentPlan} | ||
403 | isSpellcheckerIncludedInCurrentPlan={spellcheckerFeature.isIncludedInCurrentPlan} | ||
404 | isHibernationFeatureActive={settings.app.hibernate} | ||
405 | /> | 401 | /> |
406 | </ErrorBoundary> | 402 | </ErrorBoundary> |
407 | ); | 403 | ); |