diff --git a/src/components/forms/EditEnvironmentSimpleForm/EditEnvironmentSimpleForm.js b/src/components/forms/EditEnvironmentSimpleForm/EditEnvironmentSimpleForm.js
index bcd0e82d3..0de7fd898 100644
--- a/src/components/forms/EditEnvironmentSimpleForm/EditEnvironmentSimpleForm.js
+++ b/src/components/forms/EditEnvironmentSimpleForm/EditEnvironmentSimpleForm.js
@@ -117,43 +117,49 @@ class EditEnvironmentSimpleForm extends Component {
{error && {error}}
-
-
- {dirty && (
-
- )}
-
-
- ),
- submitting: (
-
- ),
- success: (
-
- ),
- }}
- />
-
-
+ {(!invalid || dirty) && (
+
+
+ {dirty && (
+
+ )}
+
+ {!invalid && (
+
+ ),
+ submitting: (
+
+ ),
+ success: (
+
+ ),
+ }}
+ />
+ )}
+
+
+ )}
>
) : (
<>
diff --git a/src/components/forms/EditTestsForm/EditTestsForm.js b/src/components/forms/EditTestsForm/EditTestsForm.js
index c833310f3..9a294ec43 100644
--- a/src/components/forms/EditTestsForm/EditTestsForm.js
+++ b/src/components/forms/EditTestsForm/EditTestsForm.js
@@ -122,6 +122,7 @@ class EditTestsForm extends Component {
submitSucceeded,
invalid,
formValues,
+ initialValues,
} = this.props;
return (
@@ -188,6 +189,7 @@ class EditTestsForm extends Component {
hasFailed={submitFailed}
handleSubmit={handleSubmit}
defaultIcon={}
+ disabled={formValues.tests.length === 0}
messages={{
submit: ,
submitting: (
@@ -197,22 +199,24 @@ class EditTestsForm extends Component {
}}
/>
-
- }
- hide={!dirty}>
-
-
+ {initialValues.tests.length > 0 && (
+
+ }
+ hide={!dirty}>
+
+
+ )}