diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2017-11-03 15:29:10 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2017-11-03 15:29:10 -0500 |
| commit | c58dfa913bb356368e12dc5248c4f5acdfe3934d (patch) | |
| tree | b50d0010ac51fa44405bcaec573dab03236ff9cb /src/libwalletqt | |
| parent | 6f95f8a7545bbdc25750412c54a92ddc5224b3ad (diff) | |
| parent | ceeb9b667fa35f92054c79942b593337fadcd08b (diff) | |
| download | monzero-gui-c58dfa913bb356368e12dc5248c4f5acdfe3934d.tar.gz monzero-gui-c58dfa913bb356368e12dc5248c4f5acdfe3934d.tar.xz monzero-gui-c58dfa913bb356368e12dc5248c4f5acdfe3934d.zip | |
Merge pull request #826
Remote nodes + mobile layout
Diffstat (limited to 'src/libwalletqt')
| -rw-r--r-- | src/libwalletqt/TransactionInfo.cpp | 2 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 2 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.cpp | 5 | ||||
| -rw-r--r-- | src/libwalletqt/WalletManager.h | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/src/libwalletqt/TransactionInfo.cpp b/src/libwalletqt/TransactionInfo.cpp index 5ad739bf..a787b151 100644 --- a/src/libwalletqt/TransactionInfo.cpp +++ b/src/libwalletqt/TransactionInfo.cpp @@ -38,6 +38,8 @@ QString TransactionInfo::displayAmount() const QString TransactionInfo::fee() const { + if(m_pimpl->fee() == 0) + return ""; return WalletManager::instance()->displayAmount(m_pimpl->fee()); } diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 409d3d1a..e5ffef82 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -646,6 +646,8 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent) Wallet::~Wallet() { qDebug("~Wallet: Closing wallet"); + delete m_addressBook; + m_addressBook = NULL; delete m_history; m_history = NULL; diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 396274c6..a8346478 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -275,6 +275,11 @@ bool WalletManager::stopMining() return m_pimpl->stopMining(); } +bool WalletManager::localDaemonSynced() const +{ + return blockchainHeight() > 1 && blockchainHeight() >= blockchainTargetHeight(); +} + QString WalletManager::resolveOpenAlias(const QString &address) const { bool dnssec_valid = false; diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index bf9bf19a..69c63b05 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -112,6 +112,7 @@ public: Q_INVOKABLE quint64 blockchainHeight() const; Q_INVOKABLE quint64 blockchainTargetHeight() const; Q_INVOKABLE double miningHashRate() const; + Q_INVOKABLE bool localDaemonSynced() const; Q_INVOKABLE bool isMining() const; Q_INVOKABLE bool startMining(const QString &address, quint32 threads, bool backgroundMining, bool ignoreBattery); |