Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use UtxoPerKbyte for custom utxo fees #12

Merged
merged 1 commit into from
Nov 25, 2024
Merged

use UtxoPerKbyte for custom utxo fees #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atomic_defi_design/Dex/Wallet/SendModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ MultipageModal
Layout.preferredHeight: 38
Layout.alignment: Qt.AlignHCenter

placeholderText: qsTr("Enter the custom fee") + " [" + api_wallet_page.ticker + "]"
placeholderText: qsTr("Enter the custom fee") + " (" + api_wallet_page.ticker + "/kb)"
}

// Token coins
Expand Down
4 changes: 2 additions & 2 deletions src/core/atomicdex/pages/qt.wallet.page.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ namespace atomic_dex
qDebug() << fees_data;
auto json_fees = nlohmann::json::parse(QString(QJsonDocument(QVariant(fees_data).toJsonObject()).toJson()).toStdString());
withdraw_init_req.fees = t_withdraw_init_fees{
.type = "UtxoFixed",
.type = "UtxoPerKbyte",
.amount = json_fees.at("fees_amount").get<std::string>()
};
}
Expand Down Expand Up @@ -702,7 +702,7 @@ namespace atomic_dex
{
qDebug() << fees_data;
withdraw_req.fees = t_withdraw_fees{
.type = "UtxoFixed",
.type = "UtxoPerKbyte",
.amount = json_fees.at("fees_amount").get<std::string>(),
.gas_limit = json_fees.at("gas_limit").get<int>()};
if (coin_info.coin_type == CoinType::ERC20)
Expand Down
Loading