Modify warning message for split CPID/mismatched email

gridcoin-community · Dec 18, 2021 · af9f0de · af9f0de
1 parent e40a782
commit af9f0de
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/gridcoin/researcher.cpp b/src/gridcoin/researcher.cpp
@@ -1219,8 +1219,15 @@ void Researcher::Reload(MiningProjectMap projects, GRC::BeaconError beacon_error
 
     bool has_split_cpid = false;
 
-    if (const CpidOption cpid = mining_id.TryCpid()) {
+    // SplitCpid currently can occur if EITHER project have the right email but thed CPID is not converged, OR
+    // the email is mismatched between them or this client, or BOTH. Right now it is too hard to tease all of that
+    // out without significant replumbing. So instead if projects not empty run the DetectSplitCpid regardless
+    // of whether the mining_id has actually been populated.
+    if (!projects.empty()) {
         has_split_cpid = DetectSplitCpid(projects);
+    }
+
+    if (const CpidOption cpid = mining_id.TryCpid()) {
         LogPrintf("Selected primary CPID: %s", cpid->ToString());
     } else if (!projects.empty()) {
         LogPrintf("WARNING: no projects eligible for research rewards.");

diff --git a/src/qt/researcher/researcherwizardsummarypage.cpp b/src/qt/researcher/researcherwizardsummarypage.cpp
@@ -2,6 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 
+#include "logging.h"
+
 #include "qt/bitcoinunits.h"
 #include "qt/decoration.h"
 #include "qt/forms/ui_researcherwizardsummarypage.h"
@@ -114,8 +116,11 @@ void ResearcherWizardSummaryPage::refreshOverallStatus()
     const int icon_size = ui->overallStatusIconLabel->width();
 
     QString status;
+    QString status_tooltip;
     QIcon icon;
 
+    LogPrintf("INFO: %s: m_researcher_model->hasSplitCpid() = %u", __func__, m_researcher_model->hasSplitCpid());
+
     if (m_researcher_model->outOfSync()) {
         status = tr("Waiting for sync...");
         icon = QIcon(":/icons/status_sync_syncing_light");
@@ -129,17 +134,22 @@ void ResearcherWizardSummaryPage::refreshOverallStatus()
         status = tr("Waiting for magnitude.");
         icon = QIcon(":/icons/scraper_waiting_light");
     } else if (m_researcher_model->hasSplitCpid()) {
-        status = tr("Likely split CPID - projects refer to more than one CPID. Please ensure all\n"
-                    "of your projects are attached using the same email address and if you added\n"
-                    "a project recently, update that project and then all other projects using the\n"
-                    "update button in the BOINC manager, then go to the projects tab and refresh.");
+        status = tr("Split CPID or mismatched email.");
+        status_tooltip = tr("Your projects either refer to more than one CPID or your projects\' email do not match "
+                            "what you used to configure Gridcoin here. Please ensure all of your projects are attached "
+                            "using the same email address, the email address matches what was configured here, and if "
+                            "you added a project recently, update that project and then all other projects using the "
+                            "update button in the BOINC manager, then restart the client and recheck.");
         icon = QIcon(":/icons/warning");
     } else {
         status = tr("Everything looks good.");
         icon = QIcon(":/icons/round_green_check");
     }
 
     ui->overallStatusLabel->setText(status);
+
+    if (!status_tooltip.isEmpty()) ui->overallStatusLabel->setToolTip(status_tooltip);
+
     ui->overallStatusIconLabel->setPixmap(icon.pixmap(icon_size, icon_size));
 }