From feecde9faa385aaaf41f61c3c0733e7c6f40da2c Mon Sep 17 00:00:00 2001
From: Calvin Lee <calvin.lee@harness.io>
Date: Thu, 11 Jul 2024 18:00:08 +0000
Subject: [PATCH] fix: [code-2105]: fix available merge strats (#2206)

* fix: [code-2105]: fix available merge strats
---
 .../PullRequestActionsBox/PullRequestActionsBox.tsx         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
index 1295e7e1e..d0ac336ef 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -209,7 +209,11 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
     if (allowedStrats) {
       const matchingMethods = mergeOptions.filter(option => allowedStrats.includes(option.method))
       if (matchingMethods.length > 0) {
-        setMergeOption(mergeOption ? mergeOption : matchingMethods[0])
+        if (mergeOption && !matchingMethods.includes(mergeOption)) {
+          setMergeOption(matchingMethods[0])
+        } else {
+          setMergeOption(mergeOption)
+        }
       }
     } else {
       setMergeOption(mergeOptions[3])