From 2c3d92398ddc63bd2c2d5b48b50ac939e8f8b31d Mon Sep 17 00:00:00 2001
From: Bolaji Olajide <25608335+BolajiOlajide@users.noreply.github.com>
Date: Tue, 9 Jul 2024 08:43:01 +0100
Subject: [PATCH] chore(batches): remove `batches-github-app-integration` 
 feature flag (#63701)

We want to make the `Batch Changes <> GitHub App` integration available
for everyone.

## Test plan

<!-- REQUIRED; info at
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->
Manual testing

## Changelog

<!-- OPTIONAL; info at
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c
-->
---
 .../src/enterprise/batches/settings/AddCredentialModal.tsx  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/web/src/enterprise/batches/settings/AddCredentialModal.tsx b/client/web/src/enterprise/batches/settings/AddCredentialModal.tsx
index 2c6d1872ef7..2ad575835c8 100644
--- a/client/web/src/enterprise/batches/settings/AddCredentialModal.tsx
+++ b/client/web/src/enterprise/batches/settings/AddCredentialModal.tsx
@@ -7,7 +7,6 @@ import type { AuthenticatedUser } from '@sourcegraph/shared/src/auth'
 import { Button, Modal, Link, Code, Label, Text, Input, ErrorAlert, Form, Select } from '@sourcegraph/wildcard'
 
 import { LoaderButton } from '../../../components/LoaderButton'
-import { useFeatureFlag } from '../../../featureFlags/useFeatureFlag'
 import { ExternalServiceKind, GitHubAppKind, type UserAreaUserFields } from '../../../graphql-operations'
 
 import { useCreateBatchChangesCredential } from './backend'
@@ -105,7 +104,6 @@ export const AddCredentialModal: FC<React.PropsWithChildren<AddCredentialModalPr
     const [authStrategy, setAuthStrategy] = useState<AuthenticationStrategyType>(
         AuthenticationStrategy.PERSONAL_ACCESS_TOKEN
     )
-    const [isGithubAppIntegrationEnabled] = useFeatureFlag('batches-github-app-integration')
 
     const onChangeCredential = useCallback<React.ChangeEventHandler<HTMLInputElement>>(event => {
         setCredential(event.target.value)
@@ -156,7 +154,7 @@ export const AddCredentialModal: FC<React.PropsWithChildren<AddCredentialModalPr
     )
 
     const isTokenSection = step === 'add-token'
-    const isGitHubKind = externalServiceKind === ExternalServiceKind.GITHUB
+    const isExternalServiceKindGitHub = externalServiceKind === ExternalServiceKind.GITHUB
 
     // addCredentialModalStepRuler
     return (
@@ -167,7 +165,7 @@ export const AddCredentialModal: FC<React.PropsWithChildren<AddCredentialModalPr
                     externalServiceKind={externalServiceKind}
                     externalServiceURL={externalServiceURL}
                 />
-                {isGitHubKind && isGithubAppIntegrationEnabled && isTokenSection && (
+                {isExternalServiceKindGitHub && isTokenSection && (
                     <Select
                         id="credential-kind"
                         selectSize="sm"