Merge branch 'MyHush-dev' into dev

src/chatmodel.cpp

@@ -698,6 +698,7 @@ void::MainWindow::addContact()
 
     try
     {   
+
     bool sapling = true;
     rpc->createNewZaddr(sapling, [=] (QJsonValue reply) {
         QString myAddr = reply.toArray()[0].toString();
@@ -707,16 +708,38 @@ void::MainWindow::addContact()
         ui->listReceiveAddresses->setCurrentIndex(0);
         DataStore::getChatDataStore()->setSendZaddr(myAddr);
     
+
         qDebug()<<"Zaddr: "<<myAddr;
     });
-    }
+
-    catch (...)
+    }catch(...)
        {
+
+            
             qDebug() << QString("Caught something nasty with myZaddr Contact");
        }
 
         QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
         
+    QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () {
+        
+        QString addr = request.zaddr->text();
+        QString myAddr = request.myzaddr->text().trimmed();
+        QString memo = request.memorequest->toPlainText().trimmed();
+        QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png");
+        QString label = request.labelRequest->text().trimmed();
+
+
+        contactRequest.setSenderAddress(myAddr);
+        contactRequest.setReceiverAddress(addr);
+        contactRequest.setMemo(memo);
+        contactRequest.setCid(cid);
+        contactRequest.setAvatar(avatar);
+        contactRequest.setLabel(label);
+
+         });
+
+
     QObject::connect(request.sendRequestButton, &QPushButton::clicked, this, &MainWindow::saveandsendContact);
 
     // QObject::connect(request.onlyAdd, &QPushButton::clicked, this, &MainWindow::saveContact);