From a0094a2eb9c44a4b761e9ef4ef7eeae6e0c61b6b Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Mon, 16 Jun 2025 14:35:31 +0000
Subject: [PATCH] txcreate, txdo, txbump: minor help screen formatting fixes

---
 mmgen/help/help_notes.py |  4 ++--
 mmgen/help/txcreate.py   | 20 +++++++++++---------
 mmgen/main_txbump.py     |  4 +---
 mmgen/main_txcreate.py   |  2 +-
 mmgen/main_txdo.py       |  2 --
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/mmgen/help/help_notes.py b/mmgen/help/help_notes.py
index 889204f4..dac21470 100755
--- a/mmgen/help/help_notes.py
+++ b/mmgen/help/help_notes.py
@@ -166,9 +166,9 @@ as {r}, using an integer followed by {l}, for{s}{u}""".format(
 					r = BaseTX(cfg=self.cfg, proto=eth_proto).rel_fee_desc,
 					l = self.fee_spec_letters(use_quotes=True, proto=eth_proto),
 					u = self.fee_spec_names(proto=eth_proto, linebreak='\n'))
-				+ ' (for Ethereum)')
+				+ ' (for Ethereum)\n\n')
 		else:
-			return text + '.'
+			return text + '.\n\n'
 
 	def passwd(self):
 		return """
diff --git a/mmgen/help/txcreate.py b/mmgen/help/txcreate.py
index 20da35a7..d61b6943 100755
--- a/mmgen/help/txcreate.py
+++ b/mmgen/help/txcreate.py
@@ -41,14 +41,7 @@ cases, the resulting byte string must not exceed {bl} bytes in length.
 The transaction output is specified in the form ADDRESS,AMOUNT.
 """)
 
-	return f"""
-The transaction’s outputs are listed on the command line, while its inputs
-are chosen from a list of the wallet’s unspent outputs via an interactive
-menu.  Alternatively, inputs may be specified using the --inputs option.
-
-Addresses on the command line can be either native coin addresses or MMGen
-IDs in the form SEED_ID:ADDRTYPE_CODE:INDEX.
-{outputs_info}
+	fee_info = """
 If the transaction fee is not specified on the command line (see FEE
 SPECIFICATION below), it will be calculated dynamically using network fee
 estimation for the default (or user-specified) number of confirmations.
@@ -56,4 +49,13 @@ If network fee estimation fails, the user will be prompted for a fee.
 
 Network-estimated fees will be multiplied by the value of --fee-adjust, if
 specified.
-"""
+""" if proto.has_usr_fee else ''
+
+	return f"""
+The transaction’s outputs are listed on the command line, while its inputs
+are chosen from a list of the wallet’s unspent outputs via an interactive
+menu.  Alternatively, inputs may be specified using the --inputs option.
+
+Addresses on the command line can be either native coin addresses or MMGen
+IDs in the form SEED_ID:ADDRTYPE_CODE:INDEX.
+{outputs_info}{fee_info}"""
diff --git a/mmgen/main_txbump.py b/mmgen/main_txbump.py
index c3dc4e82..a72f36c3 100755
--- a/mmgen/main_txbump.py
+++ b/mmgen/main_txbump.py
@@ -109,9 +109,7 @@ Internet must be reachable either directly or via the SOCKS5 proxy specified
 with the --proxy option.  To improve privacy, it’s recommended to proxy
 requests to the quote server via Tor or some other anonymity network.
 
-{g}{F}
-
-{s}
+{g}{F}{s}
 Seed source files must have the canonical extensions listed in the 'FileExt'
 column below:
 
diff --git a/mmgen/main_txcreate.py b/mmgen/main_txcreate.py
index 976e40c3..cbd4cd3f 100755
--- a/mmgen/main_txcreate.py
+++ b/mmgen/main_txcreate.py
@@ -90,7 +90,7 @@ opts_data = {
 			-- -y, --yes             Answer 'yes' to prompts, suppress non-essential output
 			e- -X, --cached-balances Use cached balances
 		""",
-		'notes': '\n{c}\n{n_at}\n\n{g}{F}\n\n{x}',
+		'notes': '\n{c}\n{n_at}\n\n{g}{F}{x}',
 	},
 	'code': {
 		'usage': lambda cfg, proto, help_notes, s: s.format(
diff --git a/mmgen/main_txdo.py b/mmgen/main_txdo.py
index 629e146f..16759393 100755
--- a/mmgen/main_txdo.py
+++ b/mmgen/main_txdo.py
@@ -122,8 +122,6 @@ opts_data = {
 {n_at}
 
 {g}{F}
-
-
                                  SIGNING NOTES
 {s}
 Seed source files must have the canonical extensions listed in the 'FileExt'