From afc2fac6255217adad816972412c2198d3b32718 Mon Sep 17 00:00:00 2001
From: Angus <angusdev@gmail.com>
Date: Mon, 17 Oct 2022 18:29:44 +0100
Subject: [PATCH] Fix menu items are disabled if close the rebase conflict
 dialog

onDismissed didn't reset IAppState. currentPopup so the menu is disabled.

Need to call closePopup in onInvokeConflictsDialogDismissed

"Abort Rebase" works properly since it calls onFlowEnded()
---
 .../ui/multi-commit-operation/base-multi-commit-operation.tsx   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx b/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
index aed59470f6..e3266ea7fe 100644
--- a/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
+++ b/app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx
@@ -93,6 +93,8 @@ export abstract class BaseMultiCommitOperation extends React.Component<IMultiCom
         {targetBranch !== null ? <strong>{targetBranch.name}</strong> : null}
       </>
     )
+
+    this.props.dispatcher.closePopup(PopupType.MultiCommitOperation)
     return dispatcher.onConflictsFoundBanner(
       repository,
       operationDescription,