From d757ffd641ce541af334dd9aef944a7f3ee83018 Mon Sep 17 00:00:00 2001 From: Jed Fox <git@jedfox.com> Date: Thu, 20 Jul 2023 06:19:05 -0400 Subject: [PATCH] =?UTF-8?q?Improve=20clarity=20of=20informational=20messag?= =?UTF-8?q?e=20in=20=E2=80=9Cmerge=20unused=20payees=E2=80=9D=20modal=20(#?= =?UTF-8?q?1371)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/modals/MergeUnusedPayees.js | 10 ++++++++-- upcoming-release-notes/1371.md | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 upcoming-release-notes/1371.md diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayees.js b/packages/desktop-client/src/components/modals/MergeUnusedPayees.js index 62cd244ef..32f61a6c4 100644 --- a/packages/desktop-client/src/components/modals/MergeUnusedPayees.js +++ b/packages/desktop-client/src/components/modals/MergeUnusedPayees.js @@ -122,8 +122,14 @@ export default function MergeUnusedPayees({ <Information> Merging will remove the payee and transfer any existing rules to - the new payee. If checked below, a rule will be created to do this - rename while importing transactions. + the new payee. + {!isEditingRule && ( + <> + {' '} + If checked below, a rule will be created to do this rename + while importing transactions. + </> + )} </Information> {!isEditingRule && ( diff --git a/upcoming-release-notes/1371.md b/upcoming-release-notes/1371.md new file mode 100644 index 000000000..690e494bc --- /dev/null +++ b/upcoming-release-notes/1371.md @@ -0,0 +1,6 @@ +--- +category: Enhancements +authors: [j-f1] +--- + +Improve clarity of informational message in “merge unused payees†modal -- GitLab