diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index e0a7945591dffc..26b95615f849f2 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -539,6 +539,10 @@ void OverviewPage::coinJoinStatus(bool fForce) if(walletModel->getKeysLeftSinceAutoBackup() < COINJOIN_KEYS_THRESHOLD_WARNING) { strKeysLeftText = "" + strKeysLeftText + ""; } + if (!walletModel->wallet().isLegacy()) { + // we don't need in auto-back for case of Descriptor wallets + strKeysLeftText = ""; + } ui->labelCoinJoinEnabled->setToolTip(strKeysLeftText); QString strCoinJoinName = QString::fromStdString(gCoinJoinName); @@ -553,7 +557,7 @@ void OverviewPage::coinJoinStatus(bool fForce) QString strEnabled = tr("Disabled"); // Show how many keys left in advanced PS UI mode only - if (fShowAdvancedCJUI) strEnabled += ", " + strKeysLeftText; + if (fShowAdvancedCJUI && !strKeysLeftText.isEmpty()) strEnabled += ", " + strKeysLeftText; ui->labelCoinJoinEnabled->setText(strEnabled); // If mixing isn't active always show the lower number of txes because there are @@ -567,7 +571,7 @@ void OverviewPage::coinJoinStatus(bool fForce) // Warn user that wallet is running out of keys // NOTE: we do NOT warn user and do NOT create autobackups if mixing is not running - if (nWalletBackups > 0 && walletModel->getKeysLeftSinceAutoBackup() < COINJOIN_KEYS_THRESHOLD_WARNING) { + if (walletModel->wallet().isLegacy() && nWalletBackups > 0 && walletModel->getKeysLeftSinceAutoBackup() < COINJOIN_KEYS_THRESHOLD_WARNING) { QSettings settings; if(settings.value("fLowKeysWarning").toBool()) { QString strWarn = tr("Very low number of keys left since last automatic backup!") + "

" + @@ -607,7 +611,7 @@ void OverviewPage::coinJoinStatus(bool fForce) QString strEnabled = walletModel->coinJoin()->isMixing() ? tr("Enabled") : tr("Disabled"); // Show how many keys left in advanced PS UI mode only - if(fShowAdvancedCJUI) strEnabled += ", " + strKeysLeftText; + if(fShowAdvancedCJUI && !strKeysLeftText.isEmpty()) strEnabled += ", " + strKeysLeftText; ui->labelCoinJoinEnabled->setText(strEnabled); if(nWalletBackups == -1) {