merge conflict resolved

src/chatmodel.cpp

@@ -698,24 +698,47 @@ void::MainWindow::addContact()
 
     try
     {   
-        bool sapling = true;
-        rpc->createNewZaddr(sapling, [=] (QJsonValue reply) {
-            QString myAddr = reply.toArray()[0].toString();
-            rpc->refreshAddresses();
-            request.myzaddr->setText(myAddr);
-            ui->listReceiveAddresses->insertItem(0, myAddr);
-            ui->listReceiveAddresses->setCurrentIndex(0);
-            DataStore::getChatDataStore()->setSendZaddr(myAddr);
 
-            qDebug()<<"Zaddr: "<<myAddr;
-        });
-    }
-    catch (...)
-    {
-        qDebug() << QString("Caught something nasty with myZaddr Contact");
-    }
+    bool sapling = true;
+    rpc->createNewZaddr(sapling, [=] (QJsonValue reply) {
+        QString myAddr = reply.toArray()[0].toString();
+        rpc->refreshAddresses();
+        request.myzaddr->setText(myAddr);
+        ui->listReceiveAddresses->insertItem(0, myAddr); 
+        ui->listReceiveAddresses->setCurrentIndex(0);
+        DataStore::getChatDataStore()->setSendZaddr(myAddr);
+    
+
+        qDebug()<<"Zaddr: "<<myAddr;
+    });
+
+    }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);
+
+         });
 
-    QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
 
     QObject::connect(request.sendRequestButton, &QPushButton::clicked, this, &MainWindow::saveandsendContact);