From 258f8561280f45c917008f2e140e5ab4e079b822 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sun, 26 Mar 2023 12:48:44 +0000
Subject: [PATCH] xmrwallet: save TX data to file even when relaying

---
 mmgen/xmrwallet.py             | 12 +++++++-----
 test/test_py_d/ts_xmrwallet.py |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mmgen/xmrwallet.py b/mmgen/xmrwallet.py
index a872eef5..aeaf4bfa 100755
--- a/mmgen/xmrwallet.py
+++ b/mmgen/xmrwallet.py
@@ -877,10 +877,13 @@ class MoneroWalletOps:
 			if uopt.tx_relay_daemon:
 				self.display_tx_relay_info(indent='    ')
 
+			msg('Saving TX data to file')
+			new_tx.write(delete_metadata=True)
+
 			if uopt.no_relay:
-				msg('Saving TX data to file')
-				new_tx.write(delete_metadata=True)
-			elif keypress_confirm(f'Relay {self.name} transaction?'):
+				return True
+
+			if keypress_confirm(f'Relay {self.name} transaction?'):
 				w_desc = 'source'
 				if uopt.tx_relay_daemon:
 					await h.stop_wallet('source')
@@ -892,11 +895,10 @@ class MoneroWalletOps:
 				msg_r(f'\n    Relaying {self.name} transaction...')
 				h.relay_tx(new_tx.data.metadata)
 				gmsg('\nAll done')
+				return True
 			else:
 				die(1,'\nExiting at user request')
 
-			return True
-
 	class transfer(sweep):
 		name    = 'transfer'
 		stem    = 'transferr'
diff --git a/test/test_py_d/ts_xmrwallet.py b/test/test_py_d/ts_xmrwallet.py
index 9cc7b852..9790abe4 100755
--- a/test/test_py_d/ts_xmrwallet.py
+++ b/test/test_py_d/ts_xmrwallet.py
@@ -438,11 +438,12 @@ class TestSuiteXMRWallet(TestSuiteBase):
 		if return_amt:
 			amt = XMRAmt(strip_ansi_escapes(t.expect_getend('Amount: ')).replace('XMR','').strip())
 
-		if no_relay:
-			t.expect('Save MoneroMMGenTX data? (y/N): ','y')
-			t.written_to_file('MoneroMMGenTX data')
-		else:
+		t.expect('Save MoneroMMGenTX data? (y/N): ','y')
+		t.written_to_file('MoneroMMGenTX data')
+
+		if not no_relay:
 			t.expect(f'Relay {op} transaction? (y/N): ','y')
+			get_file_with_ext(self.users[user].udir,'sigtx',delete_all=True)
 
 		t.read()