Merge branch 'add-xmr-tx-key-service-2' into add-xmr-tx-key-service-3

core/src/main/resources/i18n/displayStrings.properties

@@ -1257,7 +1257,7 @@ setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature t
   own XMR explorer node for maximum privacy and security.\n\n\
   You can also set the maximum amount of BTC per trade to auto-confirm as well as the number of required \
   confirmations here in Settings.\n\n\
-  See more details (including how to set up your own explorer node) on the Bisq wiki: https://bisq.wiki/Auto-confirming_trades
+  See more details (including how to set up your own explorer node) on the Bisq wiki: https://bisq.wiki/Trading_Monero#Auto-confirming_trades
 ####################################################################
 # Account
 ####################################################################
@@ -1339,35 +1339,18 @@ mediator or arbitrator in case of a dispute.\n\n\
 There is no payment ID required, just the normal public address.\n\
 If you are not sure about that process visit ArQmA discord channel (https://discord.gg/s9BQpJT) \
 or the ArQmA forum (https://labs.arqma.com) to find more information.
-account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand and fulfill \
-the following requirements:\n\n\
-Prove payments: since Monero is a private coin, some transaction details aren't publicly available \
-in the blockchain, and, in case of a dispute, the mediator or arbitrator needs them to check if the \
-transaction was really made. In Bisq, the sender of the XMR transaction is the one responsible for \
-providing this information to the mediator or arbitrator in case of a dispute. In order to do that, \
-you must send XMR using a wallet that provides the information required to prove the payment was made, \
-which includes:\n\n\
+account.altcoin.popup.xmr.msg=Trading XMR on Bisq requires that you understand the following requirement.\n\n\
+If selling XMR, you must be able to provide the following information to a mediator or arbitrator in case of a dispute:\n\
 - the transaction key (Tx Key, Tx Secret Key or Tx Private Key)\n\
 - the transaction ID (Tx ID or Tx Hash)\n\
 - the destination address (recipient's address)\n\n\
-This information can be found in the official Monero GUI & CLI wallets, MyMonero, and Exodus (desktop) \
-as well as in Cake Wallet, MyMonero, and Monerujo (mobile), in the following locations:\n\n\
-- Monero GUI: go to Transactions tab\n\
-- Monero CLI: use the command get_tx_key TXID. The flag store-tx-info must be enabled (enabled by default in new versions)\n\
-- Other wallets: go to Transactions history and search for Transaction key (Tx key or Secret key) and the destination address \
-in a sent transaction. Save recipient address option must be enabled in Cake Wallet settings.\n\n\
-If you are using a wallet different from the mentioned above, please be sure you can access those three pieces of information.\
-Since the transaction key and the destination address are stored in the Monero wallet software, and they cannot be recovered \
-in the Monero blockchain, you should never delete or restore your Monero wallet before a Bisq trade is completed. Failure to \
-provide the above data will result in losing the dispute case.\n\n\
-Check payments: with those three pieces of information, the verification that a quantity of Monero was sent to a specific \
-address can be accomplished the following way:\n\n\
-- Monero GUI: change wallet to Advanced mode and go to Advanced > Prove/check > Check Transaction\n\
-- Monero CLI: use the command check_tx_key TXID TXKEY ADDRESS\n\
-- XMR checktx tool (https://xmr.llcoins.net/checktx.html)\n\
-- Explore Monero website (https://www.exploremonero.com/receipt)\n\n\
-If you are still not sure about this process, visit (https://www.getmonero.org/resources/user-guides/prove-payment.html) \
-to find more information or ask a question on the Monero support subreddit (https://www.reddit.com/r/monerosupport/).
+See the wiki for details on where to find this information on popular Monero wallets:\n\
+https://bisq.wiki/Trading_Monero#Proving_payments\n\n\
+Failure to provide the required transaction data will result in losing disputes.\n\n\
+Also note that Bisq now offers automatic confirming for XMR transactions to make trades quicker, \
+but you need to enable it in Settings.\n\n\
+See the wiki for more about the auto-confirm feature:\n\
+https://bisq.wiki/Trading_Monero#Auto-confirming_trades
 # suppress inspection "TrailingSpacesInProperty"
 account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\