diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx index c36ae6329..7cb22148b 100644 --- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx +++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx @@ -57,6 +57,7 @@ import { Violation } from 'utils/Utils' import { UserPreference, useUserPreference } from 'hooks/useUserPreference' +import { useGetRepositoryMetadata } from 'hooks/useGetRepositoryMetadata' import ReviewSplitButton from 'components/Changes/ReviewSplitButton/ReviewSplitButton' import RuleViolationAlertModal from 'components/RuleViolationAlertModal/RuleViolationAlertModal' import css from './PullRequestActionsBox.module.scss' @@ -78,6 +79,7 @@ export const PullRequestActionsBox: React.FC = ({ const { currentUser } = useAppContext() const { hooks, standalone } = useAppContext() const space = useGetSpaceParam() + const { pullRequestSection } = useGetRepositoryMetadata() const { mutate: mergePR, loading } = useMutate({ verb: 'POST', path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/merge` @@ -140,6 +142,8 @@ export const PullRequestActionsBox: React.FC = ({ err.status === 423 // resource locked (merge / dry-run already ongoing) ) { return + } else if (pullRequestSection !== 'conversation') { + return } else { showError(getErrorMessage(err)) }