Skip to content

Commit ef9a9f2

Browse files
authored
Fix unlocking error on "Start Mixing" (#1941)
* Fix unlocking error on "Start Mixing" Instead warn that wallet is fully unlocked etc. * Revert "Fix unlocking error on "Start Mixing"" This reverts commit 4951e58. * Drop mixingOnlyCheckBox and determine the correct unlock path automatically via provided mode
1 parent 0153c4c commit ef9a9f2

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

src/qt/askpassphrasedialog.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,13 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
5050
setWindowTitle(tr("Encrypt wallet"));
5151
break;
5252
case UnlockMixing:
53-
ui->mixingOnlyCheckBox->show();
54-
ui->mixingOnlyCheckBox->setChecked(true);
53+
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to unlock the wallet."));
54+
ui->passLabel2->hide();
55+
ui->passEdit2->hide();
56+
ui->passLabel3->hide();
57+
ui->passEdit3->hide();
58+
setWindowTitle(tr("Unlock wallet for mixing only"));
59+
break;
5560
case Unlock: // Ask passphrase
5661
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to unlock the wallet."));
5762
ui->passLabel2->hide();
@@ -157,7 +162,7 @@ void AskPassphraseDialog::accept()
157162
} break;
158163
case UnlockMixing:
159164
case Unlock:
160-
if(!model->setWalletLocked(false, oldpass, ui->mixingOnlyCheckBox->isChecked()))
165+
if(!model->setWalletLocked(false, oldpass, mode == UnlockMixing))
161166
{
162167
QMessageBox::critical(this, tr("Wallet unlock failed"),
163168
tr("The passphrase entered for the wallet decryption was incorrect."));

src/qt/forms/askpassphrasedialog.ui

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,6 @@
108108
</property>
109109
</widget>
110110
</item>
111-
<item row="4" column="0">
112-
<widget class="QCheckBox" name="mixingOnlyCheckBox">
113-
<property name="enabled">
114-
<bool>true</bool>
115-
</property>
116-
<property name="toolTip">
117-
<string>Serves to disable the trivial sendmoney when OS account compromised. Provides no real security.</string>
118-
</property>
119-
<property name="text">
120-
<string>Only for mixing via PrivateSend</string>
121-
</property>
122-
<property name="visible">
123-
<bool>false</bool>
124-
</property>
125-
</widget>
126-
</item>
127111
</layout>
128112
</item>
129113
<item>

0 commit comments

Comments
 (0)