diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index 6790663..7460972 100644 --- a/src/chatmodel.cpp +++ b/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: "<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: "<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);