merge

src/chatmodel.cpp

@@ -151,7 +151,7 @@ QString ChatModel::getCidByTx(QString tx)
     {
         qDebug() << "TXID=" << pair.first << " CID=" << pair.second;
     }
-    
+
     if(this->cidMap.count(tx) > 0)
     {
         return this->cidMap[tx];

src/controller.cpp

@@ -947,7 +947,8 @@ void Controller::refreshTransactions() {
                     if(chatModel->getCidByTx(txid) != QString("0xdeadbeef"))
                         cid = chatModel->getCidByTx(txid);
 
-                    //cid = "";
+                    else
+                        cid = "";
                 }
                     
                     ChatItem item = ChatItem(