Merge pull request #1085

9250863 simplewallet: fix wrong amount in show_transfers for pending transactions (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-09-18 11:32:59 +02:00
commit 2c57885225
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -3305,7 +3305,7 @@ bool simple_wallet::show_transfers(const std::vector<std::string> &args_)
for (std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) {
const tools::wallet2::unconfirmed_transfer_details &pd = i->second;
uint64_t amount = pd.m_amount_in;
uint64_t fee = amount - pd.m_amount_out;
uint64_t fee = amount - pd.m_amount_out - pd.m_change;
std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id);
if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
payment_id = payment_id.substr(0,16);