diff --git a/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx b/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx index abe161279d..ed5b787089 100644 --- a/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx +++ b/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx @@ -78,6 +78,7 @@ export function GitIntegrationStep({ useGithubUserConnect({ projectId: selectedProjectId }); const isConnecting = connectState === "connecting"; const timedOut = connectState === "timed-out"; + const canTakeAction = !isConnecting && !timedOut; const selectedProject = useMemo( () => projects.find((p) => p.id === selectedProjectId), @@ -356,10 +357,29 @@ export function GitIntegrationStep({ ) : !isLoading && !githubUserIntegrationsLoading ? ( - selectedAlternative && - selectedProject && - !isConnecting && - !timedOut ? ( + selectedProject?.hasGithubIntegration && canTakeAction ? ( + + + GitHub is already set up on{" "} + + {selectedProject.name} + + . Sign in with one click to link your account — no + admin approval needed. + + + + ) : selectedAlternative && + selectedProject && + canTakeAction ? ( GitHub is already connected on{" "}