diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-03-01 02:38:52 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-03-01 02:38:52 -0600 |
| commit | cd9e1bf0ea64cf09d766559f391dc2cdc644323d (patch) | |
| tree | 0bee20b7601b2d24541c9d0f0c1153331bf30ea1 /wizard/WizardController.qml | |
| parent | 39b0fa18e199959a241d4a6431b62e64c50f301c (diff) | |
| parent | fc68567f23b2f754f3e54e73c00a6ca41558f923 (diff) | |
| download | monzero-gui-cd9e1bf0ea64cf09d766559f391dc2cdc644323d.tar.gz monzero-gui-cd9e1bf0ea64cf09d766559f391dc2cdc644323d.tar.xz monzero-gui-cd9e1bf0ea64cf09d766559f391dc2cdc644323d.zip | |
Merge pull request #1989
fc68567 wizard: improve restore from device ui/ux (selsta)
Diffstat (limited to 'wizard/WizardController.qml')
| -rw-r--r-- | wizard/WizardController.qml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index c57ff042..4224e904 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -60,6 +60,7 @@ Rectangle { wizardController.walletOptionsIsRecovering = false; wizardController.walletOptionsIsRecoveringFromDevice = false; wizardController.walletOptionsDeviceName = ''; + wizardController.walletOptionsDeviceIsRestore = false; wizardController.tmpWalletFilename = ''; wizardController.walletRestoreMode = 'seed' wizardController.walletOptionsSubaddressLookahead = ''; @@ -89,6 +90,7 @@ Rectangle { property bool walletOptionsIsRecoveringFromDevice: false property string walletOptionsSubaddressLookahead: '' property string walletOptionsDeviceName: '' + property bool walletOptionsDeviceIsRestore: false property string tmpWalletFilename: '' property var remoteNodes: '' @@ -388,7 +390,10 @@ Rectangle { wizardController.m_wallet = wallet; wizardController.walletOptionsIsRecoveringFromDevice = true; wizardController.tmpWalletFilename = tmp_wallet_filename; - wizardController.walletOptionsRestoreHeight = wizardController.m_wallet.walletCreationHeight; + if (!wizardController.walletOptionsDeviceIsRestore) { + // User creates a hardware wallet for the first time. Use a recent block height from API. + wizardController.walletOptionsRestoreHeight = wizardController.m_wallet.walletCreationHeight; + } } else { console.log(wallet.errorString) appWindow.showStatusMessage(qsTr(wallet.errorString), 5); |