1 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index 3ec0c23e55d..91f7c7dabf6 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -61,9 +61,6 @@ export default {
         this.customState.integrationLevel === integrationLevels.GROUP
       );
     },
-    showJiraIssuesFields() {
-      return this.isJira && this.glFeatures.jiraIssuesIntegration;
-    },
     showReset() {
       return this.isInstanceOrGroupLevel && this.propsSource.resetPath;
     },
@@ -129,7 +126,7 @@ export default {
           v-bind="field"
         />
         <jira-issues-fields
-          v-if="showJiraIssuesFields"
+          v-if="isJira && !isInstanceOrGroupLevel"
           :key="`${currentKey}-jira-issues-fields`"
           v-bind="propsSource.jiraIssuesProps"
         />
@@ -138,7 +135,7 @@ export default {
             <gl-button
               v-gl-modal.confirmSaveIntegration
               category="primary"
-              variant="success"
+              variant="confirm"
               :loading="isSaving"
               :disabled="isDisabled"
               data-qa-selector="save_changes_button"
@@ -150,7 +147,7 @@ export default {
           <gl-button
             v-else
             category="primary"
-            variant="success"
+            variant="confirm"
             type="submit"
             :loading="isSaving"
             :disabled="isDisabled"
@@ -162,6 +159,8 @@ export default {
 
           <gl-button
             v-if="propsSource.canTest"
+            category="secondary"
+            variant="confirm"
             :loading="isTesting"
             :disabled="isDisabled"
             :href="propsSource.testPath"
@@ -174,7 +173,7 @@ export default {
             <gl-button
               v-gl-modal.confirmResetIntegration
               category="secondary"
-              variant="default"
+              variant="confirm"
               :loading="isResetting"
               :disabled="isDisabled"
               data-testid="reset-button"
@@ -184,9 +183,7 @@ export default {
             <reset-confirmation-modal @reset="onResetClick" />
           </template>
 
-          <gl-button class="btn-cancel" :href="propsSource.cancelPath">{{
-            __('Cancel')
-          }}</gl-button>
+          <gl-button :href="propsSource.cancelPath">{{ __('Cancel') }}</gl-button>
         </div>
       </div>
     </div>