diff options
| author | rating89us <45968869+rating89us@users.noreply.github.com> | 2021-06-15 13:44:47 +0200 |
|---|---|---|
| committer | rating89us <rating89us@rating89us.com> | 2021-06-15 16:34:07 +0200 |
| commit | dfe8146f5c48b8ea67c417b9e2b406c1ef80a3a7 (patch) | |
| tree | 912eaef9d321657bc1b019aee4f0af8aa06cf7ea /wizard | |
| parent | 7c379e2cdaafc0cd618dbaab466625aa76c918bf (diff) | |
| download | monzero-gui-dfe8146f5c48b8ea67c417b9e2b406c1ef80a3a7.tar.gz monzero-gui-dfe8146f5c48b8ea67c417b9e2b406c1ef80a3a7.tar.xz monzero-gui-dfe8146f5c48b8ea67c417b9e2b406c1ef80a3a7.zip | |
SettingsInfo, WizardRestoreWallet1, WizardCreateDevice1: Correct restore height date when typed in wrong format
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 9 | ||||
| -rw-r--r-- | wizard/WizardRestoreWallet1.qml | 10 |
2 files changed, 2 insertions, 17 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index 97623283..1dc877e4 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -183,15 +183,8 @@ Rectangle { wizardController.walletOptionsDeviceName = wizardCreateDevice1.deviceName; if(lookahead.text) wizardController.walletOptionsSubaddressLookahead = lookahead.text; - var _restoreHeight = 0; if(restoreHeight.text){ - // Parse date string or restore height as integer - if(restoreHeight.text.indexOf('-') === 4 && restoreHeight.text.length === 10){ - _restoreHeight = Wizard.getApproximateBlockchainHeight(restoreHeight.text, Utils.netTypeToString()); - } else { - _restoreHeight = parseInt(restoreHeight.text) - } - wizardController.walletOptionsRestoreHeight = _restoreHeight; + wizardController.walletOptionsRestoreHeight = Utils.parseDateStringOrRestoreHeightAsInteger(restoreHeight.text); } wizardController.walletCreatedFromDevice.connect(onCreateWalletFromDeviceCompleted); diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml index 0bf76ca9..4eccc662 100644 --- a/wizard/WizardRestoreWallet1.qml +++ b/wizard/WizardRestoreWallet1.qml @@ -314,16 +314,8 @@ Rectangle { break; } - var _restoreHeight = 0; if(restoreHeight.text){ - // Parse date string or restore height as integer - if(restoreHeight.text.indexOf('-') === 4 && restoreHeight.text.length === 10){ - _restoreHeight = Wizard.getApproximateBlockchainHeight(restoreHeight.text, Utils.netTypeToString()); - } else { - _restoreHeight = parseInt(restoreHeight.text) - } - - wizardController.walletOptionsRestoreHeight = _restoreHeight; + wizardController.walletOptionsRestoreHeight = Utils.parseDateStringOrRestoreHeightAsInteger(restoreHeight.text); } wizardStateView.state = "wizardRestoreWallet2"; |