oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge compilation fix

This commit is contained in:
Jason Rhinelander 2022-05-27 14:22:19 -03:00
parent e9e8e93669
commit f12bb8b3f9
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View File

@ -6390,13 +6390,13 @@ std::string wallet2::transfers_to_csv(const std::vector<wallet::transfer_view>&
transfer.lock_msg,
(transfer.checkpointed ? "yes" : "no"),
tools::get_human_readable_timestamp(transfer.timestamp),
fmt::format(coin_format, transfer.amount / COIN, transfer.amount % COIN),
fmt::format(coin_format, running_balance / COIN, running_balance % COIN),
fmt::format(coin_format, transfer.amount / oxen::COIN, transfer.amount % oxen::COIN),
fmt::format(coin_format, running_balance / oxen::COIN, running_balance % oxen::COIN),
transfer.txid,
transfer.payment_id,
cryptonote::print_money(transfer.fee),
(transfer.destinations.size() ? transfer.destinations.front().address : "-"),
(transfer.destinations.size() ? fmt::format(coin_format, transfer.destinations.front().amount / COIN, transfer.destinations.front().amount % COIN) : ""),
(transfer.destinations.size() ? fmt::format(coin_format, transfer.destinations.front().amount / oxen::COIN, transfer.destinations.front().amount % oxen::COIN) : ""),
indices,
transfer.note);
@ -6407,7 +6407,7 @@ std::string wallet2::transfers_to_csv(const std::vector<wallet::transfer_view>&
for (auto it = std::next(transfer.destinations.cbegin()); it != transfer.destinations.cend(); ++it)
output << fmt::format(data_format,
"", "", "", "", "", "", "", "", "", "",
it->address, fmt::format(coin_format, it->amount / COIN, it->amount % COIN), "", "");
it->address, fmt::format(coin_format, it->amount / oxen::COIN, it->amount % oxen::COIN), "", "");
}
return output.str();
}