Merge pull request #5027

9092fc4b wallet: do not display daemon controlled text if untrusted (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-16 21:38:15 +02:00
commit 3eb96fa512
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 89 additions and 39 deletions

View file

@ -541,7 +541,7 @@ namespace
}
catch (const tools::error::tx_rejected& e)
{
fail_msg_writer() << (boost::format(sw::tr("transaction %s was rejected by daemon with status: ")) % get_transaction_hash(e.tx())) << e.status();
fail_msg_writer() << (boost::format(sw::tr("transaction %s was rejected by daemon")) % get_transaction_hash(e.tx()));
std::string reason = e.reason();
if (!reason.empty())
fail_msg_writer() << sw::tr("Reason: ") << reason;