From f37fde2a276216da1490815717d60be4fe96db8c Mon Sep 17 00:00:00 2001
From: Mateusz Kwasniewski <kwasniewski.mateusz@gmail.com>
Date: Mon, 20 Oct 2025 15:39:06 +0200
Subject: [PATCH] feat: release plan cr conflict (#10831)

---
 .../ChangeRequest/Changes/Change/ReleasePlanChange.tsx      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx
index 4f7e4e5746..f868d2aa48 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/ReleasePlanChange.tsx
@@ -35,7 +35,8 @@ const DeleteReleasePlan: FC<{
     actions?: ReactNode;
 }> = ({ change, currentReleasePlan, changeRequestState, actions }) => {
     const releasePlan =
-        changeRequestState === 'Applied' && change.payload.snapshot
+        (changeRequestState === 'Applied' || !currentReleasePlan) &&
+        change.payload.snapshot
             ? change.payload.snapshot
             : currentReleasePlan;
 
@@ -62,7 +63,8 @@ const StartMilestone: FC<{
     actions?: ReactNode;
 }> = ({ change, currentReleasePlan, changeRequestState, actions }) => {
     const releasePlan =
-        changeRequestState === 'Applied' && change.payload.snapshot
+        (changeRequestState === 'Applied' || !currentReleasePlan) &&
+        change.payload.snapshot
             ? change.payload.snapshot
             : currentReleasePlan;