From a83adb70adebf4528d558372998ac348bcc6c148 Mon Sep 17 00:00:00 2001 From: thotbot Date: Thu, 19 Dec 2019 00:16:00 +0000 Subject: Transfer: improve warning flow --- src/libwalletqt/Wallet.cpp | 10 ++++++++++ src/libwalletqt/Wallet.h | 2 ++ src/libwalletqt/WalletManager.cpp | 2 +- src/libwalletqt/WalletManager.h | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 7b122481..02f640d6 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -289,6 +289,11 @@ bool Wallet::viewOnly() const return m_walletImpl->watchOnly(); } +quint64 Wallet::balance() const +{ + return balance(m_currentSubaddressAccount); +} + quint64 Wallet::balance(quint32 accountIndex) const { return m_walletImpl->balance(accountIndex); @@ -299,6 +304,11 @@ quint64 Wallet::balanceAll() const return m_walletImpl->balanceAll(); } +quint64 Wallet::unlockedBalance() const +{ + return unlockedBalance(m_currentSubaddressAccount); +} + quint64 Wallet::unlockedBalance(quint32 accountIndex) const { return m_walletImpl->unlockedBalance(accountIndex); diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index 30861c78..a6add1da 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -160,10 +160,12 @@ public: Q_INVOKABLE void setTrustedDaemon(bool arg); //! returns balance + Q_INVOKABLE quint64 balance() const; Q_INVOKABLE quint64 balance(quint32 accountIndex) const; Q_INVOKABLE quint64 balanceAll() const; //! returns unlocked balance + Q_INVOKABLE quint64 unlockedBalance() const; Q_INVOKABLE quint64 unlockedBalance(quint32 accountIndex) const; Q_INVOKABLE quint64 unlockedBalanceAll() const; diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index eab5aad2..5a892f1e 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -260,7 +260,7 @@ quint64 WalletManager::maximumAllowedAmount() const return Monero::Wallet::maximumAllowedAmount(); } -QString WalletManager::maximumAllowedAmountAsSting() const +QString WalletManager::maximumAllowedAmountAsString() const { return WalletManager::displayAmount(WalletManager::maximumAllowedAmount()); } diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 54d2a29f..a37d0466 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -135,7 +135,7 @@ public: Q_INVOKABLE quint64 maximumAllowedAmount() const; // QML JS engine doesn't support unsigned integers - Q_INVOKABLE QString maximumAllowedAmountAsSting() const; + Q_INVOKABLE QString maximumAllowedAmountAsString() const; Q_INVOKABLE bool paymentIdValid(const QString &payment_id) const; Q_INVOKABLE bool addressValid(const QString &address, NetworkType::Type nettype) const; -- cgit v1.2.3