From 8fe06c68f35022ff402905e30ccc27b0907d68ac Mon Sep 17 00:00:00 2001
From: plsdev89 <plsdev89@gmail.com>
Date: Sat, 13 Dec 2025 13:29:12 -0500
Subject: [PATCH] fix: hide merge-and-edit-rule when not creating rule (#6393)

* fix: hide merge-and-edit-rule when not creating rule

When 'Automatically rename these payees in the future' is unchecked, no rule is created, so 'Merge and edit rule' should not be offered.

Fixes #6377

* docs: add release note for #6393
---
 .../src/components/modals/MergeUnusedPayeesModal.tsx        | 2 +-
 upcoming-release-notes/6393.md                              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 upcoming-release-notes/6393.md

diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx b/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
index 48bfe82afb..ecbd8c8e7c 100644
--- a/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
@@ -205,7 +205,7 @@ export function MergeUnusedPayeesModal({
               >
                 <Trans>Merge</Trans>
               </Button>
-              {!isEditingRule && (
+              {!isEditingRule && shouldCreateRule && (
                 <Button
                   style={{ marginRight: 10 }}
                   onPress={() => {
diff --git a/upcoming-release-notes/6393.md b/upcoming-release-notes/6393.md
new file mode 100644
index 0000000000..97eb9a4c1b
--- /dev/null
+++ b/upcoming-release-notes/6393.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [plsdev89]
+---
+
+Hide the "Merge and edit rule" button when "Automatically rename these payees in the future" is unchecked (no rule will be created).