From 1091cc33970cab105a31792766291c15cce6a040 Mon Sep 17 00:00:00 2001
From: Ritik Kapoor <ritik.kapoor@harness.io>
Date: Tue, 13 Aug 2024 23:10:35 +0000
Subject: [PATCH] fix: merge option changes on polling (#2502)

* fix: merge option changes on polling
---
 .../PullRequestActionsBox/PullRequestActionsBox.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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