diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index 3e15300..770e93c 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -239,19 +239,15 @@ void MainWindow::renderContactRequest(){ qDebug()<<"Beginn kopiert" <addAddressLabel(newLabel, addr, myAddr, cid, avatar); + rpc->refreshContacts( + ui->listContactWidget); QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact"); - rpc->refreshContacts( - ui->listContactWidget - - ); - }); dialog.exec(); - } void ChatModel::addCid(QString tx, QString cid) @@ -565,15 +561,7 @@ void::MainWindow::addContact() qDebug() << QString("Caught something nasty with myZaddr Contact"); } - QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces); - - - - - - - - + QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces); QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () { @@ -723,7 +711,10 @@ void MainWindow::ContactRequest() { delete d; }); - QString addr = contactRequest.getReceiverAddress(); + + /////Add this contact after we sent the request + + QString addr = contactRequest.getReceiverAddress(); QString newLabel = contactRequest.getLabel(); QString myAddr = contactRequest.getSenderAddress(); QString cid = contactRequest.getCid(); @@ -756,17 +747,22 @@ void MainWindow::ContactRequest() { ////// Success, so show it AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar); + rpc->refreshContacts( + ui->listContactWidget); QMessageBox::information( this, QObject::tr("Added Contact"), QObject::tr("successfully added your new contact").arg(newLabel), QMessageBox::Ok + ); return; // Force a UI update so we get the unconfirmed Tx // rpc->refresh(true); ui->memoTxtChat->clear(); rpc->refresh(true); + rpc->refreshContacts( + ui->listContactWidget); }, // Errored out diff --git a/src/controller.cpp b/src/controller.cpp index 17f80bc..0c79240 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -922,8 +922,6 @@ void Controller::refreshTransactions() { isNotarized = false; } - qDebug()<<"Conf : " << confirmations; - ChatItem item = ChatItem( datetime, address, @@ -1078,7 +1076,6 @@ void Controller::refreshTransactions() { } } } - qDebug()<<"get Lag" << getLag(); // Calculate the total unspent amount that's pending. This will need to be // shown in the UI so the user can keep track of pending funds @@ -1098,10 +1095,7 @@ void Controller::refreshTransactions() { // Update model data, which updates the table view transactionsTableModel->replaceData(txdata); chat->renderChatBox(ui, ui->listChat,ui->memoSizeChat); - // refreshContacts( - // ui->listContactWidget - - // ); + }); }