From 0b7f0396de0f6456a37d0595191e2441bd7479f9 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Tue, 19 Feb 2019 15:46:29 +0300
Subject: [PATCH] Fixed processing config
---
client/src/components/Settings/Encryption/Form.js | 8 ++++----
client/src/components/Settings/Encryption/index.js | 2 --
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/client/src/components/Settings/Encryption/Form.js b/client/src/components/Settings/Encryption/Form.js
index a82dfca0..0ed6fffb 100644
--- a/client/src/components/Settings/Encryption/Form.js
+++ b/client/src/components/Settings/Encryption/Form.js
@@ -47,7 +47,7 @@ let Form = (props) => {
change,
invalid,
submitting,
- processing,
+ processingConfig,
processingValidate,
not_after,
valid_chain,
@@ -278,7 +278,7 @@ let Form = (props) => {
disabled={
invalid
|| submitting
- || processing
+ || processingConfig
|| processingValidate
|| (privateKey && !valid_key)
|| (certificateChain && !valid_cert)
@@ -289,7 +289,7 @@ let Form = (props) => {
<button
type="button"
className="btn btn-secondary btn-standart"
- disabled={submitting || processing}
+ disabled={submitting || processingConfig}
onClick={() => clearFields(change)}
>
<Trans>reset_settings</Trans>
@@ -309,7 +309,7 @@ Form.propTypes = {
submitting: PropTypes.bool.isRequired,
invalid: PropTypes.bool.isRequired,
initialValues: PropTypes.object.isRequired,
- processing: PropTypes.bool.isRequired,
+ processingConfig: PropTypes.bool.isRequired,
processingValidate: PropTypes.bool.isRequired,
status_key: PropTypes.string,
not_after: PropTypes.string,
diff --git a/client/src/components/Settings/Encryption/index.js b/client/src/components/Settings/Encryption/index.js
index 9e9e0626..8a57e028 100644
--- a/client/src/components/Settings/Encryption/index.js
+++ b/client/src/components/Settings/Encryption/index.js
@@ -45,8 +45,6 @@ class Encryption extends Component {
certificate_chain,
private_key,
}}
- processing={encryption.processingConfig}
- processingValidate={encryption.processingValidate}
onSubmit={this.handleFormSubmit}
onChange={this.handleFormChange}
{...this.props.encryption}