Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

TxConfirmationDialog: implement multiple recipients support, layout fixes

Browse Source
This commit is contained in:
xiphon
2021-02-02 16:00:46 +00:00
parent c073867657
commit 92a2ae1a11
6 changed files with 133 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libwalletqt/WalletManager.cpp
View File

@@ -251,7 +251,7 @@ QString WalletManager::errorString() const
return tr("Unknown error");
}
quint64 WalletManager::maximumAllowedAmount() const
quint64 WalletManager::maximumAllowedAmount()
{
return Monero::Wallet::maximumAllowedAmount();
}
@@ -266,7 +266,7 @@ QString WalletManager::displayAmount(quint64 amount)
return QString::fromStdString(Monero::Wallet::displayAmount(amount));
}
quint64 WalletManager::amountFromString(const QString &amount) const
quint64 WalletManager::amountFromString(const QString &amount)
{
return Monero::Wallet::amountFromString(amount.toStdString());
}
@@ -276,6 +276,17 @@ quint64 WalletManager::amountFromDouble(double amount) const
return Monero::Wallet::amountFromDouble(amount);
}
QString WalletManager::amountsSumFromStrings(const QVector<QString> &amounts)
{
quint64 sum = 0;
for (const auto &amountString : amounts)
{
const quint64 amount = amountFromString(amountString);
sum = sum + std::min(maximumAllowedAmount() - sum, amount);
}
return QString::number(sum);
}
bool WalletManager::paymentIdValid(const QString &payment_id) const
{
return Monero::Wallet::paymentIdValid(payment_id.toStdString());

5
src/libwalletqt/WalletManager.h
View File

@@ -133,9 +133,10 @@ public:
//! since we can't call static method from QML, move it to this class
Q_INVOKABLE static QString displayAmount(quint64 amount);
Q_INVOKABLE quint64 amountFromString(const QString &amount) const;
Q_INVOKABLE static quint64 amountFromString(const QString &amount);
Q_INVOKABLE quint64 amountFromDouble(double amount) const;
Q_INVOKABLE quint64 maximumAllowedAmount() const;
Q_INVOKABLE static QString amountsSumFromStrings(const QVector<QString> &amounts);
Q_INVOKABLE static quint64 maximumAllowedAmount();
// QML JS engine doesn't support unsigned integers
Q_INVOKABLE QString maximumAllowedAmountAsString() const;