Merge pull request #2775

fbfc531 History: display Address Book names for known destination addresses (xiphon)

1 files changed, 14 insertions, 0 deletions

diff --git a/src/libwalletqt/AddressBook.cpp b/src/libwalletqt/AddressBook.cpp
index d51fecc0..4856e6fd 100644
--- a/src/libwalletqt/AddressBook.cpp
+++ b/src/libwalletqt/AddressBook.cpp
@@ -55,8 +55,10 @@ void AddressBook::getAll()
     {
         QWriteLocker locker(&m_lock);
 
+        m_addresses.clear();
         m_rows.clear();
         for (auto &abr: m_addressBookImpl->getAll()) {
+            m_addresses.insert(QString::fromStdString(abr->getAddress()), m_rows.size());
             m_rows.append(abr);
         }
     }
@@ -128,3 +130,15 @@ int AddressBook::lookupPaymentID(const QString &payment_id) const
 
     return m_addressBookImpl->lookupPaymentID(payment_id.toStdString());
 }
+
+QString AddressBook::getDescription(const QString &address) const
+{
+    QReadLocker locker(&m_lock);
+
+    const QMap<QString, size_t>::const_iterator it = m_addresses.find(address);
+    if (it == m_addresses.end())
+    {
+        return {};
+    }
+    return QString::fromStdString(m_rows.value(*it)->getDescription());
+}