diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-13 15:36:44 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-13 15:36:44 -0500 |
| commit | eed51e3ffa4a6a20dd6392e07a3d7afde99b088e (patch) | |
| tree | f6379babcea1ead55ae2db686f30a99824f9c710 /wizard | |
| parent | 6a889bdaa19bd6ef66165d18d10f82c2c5ed6fa0 (diff) | |
| parent | 48aab5c6e57f9e66ffec7cae0c1398ac767381f7 (diff) | |
| download | monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.gz monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.xz monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.zip | |
Merge pull request #2772
48aab5c WalletManager: wallet recovery - seed offset passphrase support (xiphon)
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardController.qml | 4 | ||||
| -rw-r--r-- | wizard/WizardRestoreWallet1.qml | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index 6ee5f38e..992ae2fb 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -59,6 +59,7 @@ Rectangle { wizardController.walletOptionsLocation = ''; wizardController.walletOptionsPassword = ''; wizardController.walletOptionsSeed = ''; + wizardController.walletOptionsSeedOffset = ''; wizardController.walletOptionsRecoverAddress = '' wizardController.walletOptionsRecoverViewkey = '' wizardController.walletOptionsRecoverSpendkey = '' @@ -92,6 +93,7 @@ Rectangle { property string walletOptionsLocation: '' property string walletOptionsPassword: '' property string walletOptionsSeed: '' + property string walletOptionsSeedOffset: '' property string walletOptionsRecoverAddress: '' property string walletOptionsRecoverViewkey: '' property string walletOptionsRecoverSpendkey: '' @@ -394,7 +396,7 @@ Rectangle { var wallet = '' // From seed or keys if(wizardController.walletRestoreMode === 'seed') - wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, nettype, restoreHeight, kdfRounds) + wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, wizardController.walletOptionsSeedOffset, nettype, restoreHeight, kdfRounds); else wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, wizardController.language_wallet, nettype, wizardController.walletOptionsRecoverAddress, wizardController.walletOptionsRecoverViewkey, diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml index b9fd5612..cc903bb8 100644 --- a/wizard/WizardRestoreWallet1.qml +++ b/wizard/WizardRestoreWallet1.qml @@ -164,8 +164,8 @@ Rectangle { ColumnLayout { // seed textarea visible: wizardController.walletRestoreMode === 'seed' - Layout.preferredHeight: 100 Layout.fillWidth: true + spacing: 10 Rectangle { color: "transparent" @@ -217,6 +217,20 @@ Rectangle { } } } + + MoneroComponents.CheckBox2 { + id: seedOffsetCheckbox + text: qsTr("Seed offset passphrase (optional)") + translationManager.emptyString + } + + MoneroComponents.LineEdit { + id: seedOffset + echoMode: TextInput.Password + Layout.fillWidth: true + placeholderFontSize: 16 + placeholderText: qsTr("Passphrase") + translationManager.emptyString + visible: seedOffsetCheckbox.checked + } } MoneroComponents.LineEdit { @@ -294,6 +308,7 @@ Rectangle { switch (wizardController.walletRestoreMode) { case 'seed': wizardController.walletOptionsSeed = seedInput.text; + wizardController.walletOptionsSeedOffset = seedOffsetCheckbox.checked ? seedOffset.text : ""; break; default: // walletRestoreMode = keys or qr wizardController.walletOptionsRecoverAddress = addressLine.text; @@ -325,6 +340,8 @@ Rectangle { // cleanup wizardWalletInput.reset(); seedInput.text = ""; + seedOffsetCheckbox.checked = false; + seedOffset.text = ""; addressLine.text = ""; spendKeyLine.text = ""; viewKeyLine.text = ""; |