From 3f608cd3db2ec7feb6aaf5ae6475f0218eaef018 Mon Sep 17 00:00:00 2001
From: Ritik Kapoor <ritik.kapoor@harness.io>
Date: Fri, 6 Dec 2024 10:40:00 +0000
Subject: [PATCH] fix: [CODE-2903]: Disable the inline merge btn - in case the
 merge is in progress (#3121)

*

fix: [CODE-2903]: Disable the inline merge btn - in case the merge is in progress
---
 .../PullRequestActionsBox/PullRequestActionsBox.tsx           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index ce7b50b97..287be3a4d 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -494,7 +494,9 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
                                 type="submit"
                                 onClick={handleSubmit}
                                 disabled={
-                                  isMerged || (mergeOption.method === MergeStrategy.FAST_FORWARD && rebasePossible)
+                                  (loading && !internalFlags.current.dryRun) ||
+                                  isMerged ||
+                                  (mergeOption.method === MergeStrategy.FAST_FORWARD && rebasePossible)
                                 }
                                 variation={ButtonVariation.PRIMARY}
                                 text={getString('confirmStrat', { strat: mergeOption.title })}