From 3ceb2443a3042ee1bc79d8548908068e65ec468f Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Sun, 27 Oct 2019 12:12:00 -0700
Subject: [PATCH] Show incoming memos properly

---
 src/controller.cpp   | 7 ++++++-
 src/txtablemodel.cpp | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index bc820a1..f43fe4d 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -377,10 +377,15 @@ void Controller::refreshTransactions() {
                 address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
                 model->markAddressUsed(address);
 
+                QString memo;
+                if (!it["memo"].is_null()) {
+                    memo = QString::fromStdString(it["memo"]);
+                }
+
                 items.push_back(TransactionItemDetail{
                     address,
                     CAmount::fromqint64(it["amount"].get<json::number_integer_t>()),
-                    ""
+                    memo
                 });
 
                 TransactionItem tx{
diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp
index 3b0a795..04d50e3 100644
--- a/src/txtablemodel.cpp
+++ b/src/txtablemodel.cpp
@@ -150,14 +150,14 @@ bool TxTableModel::exportToCsv(QString fileName) const {
         }
     }
 
-    if (role == Qt::DecorationRole && index.column() == 0) {
+    if (role == Qt::DecorationRole && index.column() == 0) {        
         bool hasMemo = false;
         for (int i=0; i < dat.items.length(); i++) {
             if (!dat.items[i].memo.isEmpty()) {
                 hasMemo = true;
             }
         }
-
+        
         // If the memo is a Payment URI, then show a payment request icon
         if (dat.items.length() == 1 && dat.items[0].memo.startsWith("zcash:")) {
             QIcon icon(":/icons/res/paymentreq.gif");