From fad7bd9ba3eef03fcdd7cb17011ea0c6e483c767 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Wed, 14 Jan 2026 19:37:48 +0100
Subject: [PATCH] noui: Remove always empty caption while formatting

The only behavior change is in noui_ThreadSafeQuestion, which can not
detect a style and will log a strCaption=": ".

Fix this by removing it.
---
 src/noui.cpp                                      | 1 -
 test/functional/feature_presegwit_node_upgrade.py | 2 +-
 test/functional/feature_reindex_init.py           | 2 +-
 test/functional/rpc_blockchain.py                 | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/noui.cpp b/src/noui.cpp
index 7451a99962a..327e17f8dbf 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -39,7 +39,6 @@ bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style)
         if (!fSecure) LogInfo("%s\n", message.original);
         break;
     default:
-        strCaption = ": "; // caption is always empty TODO fix this
         if (!fSecure) LogInfo("%s%s\n", strCaption, message.original);
     }
 
diff --git a/test/functional/feature_presegwit_node_upgrade.py b/test/functional/feature_presegwit_node_upgrade.py
index 759a9296c31..bbe190a6541 100755
--- a/test/functional/feature_presegwit_node_upgrade.py
+++ b/test/functional/feature_presegwit_node_upgrade.py
@@ -38,7 +38,7 @@ class SegwitUpgradeTest(BitcoinTestFramework):
         # because the blockchain consists of 3 insufficiently validated blocks per segwit consensus rules.
         node.assert_start_raises_init_error(
             extra_args=["-testactivationheight=segwit@5"],
-            expected_msg=": Witness data for blocks after height 5 requires "
+            expected_msg="Witness data for blocks after height 5 requires "
             f"validation. Please restart with -reindex..{os.linesep}"
             "Please restart with -reindex or -reindex-chainstate to recover.",
         )
diff --git a/test/functional/feature_reindex_init.py b/test/functional/feature_reindex_init.py
index d031355e439..d2ef6c5e220 100755
--- a/test/functional/feature_reindex_init.py
+++ b/test/functional/feature_reindex_init.py
@@ -21,7 +21,7 @@ class ReindexInitTest(BitcoinTestFramework):
         self.log.info("Removing the block index leads to init error")
         shutil.rmtree(node.blocks_path / "index")
         node.assert_start_raises_init_error(
-            expected_msg=f": Error initializing block database.{os.linesep}"
+            expected_msg=f"Error initializing block database.{os.linesep}"
             "Please restart with -reindex or -reindex-chainstate to recover.",
         )
 
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 3c011c09ed0..5c1f2ee4008 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -124,7 +124,7 @@ class BlockchainTest(BitcoinTestFramework):
         self.log.info("A block tip of more than MAX_FUTURE_BLOCK_TIME in the future raises an error")
         self.nodes[0].assert_start_raises_init_error(
             extra_args=[f"-mocktime={TIME_RANGE_TIP - MAX_FUTURE_BLOCK_TIME - 1}"],
-            expected_msg=": The block database contains a block which appears to be from the future."
+            expected_msg="The block database contains a block which appears to be from the future."
             " This may be due to your computer's date and time being set incorrectly."
             f" Only rebuild the block database if you are sure that your computer's date and time are correct.{os.linesep}"
             "Please restart with -reindex or -reindex-chainstate to recover.",